Updating translation files for release

14 files changed, 3420 insertions, 3178 deletions

diff --git a/po/de.po b/po/de.po
index 586414e3..80c4f4bd 100644
--- a/po/de.po
+++ b/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-08-03 18:24-0400\n"
+"POT-Creation-Date: 2010-10-18 13:14-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"
@@ -18,904 +18,920 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: German\n"
 
-#: config/SSSDConfig.py:39
+#: src/config/SSSDConfig.py:39
 msgid "Set the verbosity of the debug logging"
 msgstr ""
 
-#: config/SSSDConfig.py:40
+#: src/config/SSSDConfig.py:40
 msgid "Include timestamps in debug logs"
 msgstr ""
 
-#: config/SSSDConfig.py:41
+#: src/config/SSSDConfig.py:41
 msgid "Write debug messages to logfiles"
 msgstr ""
 
-#: config/SSSDConfig.py:42
+#: src/config/SSSDConfig.py:42
 msgid "Ping timeout before restarting service"
 msgstr ""
 
-#: config/SSSDConfig.py:43
+#: src/config/SSSDConfig.py:43
 msgid "Command to start service"
 msgstr ""
 
-#: config/SSSDConfig.py:44
+#: src/config/SSSDConfig.py:44
 msgid "Number of times to attempt connection to Data Providers"
 msgstr ""
 
-#: config/SSSDConfig.py:47
+#: src/config/SSSDConfig.py:47
 msgid "SSSD Services to start"
 msgstr ""
 
-#: config/SSSDConfig.py:48
+#: src/config/SSSDConfig.py:48
 msgid "SSSD Domains to start"
 msgstr ""
 
-#: config/SSSDConfig.py:49
+#: src/config/SSSDConfig.py:49
 msgid "Timeout for messages sent over the SBUS"
 msgstr ""
 
-#: config/SSSDConfig.py:50
+#: src/config/SSSDConfig.py:50
 msgid "Regex to parse username and domain"
 msgstr ""
 
-#: config/SSSDConfig.py:51
+#: src/config/SSSDConfig.py:51
 msgid "Printf-compatible format for displaying fully-qualified names"
 msgstr ""
 
-#: config/SSSDConfig.py:54
+#: src/config/SSSDConfig.py:54
 msgid "Enumeration cache timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:55
+#: src/config/SSSDConfig.py:55
 msgid "Entry cache background update timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:56
+#: src/config/SSSDConfig.py:56
 msgid "Negative cache timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:57
+#: src/config/SSSDConfig.py:57
 msgid "Users that SSSD should explicitly ignore"
 msgstr ""
 
-#: config/SSSDConfig.py:58
+#: src/config/SSSDConfig.py:58
 msgid "Groups that SSSD should explicitly ignore"
 msgstr ""
 
-#: config/SSSDConfig.py:59
+#: src/config/SSSDConfig.py:59
 msgid "Should filtered users appear in groups"
 msgstr ""
 
-#: config/SSSDConfig.py:60
+#: src/config/SSSDConfig.py:60
 msgid "The value of the password field the NSS provider should return"
 msgstr ""
 
-#: config/SSSDConfig.py:63
+#: src/config/SSSDConfig.py:63
 msgid "How long to allow cached logins between online logins (days)"
 msgstr ""
 
-#: config/SSSDConfig.py:64
+#: src/config/SSSDConfig.py:64
 msgid "How many failed logins attempts are allowed when offline"
 msgstr ""
 
-#: config/SSSDConfig.py:65
+#: src/config/SSSDConfig.py:65
 msgid ""
 "How long (minutes) to deny login after offline_failed_login_attempts has "
 "been reached"
 msgstr ""
 
-#: config/SSSDConfig.py:68
+#: src/config/SSSDConfig.py:68
 msgid "Identity provider"
 msgstr ""
 
-#: config/SSSDConfig.py:69
+#: src/config/SSSDConfig.py:69
 msgid "Authentication provider"
 msgstr ""
 
-#: config/SSSDConfig.py:70
+#: src/config/SSSDConfig.py:70
 msgid "Access control provider"
 msgstr ""
 
-#: config/SSSDConfig.py:71
+#: src/config/SSSDConfig.py:71
 msgid "Password change provider"
 msgstr ""
 
-#: config/SSSDConfig.py:74
+#: src/config/SSSDConfig.py:74
 msgid "Minimum user ID"
 msgstr ""
 
-#: config/SSSDConfig.py:75
+#: src/config/SSSDConfig.py:75
 msgid "Maximum user ID"
 msgstr ""
 
-#: config/SSSDConfig.py:76
+#: src/config/SSSDConfig.py:76
 msgid "Ping timeout before restarting domain"
 msgstr ""
 
-#: config/SSSDConfig.py:77
+#: src/config/SSSDConfig.py:77
 msgid "Enable enumerating all users/groups"
 msgstr ""
 
-#: config/SSSDConfig.py:78
+#: src/config/SSSDConfig.py:78
 msgid "Cache credentials for offline login"
 msgstr ""
 
-#: config/SSSDConfig.py:79
+#: src/config/SSSDConfig.py:79
 msgid "Store password hashes"
 msgstr ""
 
-#: config/SSSDConfig.py:80
+#: src/config/SSSDConfig.py:80
 msgid "Display users/groups in fully-qualified form"
 msgstr ""
 
-#: config/SSSDConfig.py:81
+#: src/config/SSSDConfig.py:81
 msgid "Entry cache timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:82
+#: src/config/SSSDConfig.py:82
 msgid ""
 "Restrict or prefer a specific address family when performing DNS lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:83
+#: src/config/SSSDConfig.py:83
 msgid "How long to keep cached entries after last successful login (days)"
 msgstr ""
 
-#: config/SSSDConfig.py:84
+#: src/config/SSSDConfig.py:84
 msgid "How long to wait for replies from DNS when resolving servers (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:85
+#: src/config/SSSDConfig.py:85
 msgid "The domain part of service discovery DNS query"
 msgstr ""
 
-#: config/SSSDConfig.py:88
+#: src/config/SSSDConfig.py:88
 msgid "IPA domain"
 msgstr "IPA-Domain"
 
-#: config/SSSDConfig.py:89
+#: src/config/SSSDConfig.py:89
 msgid "IPA server address"
 msgstr "IPA-Serveradresse"
 
-#: config/SSSDConfig.py:90
+#: src/config/SSSDConfig.py:90
 msgid "IPA client hostname"
 msgstr "IPA-Client-Rechnername"
 
-#: config/SSSDConfig.py:91
+#: src/config/SSSDConfig.py:91
 msgid "Whether to automatically update the client's DNS entry in FreeIPA"
 msgstr ""
 
-#: config/SSSDConfig.py:92
+#: src/config/SSSDConfig.py:92
 msgid "The interface whose IP should be used for dynamic DNS updates"
 msgstr ""
 
-#: config/SSSDConfig.py:95 config/SSSDConfig.py:124
+#: src/config/SSSDConfig.py:95 src/config/SSSDConfig.py:124
 msgid "Kerberos server address"
 msgstr "Kerberos-Serveradresse"
 
-#: config/SSSDConfig.py:96 config/SSSDConfig.py:125
+#: src/config/SSSDConfig.py:96 src/config/SSSDConfig.py:125
 msgid "Kerberos realm"
 msgstr "Kerberos Realm"
 
-#: config/SSSDConfig.py:97
+#: src/config/SSSDConfig.py:97
 msgid "Authentication timeout"
 msgstr ""
 
-#: config/SSSDConfig.py:100
+#: src/config/SSSDConfig.py:100
 msgid "Directory to store credential caches"
 msgstr ""
 
-#: config/SSSDConfig.py:101
+#: src/config/SSSDConfig.py:101
 msgid "Location of the user's credential cache"
 msgstr ""
 
-#: config/SSSDConfig.py:102
+#: src/config/SSSDConfig.py:102
 msgid "Location of the keytab to validate credentials"
 msgstr ""
 
-#: config/SSSDConfig.py:103
+#: src/config/SSSDConfig.py:103
 msgid "Enable credential validation"
 msgstr ""
 
-#: config/SSSDConfig.py:104
+#: src/config/SSSDConfig.py:104
 msgid "Store password if offline for later online authentication"
 msgstr ""
 
-#: config/SSSDConfig.py:107
+#: src/config/SSSDConfig.py:107
 msgid "Server where the change password service is running if not on the KDC"
 msgstr ""
 
-#: config/SSSDConfig.py:110
+#: src/config/SSSDConfig.py:110
 msgid "ldap_uri, The URI of the LDAP server"
 msgstr ""
 
-#: config/SSSDConfig.py:111
+#: src/config/SSSDConfig.py:111
 msgid "The default base DN"
 msgstr ""
 
-#: config/SSSDConfig.py:112
+#: src/config/SSSDConfig.py:112
 msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr ""
 
-#: config/SSSDConfig.py:113
+#: src/config/SSSDConfig.py:113
 msgid "The default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:114
+#: src/config/SSSDConfig.py:114
 msgid "The type of the authentication token of the default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:115
+#: src/config/SSSDConfig.py:115
 msgid "The authentication token of the default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:116
+#: src/config/SSSDConfig.py:116
 msgid "Length of time to attempt connection"
 msgstr ""
 
-#: config/SSSDConfig.py:117
+#: src/config/SSSDConfig.py:117
 msgid "Length of time to attempt synchronous LDAP operations"
 msgstr ""
 
-#: config/SSSDConfig.py:118
+#: src/config/SSSDConfig.py:118
 msgid "Length of time between attempts to reconnect while offline"
 msgstr ""
 
-#: config/SSSDConfig.py:119
+#: src/config/SSSDConfig.py:119
 msgid "File that contains CA certificates"
 msgstr ""
 
-#: config/SSSDConfig.py:120
+#: src/config/SSSDConfig.py:120
 msgid "Path to CA certificate directory"
 msgstr ""
 
-#: config/SSSDConfig.py:121
+#: src/config/SSSDConfig.py:121
 msgid "Require TLS certificate verification"
 msgstr ""
 
-#: config/SSSDConfig.py:122
+#: src/config/SSSDConfig.py:122
 msgid "Specify the sasl mechanism to use"
 msgstr ""
 
-#: config/SSSDConfig.py:123
+#: src/config/SSSDConfig.py:123
 msgid "Specify the sasl authorization id to use"
 msgstr ""
 
-#: config/SSSDConfig.py:126
+#: src/config/SSSDConfig.py:126
 msgid "Kerberos service keytab"
 msgstr ""
 
-#: config/SSSDConfig.py:127
+#: src/config/SSSDConfig.py:127
 msgid "Use Kerberos auth for LDAP connection"
 msgstr ""
 
-#: config/SSSDConfig.py:128
+#: src/config/SSSDConfig.py:128
 msgid "Follow LDAP referrals"
 msgstr ""
 
-#: config/SSSDConfig.py:129
+#: src/config/SSSDConfig.py:129
 msgid "Lifetime of TGT for LDAP connection"
 msgstr ""
 
-#: config/SSSDConfig.py:132
+#: src/config/SSSDConfig.py:132
 msgid "Length of time to wait for a search request"
 msgstr ""
 
-#: config/SSSDConfig.py:133
+#: src/config/SSSDConfig.py:133
 msgid "Length of time between enumeration updates"
 msgstr ""
 
-#: config/SSSDConfig.py:134
+#: src/config/SSSDConfig.py:134
 msgid "Require TLS for ID lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:135
+#: src/config/SSSDConfig.py:135
 msgid "Base DN for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:136
+#: src/config/SSSDConfig.py:136
 msgid "Scope of user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:137
+#: src/config/SSSDConfig.py:137
 msgid "Filter for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:138
+#: src/config/SSSDConfig.py:138
 msgid "Objectclass for users"
 msgstr ""
 
-#: config/SSSDConfig.py:139
+#: src/config/SSSDConfig.py:139
 msgid "Username attribute"
 msgstr "Benutzername-Attribut"
 
-#: config/SSSDConfig.py:140
+#: src/config/SSSDConfig.py:140
 msgid "UID attribute"
 msgstr "UID-Attribut"
 
-#: config/SSSDConfig.py:141
+#: src/config/SSSDConfig.py:141
 msgid "Primary GID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:142
+#: src/config/SSSDConfig.py:142
 msgid "GECOS attribute"
 msgstr "GECOS-Attribut"
 
-#: config/SSSDConfig.py:143
+#: src/config/SSSDConfig.py:143
 msgid "Home directory attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:144
+#: src/config/SSSDConfig.py:144
 msgid "Shell attribute"
 msgstr "Shell-Attribut"
 
-#: config/SSSDConfig.py:145
+#: src/config/SSSDConfig.py:145
 msgid "UUID attribute"
 msgstr "UUID-Attribut"
 
-#: config/SSSDConfig.py:146
+#: src/config/SSSDConfig.py:146
 msgid "User principal attribute (for Kerberos)"
 msgstr ""
 
-#: config/SSSDConfig.py:147
+#: src/config/SSSDConfig.py:147
 msgid "Full Name"
 msgstr "Vollständiger Name"
 
-#: config/SSSDConfig.py:148
+#: src/config/SSSDConfig.py:148
 msgid "memberOf attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:149
+#: src/config/SSSDConfig.py:149
 msgid "Modification time attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:152
+#: src/config/SSSDConfig.py:152
 msgid "Policy to evaluate the password expiration"
 msgstr ""
 
-#: config/SSSDConfig.py:155
+#: src/config/SSSDConfig.py:155
 msgid "LDAP filter to determine access privileges"
 msgstr ""
 
-#: config/SSSDConfig.py:158
+#: src/config/SSSDConfig.py:158
 msgid "Comma separated list of allowed users"
 msgstr ""
 
-#: config/SSSDConfig.py:159
+#: src/config/SSSDConfig.py:159
 msgid "Comma separated list of prohibited users"
 msgstr ""
 
-#: config/SSSDConfig.py:162
+#: src/config/SSSDConfig.py:162
 msgid "Default shell, /bin/bash"
 msgstr ""
 
-#: config/SSSDConfig.py:163
+#: src/config/SSSDConfig.py:163
 msgid "Base for home directories"
 msgstr ""
 
-#: config/SSSDConfig.py:166
+#: src/config/SSSDConfig.py:166
 msgid "The name of the NSS library to use"
 msgstr ""
 
-#: config/SSSDConfig.py:169
+#: src/config/SSSDConfig.py:169
 msgid "PAM stack to use"
 msgstr ""
 
-#: monitor/monitor.c:2137
+#: src/monitor/monitor.c:2140
 msgid "Become a daemon (default)"
 msgstr ""
 
-#: monitor/monitor.c:2139
+#: src/monitor/monitor.c:2142
 msgid "Run interactive (not a daemon)"
 msgstr ""
 
-#: monitor/monitor.c:2141
+#: src/monitor/monitor.c:2144
 msgid "Specify a non-default config file"
 msgstr ""
 
-#: monitor/monitor.c:2167
+#: src/monitor/monitor.c:2170
 msgid "sssd must be run as root\n"
 msgstr ""
 
-#: monitor/monitor.c:2202
+#: src/monitor/monitor.c:2205
 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:2212
+#: src/monitor/monitor.c:2215
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
 "file is owned by root.root\n"
 msgstr ""
 
-#: monitor/monitor.c:2217
+#: src/monitor/monitor.c:2220
 msgid "Cannot load configuration database\n"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:993 providers/ldap/ldap_child.c:361
-#: util/util.h:61
+#: src/providers/krb5/krb5_child.c:1043 src/providers/ldap/ldap_child.c:359
+#: src/util/util.h:63
 msgid "Debug level"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:995 providers/ldap/ldap_child.c:363
-#: util/util.h:65
+#: src/providers/krb5/krb5_child.c:1045 src/providers/ldap/ldap_child.c:361
+#: src/util/util.h:67
 msgid "Add debug timestamps"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:997 providers/ldap/ldap_child.c:365
+#: src/providers/krb5/krb5_child.c:1047 src/providers/ldap/ldap_child.c:363
 msgid "An open file descriptor for the debug logs"
 msgstr ""
 
-#: providers/data_provider_be.c:1165
+#: src/providers/data_provider_be.c:1165
 msgid "Domain of the information provider (mandatory)"
 msgstr ""
 
-#: sss_client/common.c:742
+#: src/sss_client/common.c:742
 msgid "Privileged socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:745
+#: src/sss_client/common.c:745
 msgid "Public socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:748
+#: src/sss_client/common.c:748
 msgid "Unexpected format of the server credential message."
 msgstr ""
 
-#: sss_client/common.c:751
+#: src/sss_client/common.c:751
 msgid "SSSD is not run by root."
 msgstr ""
 
-#: sss_client/common.c:756
+#: src/sss_client/common.c:756
 msgid "An error occurred, but no description can be found."
 msgstr ""
 
-#: sss_client/common.c:762
+#: src/sss_client/common.c:762
 msgid "Unexpected error while looking for an error description"
 msgstr ""
 
-#: sss_client/pam_sss.c:372
+#: src/sss_client/pam_sss.c:372
 msgid "Passwords do not match"
 msgstr ""
 
-#: sss_client/pam_sss.c:556
+#: src/sss_client/pam_sss.c:556
 msgid "Password reset by root is not supported."
 msgstr ""
 
-#: sss_client/pam_sss.c:597
+#: src/sss_client/pam_sss.c:597
 msgid "Authenticated with cached credentials"
 msgstr ""
 
-#: sss_client/pam_sss.c:598
+#: src/sss_client/pam_sss.c:598
 msgid ", your cached password will expire at: "
 msgstr ""
 
-#: sss_client/pam_sss.c:628
+#: src/sss_client/pam_sss.c:628
 #, c-format
 msgid "Your password has expired. You have %d grace login(s) remaining."
 msgstr ""
 
-#: sss_client/pam_sss.c:674
+#: src/sss_client/pam_sss.c:674
 #, c-format
 msgid "Your password will expire in %d %s."
 msgstr ""
 
-#: sss_client/pam_sss.c:723
+#: src/sss_client/pam_sss.c:723
 msgid "Authentication is denied until: "
 msgstr ""
 
-#: sss_client/pam_sss.c:750
+#: src/sss_client/pam_sss.c:750
 msgid "System is offline, password change not possible"
 msgstr ""
 
-#: sss_client/pam_sss.c:780 sss_client/pam_sss.c:793
+#: src/sss_client/pam_sss.c:780 src/sss_client/pam_sss.c:793
 msgid "Password change failed. "
 msgstr ""
 
-#: sss_client/pam_sss.c:783 sss_client/pam_sss.c:794
+#: src/sss_client/pam_sss.c:783 src/sss_client/pam_sss.c:794
 msgid "Server message: "
 msgstr ""
 
-#: sss_client/pam_sss.c:1197
+#: src/sss_client/pam_sss.c:1197
 msgid "New Password: "
 msgstr ""
 
-#: sss_client/pam_sss.c:1198
+#: src/sss_client/pam_sss.c:1198
 msgid "Reenter new Password: "
 msgstr ""
 
-#: sss_client/pam_sss.c:1280
+#: src/sss_client/pam_sss.c:1280
 msgid "Password: "
 msgstr ""
 
-#: sss_client/pam_sss.c:1312
+#: src/sss_client/pam_sss.c:1312
 msgid "Current Password: "
 msgstr ""
 
-#: sss_client/pam_sss.c:1458
+#: src/sss_client/pam_sss.c:1458
 msgid "Password expired. Change your password now."
 msgstr ""
 
-#: tools/sss_useradd.c:48 tools/sss_groupadd.c:41 tools/sss_groupdel.c:43
-#: tools/sss_groupmod.c:42 tools/sss_groupshow.c:620 tools/sss_userdel.c:131
-#: tools/sss_usermod.c:47
+#: src/tools/sss_useradd.c:48 src/tools/sss_groupadd.c:41
+#: src/tools/sss_groupdel.c:43 src/tools/sss_groupmod.c:42
+#: src/tools/sss_groupshow.c:620 src/tools/sss_userdel.c:131
+#: src/tools/sss_usermod.c:47
 msgid "The debug level to run with"
 msgstr ""
 
-#: tools/sss_useradd.c:49 tools/sss_usermod.c:48
+#: src/tools/sss_useradd.c:49 src/tools/sss_usermod.c:48
 msgid "The UID of the user"
 msgstr ""
 
-#: tools/sss_useradd.c:50 tools/sss_usermod.c:50
+#: src/tools/sss_useradd.c:50 src/tools/sss_usermod.c:50
 msgid "The comment string"
 msgstr ""
 
-#: tools/sss_useradd.c:51 tools/sss_usermod.c:51
+#: src/tools/sss_useradd.c:51 src/tools/sss_usermod.c:51
 msgid "Home directory"
 msgstr "Bneutzerverzeichnis"
 
-#: tools/sss_useradd.c:52 tools/sss_usermod.c:52
+#: src/tools/sss_useradd.c:52 src/tools/sss_usermod.c:52
 msgid "Login shell"
 msgstr "Anmelde-Shell"
 
-#: tools/sss_useradd.c:53
+#: src/tools/sss_useradd.c:53
 msgid "Groups"
 msgstr "Gruppen"
 
-#: tools/sss_useradd.c:54
+#: src/tools/sss_useradd.c:54
 msgid "Create user's directory if it does not exist"
 msgstr ""
 
-#: tools/sss_useradd.c:55
+#: src/tools/sss_useradd.c:55
 msgid "Never create user's directory, overrides config"
 msgstr ""
 
-#: tools/sss_useradd.c:56
+#: src/tools/sss_useradd.c:56
 msgid "Specify an alternative skeleton directory"
 msgstr ""
 
-#: tools/sss_useradd.c:57 tools/sss_usermod.c:57
+#: src/tools/sss_useradd.c:57 src/tools/sss_usermod.c:57
 msgid "The SELinux user for user's login"
 msgstr ""
 
-#: tools/sss_useradd.c:71 tools/sss_groupadd.c:56 tools/sss_groupdel.c:52
-#: tools/sss_groupmod.c:63 tools/sss_groupshow.c:631 tools/sss_userdel.c:148
-#: tools/sss_usermod.c:72
+#: src/tools/sss_useradd.c:71 src/tools/sss_groupadd.c:56
+#: src/tools/sss_groupdel.c:52 src/tools/sss_groupmod.c:63
+#: src/tools/sss_groupshow.c:631 src/tools/sss_userdel.c:148
+#: src/tools/sss_usermod.c:72
 msgid "Error setting the locale\n"
 msgstr ""
 
-#: tools/sss_useradd.c:107
+#: src/tools/sss_useradd.c:84 src/tools/sss_groupmod.c:76
+#: src/tools/sss_usermod.c:85
+msgid "Specify group to add to\n"
+msgstr ""
+
+#: src/tools/sss_useradd.c:108
 msgid "Specify user to add\n"
 msgstr ""
 
-#: tools/sss_useradd.c:118 tools/sss_groupadd.c:86 tools/sss_groupdel.c:81
-#: tools/sss_groupmod.c:111 tools/sss_groupshow.c:668 tools/sss_userdel.c:197
-#: tools/sss_usermod.c:128
+#: src/tools/sss_useradd.c:117 src/tools/sss_groupadd.c:82
+#: src/tools/sss_groupdel.c:77 src/tools/sss_groupmod.c:109
+#: src/tools/sss_groupshow.c:664 src/tools/sss_userdel.c:193
+#: src/tools/sss_usermod.c:126
 msgid "Error initializing the tools - no local domain\n"
 msgstr ""
 
-#: tools/sss_useradd.c:120 tools/sss_groupadd.c:88 tools/sss_groupdel.c:83
-#: tools/sss_groupmod.c:113 tools/sss_groupshow.c:670 tools/sss_userdel.c:199
-#: tools/sss_usermod.c:130
+#: src/tools/sss_useradd.c:119 src/tools/sss_groupadd.c:84
+#: src/tools/sss_groupdel.c:79 src/tools/sss_groupmod.c:111
+#: src/tools/sss_groupshow.c:666 src/tools/sss_userdel.c:195
+#: src/tools/sss_usermod.c:128
 msgid "Error initializing the tools\n"
 msgstr ""
 
-#: tools/sss_useradd.c:129 tools/sss_groupadd.c:97 tools/sss_groupdel.c:92
-#: tools/sss_groupmod.c:121 tools/sss_groupshow.c:679 tools/sss_userdel.c:208
-#: tools/sss_usermod.c:139
+#: src/tools/sss_useradd.c:128 src/tools/sss_groupadd.c:93
+#: src/tools/sss_groupdel.c:88 src/tools/sss_groupmod.c:119
+#: src/tools/sss_groupshow.c:675 src/tools/sss_userdel.c:204
+#: src/tools/sss_usermod.c:137
 msgid "Invalid domain specified in FQDN\n"
 msgstr ""
 
-#: tools/sss_useradd.c:138 tools/sss_groupmod.c:143 tools/sss_groupmod.c:170
-#: tools/sss_usermod.c:164 tools/sss_usermod.c:191
+#: src/tools/sss_useradd.c:137 src/tools/sss_groupmod.c:141
+#: src/tools/sss_groupmod.c:168 src/tools/sss_usermod.c:162
+#: src/tools/sss_usermod.c:189
 msgid "Internal error while parsing parameters\n"
 msgstr ""
 
-#: tools/sss_useradd.c:146 tools/sss_usermod.c:172 tools/sss_usermod.c:199
+#: src/tools/sss_useradd.c:145 src/tools/sss_usermod.c:170
+#: src/tools/sss_usermod.c:197
 msgid "Groups must be in the same domain as user\n"
 msgstr ""
 
-#: tools/sss_useradd.c:154
+#: src/tools/sss_useradd.c:153
 #, c-format
 msgid "Cannot find group %s in local domain\n"
 msgstr ""
 
-#: tools/sss_useradd.c:169 tools/sss_userdel.c:218
+#: src/tools/sss_useradd.c:168 src/tools/sss_userdel.c:214
 msgid "Cannot set default values\n"
 msgstr ""
 
-#: tools/sss_useradd.c:176 tools/sss_usermod.c:155
+#: src/tools/sss_useradd.c:175 src/tools/sss_usermod.c:153
 msgid "The selected UID is outside the allowed range\n"
 msgstr ""
 
-#: tools/sss_useradd.c:203 tools/sss_usermod.c:240
+#: src/tools/sss_useradd.c:202 src/tools/sss_usermod.c:238
 msgid "Cannot set SELinux login context\n"
 msgstr ""
 
-#: tools/sss_useradd.c:219
+#: src/tools/sss_useradd.c:218
 msgid "Cannot get info about the user\n"
 msgstr ""
 
-#: tools/sss_useradd.c:233
+#: src/tools/sss_useradd.c:232
 msgid "User's home directory already exists, not copying data from skeldir\n"
 msgstr ""
 
-#: tools/sss_useradd.c:236
+#: src/tools/sss_useradd.c:235
 #, c-format
 msgid "Cannot create user's home directory: %s\n"
 msgstr ""
 
-#: tools/sss_useradd.c:247
+#: src/tools/sss_useradd.c:246
 #, c-format
 msgid "Cannot create user's mail spool: %s\n"
 msgstr ""
 
-#: tools/sss_useradd.c:259
+#: src/tools/sss_useradd.c:258
 msgid "Could not allocate ID for the user - domain full?\n"
 msgstr ""
 
-#: tools/sss_useradd.c:263
+#: src/tools/sss_useradd.c:262
 msgid "A user or group with the same name or ID already exists\n"
 msgstr ""
 
-#: tools/sss_useradd.c:269
+#: src/tools/sss_useradd.c:268
 msgid "Transaction error. Could not add user.\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:43 tools/sss_groupmod.c:48
+#: src/tools/sss_groupadd.c:43 src/tools/sss_groupmod.c:48
 msgid "The GID of the group"
 msgstr ""
 
-#: tools/sss_groupadd.c:75
+#: src/tools/sss_groupadd.c:73
 msgid "Specify group to add\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:106 tools/sss_groupmod.c:194
+#: src/tools/sss_groupadd.c:102 src/tools/sss_groupmod.c:192
 msgid "The selected GID is outside the allowed range\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:131
+#: src/tools/sss_groupadd.c:127
 msgid "Could not allocate ID for the group - domain full?\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:135
+#: src/tools/sss_groupadd.c:131
 msgid "A group with the same name or GID already exists\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:140
+#: src/tools/sss_groupadd.c:136
 msgid "Transaction error. Could not add group.\n"
 msgstr ""
 
-#: tools/sss_groupdel.c:70
+#: src/tools/sss_groupdel.c:68
 msgid "Specify group to delete\n"
 msgstr ""
 
-#: tools/sss_groupdel.c:107
+#: src/tools/sss_groupdel.c:103
 #, c-format
 msgid "Group %s is outside the defined ID range for domain\n"
 msgstr ""
 
-#: tools/sss_groupdel.c:121
+#: src/tools/sss_groupdel.c:117
 msgid ""
 "No such group in local domain. Removing groups only allowed in local "
 "domain.\n"
 msgstr ""
 
-#: tools/sss_groupdel.c:126
+#: src/tools/sss_groupdel.c:122
 msgid "Internal error. Could not remove group.\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:44
+#: src/tools/sss_groupmod.c:44
 msgid "Groups to add this group to"
 msgstr ""
 
-#: tools/sss_groupmod.c:46
+#: src/tools/sss_groupmod.c:46
 msgid "Groups to remove this group from"
 msgstr ""
 
-#: tools/sss_groupmod.c:98
+#: src/tools/sss_groupmod.c:84 src/tools/sss_usermod.c:93
+msgid "Specify group to remove from\n"
+msgstr ""
+
+#: src/tools/sss_groupmod.c:98
 msgid "Specify group to modify\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:130
+#: src/tools/sss_groupmod.c:128
 msgid ""
 "Cannot find group in local domain, modifying groups is allowed only in local "
 "domain\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:151 tools/sss_groupmod.c:178
+#: src/tools/sss_groupmod.c:149 src/tools/sss_groupmod.c:176
 msgid "Member groups must be in the same domain as parent group\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:159 tools/sss_groupmod.c:186 tools/sss_usermod.c:180
-#: tools/sss_usermod.c:207
+#: src/tools/sss_groupmod.c:157 src/tools/sss_groupmod.c:184
+#: src/tools/sss_usermod.c:178 src/tools/sss_usermod.c:205
 #, c-format
 msgid ""
 "Cannot find group %s in local domain, only groups in local domain are "
 "allowed\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:220
+#: src/tools/sss_groupmod.c:218
 msgid "Could not modify group - check if member group names are correct\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:224
+#: src/tools/sss_groupmod.c:222
 msgid "Could not modify group - check if groupname is correct\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:228
+#: src/tools/sss_groupmod.c:226
 msgid "Transaction error. Could not modify group.\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:567
+#: src/tools/sss_groupshow.c:567
 #, fuzzy, c-format
 msgid "%s%sGroup: %s\n"
 msgstr "Gruppen"
 
-#: tools/sss_groupshow.c:568
+#: src/tools/sss_groupshow.c:568
 msgid "Magic Private "
 msgstr ""
 
-#: tools/sss_groupshow.c:570
+#: src/tools/sss_groupshow.c:570
 #, c-format
 msgid "%sGID number: %d\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:572
+#: src/tools/sss_groupshow.c:572
 #, c-format
 msgid "%sMember users: "
 msgstr ""
 
-#: tools/sss_groupshow.c:579
+#: src/tools/sss_groupshow.c:579
 #, c-format
 msgid ""
 "\n"
 "%sIs a member of: "
 msgstr ""
 
-#: tools/sss_groupshow.c:586
+#: src/tools/sss_groupshow.c:586
 #, c-format
 msgid ""
 "\n"
 "%sMember groups: "
 msgstr ""
 
-#: tools/sss_groupshow.c:622
+#: src/tools/sss_groupshow.c:622
 msgid "Print indirect group members recursively"
 msgstr ""
 
-#: tools/sss_groupshow.c:657
+#: src/tools/sss_groupshow.c:655
 msgid "Specify group to show\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:698
+#: src/tools/sss_groupshow.c:694
 msgid ""
 "No such group in local domain. Printing groups only allowed in local "
 "domain.\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:703
+#: src/tools/sss_groupshow.c:699
 msgid "Internal error. Could not print group.\n"
 msgstr ""
 
-#: tools/sss_userdel.c:133
+#: src/tools/sss_userdel.c:133
 msgid "Remove home directory and mail spool"
 msgstr ""
 
-#: tools/sss_userdel.c:135
+#: src/tools/sss_userdel.c:135
 msgid "Do not remove home directory and mail spool"
 msgstr ""
 
-#: tools/sss_userdel.c:137
+#: src/tools/sss_userdel.c:137
 msgid "Force removal of files not owned by the user"
 msgstr ""
 
-#: tools/sss_userdel.c:139
+#: src/tools/sss_userdel.c:139
 msgid "Kill users' processes before removing him"
 msgstr ""
 
-#: tools/sss_userdel.c:186
+#: src/tools/sss_userdel.c:184
 msgid "Specify user to delete\n"
 msgstr ""
 
-#: tools/sss_userdel.c:235
+#: src/tools/sss_userdel.c:231
 #, c-format
 msgid "User %s is outside the defined ID range for domain\n"
 msgstr ""
 
-#: tools/sss_userdel.c:260
+#: src/tools/sss_userdel.c:256
 msgid "Cannot reset SELinux login context\n"
 msgstr ""
 
-#: tools/sss_userdel.c:272
+#: src/tools/sss_userdel.c:268
 #, c-format
 msgid "WARNING: The user (uid %lu) was still logged in when deleted.\n"
 msgstr ""
 
-#: tools/sss_userdel.c:277
+#: src/tools/sss_userdel.c:273
 msgid "Cannot determine if the user was logged in on this platform"
 msgstr ""
 
-#: tools/sss_userdel.c:282
+#: src/tools/sss_userdel.c:278
 msgid "Error while checking if the user was logged in\n"
 msgstr ""
 
-#: tools/sss_userdel.c:289
+#: src/tools/sss_userdel.c:285
 #, c-format
 msgid "The post-delete command failed: %s\n"
 msgstr ""
 
-#: tools/sss_userdel.c:301
+#: src/tools/sss_userdel.c:297
 msgid "Not removing home dir - not owned by user\n"
 msgstr ""
 
-#: tools/sss_userdel.c:303
+#: src/tools/sss_userdel.c:299
 #, c-format
 msgid "Cannot remove homedir: %s\n"
 msgstr ""
 
-#: tools/sss_userdel.c:314
+#: src/tools/sss_userdel.c:310
 msgid ""
 "No such user in local domain. Removing users only allowed in local domain.\n"
 msgstr ""
 
-#: tools/sss_userdel.c:319
+#: src/tools/sss_userdel.c:315
 msgid "Internal error. Could not remove user.\n"
 msgstr ""
 
-#: tools/sss_usermod.c:49
+#: src/tools/sss_usermod.c:49
 msgid "The GID of the user"
 msgstr ""
 
-#: tools/sss_usermod.c:53
+#: src/tools/sss_usermod.c:53
 msgid "Groups to add this user to"
 msgstr ""
 
-#: tools/sss_usermod.c:54
+#: src/tools/sss_usermod.c:54
 msgid "Groups to remove this user from"
 msgstr ""
 
-#: tools/sss_usermod.c:55
+#: src/tools/sss_usermod.c:55
 msgid "Lock the account"
 msgstr "Das Konto sperren"
 
-#: tools/sss_usermod.c:56
+#: src/tools/sss_usermod.c:56
 msgid "Unlock the account"
 msgstr "Das Konto entsperren"
 
-#: tools/sss_usermod.c:117
+#: src/tools/sss_usermod.c:117
 msgid "Specify user to modify\n"
 msgstr ""
 
-#: tools/sss_usermod.c:148
+#: src/tools/sss_usermod.c:146
 msgid ""
 "Cannot find user in local domain, modifying users is allowed only in local "
 "domain\n"
 msgstr ""
 
-#: tools/sss_usermod.c:250
+#: src/tools/sss_usermod.c:248
 msgid "Could not modify user - check if group names are correct\n"
 msgstr ""
 
-#: tools/sss_usermod.c:254
+#: src/tools/sss_usermod.c:252
 msgid "Could not modify user - user already member of groups?\n"
 msgstr ""
 
-#: tools/sss_usermod.c:258
+#: src/tools/sss_usermod.c:256
 msgid "Transaction error. Could not modify user.\n"
 msgstr ""
 
-#: tools/tools_util.c:285
+#: src/tools/tools_util.c:290
 msgid "Out of memory\n"
 msgstr ""
 
-#: tools/tools_util.h:34
+#: src/tools/tools_util.h:40
 #, c-format
 msgid "%s must be run as root\n"
 msgstr ""
 
-#: util/util.h:63
+#: src/util/util.h:65
 msgid "Send the debug output to files instead of stderr"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 4e88b30d..9ae3af66 100644
--- a/po/es.po
+++ b/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-08-03 18:24-0400\n"
+"POT-Creation-Date: 2010-10-18 13:14-0400\n"
 "PO-Revision-Date: 2010-07-20 09:18-0300\n"
 "Last-Translator: Héctor Daniel Cabrera <logan@fedoraproject.org>\n"
 "Language-Team: Fedora Spanish <trans-es@lists.fedoraproject.org>\n"
@@ -20,94 +20,94 @@ msgstr ""
 "X-Poedit-Language: Spanish\n"
 "X-Poedit-Country: ARGENTINA\n"
 
-#: config/SSSDConfig.py:39
+#: src/config/SSSDConfig.py:39
 msgid "Set the verbosity of the debug logging"
 msgstr "Establece el nivel de detalle del registro de depuración"
 
-#: config/SSSDConfig.py:40
+#: src/config/SSSDConfig.py:40
 msgid "Include timestamps in debug logs"
 msgstr "Incluir la marca de tiempo en los registros de depuración"
 
-#: config/SSSDConfig.py:41
+#: src/config/SSSDConfig.py:41
 msgid "Write debug messages to logfiles"
 msgstr "Escribir los mensajes de depuración a archivos log"
 
-#: config/SSSDConfig.py:42
+#: src/config/SSSDConfig.py:42
 msgid "Ping timeout before restarting service"
 msgstr "Tiempo máximo de ping antes de reiniciar el servicio"
 
-#: config/SSSDConfig.py:43
+#: src/config/SSSDConfig.py:43
 msgid "Command to start service"
 msgstr "Comando para iniciar el servicio"
 
-#: config/SSSDConfig.py:44
+#: src/config/SSSDConfig.py:44
 msgid "Number of times to attempt connection to Data Providers"
 msgstr ""
 "Número de veces que debe intentar la conexión con los Proveedores de Datos"
 
-#: config/SSSDConfig.py:47
+#: src/config/SSSDConfig.py:47
 msgid "SSSD Services to start"
 msgstr "Servicios SSSD a iniciar"
 
-#: config/SSSDConfig.py:48
+#: src/config/SSSDConfig.py:48
 msgid "SSSD Domains to start"
 msgstr "Dominios SSSD a iniciar"
 
-#: config/SSSDConfig.py:49
+#: src/config/SSSDConfig.py:49
 msgid "Timeout for messages sent over the SBUS"
 msgstr "Tiempo máximo para los mensajes enviados a través de SBUS"
 
-#: config/SSSDConfig.py:50
+#: src/config/SSSDConfig.py:50
 msgid "Regex to parse username and domain"
 msgstr ""
 "Expresión regular para analizar sintácticamente el nombre de usuario y "
 "dominio"
 
-#: config/SSSDConfig.py:51
+#: src/config/SSSDConfig.py:51
 msgid "Printf-compatible format for displaying fully-qualified names"
 msgstr ""
 "Formato compatible con printf para mostrar nombres completamente calificados"
 
-#: config/SSSDConfig.py:54
+#: src/config/SSSDConfig.py:54
 msgid "Enumeration cache timeout length (seconds)"
 msgstr "Tiempo máximo (segundos) del caché de enumeración"
 
-#: config/SSSDConfig.py:55
+#: src/config/SSSDConfig.py:55
 msgid "Entry cache background update timeout length (seconds)"
 msgstr ""
 "Tiempo máximo (segundos) de la entrada de caché a actualizar en segundo plano"
 
-#: config/SSSDConfig.py:56
+#: src/config/SSSDConfig.py:56
 msgid "Negative cache timeout length (seconds)"
 msgstr "Tiempo máximo negativo del cache (segundos)"
 
-#: config/SSSDConfig.py:57
+#: src/config/SSSDConfig.py:57
 msgid "Users that SSSD should explicitly ignore"
 msgstr "Usuarios que deben ser explícitamente ignorados por SSSD"
 
-#: config/SSSDConfig.py:58
+#: src/config/SSSDConfig.py:58
 msgid "Groups that SSSD should explicitly ignore"
 msgstr "Grupos que deben ser explícitamente ignorados por SSSD"
 
-#: config/SSSDConfig.py:59
+#: src/config/SSSDConfig.py:59
 msgid "Should filtered users appear in groups"
 msgstr "Deben aparecer los usuarios filtrados en los grupos"
 
-#: config/SSSDConfig.py:60
+#: src/config/SSSDConfig.py:60
 msgid "The value of the password field the NSS provider should return"
 msgstr "El valor del campo contraseña que el proveedor NSS debe devolver"
 
-#: config/SSSDConfig.py:63
+#: src/config/SSSDConfig.py:63
 msgid "How long to allow cached logins between online logins (days)"
 msgstr ""
 "Por cuánto tiempo permitir ingresos cacheados entre ingresos en línea (días)"
 
-#: config/SSSDConfig.py:64
+#: src/config/SSSDConfig.py:64
 msgid "How many failed logins attempts are allowed when offline"
 msgstr ""
 "Cuantos intentos de ingreso fallidos se permiten cuando está desconectado"
 
-#: config/SSSDConfig.py:65
+#: src/config/SSSDConfig.py:65
 msgid ""
 "How long (minutes) to deny login after offline_failed_login_attempts has "
 "been reached"
@@ -115,331 +115,331 @@ msgstr ""
 "Cuántos minutos se denegará el ingreso después de que se alcance el máximo "
 "de ingresos fallidos offline_failed_login_attempts"
 
-#: config/SSSDConfig.py:68
+#: src/config/SSSDConfig.py:68
 msgid "Identity provider"
 msgstr "Proveedor de identidad"
 
-#: config/SSSDConfig.py:69
+#: src/config/SSSDConfig.py:69
 msgid "Authentication provider"
 msgstr "Proveedor de Autenticación"
 
-#: config/SSSDConfig.py:70
+#: src/config/SSSDConfig.py:70
 msgid "Access control provider"
 msgstr "Proveedor de control de acceso"
 
-#: config/SSSDConfig.py:71
+#: src/config/SSSDConfig.py:71
 msgid "Password change provider"
 msgstr "Proveedor de cambio de contraseña"
 
-#: config/SSSDConfig.py:74
+#: src/config/SSSDConfig.py:74
 msgid "Minimum user ID"
 msgstr "ID mínimo de usuario"
 
-#: config/SSSDConfig.py:75
+#: src/config/SSSDConfig.py:75
 msgid "Maximum user ID"
 msgstr "ID máximo de usuario"
 
-#: config/SSSDConfig.py:76
+#: src/config/SSSDConfig.py:76
 msgid "Ping timeout before restarting domain"
 msgstr "Tiempo máximo de ping antes de reinciar el dominio"
 
-#: config/SSSDConfig.py:77
+#: src/config/SSSDConfig.py:77
 msgid "Enable enumerating all users/groups"
 msgstr "Habilitar la enumeración de todos los usuarios/grupos"
 
-#: config/SSSDConfig.py:78
+#: src/config/SSSDConfig.py:78
 msgid "Cache credentials for offline login"
 msgstr "Hacer caché de las credenciales para ingresos fuera de línea"
 
-#: config/SSSDConfig.py:79
+#: src/config/SSSDConfig.py:79
 msgid "Store password hashes"
 msgstr "Guardar los hashes de la contraseña"
 
-#: config/SSSDConfig.py:80
+#: src/config/SSSDConfig.py:80
 msgid "Display users/groups in fully-qualified form"
 msgstr "Mostrar los usuarios/grupos en un formato completamente calificado"
 
-#: config/SSSDConfig.py:81
+#: src/config/SSSDConfig.py:81
 msgid "Entry cache timeout length (seconds)"
 msgstr "Tiempo máximo de una entrada del caché (segundos)"
 
-#: config/SSSDConfig.py:82
+#: src/config/SSSDConfig.py:82
 msgid ""
 "Restrict or prefer a specific address family when performing DNS lookups"
 msgstr ""
 "Restringir o preferir una familia de direcciones específica, cuando se "
 "realicen búsquedas DNS"
 
-#: config/SSSDConfig.py:83
+#: src/config/SSSDConfig.py:83
 msgid "How long to keep cached entries after last successful login (days)"
 msgstr "Por cuánto tiempo permitir ingresos cacheados luego del último (días)"
 
-#: config/SSSDConfig.py:84
+#: src/config/SSSDConfig.py:84
 msgid "How long to wait for replies from DNS when resolving servers (seconds)"
 msgstr ""
 "Cantidad de tiempo (en segundos) a esperar respuestas desde DNS cuando se "
 "estén resolviendo servidores"
 
-#: config/SSSDConfig.py:85
+#: src/config/SSSDConfig.py:85
 msgid "The domain part of service discovery DNS query"
 msgstr "La sección del dominio de la consulta para descubrir servicios DNS"
 
-#: config/SSSDConfig.py:88
+#: src/config/SSSDConfig.py:88
 msgid "IPA domain"
 msgstr "Dominio IPA"
 
-#: config/SSSDConfig.py:89
+#: src/config/SSSDConfig.py:89
 msgid "IPA server address"
 msgstr "Dirección del servidor IPA"
 
-#: config/SSSDConfig.py:90
+#: src/config/SSSDConfig.py:90
 msgid "IPA client hostname"
 msgstr "Nombre de equipo del cliente IPA"
 
-#: config/SSSDConfig.py:91
+#: src/config/SSSDConfig.py:91
 msgid "Whether to automatically update the client's DNS entry in FreeIPA"
 msgstr ""
 "Si actualizar o no en forma automática la entrada DNS del cliente en FreeIPA"
 
-#: config/SSSDConfig.py:92
+#: src/config/SSSDConfig.py:92
 msgid "The interface whose IP should be used for dynamic DNS updates"
 msgstr ""
 "La interfaz cuya IP debería ser utilizada para actualizaciones DNS "
 "automáticas"
 
-#: config/SSSDConfig.py:95 config/SSSDConfig.py:124
+#: src/config/SSSDConfig.py:95 src/config/SSSDConfig.py:124
 msgid "Kerberos server address"
 msgstr "Dirección del servidor Kerberos"
 
-#: config/SSSDConfig.py:96 config/SSSDConfig.py:125
+#: src/config/SSSDConfig.py:96 src/config/SSSDConfig.py:125
 msgid "Kerberos realm"
 msgstr "Reinado Kerberos"
 
-#: config/SSSDConfig.py:97
+#: src/config/SSSDConfig.py:97
 msgid "Authentication timeout"
 msgstr "Expiración de la autenticación"
 
-#: config/SSSDConfig.py:100
+#: src/config/SSSDConfig.py:100
 msgid "Directory to store credential caches"
 msgstr "Directorio donde almacenar las credenciales cacheadas"
 
-#: config/SSSDConfig.py:101
+#: src/config/SSSDConfig.py:101
 msgid "Location of the user's credential cache"
 msgstr "Ubicación del caché de credenciales del usuario"
 
-#: config/SSSDConfig.py:102
+#: src/config/SSSDConfig.py:102
 msgid "Location of the keytab to validate credentials"
 msgstr "Ubicación de la tabla de claves para validar las credenciales"
 
-#: config/SSSDConfig.py:103
+#: src/config/SSSDConfig.py:103
 msgid "Enable credential validation"
 msgstr "Habilitar la validación de credenciales"
 
-#: config/SSSDConfig.py:104
+#: src/config/SSSDConfig.py:104
 msgid "Store password if offline for later online authentication"
 msgstr ""
 "Si se encuentra desconectado, almacena contraseñas para más tarde realizar "
 "una autenticación en línea"
 
-#: config/SSSDConfig.py:107
+#: src/config/SSSDConfig.py:107
 msgid "Server where the change password service is running if not on the KDC"
 msgstr ""
 "El servidor en donde está ejecutándose el servicio de modificación de "
 "contraseña, en caso de no ser KDC. "
 
-#: config/SSSDConfig.py:110
+#: src/config/SSSDConfig.py:110
 msgid "ldap_uri, The URI of the LDAP server"
 msgstr "ldap_uri, El URI del servidor LDAP"
 
-#: config/SSSDConfig.py:111
+#: src/config/SSSDConfig.py:111
 msgid "The default base DN"
 msgstr "DN base predeterminado"
 
-#: config/SSSDConfig.py:112
+#: src/config/SSSDConfig.py:112
 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:113
+#: src/config/SSSDConfig.py:113
 msgid "The default bind DN"
 msgstr "El DN Bind predeterminado"
 
-#: config/SSSDConfig.py:114
+#: src/config/SSSDConfig.py:114
 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:115
+#: src/config/SSSDConfig.py:115
 msgid "The authentication token of the default bind DN"
 msgstr "El token de autenticación del DN bind predeterminado"
 
-#: config/SSSDConfig.py:116
+#: src/config/SSSDConfig.py:116
 msgid "Length of time to attempt connection"
 msgstr "Tiempo durante el que se intentará la conexión"
 
-#: config/SSSDConfig.py:117
+#: src/config/SSSDConfig.py:117
 msgid "Length of time to attempt synchronous LDAP operations"
 msgstr "Tiempo durante el que se intentará operaciones LDAP sincrónicas"
 
-#: config/SSSDConfig.py:118
+#: src/config/SSSDConfig.py:118
 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:119
+#: src/config/SSSDConfig.py:119
 msgid "File that contains CA certificates"
 msgstr "Archivo que contiene los certificados CA"
 
-#: config/SSSDConfig.py:120
+#: src/config/SSSDConfig.py:120
 msgid "Path to CA certificate directory"
 msgstr "Ruta hacia un directorio certificado CA"
 
-#: config/SSSDConfig.py:121
+#: src/config/SSSDConfig.py:121
 msgid "Require TLS certificate verification"
 msgstr "Requiere la verificación de certificado TLS"
 
-#: config/SSSDConfig.py:122
+#: src/config/SSSDConfig.py:122
 msgid "Specify the sasl mechanism to use"
 msgstr "Especificar el mecanismo sasl a usar"
 
-#: config/SSSDConfig.py:123
+#: src/config/SSSDConfig.py:123
 msgid "Specify the sasl authorization id to use"
 msgstr "Especifique el id de autorización sasl a usar"
 
-#: config/SSSDConfig.py:126
+#: src/config/SSSDConfig.py:126
 msgid "Kerberos service keytab"
 msgstr "Tabla de clave del servicio Kerberos"
 
-#: config/SSSDConfig.py:127
+#: src/config/SSSDConfig.py:127
 msgid "Use Kerberos auth for LDAP connection"
 msgstr "Usar auth Kerberos para la conexión LDAP"
 
-#: config/SSSDConfig.py:128
+#: src/config/SSSDConfig.py:128
 msgid "Follow LDAP referrals"
 msgstr "Seguir referencias LDAP"
 
-#: config/SSSDConfig.py:129
+#: src/config/SSSDConfig.py:129
 msgid "Lifetime of TGT for LDAP connection"
 msgstr "Período de vida del TGT para la conexión LDAP"
 
-#: config/SSSDConfig.py:132
+#: src/config/SSSDConfig.py:132
 msgid "Length of time to wait for a search request"
 msgstr "Tiempo máximo a esperar un pedido de búsqueda"
 
-#: config/SSSDConfig.py:133
+#: src/config/SSSDConfig.py:133
 msgid "Length of time between enumeration updates"
 msgstr "Tiempo en segundos entre las actualizaciones de enumeración"
 
-#: config/SSSDConfig.py:134
+#: src/config/SSSDConfig.py:134
 msgid "Require TLS for ID lookups"
 msgstr "Requiere TLS para búsquedas de ID"
 
-#: config/SSSDConfig.py:135
+#: src/config/SSSDConfig.py:135
 msgid "Base DN for user lookups"
 msgstr "DN base para búsquedas de usuario"
 
-#: config/SSSDConfig.py:136
+#: src/config/SSSDConfig.py:136
 msgid "Scope of user lookups"
 msgstr "Ambito de las búsquedas del usuario"
 
-#: config/SSSDConfig.py:137
+#: src/config/SSSDConfig.py:137
 msgid "Filter for user lookups"
 msgstr "Filtro para las búsquedas del usuario"
 
-#: config/SSSDConfig.py:138
+#: src/config/SSSDConfig.py:138
 msgid "Objectclass for users"
 msgstr "Objectclass para los usuarios"
 
-#: config/SSSDConfig.py:139
+#: src/config/SSSDConfig.py:139
 msgid "Username attribute"
 msgstr "Atributo Username"
 
-#: config/SSSDConfig.py:140
+#: src/config/SSSDConfig.py:140
 msgid "UID attribute"
 msgstr "Atributo UID"
 
-#: config/SSSDConfig.py:141
+#: src/config/SSSDConfig.py:141
 msgid "Primary GID attribute"
 msgstr "Atributo GID primario"
 
-#: config/SSSDConfig.py:142
+#: src/config/SSSDConfig.py:142
 msgid "GECOS attribute"
 msgstr "Atributo GECOS"
 
-#: config/SSSDConfig.py:143
+#: src/config/SSSDConfig.py:143
 msgid "Home directory attribute"
 msgstr "Atributo Directorio de inicio"
 
-#: config/SSSDConfig.py:144
+#: src/config/SSSDConfig.py:144
 msgid "Shell attribute"
 msgstr "Atributo shell"
 
-#: config/SSSDConfig.py:145
+#: src/config/SSSDConfig.py:145
 msgid "UUID attribute"
 msgstr "Atributo UUID"
 
-#: config/SSSDConfig.py:146
+#: src/config/SSSDConfig.py:146
 msgid "User principal attribute (for Kerberos)"
 msgstr "Atributo principal del usuario (para Kerberos) "
 
-#: config/SSSDConfig.py:147
+#: src/config/SSSDConfig.py:147
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: config/SSSDConfig.py:148
+#: src/config/SSSDConfig.py:148
 msgid "memberOf attribute"
 msgstr "Atributo memberOf"
 
-#: config/SSSDConfig.py:149
+#: src/config/SSSDConfig.py:149
 msgid "Modification time attribute"
 msgstr "Atributo hora de modificación"
 
-#: config/SSSDConfig.py:152
+#: src/config/SSSDConfig.py:152
 msgid "Policy to evaluate the password expiration"
 msgstr "Política para evaluar el vencimiento de la contraseña"
 
-#: config/SSSDConfig.py:155
+#: src/config/SSSDConfig.py:155
 msgid "LDAP filter to determine access privileges"
 msgstr "Filtro LDAP para determinar privilegios de acceso"
 
-#: config/SSSDConfig.py:158
+#: src/config/SSSDConfig.py:158
 msgid "Comma separated list of allowed users"
 msgstr "Lista separada por comas de usuarios autorizados"
 
-#: config/SSSDConfig.py:159
+#: src/config/SSSDConfig.py:159
 msgid "Comma separated list of prohibited users"
 msgstr "Lista separada por comas de usuarios prohibidos"
 
-#: config/SSSDConfig.py:162
+#: src/config/SSSDConfig.py:162
 msgid "Default shell, /bin/bash"
 msgstr "Shell predeterminado, /bin/bash"
 
-#: config/SSSDConfig.py:163
+#: src/config/SSSDConfig.py:163
 msgid "Base for home directories"
 msgstr "Base de los directorios de inicio"
 
-#: config/SSSDConfig.py:166
+#: src/config/SSSDConfig.py:166
 msgid "The name of the NSS library to use"
 msgstr "Nombre de la biblioteca NSS a usar"
 
-#: config/SSSDConfig.py:169
+#: src/config/SSSDConfig.py:169
 msgid "PAM stack to use"
 msgstr "Pila PAM a usar"
 
-#: monitor/monitor.c:2137
+#: src/monitor/monitor.c:2140
 msgid "Become a daemon (default)"
 msgstr "Convertirse en demonio (predeterminado)"
 
-#: monitor/monitor.c:2139
+#: src/monitor/monitor.c:2142
 msgid "Run interactive (not a daemon)"
 msgstr "Ejecutarse en forma interactiva (no un demonio)"
 
-#: monitor/monitor.c:2141
+#: src/monitor/monitor.c:2144
 msgid "Specify a non-default config file"
 msgstr "Indicar un archivo de configuración diferente al predeterminado"
 
-#: monitor/monitor.c:2167
+#: src/monitor/monitor.c:2170
 msgid "sssd must be run as root\n"
 msgstr "sssd debe ejecutarse como root\n"
 
-#: monitor/monitor.c:2202
+#: src/monitor/monitor.c:2205
 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"
@@ -448,7 +448,7 @@ msgstr ""
 "nscd pueden entrar en conflicto con SSSD, se recomienda no ejecutar nscd en "
 "forma paralalea con SSSD\n"
 
-#: monitor/monitor.c:2212
+#: src/monitor/monitor.c:2215
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
@@ -457,278 +457,291 @@ 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"
 
-#: monitor/monitor.c:2217
+#: src/monitor/monitor.c:2220
 msgid "Cannot load configuration database\n"
 msgstr "No es posible cargar base de datos de la configuración\n"
 
-#: providers/krb5/krb5_child.c:993 providers/ldap/ldap_child.c:361
-#: util/util.h:61
+#: src/providers/krb5/krb5_child.c:1043 src/providers/ldap/ldap_child.c:359
+#: src/util/util.h:63
 msgid "Debug level"
 msgstr "Nive de depuración"
 
-#: providers/krb5/krb5_child.c:995 providers/ldap/ldap_child.c:363
-#: util/util.h:65
+#: src/providers/krb5/krb5_child.c:1045 src/providers/ldap/ldap_child.c:361
+#: src/util/util.h:67
 msgid "Add debug timestamps"
 msgstr "Agregar marcas de tiempo de depuración"
 
-#: providers/krb5/krb5_child.c:997 providers/ldap/ldap_child.c:365
+#: src/providers/krb5/krb5_child.c:1047 src/providers/ldap/ldap_child.c:363
 msgid "An open file descriptor for the debug logs"
 msgstr "Un arhivo abierto de descriptor para los registros de depuración"
 
-#: providers/data_provider_be.c:1165
+#: src/providers/data_provider_be.c:1165
 msgid "Domain of the information provider (mandatory)"
 msgstr "Dominio del proveedor de información (obligatorio)"
 
-#: sss_client/common.c:742
+#: src/sss_client/common.c:742
 msgid "Privileged socket has wrong ownership or permissions."
 msgstr "El zócalo privilegiado posee permisos o pertenencia equivocados."
 
-#: sss_client/common.c:745
+#: src/sss_client/common.c:745
 msgid "Public socket has wrong ownership or permissions."
 msgstr "El zócalo público posee permisos o pertenencia equivocados."
 
-#: sss_client/common.c:748
+#: src/sss_client/common.c:748
 msgid "Unexpected format of the server credential message."
 msgstr "Formato no esperado del mensaje de la credencial del servidor."
 
-#: sss_client/common.c:751
+#: src/sss_client/common.c:751
 msgid "SSSD is not run by root."
 msgstr "SSSD no está siendo ejecutado por el usuario root."
 
-#: sss_client/common.c:756
+#: src/sss_client/common.c:756
 msgid "An error occurred, but no description can be found."
 msgstr "Ha ocurrido un error, pero no se ha podido encontrar una descripción."
 
-#: sss_client/common.c:762
+#: src/sss_client/common.c:762
 msgid "Unexpected error while looking for an error description"
 msgstr ""
 "Ha ocurrido un error no esperado mientras se buscaba la descripción del error"
 
-#: sss_client/pam_sss.c:372
+#: src/sss_client/pam_sss.c:372
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
-#: sss_client/pam_sss.c:556
+#: src/sss_client/pam_sss.c:556
 msgid "Password reset by root is not supported."
 msgstr "No existe soporte para reseteado de la contraseña por el usuario root."
 
-#: sss_client/pam_sss.c:597
+#: src/sss_client/pam_sss.c:597
 msgid "Authenticated with cached credentials"
 msgstr "Autenticado mediante credenciales cacheada"
 
-#: sss_client/pam_sss.c:598
+#: src/sss_client/pam_sss.c:598
 msgid ", your cached password will expire at: "
 msgstr ", su contraseña cacheada vencerá el:"
 
-#: sss_client/pam_sss.c:628
+#: src/sss_client/pam_sss.c:628
 #, c-format
 msgid "Your password has expired. You have %d grace login(s) remaining."
 msgstr "Su contraseña ha expirado. Dispone de %d ingreso(s) excepcionales. "
 
-#: sss_client/pam_sss.c:674
+#: src/sss_client/pam_sss.c:674
 #, c-format
 msgid "Your password will expire in %d %s."
 msgstr "Su contraseña expirará en %d %s."
 
-#: sss_client/pam_sss.c:723
+#: src/sss_client/pam_sss.c:723
 msgid "Authentication is denied until: "
 msgstr "La autenticación ha sido denegada hasta:"
 
-#: sss_client/pam_sss.c:750
+#: src/sss_client/pam_sss.c:750
 msgid "System is offline, password change not possible"
 msgstr "El sistema está fuera de línea, no se puede cambiar la contraseña"
 
-#: sss_client/pam_sss.c:780 sss_client/pam_sss.c:793
+#: src/sss_client/pam_sss.c:780 src/sss_client/pam_sss.c:793
 msgid "Password change failed. "
 msgstr "Falló el cambio de contraseña."
 
-#: sss_client/pam_sss.c:783 sss_client/pam_sss.c:794
+#: src/sss_client/pam_sss.c:783 src/sss_client/pam_sss.c:794
 msgid "Server message: "
 msgstr "Mensaje del servidor:"
 
-#: sss_client/pam_sss.c:1197
+#: src/sss_client/pam_sss.c:1197
 msgid "New Password: "
 msgstr "Nueva contraseña: "
 
-#: sss_client/pam_sss.c:1198
+#: src/sss_client/pam_sss.c:1198
 msgid "Reenter new Password: "
 msgstr "Reingrese la contraseña nueva:"
 
-#: sss_client/pam_sss.c:1280
+#: src/sss_client/pam_sss.c:1280
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: sss_client/pam_sss.c:1312
+#: src/sss_client/pam_sss.c:1312
 msgid "Current Password: "
 msgstr "Contraseña actual: "
 
-#: sss_client/pam_sss.c:1458
+#: src/sss_client/pam_sss.c:1458
 msgid "Password expired. Change your password now."
 msgstr "La contraseña ha expirado. Modifíquela en este preciso momento."
 
-#: tools/sss_useradd.c:48 tools/sss_groupadd.c:41 tools/sss_groupdel.c:43
-#: tools/sss_groupmod.c:42 tools/sss_groupshow.c:620 tools/sss_userdel.c:131
-#: tools/sss_usermod.c:47
+#: src/tools/sss_useradd.c:48 src/tools/sss_groupadd.c:41
+#: src/tools/sss_groupdel.c:43 src/tools/sss_groupmod.c:42
+#: src/tools/sss_groupshow.c:620 src/tools/sss_userdel.c:131
+#: src/tools/sss_usermod.c:47
 msgid "The debug level to run with"
 msgstr "Nivel de depuración en que se debe ejecutar"
 
-#: tools/sss_useradd.c:49 tools/sss_usermod.c:48
+#: src/tools/sss_useradd.c:49 src/tools/sss_usermod.c:48
 msgid "The UID of the user"
 msgstr "El UID del usuario"
 
-#: tools/sss_useradd.c:50 tools/sss_usermod.c:50
+#: src/tools/sss_useradd.c:50 src/tools/sss_usermod.c:50
 msgid "The comment string"
 msgstr "La cadena de comentarios"
 
-#: tools/sss_useradd.c:51 tools/sss_usermod.c:51
+#: src/tools/sss_useradd.c:51 src/tools/sss_usermod.c:51
 msgid "Home directory"
 msgstr "Directorio de inicio"
 
-#: tools/sss_useradd.c:52 tools/sss_usermod.c:52
+#: src/tools/sss_useradd.c:52 src/tools/sss_usermod.c:52
 msgid "Login shell"
 msgstr "Shell de ingreso"
 
-#: tools/sss_useradd.c:53
+#: src/tools/sss_useradd.c:53
 msgid "Groups"
 msgstr "Grupos"
 
-#: tools/sss_useradd.c:54
+#: src/tools/sss_useradd.c:54
 msgid "Create user's directory if it does not exist"
 msgstr "Crear el directorio del usuario si no existe"
 
-#: tools/sss_useradd.c:55
+#: src/tools/sss_useradd.c:55
 msgid "Never create user's directory, overrides config"
 msgstr ""
 "La opción de nunca crear el directorio del usuario, anula la configurada"
 
-#: tools/sss_useradd.c:56
+#: src/tools/sss_useradd.c:56
 msgid "Specify an alternative skeleton directory"
 msgstr "Debe especificar un directorio esqueleto alternativo"
 
-#: tools/sss_useradd.c:57 tools/sss_usermod.c:57
+#: src/tools/sss_useradd.c:57 src/tools/sss_usermod.c:57
 msgid "The SELinux user for user's login"
 msgstr "El usuario de SELinux para el registro del usuario"
 
-#: tools/sss_useradd.c:71 tools/sss_groupadd.c:56 tools/sss_groupdel.c:52
-#: tools/sss_groupmod.c:63 tools/sss_groupshow.c:631 tools/sss_userdel.c:148
-#: tools/sss_usermod.c:72
+#: src/tools/sss_useradd.c:71 src/tools/sss_groupadd.c:56
+#: src/tools/sss_groupdel.c:52 src/tools/sss_groupmod.c:63
+#: src/tools/sss_groupshow.c:631 src/tools/sss_userdel.c:148
+#: src/tools/sss_usermod.c:72
 msgid "Error setting the locale\n"
 msgstr "Error al poner la región\n"
 
-#: tools/sss_useradd.c:107
+#: src/tools/sss_useradd.c:84 src/tools/sss_groupmod.c:76
+#: src/tools/sss_usermod.c:85
+#, fuzzy
+msgid "Specify group to add to\n"
+msgstr "Especifique el grupo a agregar\n"
+
+#: src/tools/sss_useradd.c:108
 msgid "Specify user to add\n"
 msgstr "Especifique el usuario a agregar\n"
 
-#: tools/sss_useradd.c:118 tools/sss_groupadd.c:86 tools/sss_groupdel.c:81
-#: tools/sss_groupmod.c:111 tools/sss_groupshow.c:668 tools/sss_userdel.c:197
-#: tools/sss_usermod.c:128
+#: src/tools/sss_useradd.c:117 src/tools/sss_groupadd.c:82
+#: src/tools/sss_groupdel.c:77 src/tools/sss_groupmod.c:109
+#: src/tools/sss_groupshow.c:664 src/tools/sss_userdel.c:193
+#: src/tools/sss_usermod.c:126
 msgid "Error initializing the tools - no local domain\n"
 msgstr "Error al inicializar las herramientas -  no hay dominio local\n"
 
-#: tools/sss_useradd.c:120 tools/sss_groupadd.c:88 tools/sss_groupdel.c:83
-#: tools/sss_groupmod.c:113 tools/sss_groupshow.c:670 tools/sss_userdel.c:199
-#: tools/sss_usermod.c:130
+#: src/tools/sss_useradd.c:119 src/tools/sss_groupadd.c:84
+#: src/tools/sss_groupdel.c:79 src/tools/sss_groupmod.c:111
+#: src/tools/sss_groupshow.c:666 src/tools/sss_userdel.c:195
+#: src/tools/sss_usermod.c:128
 msgid "Error initializing the tools\n"
 msgstr "Error al inicializar las herramientas\n"
 
-#: tools/sss_useradd.c:129 tools/sss_groupadd.c:97 tools/sss_groupdel.c:92
-#: tools/sss_groupmod.c:121 tools/sss_groupshow.c:679 tools/sss_userdel.c:208
-#: tools/sss_usermod.c:139
+#: src/tools/sss_useradd.c:128 src/tools/sss_groupadd.c:93
+#: src/tools/sss_groupdel.c:88 src/tools/sss_groupmod.c:119
+#: src/tools/sss_groupshow.c:675 src/tools/sss_userdel.c:204
+#: src/tools/sss_usermod.c:137
 msgid "Invalid domain specified in FQDN\n"
 msgstr "Dominio inválido especificado en FQDN\n"
 
-#: tools/sss_useradd.c:138 tools/sss_groupmod.c:143 tools/sss_groupmod.c:170
-#: tools/sss_usermod.c:164 tools/sss_usermod.c:191
+#: src/tools/sss_useradd.c:137 src/tools/sss_groupmod.c:141
+#: src/tools/sss_groupmod.c:168 src/tools/sss_usermod.c:162
+#: src/tools/sss_usermod.c:189
 msgid "Internal error while parsing parameters\n"
 msgstr "Error interno al analizar sintácticamente los parámetros.\n"
 
-#: tools/sss_useradd.c:146 tools/sss_usermod.c:172 tools/sss_usermod.c:199
+#: src/tools/sss_useradd.c:145 src/tools/sss_usermod.c:170
+#: src/tools/sss_usermod.c:197
 msgid "Groups must be in the same domain as user\n"
 msgstr "Los grupos deben estar en el mismo dominio que el usuario\n"
 
-#: tools/sss_useradd.c:154
+#: src/tools/sss_useradd.c:153
 #, c-format
 msgid "Cannot find group %s in local domain\n"
 msgstr "No se pudo encontrar el grupo %s en el dominio local\n"
 
-#: tools/sss_useradd.c:169 tools/sss_userdel.c:218
+#: src/tools/sss_useradd.c:168 src/tools/sss_userdel.c:214
 msgid "Cannot set default values\n"
 msgstr "No se pudieron establecer los valores predeterminados\n"
 
-#: tools/sss_useradd.c:176 tools/sss_usermod.c:155
+#: src/tools/sss_useradd.c:175 src/tools/sss_usermod.c:153
 msgid "The selected UID is outside the allowed range\n"
 msgstr "El UID seleccionado está fuera del rango permitido\n"
 
-#: tools/sss_useradd.c:203 tools/sss_usermod.c:240
+#: src/tools/sss_useradd.c:202 src/tools/sss_usermod.c:238
 msgid "Cannot set SELinux login context\n"
 msgstr "No es posible definir contexto de registro de SELinux\n"
 
-#: tools/sss_useradd.c:219
+#: src/tools/sss_useradd.c:218
 msgid "Cannot get info about the user\n"
 msgstr "No se pudo obtener información del usuario\n"
 
-#: tools/sss_useradd.c:233
+#: src/tools/sss_useradd.c:232
 msgid "User's home directory already exists, not copying data from skeldir\n"
 msgstr ""
 "El directorio de inicio del usuario ya existe, no copiar datos desde el "
 "esqueleto\n"
 
-#: tools/sss_useradd.c:236
+#: src/tools/sss_useradd.c:235
 #, c-format
 msgid "Cannot create user's home directory: %s\n"
 msgstr "No se pudo crear el directorio personal del usuario: %s\n"
 
-#: tools/sss_useradd.c:247
+#: src/tools/sss_useradd.c:246
 #, c-format
 msgid "Cannot create user's mail spool: %s\n"
 msgstr "No se pudo crear el receptor de correo del usuario: %s\n"
 
-#: tools/sss_useradd.c:259
+#: src/tools/sss_useradd.c:258
 msgid "Could not allocate ID for the user - domain full?\n"
 msgstr "No se pudo asignar el ID para el usuario - ¿el dominio estará lleno?\n"
 
-#: tools/sss_useradd.c:263
+#: src/tools/sss_useradd.c:262
 msgid "A user or group with the same name or ID already exists\n"
 msgstr "Ya existe un usuario o grupo con el mismo nombre o ID\n"
 
-#: tools/sss_useradd.c:269
+#: src/tools/sss_useradd.c:268
 msgid "Transaction error. Could not add user.\n"
 msgstr "Error en la transacción. No se pudo agregar el usuario.\n"
 
-#: tools/sss_groupadd.c:43 tools/sss_groupmod.c:48
+#: src/tools/sss_groupadd.c:43 src/tools/sss_groupmod.c:48
 msgid "The GID of the group"
 msgstr "El GID del grupo"
 
-#: tools/sss_groupadd.c:75
+#: src/tools/sss_groupadd.c:73
 msgid "Specify group to add\n"
 msgstr "Especifique el grupo a agregar\n"
 
-#: tools/sss_groupadd.c:106 tools/sss_groupmod.c:194
+#: src/tools/sss_groupadd.c:102 src/tools/sss_groupmod.c:192
 msgid "The selected GID is outside the allowed range\n"
 msgstr "El GID elegido está fuera del rango permitido\n"
 
-#: tools/sss_groupadd.c:131
+#: src/tools/sss_groupadd.c:127
 msgid "Could not allocate ID for the group - domain full?\n"
 msgstr "No se pudo asignar el ID para el grupo - ¿el dominio estará lleno?\n"
 
-#: tools/sss_groupadd.c:135
+#: src/tools/sss_groupadd.c:131
 msgid "A group with the same name or GID already exists\n"
 msgstr "Ya existe un grupo con el mismo nombre o GID\n"
 
-#: tools/sss_groupadd.c:140
+#: src/tools/sss_groupadd.c:136
 msgid "Transaction error. Could not add group.\n"
 msgstr "Error en la transacción. No se pudo agregar el grupo.\n"
 
-#: tools/sss_groupdel.c:70
+#: src/tools/sss_groupdel.c:68
 msgid "Specify group to delete\n"
 msgstr "Especifique el grupo a borrar\n"
 
-#: tools/sss_groupdel.c:107
+#: src/tools/sss_groupdel.c:103
 #, c-format
 msgid "Group %s is outside the defined ID range for domain\n"
 msgstr "El grupo %s está fuera del rango de ID definido para los dominios\n"
 
-#: tools/sss_groupdel.c:121
+#: src/tools/sss_groupdel.c:117
 msgid ""
 "No such group in local domain. Removing groups only allowed in local "
 "domain.\n"
@@ -736,23 +749,28 @@ msgstr ""
 "No existe tal grupo en el dominio local. Eliminando los grupos que sólo se "
 "permiten en el dominio local.\n"
 
-#: tools/sss_groupdel.c:126
+#: src/tools/sss_groupdel.c:122
 msgid "Internal error. Could not remove group.\n"
 msgstr "Error interno. No se pudo eliminar el grupo.\n"
 
-#: tools/sss_groupmod.c:44
+#: src/tools/sss_groupmod.c:44
 msgid "Groups to add this group to"
 msgstr "Grupos a los que se debe agregar este grupo"
 
-#: tools/sss_groupmod.c:46
+#: src/tools/sss_groupmod.c:46
 msgid "Groups to remove this group from"
 msgstr "Grupos desde los que se debe eliminar este grupo"
 
-#: tools/sss_groupmod.c:98
+#: src/tools/sss_groupmod.c:84 src/tools/sss_usermod.c:93
+#, fuzzy
+msgid "Specify group to remove from\n"
+msgstr "Especifique el grupo a modificar\n"
+
+#: src/tools/sss_groupmod.c:98
 msgid "Specify group to modify\n"
 msgstr "Especifique el grupo a modificar\n"
 
-#: tools/sss_groupmod.c:130
+#: src/tools/sss_groupmod.c:128
 msgid ""
 "Cannot find group in local domain, modifying groups is allowed only in local "
 "domain\n"
@@ -760,13 +778,13 @@ msgstr ""
 "No se pudo encontrar el grupo en el dominio local, la modificación de grupos "
 "se permite sólo en el dominio local\n"
 
-#: tools/sss_groupmod.c:151 tools/sss_groupmod.c:178
+#: src/tools/sss_groupmod.c:149 src/tools/sss_groupmod.c:176
 msgid "Member groups must be in the same domain as parent group\n"
 msgstr ""
 "Los grupos miembro deben estar en el mismo dominio que el grupo padre\n"
 
-#: tools/sss_groupmod.c:159 tools/sss_groupmod.c:186 tools/sss_usermod.c:180
-#: tools/sss_usermod.c:207
+#: src/tools/sss_groupmod.c:157 src/tools/sss_groupmod.c:184
+#: src/tools/sss_usermod.c:178 src/tools/sss_usermod.c:205
 #, c-format
 msgid ""
 "Cannot find group %s in local domain, only groups in local domain are "
@@ -775,41 +793,41 @@ msgstr ""
 "No se pudo encontrar el grupo %s en el dominio local, solo se permiten los "
 "grupos del dominio local\n"
 
-#: tools/sss_groupmod.c:220
+#: src/tools/sss_groupmod.c:218
 msgid "Could not modify group - check if member group names are correct\n"
 msgstr ""
 "No se pudo modificar el grupo - verifique si los nombre de grupo miembro son "
 "los correctos\n"
 
-#: tools/sss_groupmod.c:224
+#: src/tools/sss_groupmod.c:222
 msgid "Could not modify group - check if groupname is correct\n"
 msgstr ""
 "No se pudo modificar el grupo - verifique si el nombre de grupo es correcto\n"
 
-#: tools/sss_groupmod.c:228
+#: src/tools/sss_groupmod.c:226
 msgid "Transaction error. Could not modify group.\n"
 msgstr "Error de transacción. No se pudo modificar el grupo.\n"
 
-#: tools/sss_groupshow.c:567
+#: src/tools/sss_groupshow.c:567
 #, c-format
 msgid "%s%sGroup: %s\n"
 msgstr "%s%sGrupo: %s\n"
 
-#: tools/sss_groupshow.c:568
+#: src/tools/sss_groupshow.c:568
 msgid "Magic Private "
 msgstr "Magia privada"
 
-#: tools/sss_groupshow.c:570
+#: src/tools/sss_groupshow.c:570
 #, c-format
 msgid "%sGID number: %d\n"
 msgstr "%sGID número: %d\n"
 
-#: tools/sss_groupshow.c:572
+#: src/tools/sss_groupshow.c:572
 #, c-format
 msgid "%sMember users: "
 msgstr "%sMember usuarios: "
 
-#: tools/sss_groupshow.c:579
+#: src/tools/sss_groupshow.c:579
 #, c-format
 msgid ""
 "\n"
@@ -818,7 +836,7 @@ msgstr ""
 "\n"
 "%sEs miembro de: "
 
-#: tools/sss_groupshow.c:586
+#: src/tools/sss_groupshow.c:586
 #, c-format
 msgid ""
 "\n"
@@ -827,15 +845,15 @@ msgstr ""
 "\n"
 "%sGrupos de miembro: "
 
-#: tools/sss_groupshow.c:622
+#: src/tools/sss_groupshow.c:622
 msgid "Print indirect group members recursively"
 msgstr "Imprime miembros de grupo indirecto en forma recursiva"
 
-#: tools/sss_groupshow.c:657
+#: src/tools/sss_groupshow.c:655
 msgid "Specify group to show\n"
 msgstr "Especifica el grupo a mostrar\n"
 
-#: tools/sss_groupshow.c:698
+#: src/tools/sss_groupshow.c:694
 msgid ""
 "No such group in local domain. Printing groups only allowed in local "
 "domain.\n"
@@ -843,105 +861,105 @@ msgstr ""
 "No existe tal grupo en el dominio local. Imprimir los grupos está permitido "
 "únicamente en el dominio local.\n"
 
-#: tools/sss_groupshow.c:703
+#: src/tools/sss_groupshow.c:699
 msgid "Internal error. Could not print group.\n"
 msgstr "Error interno. No se pudo imprimir el grupo.\n"
 
-#: tools/sss_userdel.c:133
+#: src/tools/sss_userdel.c:133
 msgid "Remove home directory and mail spool"
 msgstr "Eliminar el directorio de inicio y el receptor de correo"
 
-#: tools/sss_userdel.c:135
+#: src/tools/sss_userdel.c:135
 msgid "Do not remove home directory and mail spool"
 msgstr "No eliminar el directorio de inicio y el receptor de correo"
 
-#: tools/sss_userdel.c:137
+#: src/tools/sss_userdel.c:137
 msgid "Force removal of files not owned by the user"
 msgstr "Forzar la eliminación de los archivos que no pertenecen al usuario"
 
-#: tools/sss_userdel.c:139
+#: src/tools/sss_userdel.c:139
 msgid "Kill users' processes before removing him"
 msgstr "Finaliza los procesos del usuario antes de eliminarlo"
 
-#: tools/sss_userdel.c:186
+#: src/tools/sss_userdel.c:184
 msgid "Specify user to delete\n"
 msgstr "Especifique el usuario a borrar\n"
 
-#: tools/sss_userdel.c:235
+#: src/tools/sss_userdel.c:231
 #, c-format
 msgid "User %s is outside the defined ID range for domain\n"
 msgstr "El usuario %s está fuera del rango de ID para el dominio\n"
 
-#: tools/sss_userdel.c:260
+#: src/tools/sss_userdel.c:256
 msgid "Cannot reset SELinux login context\n"
 msgstr "No es posible reiniciar contexto de registro de SELinux\n"
 
-#: tools/sss_userdel.c:272
+#: src/tools/sss_userdel.c:268
 #, c-format
 msgid "WARNING: The user (uid %lu) was still logged in when deleted.\n"
 msgstr ""
 "ADVERTENCIA: El usuario (uid %lu) todavía se encontraba registrado mientras "
 "se lo eliminaba.\n"
 
-#: tools/sss_userdel.c:277
+#: src/tools/sss_userdel.c:273
 msgid "Cannot determine if the user was logged in on this platform"
 msgstr ""
 "No es posible determinar si el usuario estaba registrado en esta plataforma"
 
-#: tools/sss_userdel.c:282
+#: src/tools/sss_userdel.c:278
 msgid "Error while checking if the user was logged in\n"
 msgstr "Error mientras se verificaba si el usuario se encontraba registrado\n"
 
-#: tools/sss_userdel.c:289
+#: src/tools/sss_userdel.c:285
 #, c-format
 msgid "The post-delete command failed: %s\n"
 msgstr "Falló el comando de post-eliminación: %s\n"
 
-#: tools/sss_userdel.c:301
+#: src/tools/sss_userdel.c:297
 msgid "Not removing home dir - not owned by user\n"
 msgstr "No eliminando el directorio de inicio - no pertenece al usuario\n"
 
-#: tools/sss_userdel.c:303
+#: src/tools/sss_userdel.c:299
 #, c-format
 msgid "Cannot remove homedir: %s\n"
 msgstr " Imposible eliminar el directorio de inicio: %s\n"
 
-#: tools/sss_userdel.c:314
+#: src/tools/sss_userdel.c:310
 msgid ""
 "No such user in local domain. Removing users only allowed in local domain.\n"
 msgstr ""
 "No existe ese usuario en el dominio local. La eliminación de usuarios se "
 "permite en el dominio local.\n"
 
-#: tools/sss_userdel.c:319
+#: src/tools/sss_userdel.c:315
 msgid "Internal error. Could not remove user.\n"
 msgstr "Error interno. No se pudo eliminar el usuario.\n"
 
-#: tools/sss_usermod.c:49
+#: src/tools/sss_usermod.c:49
 msgid "The GID of the user"
 msgstr "El GID del Usuario"
 
-#: tools/sss_usermod.c:53
+#: src/tools/sss_usermod.c:53
 msgid "Groups to add this user to"
 msgstr "Grupos a los que se debe agregar este usuario"
 
-#: tools/sss_usermod.c:54
+#: src/tools/sss_usermod.c:54
 msgid "Groups to remove this user from"
 msgstr "Grupos desde los que hay que eliminar este usuario"
 
-#: tools/sss_usermod.c:55
+#: src/tools/sss_usermod.c:55
 msgid "Lock the account"
 msgstr "Bloquear la cuenta"
 
-#: tools/sss_usermod.c:56
+#: src/tools/sss_usermod.c:56
 msgid "Unlock the account"
 msgstr "Desbloquear la cuenta"
 
-#: tools/sss_usermod.c:117
+#: src/tools/sss_usermod.c:117
 msgid "Specify user to modify\n"
 msgstr "Especifique el usuario a modificar\n"
 
-#: tools/sss_usermod.c:148
+#: src/tools/sss_usermod.c:146
 msgid ""
 "Cannot find user in local domain, modifying users is allowed only in local "
 "domain\n"
@@ -949,31 +967,31 @@ msgstr ""
 "No se pudo encontrar el usuario en el dominio local, la modificación de los "
 "usuarios se permite solamente en el dominio local\n"
 
-#: tools/sss_usermod.c:250
+#: src/tools/sss_usermod.c:248
 msgid "Could not modify user - check if group names are correct\n"
 msgstr ""
 "No se pudo modificar el usuario - verifique si los nombres de grupo son "
 "correctos\n"
 
-#: tools/sss_usermod.c:254
+#: src/tools/sss_usermod.c:252
 msgid "Could not modify user - user already member of groups?\n"
 msgstr ""
 "No se pudo modificar el usuario - ¿no será ya miembro de esos grupos?\n"
 
-#: tools/sss_usermod.c:258
+#: src/tools/sss_usermod.c:256
 msgid "Transaction error. Could not modify user.\n"
 msgstr "Error de transacción. No se pudo modificar el usuario.\n"
 
-#: tools/tools_util.c:285
+#: src/tools/tools_util.c:290
 msgid "Out of memory\n"
 msgstr "Falta memoria\n"
 
-#: tools/tools_util.h:34
+#: src/tools/tools_util.h:40
 #, c-format
 msgid "%s must be run as root\n"
 msgstr "%s se debe ejecutar como root\n"
 
-#: util/util.h:63
+#: src/util/util.h:65
 msgid "Send the debug output to files instead of stderr"
 msgstr "Envia el resultado de la depuración hacia archivos en lugar de stderr"
 
diff --git a/po/fr.po b/po/fr.po
index 8f0bfa10..9ae8d9fb 100644
--- a/po/fr.po
+++ b/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-08-03 18:24-0400\n"
+"POT-Creation-Date: 2010-10-18 13:14-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"
@@ -16,907 +16,923 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: config/SSSDConfig.py:39
+#: src/config/SSSDConfig.py:39
 msgid "Set the verbosity of the debug logging"
 msgstr ""
 
-#: config/SSSDConfig.py:40
+#: src/config/SSSDConfig.py:40
 msgid "Include timestamps in debug logs"
 msgstr ""
 
-#: config/SSSDConfig.py:41
+#: src/config/SSSDConfig.py:41
 msgid "Write debug messages to logfiles"
 msgstr ""
 
-#: config/SSSDConfig.py:42
+#: src/config/SSSDConfig.py:42
 msgid "Ping timeout before restarting service"
 msgstr ""
 
-#: config/SSSDConfig.py:43
+#: src/config/SSSDConfig.py:43
 msgid "Command to start service"
 msgstr ""
 
-#: config/SSSDConfig.py:44
+#: src/config/SSSDConfig.py:44
 msgid "Number of times to attempt connection to Data Providers"
 msgstr ""
 
-#: config/SSSDConfig.py:47
+#: src/config/SSSDConfig.py:47
 msgid "SSSD Services to start"
 msgstr ""
 
-#: config/SSSDConfig.py:48
+#: src/config/SSSDConfig.py:48
 msgid "SSSD Domains to start"
 msgstr ""
 
-#: config/SSSDConfig.py:49
+#: src/config/SSSDConfig.py:49
 msgid "Timeout for messages sent over the SBUS"
 msgstr ""
 
-#: config/SSSDConfig.py:50
+#: src/config/SSSDConfig.py:50
 msgid "Regex to parse username and domain"
 msgstr ""
 
-#: config/SSSDConfig.py:51
+#: src/config/SSSDConfig.py:51
 msgid "Printf-compatible format for displaying fully-qualified names"
 msgstr ""
 
-#: config/SSSDConfig.py:54
+#: src/config/SSSDConfig.py:54
 msgid "Enumeration cache timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:55
+#: src/config/SSSDConfig.py:55
 msgid "Entry cache background update timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:56
+#: src/config/SSSDConfig.py:56
 msgid "Negative cache timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:57
+#: src/config/SSSDConfig.py:57
 msgid "Users that SSSD should explicitly ignore"
 msgstr ""
 
-#: config/SSSDConfig.py:58
+#: src/config/SSSDConfig.py:58
 msgid "Groups that SSSD should explicitly ignore"
 msgstr ""
 
-#: config/SSSDConfig.py:59
+#: src/config/SSSDConfig.py:59
 msgid "Should filtered users appear in groups"
 msgstr ""
 
-#: config/SSSDConfig.py:60
+#: src/config/SSSDConfig.py:60
 msgid "The value of the password field the NSS provider should return"
 msgstr ""
 
-#: config/SSSDConfig.py:63
+#: src/config/SSSDConfig.py:63
 msgid "How long to allow cached logins between online logins (days)"
 msgstr ""
 
-#: config/SSSDConfig.py:64
+#: src/config/SSSDConfig.py:64
 msgid "How many failed logins attempts are allowed when offline"
 msgstr ""
 
-#: config/SSSDConfig.py:65
+#: src/config/SSSDConfig.py:65
 msgid ""
 "How long (minutes) to deny login after offline_failed_login_attempts has "
 "been reached"
 msgstr ""
 
-#: config/SSSDConfig.py:68
+#: src/config/SSSDConfig.py:68
 msgid "Identity provider"
 msgstr ""
 
-#: config/SSSDConfig.py:69
+#: src/config/SSSDConfig.py:69
 msgid "Authentication provider"
 msgstr ""
 
-#: config/SSSDConfig.py:70
+#: src/config/SSSDConfig.py:70
 msgid "Access control provider"
 msgstr ""
 
-#: config/SSSDConfig.py:71
+#: src/config/SSSDConfig.py:71
 #, fuzzy
 msgid "Password change provider"
 msgstr "Le mot de passe a expiré."
 
-#: config/SSSDConfig.py:74
+#: src/config/SSSDConfig.py:74
 msgid "Minimum user ID"
 msgstr ""
 
-#: config/SSSDConfig.py:75
+#: src/config/SSSDConfig.py:75
 msgid "Maximum user ID"
 msgstr ""
 
-#: config/SSSDConfig.py:76
+#: src/config/SSSDConfig.py:76
 msgid "Ping timeout before restarting domain"
 msgstr ""
 
-#: config/SSSDConfig.py:77
+#: src/config/SSSDConfig.py:77
 msgid "Enable enumerating all users/groups"
 msgstr ""
 
-#: config/SSSDConfig.py:78
+#: src/config/SSSDConfig.py:78
 msgid "Cache credentials for offline login"
 msgstr ""
 
-#: config/SSSDConfig.py:79
+#: src/config/SSSDConfig.py:79
 msgid "Store password hashes"
 msgstr ""
 
-#: config/SSSDConfig.py:80
+#: src/config/SSSDConfig.py:80
 msgid "Display users/groups in fully-qualified form"
 msgstr ""
 
-#: config/SSSDConfig.py:81
+#: src/config/SSSDConfig.py:81
 msgid "Entry cache timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:82
+#: src/config/SSSDConfig.py:82
 msgid ""
 "Restrict or prefer a specific address family when performing DNS lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:83
+#: src/config/SSSDConfig.py:83
 msgid "How long to keep cached entries after last successful login (days)"
 msgstr ""
 
-#: config/SSSDConfig.py:84
+#: src/config/SSSDConfig.py:84
 msgid "How long to wait for replies from DNS when resolving servers (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:85
+#: src/config/SSSDConfig.py:85
 msgid "The domain part of service discovery DNS query"
 msgstr ""
 
-#: config/SSSDConfig.py:88
+#: src/config/SSSDConfig.py:88
 msgid "IPA domain"
 msgstr ""
 
-#: config/SSSDConfig.py:89
+#: src/config/SSSDConfig.py:89
 msgid "IPA server address"
 msgstr ""
 
-#: config/SSSDConfig.py:90
+#: src/config/SSSDConfig.py:90
 msgid "IPA client hostname"
 msgstr ""
 
-#: config/SSSDConfig.py:91
+#: src/config/SSSDConfig.py:91
 msgid "Whether to automatically update the client's DNS entry in FreeIPA"
 msgstr ""
 
-#: config/SSSDConfig.py:92
+#: src/config/SSSDConfig.py:92
 msgid "The interface whose IP should be used for dynamic DNS updates"
 msgstr ""
 
-#: config/SSSDConfig.py:95 config/SSSDConfig.py:124
+#: src/config/SSSDConfig.py:95 src/config/SSSDConfig.py:124
 msgid "Kerberos server address"
 msgstr ""
 
-#: config/SSSDConfig.py:96 config/SSSDConfig.py:125
+#: src/config/SSSDConfig.py:96 src/config/SSSDConfig.py:125
 msgid "Kerberos realm"
 msgstr ""
 
-#: config/SSSDConfig.py:97
+#: src/config/SSSDConfig.py:97
 msgid "Authentication timeout"
 msgstr ""
 
-#: config/SSSDConfig.py:100
+#: src/config/SSSDConfig.py:100
 msgid "Directory to store credential caches"
 msgstr ""
 
-#: config/SSSDConfig.py:101
+#: src/config/SSSDConfig.py:101
 msgid "Location of the user's credential cache"
 msgstr ""
 
-#: config/SSSDConfig.py:102
+#: src/config/SSSDConfig.py:102
 msgid "Location of the keytab to validate credentials"
 msgstr ""
 
-#: config/SSSDConfig.py:103
+#: src/config/SSSDConfig.py:103
 msgid "Enable credential validation"
 msgstr ""
 
-#: config/SSSDConfig.py:104
+#: src/config/SSSDConfig.py:104
 msgid "Store password if offline for later online authentication"
 msgstr ""
 
-#: config/SSSDConfig.py:107
+#: src/config/SSSDConfig.py:107
 msgid "Server where the change password service is running if not on the KDC"
 msgstr ""
 
-#: config/SSSDConfig.py:110
+#: src/config/SSSDConfig.py:110
 msgid "ldap_uri, The URI of the LDAP server"
 msgstr ""
 
-#: config/SSSDConfig.py:111
+#: src/config/SSSDConfig.py:111
 msgid "The default base DN"
 msgstr ""
 
-#: config/SSSDConfig.py:112
+#: src/config/SSSDConfig.py:112
 msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr ""
 
-#: config/SSSDConfig.py:113
+#: src/config/SSSDConfig.py:113
 msgid "The default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:114
+#: src/config/SSSDConfig.py:114
 msgid "The type of the authentication token of the default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:115
+#: src/config/SSSDConfig.py:115
 msgid "The authentication token of the default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:116
+#: src/config/SSSDConfig.py:116
 msgid "Length of time to attempt connection"
 msgstr ""
 
-#: config/SSSDConfig.py:117
+#: src/config/SSSDConfig.py:117
 msgid "Length of time to attempt synchronous LDAP operations"
 msgstr ""
 
-#: config/SSSDConfig.py:118
+#: src/config/SSSDConfig.py:118
 msgid "Length of time between attempts to reconnect while offline"
 msgstr ""
 
-#: config/SSSDConfig.py:119
+#: src/config/SSSDConfig.py:119
 msgid "File that contains CA certificates"
 msgstr ""
 
-#: config/SSSDConfig.py:120
+#: src/config/SSSDConfig.py:120
 msgid "Path to CA certificate directory"
 msgstr ""
 
-#: config/SSSDConfig.py:121
+#: src/config/SSSDConfig.py:121
 msgid "Require TLS certificate verification"
 msgstr ""
 
-#: config/SSSDConfig.py:122
+#: src/config/SSSDConfig.py:122
 msgid "Specify the sasl mechanism to use"
 msgstr ""
 
-#: config/SSSDConfig.py:123
+#: src/config/SSSDConfig.py:123
 msgid "Specify the sasl authorization id to use"
 msgstr ""
 
-#: config/SSSDConfig.py:126
+#: src/config/SSSDConfig.py:126
 msgid "Kerberos service keytab"
 msgstr ""
 
-#: config/SSSDConfig.py:127
+#: src/config/SSSDConfig.py:127
 msgid "Use Kerberos auth for LDAP connection"
 msgstr ""
 
-#: config/SSSDConfig.py:128
+#: src/config/SSSDConfig.py:128
 msgid "Follow LDAP referrals"
 msgstr ""
 
-#: config/SSSDConfig.py:129
+#: src/config/SSSDConfig.py:129
 msgid "Lifetime of TGT for LDAP connection"
 msgstr ""
 
-#: config/SSSDConfig.py:132
+#: src/config/SSSDConfig.py:132
 msgid "Length of time to wait for a search request"
 msgstr ""
 
-#: config/SSSDConfig.py:133
+#: src/config/SSSDConfig.py:133
 msgid "Length of time between enumeration updates"
 msgstr ""
 
-#: config/SSSDConfig.py:134
+#: src/config/SSSDConfig.py:134
 msgid "Require TLS for ID lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:135
+#: src/config/SSSDConfig.py:135
 msgid "Base DN for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:136
+#: src/config/SSSDConfig.py:136
 msgid "Scope of user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:137
+#: src/config/SSSDConfig.py:137
 msgid "Filter for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:138
+#: src/config/SSSDConfig.py:138
 msgid "Objectclass for users"
 msgstr ""
 
-#: config/SSSDConfig.py:139
+#: src/config/SSSDConfig.py:139
 msgid "Username attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:140
+#: src/config/SSSDConfig.py:140
 msgid "UID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:141
+#: src/config/SSSDConfig.py:141
 msgid "Primary GID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:142
+#: src/config/SSSDConfig.py:142
 msgid "GECOS attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:143
+#: src/config/SSSDConfig.py:143
 msgid "Home directory attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:144
+#: src/config/SSSDConfig.py:144
 msgid "Shell attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:145
+#: src/config/SSSDConfig.py:145
 msgid "UUID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:146
+#: src/config/SSSDConfig.py:146
 msgid "User principal attribute (for Kerberos)"
 msgstr ""
 
-#: config/SSSDConfig.py:147
+#: src/config/SSSDConfig.py:147
 msgid "Full Name"
 msgstr ""
 
-#: config/SSSDConfig.py:148
+#: src/config/SSSDConfig.py:148
 msgid "memberOf attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:149
+#: src/config/SSSDConfig.py:149
 msgid "Modification time attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:152
+#: src/config/SSSDConfig.py:152
 msgid "Policy to evaluate the password expiration"
 msgstr ""
 
-#: config/SSSDConfig.py:155
+#: src/config/SSSDConfig.py:155
 msgid "LDAP filter to determine access privileges"
 msgstr ""
 
-#: config/SSSDConfig.py:158
+#: src/config/SSSDConfig.py:158
 msgid "Comma separated list of allowed users"
 msgstr ""
 
-#: config/SSSDConfig.py:159
+#: src/config/SSSDConfig.py:159
 msgid "Comma separated list of prohibited users"
 msgstr ""
 
-#: config/SSSDConfig.py:162
+#: src/config/SSSDConfig.py:162
 msgid "Default shell, /bin/bash"
 msgstr ""
 
-#: config/SSSDConfig.py:163
+#: src/config/SSSDConfig.py:163
 msgid "Base for home directories"
 msgstr ""
 
-#: config/SSSDConfig.py:166
+#: src/config/SSSDConfig.py:166
 msgid "The name of the NSS library to use"
 msgstr ""
 
-#: config/SSSDConfig.py:169
+#: src/config/SSSDConfig.py:169
 msgid "PAM stack to use"
 msgstr ""
 
-#: monitor/monitor.c:2137
+#: src/monitor/monitor.c:2140
 msgid "Become a daemon (default)"
 msgstr ""
 
-#: monitor/monitor.c:2139
+#: src/monitor/monitor.c:2142
 msgid "Run interactive (not a daemon)"
 msgstr ""
 
-#: monitor/monitor.c:2141
+#: src/monitor/monitor.c:2144
 msgid "Specify a non-default config file"
 msgstr ""
 
-#: monitor/monitor.c:2167
+#: src/monitor/monitor.c:2170
 msgid "sssd must be run as root\n"
 msgstr ""
 
-#: monitor/monitor.c:2202
+#: src/monitor/monitor.c:2205
 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:2212
+#: src/monitor/monitor.c:2215
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
 "file is owned by root.root\n"
 msgstr ""
 
-#: monitor/monitor.c:2217
+#: src/monitor/monitor.c:2220
 msgid "Cannot load configuration database\n"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:993 providers/ldap/ldap_child.c:361
-#: util/util.h:61
+#: src/providers/krb5/krb5_child.c:1043 src/providers/ldap/ldap_child.c:359
+#: src/util/util.h:63
 msgid "Debug level"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:995 providers/ldap/ldap_child.c:363
-#: util/util.h:65
+#: src/providers/krb5/krb5_child.c:1045 src/providers/ldap/ldap_child.c:361
+#: src/util/util.h:67
 msgid "Add debug timestamps"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:997 providers/ldap/ldap_child.c:365
+#: src/providers/krb5/krb5_child.c:1047 src/providers/ldap/ldap_child.c:363
 msgid "An open file descriptor for the debug logs"
 msgstr ""
 
-#: providers/data_provider_be.c:1165
+#: src/providers/data_provider_be.c:1165
 msgid "Domain of the information provider (mandatory)"
 msgstr ""
 
-#: sss_client/common.c:742
+#: src/sss_client/common.c:742
 msgid "Privileged socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:745
+#: src/sss_client/common.c:745
 msgid "Public socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:748
+#: src/sss_client/common.c:748
 msgid "Unexpected format of the server credential message."
 msgstr ""
 
-#: sss_client/common.c:751
+#: src/sss_client/common.c:751
 msgid "SSSD is not run by root."
 msgstr ""
 
-#: sss_client/common.c:756
+#: src/sss_client/common.c:756
 msgid "An error occurred, but no description can be found."
 msgstr ""
 
-#: sss_client/common.c:762
+#: src/sss_client/common.c:762
 msgid "Unexpected error while looking for an error description"
 msgstr ""
 
-#: sss_client/pam_sss.c:372
+#: src/sss_client/pam_sss.c:372
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: sss_client/pam_sss.c:556
+#: src/sss_client/pam_sss.c:556
 msgid "Password reset by root is not supported."
 msgstr ""
 
-#: sss_client/pam_sss.c:597
+#: src/sss_client/pam_sss.c:597
 msgid "Authenticated with cached credentials"
 msgstr ""
 
-#: sss_client/pam_sss.c:598
+#: src/sss_client/pam_sss.c:598
 msgid ", your cached password will expire at: "
 msgstr ""
 
-#: sss_client/pam_sss.c:628
+#: src/sss_client/pam_sss.c:628
 #, c-format
 msgid "Your password has expired. You have %d grace login(s) remaining."
 msgstr ""
 
-#: sss_client/pam_sss.c:674
+#: src/sss_client/pam_sss.c:674
 #, fuzzy, c-format
 msgid "Your password will expire in %d %s."
 msgstr "Le mot de passe a expiré."
 
-#: sss_client/pam_sss.c:723
+#: src/sss_client/pam_sss.c:723
 msgid "Authentication is denied until: "
 msgstr ""
 
-#: sss_client/pam_sss.c:750
+#: src/sss_client/pam_sss.c:750
 msgid "System is offline, password change not possible"
 msgstr ""
 
-#: sss_client/pam_sss.c:780 sss_client/pam_sss.c:793
+#: src/sss_client/pam_sss.c:780 src/sss_client/pam_sss.c:793
 #, fuzzy
 msgid "Password change failed. "
 msgstr "Le mot de passe a expiré."
 
-#: sss_client/pam_sss.c:783 sss_client/pam_sss.c:794
+#: src/sss_client/pam_sss.c:783 src/sss_client/pam_sss.c:794
 msgid "Server message: "
 msgstr ""
 
-#: sss_client/pam_sss.c:1197
+#: src/sss_client/pam_sss.c:1197
 msgid "New Password: "
 msgstr "Nouveau mot de passe : "
 
-#: sss_client/pam_sss.c:1198
+#: src/sss_client/pam_sss.c:1198
 msgid "Reenter new Password: "
 msgstr "Retaper le nouveau mot de passe : "
 
-#: sss_client/pam_sss.c:1280
+#: src/sss_client/pam_sss.c:1280
 msgid "Password: "
 msgstr "Mot de passe : "
 
-#: sss_client/pam_sss.c:1312
+#: src/sss_client/pam_sss.c:1312
 #, fuzzy
 msgid "Current Password: "
 msgstr "Nouveau mot de passe : "
 
-#: sss_client/pam_sss.c:1458
+#: src/sss_client/pam_sss.c:1458
 msgid "Password expired. Change your password now."
 msgstr ""
 
-#: tools/sss_useradd.c:48 tools/sss_groupadd.c:41 tools/sss_groupdel.c:43
-#: tools/sss_groupmod.c:42 tools/sss_groupshow.c:620 tools/sss_userdel.c:131
-#: tools/sss_usermod.c:47
+#: src/tools/sss_useradd.c:48 src/tools/sss_groupadd.c:41
+#: src/tools/sss_groupdel.c:43 src/tools/sss_groupmod.c:42
+#: src/tools/sss_groupshow.c:620 src/tools/sss_userdel.c:131
+#: src/tools/sss_usermod.c:47
 msgid "The debug level to run with"
 msgstr ""
 
-#: tools/sss_useradd.c:49 tools/sss_usermod.c:48
+#: src/tools/sss_useradd.c:49 src/tools/sss_usermod.c:48
 msgid "The UID of the user"
 msgstr ""
 
-#: tools/sss_useradd.c:50 tools/sss_usermod.c:50
+#: src/tools/sss_useradd.c:50 src/tools/sss_usermod.c:50
 msgid "The comment string"
 msgstr ""
 
-#: tools/sss_useradd.c:51 tools/sss_usermod.c:51
+#: src/tools/sss_useradd.c:51 src/tools/sss_usermod.c:51
 msgid "Home directory"
 msgstr ""
 
-#: tools/sss_useradd.c:52 tools/sss_usermod.c:52
+#: src/tools/sss_useradd.c:52 src/tools/sss_usermod.c:52
 msgid "Login shell"
 msgstr ""
 
-#: tools/sss_useradd.c:53
+#: src/tools/sss_useradd.c:53
 msgid "Groups"
 msgstr ""
 
-#: tools/sss_useradd.c:54
+#: src/tools/sss_useradd.c:54
 msgid "Create user's directory if it does not exist"
 msgstr ""
 
-#: tools/sss_useradd.c:55
+#: src/tools/sss_useradd.c:55
 msgid "Never create user's directory, overrides config"
 msgstr ""
 
-#: tools/sss_useradd.c:56
+#: src/tools/sss_useradd.c:56
 msgid "Specify an alternative skeleton directory"
 msgstr ""
 
-#: tools/sss_useradd.c:57 tools/sss_usermod.c:57
+#: src/tools/sss_useradd.c:57 src/tools/sss_usermod.c:57
 msgid "The SELinux user for user's login"
 msgstr ""
 
-#: tools/sss_useradd.c:71 tools/sss_groupadd.c:56 tools/sss_groupdel.c:52
-#: tools/sss_groupmod.c:63 tools/sss_groupshow.c:631 tools/sss_userdel.c:148
-#: tools/sss_usermod.c:72
+#: src/tools/sss_useradd.c:71 src/tools/sss_groupadd.c:56
+#: src/tools/sss_groupdel.c:52 src/tools/sss_groupmod.c:63
+#: src/tools/sss_groupshow.c:631 src/tools/sss_userdel.c:148
+#: src/tools/sss_usermod.c:72
 msgid "Error setting the locale\n"
 msgstr ""
 
-#: tools/sss_useradd.c:107
+#: src/tools/sss_useradd.c:84 src/tools/sss_groupmod.c:76
+#: src/tools/sss_usermod.c:85
+msgid "Specify group to add to\n"
+msgstr ""
+
+#: src/tools/sss_useradd.c:108
 msgid "Specify user to add\n"
 msgstr ""
 
-#: tools/sss_useradd.c:118 tools/sss_groupadd.c:86 tools/sss_groupdel.c:81
-#: tools/sss_groupmod.c:111 tools/sss_groupshow.c:668 tools/sss_userdel.c:197
-#: tools/sss_usermod.c:128
+#: src/tools/sss_useradd.c:117 src/tools/sss_groupadd.c:82
+#: src/tools/sss_groupdel.c:77 src/tools/sss_groupmod.c:109
+#: src/tools/sss_groupshow.c:664 src/tools/sss_userdel.c:193
+#: src/tools/sss_usermod.c:126
 msgid "Error initializing the tools - no local domain\n"
 msgstr ""
 
-#: tools/sss_useradd.c:120 tools/sss_groupadd.c:88 tools/sss_groupdel.c:83
-#: tools/sss_groupmod.c:113 tools/sss_groupshow.c:670 tools/sss_userdel.c:199
-#: tools/sss_usermod.c:130
+#: src/tools/sss_useradd.c:119 src/tools/sss_groupadd.c:84
+#: src/tools/sss_groupdel.c:79 src/tools/sss_groupmod.c:111
+#: src/tools/sss_groupshow.c:666 src/tools/sss_userdel.c:195
+#: src/tools/sss_usermod.c:128
 msgid "Error initializing the tools\n"
 msgstr ""
 
-#: tools/sss_useradd.c:129 tools/sss_groupadd.c:97 tools/sss_groupdel.c:92
-#: tools/sss_groupmod.c:121 tools/sss_groupshow.c:679 tools/sss_userdel.c:208
-#: tools/sss_usermod.c:139
+#: src/tools/sss_useradd.c:128 src/tools/sss_groupadd.c:93
+#: src/tools/sss_groupdel.c:88 src/tools/sss_groupmod.c:119
+#: src/tools/sss_groupshow.c:675 src/tools/sss_userdel.c:204
+#: src/tools/sss_usermod.c:137
 msgid "Invalid domain specified in FQDN\n"
 msgstr ""
 
-#: tools/sss_useradd.c:138 tools/sss_groupmod.c:143 tools/sss_groupmod.c:170
-#: tools/sss_usermod.c:164 tools/sss_usermod.c:191
+#: src/tools/sss_useradd.c:137 src/tools/sss_groupmod.c:141
+#: src/tools/sss_groupmod.c:168 src/tools/sss_usermod.c:162
+#: src/tools/sss_usermod.c:189
 msgid "Internal error while parsing parameters\n"
 msgstr ""
 
-#: tools/sss_useradd.c:146 tools/sss_usermod.c:172 tools/sss_usermod.c:199
+#: src/tools/sss_useradd.c:145 src/tools/sss_usermod.c:170
+#: src/tools/sss_usermod.c:197
 msgid "Groups must be in the same domain as user\n"
 msgstr ""
 
-#: tools/sss_useradd.c:154
+#: src/tools/sss_useradd.c:153
 #, c-format
 msgid "Cannot find group %s in local domain\n"
 msgstr ""
 
-#: tools/sss_useradd.c:169 tools/sss_userdel.c:218
+#: src/tools/sss_useradd.c:168 src/tools/sss_userdel.c:214
 msgid "Cannot set default values\n"
 msgstr ""
 
-#: tools/sss_useradd.c:176 tools/sss_usermod.c:155
+#: src/tools/sss_useradd.c:175 src/tools/sss_usermod.c:153
 msgid "The selected UID is outside the allowed range\n"
 msgstr ""
 
-#: tools/sss_useradd.c:203 tools/sss_usermod.c:240
+#: src/tools/sss_useradd.c:202 src/tools/sss_usermod.c:238
 msgid "Cannot set SELinux login context\n"
 msgstr ""
 
-#: tools/sss_useradd.c:219
+#: src/tools/sss_useradd.c:218
 msgid "Cannot get info about the user\n"
 msgstr ""
 
-#: tools/sss_useradd.c:233
+#: src/tools/sss_useradd.c:232
 msgid "User's home directory already exists, not copying data from skeldir\n"
 msgstr ""
 
-#: tools/sss_useradd.c:236
+#: src/tools/sss_useradd.c:235
 #, c-format
 msgid "Cannot create user's home directory: %s\n"
 msgstr ""
 
-#: tools/sss_useradd.c:247
+#: src/tools/sss_useradd.c:246
 #, c-format
 msgid "Cannot create user's mail spool: %s\n"
 msgstr ""
 
-#: tools/sss_useradd.c:259
+#: src/tools/sss_useradd.c:258
 msgid "Could not allocate ID for the user - domain full?\n"
 msgstr ""
 
-#: tools/sss_useradd.c:263
+#: src/tools/sss_useradd.c:262
 msgid "A user or group with the same name or ID already exists\n"
 msgstr ""
 
-#: tools/sss_useradd.c:269
+#: src/tools/sss_useradd.c:268
 msgid "Transaction error. Could not add user.\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:43 tools/sss_groupmod.c:48
+#: src/tools/sss_groupadd.c:43 src/tools/sss_groupmod.c:48
 msgid "The GID of the group"
 msgstr ""
 
-#: tools/sss_groupadd.c:75
+#: src/tools/sss_groupadd.c:73
 msgid "Specify group to add\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:106 tools/sss_groupmod.c:194
+#: src/tools/sss_groupadd.c:102 src/tools/sss_groupmod.c:192
 msgid "The selected GID is outside the allowed range\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:131
+#: src/tools/sss_groupadd.c:127
 msgid "Could not allocate ID for the group - domain full?\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:135
+#: src/tools/sss_groupadd.c:131
 msgid "A group with the same name or GID already exists\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:140
+#: src/tools/sss_groupadd.c:136
 msgid "Transaction error. Could not add group.\n"
 msgstr ""
 
-#: tools/sss_groupdel.c:70
+#: src/tools/sss_groupdel.c:68
 msgid "Specify group to delete\n"
 msgstr ""
 
-#: tools/sss_groupdel.c:107
+#: src/tools/sss_groupdel.c:103
 #, c-format
 msgid "Group %s is outside the defined ID range for domain\n"
 msgstr ""
 
-#: tools/sss_groupdel.c:121
+#: src/tools/sss_groupdel.c:117
 msgid ""
 "No such group in local domain. Removing groups only allowed in local "
 "domain.\n"
 msgstr ""
 
-#: tools/sss_groupdel.c:126
+#: src/tools/sss_groupdel.c:122
 msgid "Internal error. Could not remove group.\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:44
+#: src/tools/sss_groupmod.c:44
 msgid "Groups to add this group to"
 msgstr ""
 
-#: tools/sss_groupmod.c:46
+#: src/tools/sss_groupmod.c:46
 msgid "Groups to remove this group from"
 msgstr ""
 
-#: tools/sss_groupmod.c:98
+#: src/tools/sss_groupmod.c:84 src/tools/sss_usermod.c:93
+msgid "Specify group to remove from\n"
+msgstr ""
+
+#: src/tools/sss_groupmod.c:98
 msgid "Specify group to modify\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:130
+#: src/tools/sss_groupmod.c:128
 msgid ""
 "Cannot find group in local domain, modifying groups is allowed only in local "
 "domain\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:151 tools/sss_groupmod.c:178
+#: src/tools/sss_groupmod.c:149 src/tools/sss_groupmod.c:176
 msgid "Member groups must be in the same domain as parent group\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:159 tools/sss_groupmod.c:186 tools/sss_usermod.c:180
-#: tools/sss_usermod.c:207
+#: src/tools/sss_groupmod.c:157 src/tools/sss_groupmod.c:184
+#: src/tools/sss_usermod.c:178 src/tools/sss_usermod.c:205
 #, c-format
 msgid ""
 "Cannot find group %s in local domain, only groups in local domain are "
 "allowed\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:220
+#: src/tools/sss_groupmod.c:218
 msgid "Could not modify group - check if member group names are correct\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:224
+#: src/tools/sss_groupmod.c:222
 msgid "Could not modify group - check if groupname is correct\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:228
+#: src/tools/sss_groupmod.c:226
 msgid "Transaction error. Could not modify group.\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:567
+#: src/tools/sss_groupshow.c:567
 #, c-format
 msgid "%s%sGroup: %s\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:568
+#: src/tools/sss_groupshow.c:568
 msgid "Magic Private "
 msgstr ""
 
-#: tools/sss_groupshow.c:570
+#: src/tools/sss_groupshow.c:570
 #, c-format
 msgid "%sGID number: %d\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:572
+#: src/tools/sss_groupshow.c:572
 #, c-format
 msgid "%sMember users: "
 msgstr ""
 
-#: tools/sss_groupshow.c:579
+#: src/tools/sss_groupshow.c:579
 #, c-format
 msgid ""
 "\n"
 "%sIs a member of: "
 msgstr ""
 
-#: tools/sss_groupshow.c:586
+#: src/tools/sss_groupshow.c:586
 #, c-format
 msgid ""
 "\n"
 "%sMember groups: "
 msgstr ""
 
-#: tools/sss_groupshow.c:622
+#: src/tools/sss_groupshow.c:622
 msgid "Print indirect group members recursively"
 msgstr ""
 
-#: tools/sss_groupshow.c:657
+#: src/tools/sss_groupshow.c:655
 msgid "Specify group to show\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:698
+#: src/tools/sss_groupshow.c:694
 msgid ""
 "No such group in local domain. Printing groups only allowed in local "
 "domain.\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:703
+#: src/tools/sss_groupshow.c:699
 msgid "Internal error. Could not print group.\n"
 msgstr ""
 
-#: tools/sss_userdel.c:133
+#: src/tools/sss_userdel.c:133
 msgid "Remove home directory and mail spool"
 msgstr ""
 
-#: tools/sss_userdel.c:135
+#: src/tools/sss_userdel.c:135
 msgid "Do not remove home directory and mail spool"
 msgstr ""
 
-#: tools/sss_userdel.c:137
+#: src/tools/sss_userdel.c:137
 msgid "Force removal of files not owned by the user"
 msgstr ""
 
-#: tools/sss_userdel.c:139
+#: src/tools/sss_userdel.c:139
 msgid "Kill users' processes before removing him"
 msgstr ""
 
-#: tools/sss_userdel.c:186
+#: src/tools/sss_userdel.c:184
 msgid "Specify user to delete\n"
 msgstr ""
 
-#: tools/sss_userdel.c:235
+#: src/tools/sss_userdel.c:231
 #, c-format
 msgid "User %s is outside the defined ID range for domain\n"
 msgstr ""
 
-#: tools/sss_userdel.c:260
+#: src/tools/sss_userdel.c:256
 msgid "Cannot reset SELinux login context\n"
 msgstr ""
 
-#: tools/sss_userdel.c:272
+#: src/tools/sss_userdel.c:268
 #, c-format
 msgid "WARNING: The user (uid %lu) was still logged in when deleted.\n"
 msgstr ""
 
-#: tools/sss_userdel.c:277
+#: src/tools/sss_userdel.c:273
 msgid "Cannot determine if the user was logged in on this platform"
 msgstr ""
 
-#: tools/sss_userdel.c:282
+#: src/tools/sss_userdel.c:278
 msgid "Error while checking if the user was logged in\n"
 msgstr ""
 
-#: tools/sss_userdel.c:289
+#: src/tools/sss_userdel.c:285
 #, c-format
 msgid "The post-delete command failed: %s\n"
 msgstr ""
 
-#: tools/sss_userdel.c:301
+#: src/tools/sss_userdel.c:297
 msgid "Not removing home dir - not owned by user\n"
 msgstr ""
 
-#: tools/sss_userdel.c:303
+#: src/tools/sss_userdel.c:299
 #, c-format
 msgid "Cannot remove homedir: %s\n"
 msgstr ""
 
-#: tools/sss_userdel.c:314
+#: src/tools/sss_userdel.c:310
 msgid ""
 "No such user in local domain. Removing users only allowed in local domain.\n"
 msgstr ""
 
-#: tools/sss_userdel.c:319
+#: src/tools/sss_userdel.c:315
 msgid "Internal error. Could not remove user.\n"
 msgstr ""
 
-#: tools/sss_usermod.c:49
+#: src/tools/sss_usermod.c:49
 msgid "The GID of the user"
 msgstr ""
 
-#: tools/sss_usermod.c:53
+#: src/tools/sss_usermod.c:53
 msgid "Groups to add this user to"
 msgstr ""
 
-#: tools/sss_usermod.c:54
+#: src/tools/sss_usermod.c:54
 msgid "Groups to remove this user from"
 msgstr ""
 
-#: tools/sss_usermod.c:55
+#: src/tools/sss_usermod.c:55
 msgid "Lock the account"
 msgstr ""
 
-#: tools/sss_usermod.c:56
+#: src/tools/sss_usermod.c:56
 msgid "Unlock the account"
 msgstr ""
 
-#: tools/sss_usermod.c:117
+#: src/tools/sss_usermod.c:117
 msgid "Specify user to modify\n"
 msgstr ""
 
-#: tools/sss_usermod.c:148
+#: src/tools/sss_usermod.c:146
 msgid ""
 "Cannot find user in local domain, modifying users is allowed only in local "
 "domain\n"
 msgstr ""
 
-#: tools/sss_usermod.c:250
+#: src/tools/sss_usermod.c:248
 msgid "Could not modify user - check if group names are correct\n"
 msgstr ""
 
-#: tools/sss_usermod.c:254
+#: src/tools/sss_usermod.c:252
 msgid "Could not modify user - user already member of groups?\n"
 msgstr ""
 
-#: tools/sss_usermod.c:258
+#: src/tools/sss_usermod.c:256
 msgid "Transaction error. Could not modify user.\n"
 msgstr ""
 
-#: tools/tools_util.c:285
+#: src/tools/tools_util.c:290
 msgid "Out of memory\n"
 msgstr ""
 
-#: tools/tools_util.h:34
+#: src/tools/tools_util.h:40
 #, c-format
 msgid "%s must be run as root\n"
 msgstr ""
 
-#: util/util.h:63
+#: src/util/util.h:65
 msgid "Send the debug output to files instead of stderr"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 0636854b..e4b2a8b9 100644
--- a/po/id.po
+++ b/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-08-03 18:24-0400\n"
+"POT-Creation-Date: 2010-10-18 13:14-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"
@@ -17,694 +17,707 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Virtaal 0.5.1\n"
 
-#: config/SSSDConfig.py:39
+#: src/config/SSSDConfig.py:39
 msgid "Set the verbosity of the debug logging"
 msgstr "Mengatur verbosity dari pencatatan debug"
 
-#: config/SSSDConfig.py:40
+#: src/config/SSSDConfig.py:40
 msgid "Include timestamps in debug logs"
 msgstr "Sertakan cap waktu di pencatatan debug"
 
-#: config/SSSDConfig.py:41
+#: src/config/SSSDConfig.py:41
 msgid "Write debug messages to logfiles"
 msgstr "Menulis pesan debug ke berkas log"
 
-#: config/SSSDConfig.py:42
+#: src/config/SSSDConfig.py:42
 msgid "Ping timeout before restarting service"
 msgstr ""
 
-#: config/SSSDConfig.py:43
+#: src/config/SSSDConfig.py:43
 msgid "Command to start service"
 msgstr "Perintah untuk memulai layanan"
 
-#: config/SSSDConfig.py:44
+#: src/config/SSSDConfig.py:44
 msgid "Number of times to attempt connection to Data Providers"
 msgstr "Jumlah usaha yang dilakukan untuk mencoba koneksi ke Penyedia Data"
 
-#: config/SSSDConfig.py:47
+#: src/config/SSSDConfig.py:47
 msgid "SSSD Services to start"
 msgstr "Layanan SSSD akan dijalankan"
 
-#: config/SSSDConfig.py:48
+#: src/config/SSSDConfig.py:48
 msgid "SSSD Domains to start"
 msgstr "Domain SSSD akan dijalankan"
 
-#: config/SSSDConfig.py:49
+#: src/config/SSSDConfig.py:49
 msgid "Timeout for messages sent over the SBUS"
 msgstr ""
 
-#: config/SSSDConfig.py:50
+#: src/config/SSSDConfig.py:50
 msgid "Regex to parse username and domain"
 msgstr ""
 
-#: config/SSSDConfig.py:51
+#: src/config/SSSDConfig.py:51
 msgid "Printf-compatible format for displaying fully-qualified names"
 msgstr ""
 
-#: config/SSSDConfig.py:54
+#: src/config/SSSDConfig.py:54
 msgid "Enumeration cache timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:55
+#: src/config/SSSDConfig.py:55
 msgid "Entry cache background update timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:56
+#: src/config/SSSDConfig.py:56
 msgid "Negative cache timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:57
+#: src/config/SSSDConfig.py:57
 msgid "Users that SSSD should explicitly ignore"
 msgstr "Pengguna yang diabaikan secara eksplisit oleh SSSD"
 
-#: config/SSSDConfig.py:58
+#: src/config/SSSDConfig.py:58
 msgid "Groups that SSSD should explicitly ignore"
 msgstr "Grup yang diabaikan secara eksplisit oleh SSSD"
 
-#: config/SSSDConfig.py:59
+#: src/config/SSSDConfig.py:59
 msgid "Should filtered users appear in groups"
 msgstr "Haruskah pengguna yang disaring muncul dalam grup"
 
-#: config/SSSDConfig.py:60
+#: src/config/SSSDConfig.py:60
 msgid "The value of the password field the NSS provider should return"
 msgstr "Nilai kolom kata sandi yang harus dikembalikan oleh penyedia NSS"
 
-#: config/SSSDConfig.py:63
+#: src/config/SSSDConfig.py:63
 msgid "How long to allow cached logins between online logins (days)"
 msgstr ""
 
-#: config/SSSDConfig.py:64
+#: src/config/SSSDConfig.py:64
 msgid "How many failed logins attempts are allowed when offline"
 msgstr ""
 
-#: config/SSSDConfig.py:65
+#: src/config/SSSDConfig.py:65
 msgid ""
 "How long (minutes) to deny login after offline_failed_login_attempts has "
 "been reached"
 msgstr ""
 
-#: config/SSSDConfig.py:68
+#: src/config/SSSDConfig.py:68
 msgid "Identity provider"
 msgstr "Penyedia identitas"
 
-#: config/SSSDConfig.py:69
+#: src/config/SSSDConfig.py:69
 msgid "Authentication provider"
 msgstr "Penyedia otentikasi"
 
-#: config/SSSDConfig.py:70
+#: src/config/SSSDConfig.py:70
 msgid "Access control provider"
 msgstr "Penyedia kontrol akses"
 
-#: config/SSSDConfig.py:71
+#: src/config/SSSDConfig.py:71
 msgid "Password change provider"
 msgstr "Penyedia pengubah kata sandi"
 
-#: config/SSSDConfig.py:74
+#: src/config/SSSDConfig.py:74
 msgid "Minimum user ID"
 msgstr "ID pengguna minimum"
 
-#: config/SSSDConfig.py:75
+#: src/config/SSSDConfig.py:75
 msgid "Maximum user ID"
 msgstr "ID pengguna maksimum"
 
-#: config/SSSDConfig.py:76
+#: src/config/SSSDConfig.py:76
 msgid "Ping timeout before restarting domain"
 msgstr ""
 
-#: config/SSSDConfig.py:77
+#: src/config/SSSDConfig.py:77
 msgid "Enable enumerating all users/groups"
 msgstr ""
 
-#: config/SSSDConfig.py:78
+#: src/config/SSSDConfig.py:78
 msgid "Cache credentials for offline login"
 msgstr ""
 
-#: config/SSSDConfig.py:79
+#: src/config/SSSDConfig.py:79
 msgid "Store password hashes"
 msgstr ""
 
-#: config/SSSDConfig.py:80
+#: src/config/SSSDConfig.py:80
 msgid "Display users/groups in fully-qualified form"
 msgstr ""
 
-#: config/SSSDConfig.py:81
+#: src/config/SSSDConfig.py:81
 msgid "Entry cache timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:82
+#: src/config/SSSDConfig.py:82
 msgid ""
 "Restrict or prefer a specific address family when performing DNS lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:83
+#: src/config/SSSDConfig.py:83
 msgid "How long to keep cached entries after last successful login (days)"
 msgstr ""
 
-#: config/SSSDConfig.py:84
+#: src/config/SSSDConfig.py:84
 msgid "How long to wait for replies from DNS when resolving servers (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:85
+#: src/config/SSSDConfig.py:85
 msgid "The domain part of service discovery DNS query"
 msgstr ""
 
-#: config/SSSDConfig.py:88
+#: src/config/SSSDConfig.py:88
 msgid "IPA domain"
 msgstr "Domain IPA"
 
-#: config/SSSDConfig.py:89
+#: src/config/SSSDConfig.py:89
 msgid "IPA server address"
 msgstr "Alamat server IPA"
 
-#: config/SSSDConfig.py:90
+#: src/config/SSSDConfig.py:90
 msgid "IPA client hostname"
 msgstr "Nama host klien IPA"
 
-#: config/SSSDConfig.py:91
+#: src/config/SSSDConfig.py:91
 msgid "Whether to automatically update the client's DNS entry in FreeIPA"
 msgstr ""
 
-#: config/SSSDConfig.py:92
+#: src/config/SSSDConfig.py:92
 msgid "The interface whose IP should be used for dynamic DNS updates"
 msgstr ""
 
-#: config/SSSDConfig.py:95 config/SSSDConfig.py:124
+#: src/config/SSSDConfig.py:95 src/config/SSSDConfig.py:124
 msgid "Kerberos server address"
 msgstr "Alamat server Kerberos"
 
-#: config/SSSDConfig.py:96 config/SSSDConfig.py:125
+#: src/config/SSSDConfig.py:96 src/config/SSSDConfig.py:125
 msgid "Kerberos realm"
 msgstr "Realm Kerberos"
 
-#: config/SSSDConfig.py:97
+#: src/config/SSSDConfig.py:97
 msgid "Authentication timeout"
 msgstr ""
 
-#: config/SSSDConfig.py:100
+#: src/config/SSSDConfig.py:100
 msgid "Directory to store credential caches"
 msgstr ""
 
-#: config/SSSDConfig.py:101
+#: src/config/SSSDConfig.py:101
 msgid "Location of the user's credential cache"
 msgstr ""
 
-#: config/SSSDConfig.py:102
+#: src/config/SSSDConfig.py:102
 msgid "Location of the keytab to validate credentials"
 msgstr ""
 
-#: config/SSSDConfig.py:103
+#: src/config/SSSDConfig.py:103
 msgid "Enable credential validation"
 msgstr ""
 
-#: config/SSSDConfig.py:104
+#: src/config/SSSDConfig.py:104
 msgid "Store password if offline for later online authentication"
 msgstr ""
 
-#: config/SSSDConfig.py:107
+#: src/config/SSSDConfig.py:107
 msgid "Server where the change password service is running if not on the KDC"
 msgstr ""
 
-#: config/SSSDConfig.py:110
+#: src/config/SSSDConfig.py:110
 msgid "ldap_uri, The URI of the LDAP server"
 msgstr "ldap_uri, URI server LDAP"
 
-#: config/SSSDConfig.py:111
+#: src/config/SSSDConfig.py:111
 msgid "The default base DN"
 msgstr ""
 
-#: config/SSSDConfig.py:112
+#: src/config/SSSDConfig.py:112
 msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr "Jenis Skema yang digunakan pada server LDAP, rfc2307"
 
-#: config/SSSDConfig.py:113
+#: src/config/SSSDConfig.py:113
 msgid "The default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:114
+#: src/config/SSSDConfig.py:114
 msgid "The type of the authentication token of the default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:115
+#: src/config/SSSDConfig.py:115
 msgid "The authentication token of the default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:116
+#: src/config/SSSDConfig.py:116
 msgid "Length of time to attempt connection"
 msgstr "Lamanya waktu untuk mencoba koneksi"
 
-#: config/SSSDConfig.py:117
+#: src/config/SSSDConfig.py:117
 msgid "Length of time to attempt synchronous LDAP operations"
 msgstr "Lamanya waktu untuk mencoba operasi LDAP yang sinkron"
 
-#: config/SSSDConfig.py:118
+#: src/config/SSSDConfig.py:118
 msgid "Length of time between attempts to reconnect while offline"
 msgstr "Lamanya waktu antara upaya untuk menyambung kembali saat luring"
 
-#: config/SSSDConfig.py:119
+#: src/config/SSSDConfig.py:119
 #, fuzzy
 msgid "File that contains CA certificates"
 msgstr "berkas yang berisi sertifikat CA"
 
-#: config/SSSDConfig.py:120
+#: src/config/SSSDConfig.py:120
 msgid "Path to CA certificate directory"
 msgstr ""
 
-#: config/SSSDConfig.py:121
+#: src/config/SSSDConfig.py:121
 msgid "Require TLS certificate verification"
 msgstr "Membutuhkan verifikasi sertifikat TLS"
 
-#: config/SSSDConfig.py:122
+#: src/config/SSSDConfig.py:122
 msgid "Specify the sasl mechanism to use"
 msgstr "Tentukan mekanisme sasl yang digunakan"
 
-#: config/SSSDConfig.py:123
+#: src/config/SSSDConfig.py:123
 msgid "Specify the sasl authorization id to use"
 msgstr "Tentukan id otorisasi sasl yang digunakan"
 
-#: config/SSSDConfig.py:126
+#: src/config/SSSDConfig.py:126
 msgid "Kerberos service keytab"
 msgstr "Keytab layanan Kerberos"
 
-#: config/SSSDConfig.py:127
+#: src/config/SSSDConfig.py:127
 msgid "Use Kerberos auth for LDAP connection"
 msgstr "Gunakan otentikasi Kerberos untuk koneksi LDAP"
 
-#: config/SSSDConfig.py:128
+#: src/config/SSSDConfig.py:128
 msgid "Follow LDAP referrals"
 msgstr ""
 
-#: config/SSSDConfig.py:129
+#: src/config/SSSDConfig.py:129
 #, fuzzy
 msgid "Lifetime of TGT for LDAP connection"
 msgstr "Gunakan otentikasi Kerberos untuk koneksi LDAP"
 
-#: config/SSSDConfig.py:132
+#: src/config/SSSDConfig.py:132
 msgid "Length of time to wait for a search request"
 msgstr ""
 
-#: config/SSSDConfig.py:133
+#: src/config/SSSDConfig.py:133
 msgid "Length of time between enumeration updates"
 msgstr ""
 
-#: config/SSSDConfig.py:134
+#: src/config/SSSDConfig.py:134
 #, fuzzy
 msgid "Require TLS for ID lookups"
 msgstr "Filter pencarian pengguna"
 
-#: config/SSSDConfig.py:135
+#: src/config/SSSDConfig.py:135
 msgid "Base DN for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:136
+#: src/config/SSSDConfig.py:136
 msgid "Scope of user lookups"
 msgstr "Lingkup pencarian pengguna"
 
-#: config/SSSDConfig.py:137
+#: src/config/SSSDConfig.py:137
 msgid "Filter for user lookups"
 msgstr "Filter pencarian pengguna"
 
-#: config/SSSDConfig.py:138
+#: src/config/SSSDConfig.py:138
 msgid "Objectclass for users"
 msgstr "Objectclass untuk pengguna"
 
-#: config/SSSDConfig.py:139
+#: src/config/SSSDConfig.py:139
 msgid "Username attribute"
 msgstr "Atribut Nama pengguna"
 
-#: config/SSSDConfig.py:140
+#: src/config/SSSDConfig.py:140
 msgid "UID attribute"
 msgstr "Atribut UID"
 
-#: config/SSSDConfig.py:141
+#: src/config/SSSDConfig.py:141
 msgid "Primary GID attribute"
 msgstr "Atribut GID Primer"
 
-#: config/SSSDConfig.py:142
+#: src/config/SSSDConfig.py:142
 msgid "GECOS attribute"
 msgstr "Atribut GECOS"
 
-#: config/SSSDConfig.py:143
+#: src/config/SSSDConfig.py:143
 msgid "Home directory attribute"
 msgstr "Atribut direktori Home"
 
-#: config/SSSDConfig.py:144
+#: src/config/SSSDConfig.py:144
 msgid "Shell attribute"
 msgstr "Atribut Shell"
 
-#: config/SSSDConfig.py:145
+#: src/config/SSSDConfig.py:145
 msgid "UUID attribute"
 msgstr "Atribut UUID"
 
-#: config/SSSDConfig.py:146
+#: src/config/SSSDConfig.py:146
 msgid "User principal attribute (for Kerberos)"
 msgstr "Atribut utama pengguna (untuk Kerberos)"
 
-#: config/SSSDConfig.py:147
+#: src/config/SSSDConfig.py:147
 msgid "Full Name"
 msgstr "Nama Lengkap"
 
-#: config/SSSDConfig.py:148
+#: src/config/SSSDConfig.py:148
 msgid "memberOf attribute"
 msgstr "Atribut memberOf"
 
-#: config/SSSDConfig.py:149
+#: src/config/SSSDConfig.py:149
 msgid "Modification time attribute"
 msgstr "Atribut waktu modifikasi"
 
-#: config/SSSDConfig.py:152
+#: src/config/SSSDConfig.py:152
 msgid "Policy to evaluate the password expiration"
 msgstr ""
 
-#: config/SSSDConfig.py:155
+#: src/config/SSSDConfig.py:155
 msgid "LDAP filter to determine access privileges"
 msgstr ""
 
-#: config/SSSDConfig.py:158
+#: src/config/SSSDConfig.py:158
 msgid "Comma separated list of allowed users"
 msgstr "Daftar pengguna yang diijinkan dalam format yang dipisahkan koma"
 
-#: config/SSSDConfig.py:159
+#: src/config/SSSDConfig.py:159
 msgid "Comma separated list of prohibited users"
 msgstr "Daftar pengguna yang tidak diijinkan dalam format yang dipisahkan koma"
 
-#: config/SSSDConfig.py:162
+#: src/config/SSSDConfig.py:162
 msgid "Default shell, /bin/bash"
 msgstr "Shell default, /bin/bash"
 
-#: config/SSSDConfig.py:163
+#: src/config/SSSDConfig.py:163
 msgid "Base for home directories"
 msgstr ""
 
-#: config/SSSDConfig.py:166
+#: src/config/SSSDConfig.py:166
 msgid "The name of the NSS library to use"
 msgstr ""
 
-#: config/SSSDConfig.py:169
+#: src/config/SSSDConfig.py:169
 msgid "PAM stack to use"
 msgstr ""
 
-#: monitor/monitor.c:2137
+#: src/monitor/monitor.c:2140
 msgid "Become a daemon (default)"
 msgstr ""
 
-#: monitor/monitor.c:2139
+#: src/monitor/monitor.c:2142
 msgid "Run interactive (not a daemon)"
 msgstr ""
 
-#: monitor/monitor.c:2141
+#: src/monitor/monitor.c:2144
 msgid "Specify a non-default config file"
 msgstr ""
 
-#: monitor/monitor.c:2167
+#: src/monitor/monitor.c:2170
 #, fuzzy
 msgid "sssd must be run as root\n"
 msgstr "%s harus dijalankan sebagai root\n"
 
-#: monitor/monitor.c:2202
+#: src/monitor/monitor.c:2205
 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:2212
+#: src/monitor/monitor.c:2215
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
 "file is owned by root.root\n"
 msgstr ""
 
-#: monitor/monitor.c:2217
+#: src/monitor/monitor.c:2220
 msgid "Cannot load configuration database\n"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:993 providers/ldap/ldap_child.c:361
-#: util/util.h:61
+#: src/providers/krb5/krb5_child.c:1043 src/providers/ldap/ldap_child.c:359
+#: src/util/util.h:63
 msgid "Debug level"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:995 providers/ldap/ldap_child.c:363
-#: util/util.h:65
+#: src/providers/krb5/krb5_child.c:1045 src/providers/ldap/ldap_child.c:361
+#: src/util/util.h:67
 msgid "Add debug timestamps"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:997 providers/ldap/ldap_child.c:365
+#: src/providers/krb5/krb5_child.c:1047 src/providers/ldap/ldap_child.c:363
 #, fuzzy
 msgid "An open file descriptor for the debug logs"
 msgstr "Mengatur verbosity dari pencatatan debug"
 
-#: providers/data_provider_be.c:1165
+#: src/providers/data_provider_be.c:1165
 msgid "Domain of the information provider (mandatory)"
 msgstr ""
 
-#: sss_client/common.c:742
+#: src/sss_client/common.c:742
 msgid "Privileged socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:745
+#: src/sss_client/common.c:745
 msgid "Public socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:748
+#: src/sss_client/common.c:748
 msgid "Unexpected format of the server credential message."
 msgstr ""
 
-#: sss_client/common.c:751
+#: src/sss_client/common.c:751
 msgid "SSSD is not run by root."
 msgstr ""
 
-#: sss_client/common.c:756
+#: src/sss_client/common.c:756
 msgid "An error occurred, but no description can be found."
 msgstr ""
 
-#: sss_client/common.c:762
+#: src/sss_client/common.c:762
 msgid "Unexpected error while looking for an error description"
 msgstr ""
 
-#: sss_client/pam_sss.c:372
+#: src/sss_client/pam_sss.c:372
 msgid "Passwords do not match"
 msgstr "Kata sandi tidak cocok"
 
-#: sss_client/pam_sss.c:556
+#: src/sss_client/pam_sss.c:556
 msgid "Password reset by root is not supported."
 msgstr ""
 
-#: sss_client/pam_sss.c:597
+#: src/sss_client/pam_sss.c:597
 msgid "Authenticated with cached credentials"
 msgstr ""
 
-#: sss_client/pam_sss.c:598
+#: src/sss_client/pam_sss.c:598
 msgid ", your cached password will expire at: "
 msgstr ""
 
-#: sss_client/pam_sss.c:628
+#: src/sss_client/pam_sss.c:628
 #, c-format
 msgid "Your password has expired. You have %d grace login(s) remaining."
 msgstr ""
 
-#: sss_client/pam_sss.c:674
+#: src/sss_client/pam_sss.c:674
 #, c-format
 msgid "Your password will expire in %d %s."
 msgstr ""
 
-#: sss_client/pam_sss.c:723
+#: src/sss_client/pam_sss.c:723
 #, fuzzy
 msgid "Authentication is denied until: "
 msgstr "Otentikasi luring, otentikasi ditolak sampai:"
 
-#: sss_client/pam_sss.c:750
+#: src/sss_client/pam_sss.c:750
 msgid "System is offline, password change not possible"
 msgstr "Sistem sedang luring, perubahan kata sandi tidak dimungkinkan"
 
-#: sss_client/pam_sss.c:780 sss_client/pam_sss.c:793
+#: src/sss_client/pam_sss.c:780 src/sss_client/pam_sss.c:793
 msgid "Password change failed. "
 msgstr "Perubahan kata sandi gagal."
 
-#: sss_client/pam_sss.c:783 sss_client/pam_sss.c:794
+#: src/sss_client/pam_sss.c:783 src/sss_client/pam_sss.c:794
 msgid "Server message: "
 msgstr "Pesan server:"
 
-#: sss_client/pam_sss.c:1197
+#: src/sss_client/pam_sss.c:1197
 msgid "New Password: "
 msgstr "Kata Sandi Baru: "
 
-#: sss_client/pam_sss.c:1198
+#: src/sss_client/pam_sss.c:1198
 msgid "Reenter new Password: "
 msgstr "Masukkan lagi kata sandi baru:"
 
-#: sss_client/pam_sss.c:1280
+#: src/sss_client/pam_sss.c:1280
 msgid "Password: "
 msgstr "Kata sandi:"
 
-#: sss_client/pam_sss.c:1312
+#: src/sss_client/pam_sss.c:1312
 msgid "Current Password: "
 msgstr "Kata sandi saat ini:"
 
-#: sss_client/pam_sss.c:1458
+#: src/sss_client/pam_sss.c:1458
 msgid "Password expired. Change your password now."
 msgstr ""
 
-#: tools/sss_useradd.c:48 tools/sss_groupadd.c:41 tools/sss_groupdel.c:43
-#: tools/sss_groupmod.c:42 tools/sss_groupshow.c:620 tools/sss_userdel.c:131
-#: tools/sss_usermod.c:47
+#: src/tools/sss_useradd.c:48 src/tools/sss_groupadd.c:41
+#: src/tools/sss_groupdel.c:43 src/tools/sss_groupmod.c:42
+#: src/tools/sss_groupshow.c:620 src/tools/sss_userdel.c:131
+#: src/tools/sss_usermod.c:47
 msgid "The debug level to run with"
 msgstr ""
 
-#: tools/sss_useradd.c:49 tools/sss_usermod.c:48
+#: src/tools/sss_useradd.c:49 src/tools/sss_usermod.c:48
 msgid "The UID of the user"
 msgstr "UID dari pengguna"
 
-#: tools/sss_useradd.c:50 tools/sss_usermod.c:50
+#: src/tools/sss_useradd.c:50 src/tools/sss_usermod.c:50
 msgid "The comment string"
 msgstr "String komentar"
 
-#: tools/sss_useradd.c:51 tools/sss_usermod.c:51
+#: src/tools/sss_useradd.c:51 src/tools/sss_usermod.c:51
 msgid "Home directory"
 msgstr "Direktori Home"
 
-#: tools/sss_useradd.c:52 tools/sss_usermod.c:52
+#: src/tools/sss_useradd.c:52 src/tools/sss_usermod.c:52
 msgid "Login shell"
 msgstr "Shell login"
 
-#: tools/sss_useradd.c:53
+#: src/tools/sss_useradd.c:53
 msgid "Groups"
 msgstr "Grup"
 
-#: tools/sss_useradd.c:54
+#: src/tools/sss_useradd.c:54
 msgid "Create user's directory if it does not exist"
 msgstr "Buat direktori pengguna jika tidak ada"
 
-#: tools/sss_useradd.c:55
+#: src/tools/sss_useradd.c:55
 msgid "Never create user's directory, overrides config"
 msgstr "Jangan pernah buat direktori pengguna, timpa konfigurasi"
 
-#: tools/sss_useradd.c:56
+#: src/tools/sss_useradd.c:56
 msgid "Specify an alternative skeleton directory"
 msgstr "Tentukan direktori kerangka alternatif"
 
-#: tools/sss_useradd.c:57 tools/sss_usermod.c:57
+#: src/tools/sss_useradd.c:57 src/tools/sss_usermod.c:57
 msgid "The SELinux user for user's login"
 msgstr ""
 
-#: tools/sss_useradd.c:71 tools/sss_groupadd.c:56 tools/sss_groupdel.c:52
-#: tools/sss_groupmod.c:63 tools/sss_groupshow.c:631 tools/sss_userdel.c:148
-#: tools/sss_usermod.c:72
+#: src/tools/sss_useradd.c:71 src/tools/sss_groupadd.c:56
+#: src/tools/sss_groupdel.c:52 src/tools/sss_groupmod.c:63
+#: src/tools/sss_groupshow.c:631 src/tools/sss_userdel.c:148
+#: src/tools/sss_usermod.c:72
 msgid "Error setting the locale\n"
 msgstr ""
 
-#: tools/sss_useradd.c:107
+#: src/tools/sss_useradd.c:84 src/tools/sss_groupmod.c:76
+#: src/tools/sss_usermod.c:85
+#, fuzzy
+msgid "Specify group to add to\n"
+msgstr "Tentukan grup untuk ditambahkan\n"
+
+#: src/tools/sss_useradd.c:108
 msgid "Specify user to add\n"
 msgstr "Tentukan pengguna untuk ditambahkan\n"
 
-#: tools/sss_useradd.c:118 tools/sss_groupadd.c:86 tools/sss_groupdel.c:81
-#: tools/sss_groupmod.c:111 tools/sss_groupshow.c:668 tools/sss_userdel.c:197
-#: tools/sss_usermod.c:128
+#: src/tools/sss_useradd.c:117 src/tools/sss_groupadd.c:82
+#: src/tools/sss_groupdel.c:77 src/tools/sss_groupmod.c:109
+#: src/tools/sss_groupshow.c:664 src/tools/sss_userdel.c:193
+#: src/tools/sss_usermod.c:126
 msgid "Error initializing the tools - no local domain\n"
 msgstr ""
 
-#: tools/sss_useradd.c:120 tools/sss_groupadd.c:88 tools/sss_groupdel.c:83
-#: tools/sss_groupmod.c:113 tools/sss_groupshow.c:670 tools/sss_userdel.c:199
-#: tools/sss_usermod.c:130
+#: src/tools/sss_useradd.c:119 src/tools/sss_groupadd.c:84
+#: src/tools/sss_groupdel.c:79 src/tools/sss_groupmod.c:111
+#: src/tools/sss_groupshow.c:666 src/tools/sss_userdel.c:195
+#: src/tools/sss_usermod.c:128
 msgid "Error initializing the tools\n"
 msgstr "Gagal saat menginisialisasi perkakas\n"
 
-#: tools/sss_useradd.c:129 tools/sss_groupadd.c:97 tools/sss_groupdel.c:92
-#: tools/sss_groupmod.c:121 tools/sss_groupshow.c:679 tools/sss_userdel.c:208
-#: tools/sss_usermod.c:139
+#: src/tools/sss_useradd.c:128 src/tools/sss_groupadd.c:93
+#: src/tools/sss_groupdel.c:88 src/tools/sss_groupmod.c:119
+#: src/tools/sss_groupshow.c:675 src/tools/sss_userdel.c:204
+#: src/tools/sss_usermod.c:137
 msgid "Invalid domain specified in FQDN\n"
 msgstr "Domain yang ditentukan dalam FQDN tidak valid\n"
 
-#: tools/sss_useradd.c:138 tools/sss_groupmod.c:143 tools/sss_groupmod.c:170
-#: tools/sss_usermod.c:164 tools/sss_usermod.c:191
+#: src/tools/sss_useradd.c:137 src/tools/sss_groupmod.c:141
+#: src/tools/sss_groupmod.c:168 src/tools/sss_usermod.c:162
+#: src/tools/sss_usermod.c:189
 msgid "Internal error while parsing parameters\n"
 msgstr "Terjadi kesalahan internal ketika mengurai parameter\n"
 
-#: tools/sss_useradd.c:146 tools/sss_usermod.c:172 tools/sss_usermod.c:199
+#: src/tools/sss_useradd.c:145 src/tools/sss_usermod.c:170
+#: src/tools/sss_usermod.c:197
 msgid "Groups must be in the same domain as user\n"
 msgstr "Grup harus berada dalam domain yang sama dengan pengguna\n"
 
-#: tools/sss_useradd.c:154
+#: src/tools/sss_useradd.c:153
 #, c-format
 msgid "Cannot find group %s in local domain\n"
 msgstr "Tidak dapat menemukan grup %s dalam domain lokal\n"
 
-#: tools/sss_useradd.c:169 tools/sss_userdel.c:218
+#: src/tools/sss_useradd.c:168 src/tools/sss_userdel.c:214
 msgid "Cannot set default values\n"
 msgstr "Tidak dapat menetapkan nilai default\n"
 
-#: tools/sss_useradd.c:176 tools/sss_usermod.c:155
+#: src/tools/sss_useradd.c:175 src/tools/sss_usermod.c:153
 msgid "The selected UID is outside the allowed range\n"
 msgstr "UID yang dipilih berada di luar rentang yang diizinkan\n"
 
-#: tools/sss_useradd.c:203 tools/sss_usermod.c:240
+#: src/tools/sss_useradd.c:202 src/tools/sss_usermod.c:238
 msgid "Cannot set SELinux login context\n"
 msgstr ""
 
-#: tools/sss_useradd.c:219
+#: src/tools/sss_useradd.c:218
 msgid "Cannot get info about the user\n"
 msgstr "Tidak bisa mendapatkan info tentang pengguna\n"
 
-#: tools/sss_useradd.c:233
+#: src/tools/sss_useradd.c:232
 msgid "User's home directory already exists, not copying data from skeldir\n"
 msgstr ""
 "Direktori home milik pengguna sudah ada, tidak menyalin data dari skeldir\n"
 
-#: tools/sss_useradd.c:236
+#: src/tools/sss_useradd.c:235
 #, c-format
 msgid "Cannot create user's home directory: %s\n"
 msgstr "Tidak dapat membuat direktori home milik pengguna: %s\n"
 
-#: tools/sss_useradd.c:247
+#: src/tools/sss_useradd.c:246
 #, c-format
 msgid "Cannot create user's mail spool: %s\n"
 msgstr "Tidak dapat membuat spool mail milik pengguna: %s\n"
 
-#: tools/sss_useradd.c:259
+#: src/tools/sss_useradd.c:258
 msgid "Could not allocate ID for the user - domain full?\n"
 msgstr "Tidak dapat mengalokasikan ID untuk pengguna - domain penuh?\n"
 
-#: tools/sss_useradd.c:263
+#: src/tools/sss_useradd.c:262
 msgid "A user or group with the same name or ID already exists\n"
 msgstr "Pengguna atau grup dengan nama atau ID yang sama sudah ada\n"
 
-#: tools/sss_useradd.c:269
+#: src/tools/sss_useradd.c:268
 msgid "Transaction error. Could not add user.\n"
 msgstr "Kesalahan transaksi. Tidak dapat menambahkan pengguna.\n"
 
-#: tools/sss_groupadd.c:43 tools/sss_groupmod.c:48
+#: src/tools/sss_groupadd.c:43 src/tools/sss_groupmod.c:48
 msgid "The GID of the group"
 msgstr "GID grup"
 
-#: tools/sss_groupadd.c:75
+#: src/tools/sss_groupadd.c:73
 msgid "Specify group to add\n"
 msgstr "Tentukan grup untuk ditambahkan\n"
 
-#: tools/sss_groupadd.c:106 tools/sss_groupmod.c:194
+#: src/tools/sss_groupadd.c:102 src/tools/sss_groupmod.c:192
 msgid "The selected GID is outside the allowed range\n"
 msgstr "GID yang dipilih berada di luar rentang yang diizinkan\n"
 
-#: tools/sss_groupadd.c:131
+#: src/tools/sss_groupadd.c:127
 msgid "Could not allocate ID for the group - domain full?\n"
 msgstr "Tidak dapat mengalokasikan ID untuk grup - domain penuh?\n"
 
-#: tools/sss_groupadd.c:135
+#: src/tools/sss_groupadd.c:131
 msgid "A group with the same name or GID already exists\n"
 msgstr "Grup dengan nama atau GID yang sama sudah ada\n"
 
-#: tools/sss_groupadd.c:140
+#: src/tools/sss_groupadd.c:136
 msgid "Transaction error. Could not add group.\n"
 msgstr "Kesalahan transaksi. Tidak dapat menambahkan grup.\n"
 
-#: tools/sss_groupdel.c:70
+#: src/tools/sss_groupdel.c:68
 msgid "Specify group to delete\n"
 msgstr ""
 
-#: tools/sss_groupdel.c:107
+#: src/tools/sss_groupdel.c:103
 #, c-format
 msgid "Group %s is outside the defined ID range for domain\n"
 msgstr ""
 "Grup %s berada di luar rentang ID yang telah didefinisikan untuk domain\n"
 
-#: tools/sss_groupdel.c:121
+#: src/tools/sss_groupdel.c:117
 msgid ""
 "No such group in local domain. Removing groups only allowed in local "
 "domain.\n"
@@ -712,23 +725,28 @@ msgstr ""
 "Tidak ada grup seperti itu di domain lokal. Menghapus grup hanya "
 "diperbolehkan dalam domain lokal.\n"
 
-#: tools/sss_groupdel.c:126
+#: src/tools/sss_groupdel.c:122
 msgid "Internal error. Could not remove group.\n"
 msgstr "Kesalahan internal. Tidak dapat menghapus grup.\n"
 
-#: tools/sss_groupmod.c:44
+#: src/tools/sss_groupmod.c:44
 msgid "Groups to add this group to"
 msgstr ""
 
-#: tools/sss_groupmod.c:46
+#: src/tools/sss_groupmod.c:46
 msgid "Groups to remove this group from"
 msgstr ""
 
-#: tools/sss_groupmod.c:98
+#: src/tools/sss_groupmod.c:84 src/tools/sss_usermod.c:93
+#, fuzzy
+msgid "Specify group to remove from\n"
+msgstr "Tentukan grup untuk dimodifikasi\n"
+
+#: src/tools/sss_groupmod.c:98
 msgid "Specify group to modify\n"
 msgstr "Tentukan grup untuk dimodifikasi\n"
 
-#: tools/sss_groupmod.c:130
+#: src/tools/sss_groupmod.c:128
 msgid ""
 "Cannot find group in local domain, modifying groups is allowed only in local "
 "domain\n"
@@ -736,14 +754,14 @@ msgstr ""
 "Tidak dapat menemukan grup di domain lokal, memodifikasi grup hanya "
 "diperbolehkan dalam domain lokal\n"
 
-#: tools/sss_groupmod.c:151 tools/sss_groupmod.c:178
+#: src/tools/sss_groupmod.c:149 src/tools/sss_groupmod.c:176
 msgid "Member groups must be in the same domain as parent group\n"
 msgstr ""
 "Anggota kelompok harus berada dalam domain yang sama sebagaimana kelompok "
 "induknya\n"
 
-#: tools/sss_groupmod.c:159 tools/sss_groupmod.c:186 tools/sss_usermod.c:180
-#: tools/sss_usermod.c:207
+#: src/tools/sss_groupmod.c:157 src/tools/sss_groupmod.c:184
+#: src/tools/sss_usermod.c:178 src/tools/sss_usermod.c:205
 #, c-format
 msgid ""
 "Cannot find group %s in local domain, only groups in local domain are "
@@ -752,62 +770,62 @@ msgstr ""
 "Tidak dapat menemukan grup %s di domain lokal, hanya grup dalam domain lokal "
 "yang diperbolehkan\n"
 
-#: tools/sss_groupmod.c:220
+#: src/tools/sss_groupmod.c:218
 msgid "Could not modify group - check if member group names are correct\n"
 msgstr ""
 "Tidak bisa memodifikasi grup - periksa apakah nama grup anggota sudah benar\n"
 
-#: tools/sss_groupmod.c:224
+#: src/tools/sss_groupmod.c:222
 msgid "Could not modify group - check if groupname is correct\n"
 msgstr "Tidak bisa memodifikasi grup - periksa apakah groupname sudah benar\n"
 
-#: tools/sss_groupmod.c:228
+#: src/tools/sss_groupmod.c:226
 msgid "Transaction error. Could not modify group.\n"
 msgstr "Kesalahan transaksi. Tidak bisa memodifikasi grup.\n"
 
-#: tools/sss_groupshow.c:567
+#: src/tools/sss_groupshow.c:567
 #, fuzzy, c-format
 msgid "%s%sGroup: %s\n"
 msgstr "Grup"
 
-#: tools/sss_groupshow.c:568
+#: src/tools/sss_groupshow.c:568
 msgid "Magic Private "
 msgstr ""
 
-#: tools/sss_groupshow.c:570
+#: src/tools/sss_groupshow.c:570
 #, c-format
 msgid "%sGID number: %d\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:572
+#: src/tools/sss_groupshow.c:572
 #, c-format
 msgid "%sMember users: "
 msgstr ""
 
-#: tools/sss_groupshow.c:579
+#: src/tools/sss_groupshow.c:579
 #, c-format
 msgid ""
 "\n"
 "%sIs a member of: "
 msgstr ""
 
-#: tools/sss_groupshow.c:586
+#: src/tools/sss_groupshow.c:586
 #, c-format
 msgid ""
 "\n"
 "%sMember groups: "
 msgstr ""
 
-#: tools/sss_groupshow.c:622
+#: src/tools/sss_groupshow.c:622
 msgid "Print indirect group members recursively"
 msgstr ""
 
-#: tools/sss_groupshow.c:657
+#: src/tools/sss_groupshow.c:655
 #, fuzzy
 msgid "Specify group to show\n"
 msgstr "Tentukan grup untuk ditambahkan\n"
 
-#: tools/sss_groupshow.c:698
+#: src/tools/sss_groupshow.c:694
 #, fuzzy
 msgid ""
 "No such group in local domain. Printing groups only allowed in local "
@@ -816,104 +834,104 @@ msgstr ""
 "Tidak ada grup seperti itu di domain lokal. Menghapus grup hanya "
 "diperbolehkan dalam domain lokal.\n"
 
-#: tools/sss_groupshow.c:703
+#: src/tools/sss_groupshow.c:699
 #, fuzzy
 msgid "Internal error. Could not print group.\n"
 msgstr "Kesalahan internal. Tidak dapat menghapus grup.\n"
 
-#: tools/sss_userdel.c:133
+#: src/tools/sss_userdel.c:133
 msgid "Remove home directory and mail spool"
 msgstr "Hapus direktori home, dan spool mail"
 
-#: tools/sss_userdel.c:135
+#: src/tools/sss_userdel.c:135
 msgid "Do not remove home directory and mail spool"
 msgstr "Jangan hapus direktori home dan spool mail"
 
-#: tools/sss_userdel.c:137
+#: src/tools/sss_userdel.c:137
 msgid "Force removal of files not owned by the user"
 msgstr "Paksa penghapusan berkas yang tidak dimiliki oleh pengguna"
 
-#: tools/sss_userdel.c:139
+#: src/tools/sss_userdel.c:139
 msgid "Kill users' processes before removing him"
 msgstr ""
 
-#: tools/sss_userdel.c:186
+#: src/tools/sss_userdel.c:184
 msgid "Specify user to delete\n"
 msgstr "Tentukan pengguna yang akan dihapus\n"
 
-#: tools/sss_userdel.c:235
+#: src/tools/sss_userdel.c:231
 #, c-format
 msgid "User %s is outside the defined ID range for domain\n"
 msgstr ""
 "Pengguna %s berada di luar rentang ID yang telah didefinisikan untuk domain\n"
 
-#: tools/sss_userdel.c:260
+#: src/tools/sss_userdel.c:256
 msgid "Cannot reset SELinux login context\n"
 msgstr ""
 
-#: tools/sss_userdel.c:272
+#: src/tools/sss_userdel.c:268
 #, c-format
 msgid "WARNING: The user (uid %lu) was still logged in when deleted.\n"
 msgstr ""
 
-#: tools/sss_userdel.c:277
+#: src/tools/sss_userdel.c:273
 msgid "Cannot determine if the user was logged in on this platform"
 msgstr ""
 
-#: tools/sss_userdel.c:282
+#: src/tools/sss_userdel.c:278
 msgid "Error while checking if the user was logged in\n"
 msgstr ""
 
-#: tools/sss_userdel.c:289
+#: src/tools/sss_userdel.c:285
 #, c-format
 msgid "The post-delete command failed: %s\n"
 msgstr ""
 
-#: tools/sss_userdel.c:301
+#: src/tools/sss_userdel.c:297
 msgid "Not removing home dir - not owned by user\n"
 msgstr "Tidak menghapus home dir - tidak dimiliki oleh pengguna\n"
 
-#: tools/sss_userdel.c:303
+#: src/tools/sss_userdel.c:299
 #, c-format
 msgid "Cannot remove homedir: %s\n"
 msgstr "Tidak dapat menghapus homedir: %s\n"
 
-#: tools/sss_userdel.c:314
+#: src/tools/sss_userdel.c:310
 msgid ""
 "No such user in local domain. Removing users only allowed in local domain.\n"
 msgstr ""
 "Tidak ada pengguna seperti itu di domain lokal. Menghapus pengguna hanya "
 "diperbolehkan dalam domain lokal.\n"
 
-#: tools/sss_userdel.c:319
+#: src/tools/sss_userdel.c:315
 msgid "Internal error. Could not remove user.\n"
 msgstr "Kesalahan internal. Tidak dapat menghapus pengguna.\n"
 
-#: tools/sss_usermod.c:49
+#: src/tools/sss_usermod.c:49
 msgid "The GID of the user"
 msgstr "GID pengguna"
 
-#: tools/sss_usermod.c:53
+#: src/tools/sss_usermod.c:53
 msgid "Groups to add this user to"
 msgstr "Pengguna ini akan ditambahkan ke grup"
 
-#: tools/sss_usermod.c:54
+#: src/tools/sss_usermod.c:54
 msgid "Groups to remove this user from"
 msgstr "Pengguna ini akan dihapus dari grup"
 
-#: tools/sss_usermod.c:55
+#: src/tools/sss_usermod.c:55
 msgid "Lock the account"
 msgstr "Kunci akun"
 
-#: tools/sss_usermod.c:56
+#: src/tools/sss_usermod.c:56
 msgid "Unlock the account"
 msgstr "Buka kunci akun"
 
-#: tools/sss_usermod.c:117
+#: src/tools/sss_usermod.c:117
 msgid "Specify user to modify\n"
 msgstr "Tentukan pengguna untuk dimodifikasi\n"
 
-#: tools/sss_usermod.c:148
+#: src/tools/sss_usermod.c:146
 msgid ""
 "Cannot find user in local domain, modifying users is allowed only in local "
 "domain\n"
@@ -921,30 +939,30 @@ msgstr ""
 "Tidak dapat menemukan pengguna dalam domain lokal, memodifikasi pengguna "
 "hanya diperbolehkan dalam domain lokal\n"
 
-#: tools/sss_usermod.c:250
+#: src/tools/sss_usermod.c:248
 msgid "Could not modify user - check if group names are correct\n"
 msgstr ""
 "Tidak bisa memodifikasi pengguna - periksa apakah nama grup sudah benar\n"
 
-#: tools/sss_usermod.c:254
+#: src/tools/sss_usermod.c:252
 msgid "Could not modify user - user already member of groups?\n"
 msgstr ""
 "Tidak bisa memodifikasi pengguna - pengguna sudah menjadi anggota kelompok?\n"
 
-#: tools/sss_usermod.c:258
+#: src/tools/sss_usermod.c:256
 msgid "Transaction error. Could not modify user.\n"
 msgstr "Kesalahan transaksi. Pengguna tidak dapat dimodifikasi.\n"
 
-#: tools/tools_util.c:285
+#: src/tools/tools_util.c:290
 msgid "Out of memory\n"
 msgstr "Kehabisan memori\n"
 
-#: tools/tools_util.h:34
+#: src/tools/tools_util.h:40
 #, c-format
 msgid "%s must be run as root\n"
 msgstr "%s harus dijalankan sebagai root\n"
 
-#: util/util.h:63
+#: src/util/util.h:65
 msgid "Send the debug output to files instead of stderr"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index d9dc9cda..4f295f61 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2010-08-03 18:24-0400\n"
+"POT-Creation-Date: 2010-10-18 13:14-0400\n"
 "PO-Revision-Date: 2010-04-08 16:50+0200\n"
 "Last-Translator: Guido Grazioli <guido.grazioli@gmail.com>\n"
 "Language-Team: Italian <trans-it@lists.fedoraproject.org>\n"
@@ -21,88 +21,88 @@ msgstr ""
 "X-Poedit-Country: ITALY\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: config/SSSDConfig.py:39
+#: src/config/SSSDConfig.py:39
 msgid "Set the verbosity of the debug logging"
 msgstr "Imposta il livello di dettaglio dei messaggi di debug"
 
-#: config/SSSDConfig.py:40
+#: src/config/SSSDConfig.py:40
 msgid "Include timestamps in debug logs"
 msgstr "Includi i timestamp nei log"
 
-#: config/SSSDConfig.py:41
+#: src/config/SSSDConfig.py:41
 msgid "Write debug messages to logfiles"
 msgstr "Scrivere i messaggi di debug nei file di log"
 
-#: config/SSSDConfig.py:42
+#: src/config/SSSDConfig.py:42
 msgid "Ping timeout before restarting service"
 msgstr "Timeout di ping per il riavvio del servizio"
 
-#: config/SSSDConfig.py:43
+#: src/config/SSSDConfig.py:43
 msgid "Command to start service"
 msgstr "Comando per avviare il servizio"
 
-#: config/SSSDConfig.py:44
+#: src/config/SSSDConfig.py:44
 msgid "Number of times to attempt connection to Data Providers"
 msgstr "Numero di tentativi di connessione ai data providers"
 
-#: config/SSSDConfig.py:47
+#: src/config/SSSDConfig.py:47
 msgid "SSSD Services to start"
 msgstr "Avvio dei servizi SSSD"
 
-#: config/SSSDConfig.py:48
+#: src/config/SSSDConfig.py:48
 msgid "SSSD Domains to start"
 msgstr "Avvio dei domini SSSD"
 
-#: config/SSSDConfig.py:49
+#: src/config/SSSDConfig.py:49
 msgid "Timeout for messages sent over the SBUS"
 msgstr "Timeout dei messaggi inviati sul SBUS"
 
-#: config/SSSDConfig.py:50
+#: src/config/SSSDConfig.py:50
 msgid "Regex to parse username and domain"
 msgstr "Regex per il parsing di nome utente e dominio"
 
-#: config/SSSDConfig.py:51
+#: src/config/SSSDConfig.py:51
 msgid "Printf-compatible format for displaying fully-qualified names"
 msgstr "Formato compatibile con printf per la visualizzazione di nomi completi"
 
-#: config/SSSDConfig.py:54
+#: src/config/SSSDConfig.py:54
 msgid "Enumeration cache timeout length (seconds)"
 msgstr "Durata timeout per la cache enumeration (secondi)"
 
-#: config/SSSDConfig.py:55
+#: src/config/SSSDConfig.py:55
 msgid "Entry cache background update timeout length (seconds)"
 msgstr "Durata timeout aggiornamento cache in background (secondi)"
 
-#: config/SSSDConfig.py:56
+#: src/config/SSSDConfig.py:56
 msgid "Negative cache timeout length (seconds)"
 msgstr "Durata timeout negative cache (secondi)"
 
-#: config/SSSDConfig.py:57
+#: src/config/SSSDConfig.py:57
 msgid "Users that SSSD should explicitly ignore"
 msgstr "Utenti che SSSD dovrebbe ignorare esplicitamente"
 
-#: config/SSSDConfig.py:58
+#: src/config/SSSDConfig.py:58
 msgid "Groups that SSSD should explicitly ignore"
 msgstr "Gruppi che SSSD dovrebbe ignorare esplicitamente"
 
-#: config/SSSDConfig.py:59
+#: src/config/SSSDConfig.py:59
 msgid "Should filtered users appear in groups"
 msgstr "Specifica se mostrare gli utenti filtrati nei gruppi"
 
-#: config/SSSDConfig.py:60
+#: src/config/SSSDConfig.py:60
 msgid "The value of the password field the NSS provider should return"
 msgstr ""
 "Il valore del campo password che deve essere ritornato dal provider NSS"
 
-#: config/SSSDConfig.py:63
+#: src/config/SSSDConfig.py:63
 msgid "How long to allow cached logins between online logins (days)"
 msgstr "Per quanto tempo accettare login in cache tra login online (giorni)"
 
-#: config/SSSDConfig.py:64
+#: src/config/SSSDConfig.py:64
 msgid "How many failed logins attempts are allowed when offline"
 msgstr "Numero di tentativi di login falliti quando offline"
 
-#: config/SSSDConfig.py:65
+#: src/config/SSSDConfig.py:65
 msgid ""
 "How long (minutes) to deny login after offline_failed_login_attempts has "
 "been reached"
@@ -110,328 +110,328 @@ msgstr ""
 "Per quanto tempo (minuti) negare i tentativi di login dopo che "
 "offline_failed_login_attemps è stato raggiunto"
 
-#: config/SSSDConfig.py:68
+#: src/config/SSSDConfig.py:68
 msgid "Identity provider"
 msgstr "Provider di identità"
 
-#: config/SSSDConfig.py:69
+#: src/config/SSSDConfig.py:69
 msgid "Authentication provider"
 msgstr "Provider di autenticazione"
 
-#: config/SSSDConfig.py:70
+#: src/config/SSSDConfig.py:70
 msgid "Access control provider"
 msgstr "Provider di access control"
 
-#: config/SSSDConfig.py:71
+#: src/config/SSSDConfig.py:71
 msgid "Password change provider"
 msgstr "Provider di cambio password"
 
-#: config/SSSDConfig.py:74
+#: src/config/SSSDConfig.py:74
 msgid "Minimum user ID"
 msgstr "ID utente minimo"
 
-#: config/SSSDConfig.py:75
+#: src/config/SSSDConfig.py:75
 msgid "Maximum user ID"
 msgstr "ID utente massimo"
 
-#: config/SSSDConfig.py:76
+#: src/config/SSSDConfig.py:76
 msgid "Ping timeout before restarting domain"
 msgstr "Timeout ping per il riavvio del dominio"
 
-#: config/SSSDConfig.py:77
+#: src/config/SSSDConfig.py:77
 msgid "Enable enumerating all users/groups"
 msgstr "Consentire l'enumerazione di tutti gli utenti/gruppi"
 
-#: config/SSSDConfig.py:78
+#: src/config/SSSDConfig.py:78
 msgid "Cache credentials for offline login"
 msgstr "Salvare in cache le credenziali per login offline"
 
-#: config/SSSDConfig.py:79
+#: src/config/SSSDConfig.py:79
 msgid "Store password hashes"
 msgstr "Salvare gli hash delle password"
 
-#: config/SSSDConfig.py:80
+#: src/config/SSSDConfig.py:80
 msgid "Display users/groups in fully-qualified form"
 msgstr "Mostrare utenti/gruppi in formato fully-qualified"
 
-#: config/SSSDConfig.py:81
+#: src/config/SSSDConfig.py:81
 msgid "Entry cache timeout length (seconds)"
 msgstr "Durata timeout elementi in cache (secondi)"
 
-#: config/SSSDConfig.py:82
+#: src/config/SSSDConfig.py:82
 msgid ""
 "Restrict or prefer a specific address family when performing DNS lookups"
 msgstr ""
 "Restringere o preferire una specifica famiglia di indirizzi per l'esecuzione "
 "di lookup DNS"
 
-#: config/SSSDConfig.py:83
+#: src/config/SSSDConfig.py:83
 msgid "How long to keep cached entries after last successful login (days)"
 msgstr ""
 "Per quanto tempo tenere in cache gli elementi dopo un login che ha avuto "
 "successo (giorni)"
 
-#: config/SSSDConfig.py:84
+#: src/config/SSSDConfig.py:84
 msgid "How long to wait for replies from DNS when resolving servers (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:85
+#: src/config/SSSDConfig.py:85
 msgid "The domain part of service discovery DNS query"
 msgstr ""
 
-#: config/SSSDConfig.py:88
+#: src/config/SSSDConfig.py:88
 msgid "IPA domain"
 msgstr "Dominio IPA"
 
-#: config/SSSDConfig.py:89
+#: src/config/SSSDConfig.py:89
 msgid "IPA server address"
 msgstr "Indirizzo del server IPA"
 
-#: config/SSSDConfig.py:90
+#: src/config/SSSDConfig.py:90
 msgid "IPA client hostname"
 msgstr "Hostname del client IPA"
 
-#: config/SSSDConfig.py:91
+#: src/config/SSSDConfig.py:91
 msgid "Whether to automatically update the client's DNS entry in FreeIPA"
 msgstr ""
 
-#: config/SSSDConfig.py:92
+#: src/config/SSSDConfig.py:92
 msgid "The interface whose IP should be used for dynamic DNS updates"
 msgstr ""
 
-#: config/SSSDConfig.py:95 config/SSSDConfig.py:124
+#: src/config/SSSDConfig.py:95 src/config/SSSDConfig.py:124
 msgid "Kerberos server address"
 msgstr "Indirizzo del server Kerberos"
 
-#: config/SSSDConfig.py:96 config/SSSDConfig.py:125
+#: src/config/SSSDConfig.py:96 src/config/SSSDConfig.py:125
 msgid "Kerberos realm"
 msgstr "Realm Kerberos"
 
-#: config/SSSDConfig.py:97
+#: src/config/SSSDConfig.py:97
 msgid "Authentication timeout"
 msgstr "Timeout di autenticazione"
 
-#: config/SSSDConfig.py:100
+#: src/config/SSSDConfig.py:100
 msgid "Directory to store credential caches"
 msgstr "Directory in cui salvare le credenziali"
 
-#: config/SSSDConfig.py:101
+#: src/config/SSSDConfig.py:101
 msgid "Location of the user's credential cache"
 msgstr "Percorso della cache delle credenziali utente"
 
-#: config/SSSDConfig.py:102
+#: src/config/SSSDConfig.py:102
 msgid "Location of the keytab to validate credentials"
 msgstr "Percorso del keytab per la validazione delle credenziali"
 
-#: config/SSSDConfig.py:103
+#: src/config/SSSDConfig.py:103
 msgid "Enable credential validation"
 msgstr "Abilita la validazione delle credenziali"
 
-#: config/SSSDConfig.py:104
+#: src/config/SSSDConfig.py:104
 msgid "Store password if offline for later online authentication"
 msgstr ""
 
-#: config/SSSDConfig.py:107
+#: src/config/SSSDConfig.py:107
 msgid "Server where the change password service is running if not on the KDC"
 msgstr ""
 "Server dove viene eseguito il servizio di cambio password, se non nel KDC"
 
-#: config/SSSDConfig.py:110
+#: src/config/SSSDConfig.py:110
 msgid "ldap_uri, The URI of the LDAP server"
 msgstr "ldap_uri, l'indirizzo del server LDAP"
 
-#: config/SSSDConfig.py:111
+#: src/config/SSSDConfig.py:111
 msgid "The default base DN"
 msgstr "Il base DN predefinito"
 
-#: config/SSSDConfig.py:112
+#: src/config/SSSDConfig.py:112
 msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr "Lo Schema Type utilizzato dal server LDAP, rfc2307"
 
-#: config/SSSDConfig.py:113
+#: src/config/SSSDConfig.py:113
 msgid "The default bind DN"
 msgstr "Il bind DN predefinito"
 
-#: config/SSSDConfig.py:114
+#: src/config/SSSDConfig.py:114
 msgid "The type of the authentication token of the default bind DN"
 msgstr "Il tipo di token di autenticazione del bind DN predefinito"
 
-#: config/SSSDConfig.py:115
+#: src/config/SSSDConfig.py:115
 msgid "The authentication token of the default bind DN"
 msgstr "Il token di autenticazione del bind DN predefinito"
 
-#: config/SSSDConfig.py:116
+#: src/config/SSSDConfig.py:116
 msgid "Length of time to attempt connection"
 msgstr "Durata del tentativo di connessione"
 
-#: config/SSSDConfig.py:117
+#: src/config/SSSDConfig.py:117
 msgid "Length of time to attempt synchronous LDAP operations"
 msgstr "Durata del tentativo di esecuzione di operazioni LDAP sincrone"
 
-#: config/SSSDConfig.py:118
+#: src/config/SSSDConfig.py:118
 msgid "Length of time between attempts to reconnect while offline"
 msgstr "Durata tra tentativi di riconnessione quando offline"
 
-#: config/SSSDConfig.py:119
+#: src/config/SSSDConfig.py:119
 #, fuzzy
 msgid "File that contains CA certificates"
 msgstr "file che contiene certificati CA"
 
-#: config/SSSDConfig.py:120
+#: src/config/SSSDConfig.py:120
 msgid "Path to CA certificate directory"
 msgstr ""
 
-#: config/SSSDConfig.py:121
+#: src/config/SSSDConfig.py:121
 msgid "Require TLS certificate verification"
 msgstr "Richiedere la verifica del certificato TLS"
 
-#: config/SSSDConfig.py:122
+#: src/config/SSSDConfig.py:122
 msgid "Specify the sasl mechanism to use"
 msgstr "Specificare il meccanismo sasl da usare"
 
-#: config/SSSDConfig.py:123
+#: src/config/SSSDConfig.py:123
 msgid "Specify the sasl authorization id to use"
 msgstr "Specificare l'id di autorizzazione sasl da usare"
 
-#: config/SSSDConfig.py:126
+#: src/config/SSSDConfig.py:126
 msgid "Kerberos service keytab"
 msgstr "Keytab del servizio Kerberos"
 
-#: config/SSSDConfig.py:127
+#: src/config/SSSDConfig.py:127
 msgid "Use Kerberos auth for LDAP connection"
 msgstr "Usare autorizzazione Kerberos per la connessione LDAP"
 
-#: config/SSSDConfig.py:128
+#: src/config/SSSDConfig.py:128
 msgid "Follow LDAP referrals"
 msgstr "Seguire i referral LDAP"
 
-#: config/SSSDConfig.py:129
+#: src/config/SSSDConfig.py:129
 #, fuzzy
 msgid "Lifetime of TGT for LDAP connection"
 msgstr "Usare autorizzazione Kerberos per la connessione LDAP"
 
-#: config/SSSDConfig.py:132
+#: src/config/SSSDConfig.py:132
 msgid "Length of time to wait for a search request"
 msgstr "Durata attesa per le richieste di ricerca"
 
-#: config/SSSDConfig.py:133
+#: src/config/SSSDConfig.py:133
 msgid "Length of time between enumeration updates"
 msgstr "Durata tra gli aggiornamenti alle enumeration"
 
-#: config/SSSDConfig.py:134
+#: src/config/SSSDConfig.py:134
 #, fuzzy
 msgid "Require TLS for ID lookups"
 msgstr "Richiedere TLS per gli ID lookup, false"
 
-#: config/SSSDConfig.py:135
+#: src/config/SSSDConfig.py:135
 msgid "Base DN for user lookups"
 msgstr "Base DN per i lookup utente"
 
-#: config/SSSDConfig.py:136
+#: src/config/SSSDConfig.py:136
 msgid "Scope of user lookups"
 msgstr "Ambito di applicazione dei lookup utente"
 
-#: config/SSSDConfig.py:137
+#: src/config/SSSDConfig.py:137
 msgid "Filter for user lookups"
 msgstr "Filtro per i lookup utente"
 
-#: config/SSSDConfig.py:138
+#: src/config/SSSDConfig.py:138
 msgid "Objectclass for users"
 msgstr "Objectclass per gli utenti"
 
-#: config/SSSDConfig.py:139
+#: src/config/SSSDConfig.py:139
 msgid "Username attribute"
 msgstr "Attributo del nome utente"
 
-#: config/SSSDConfig.py:140
+#: src/config/SSSDConfig.py:140
 msgid "UID attribute"
 msgstr "Attributo UID"
 
-#: config/SSSDConfig.py:141
+#: src/config/SSSDConfig.py:141
 msgid "Primary GID attribute"
 msgstr "Attributo del GID primario"
 
-#: config/SSSDConfig.py:142
+#: src/config/SSSDConfig.py:142
 msgid "GECOS attribute"
 msgstr "Attributo GECOS"
 
-#: config/SSSDConfig.py:143
+#: src/config/SSSDConfig.py:143
 msgid "Home directory attribute"
 msgstr "Attributo della home directory"
 
-#: config/SSSDConfig.py:144
+#: src/config/SSSDConfig.py:144
 msgid "Shell attribute"
 msgstr "Attributo della shell"
 
-#: config/SSSDConfig.py:145
+#: src/config/SSSDConfig.py:145
 msgid "UUID attribute"
 msgstr "Attributo UUID"
 
-#: config/SSSDConfig.py:146
+#: src/config/SSSDConfig.py:146
 msgid "User principal attribute (for Kerberos)"
 msgstr "Attributo user principal (per Kerberos)"
 
-#: config/SSSDConfig.py:147
+#: src/config/SSSDConfig.py:147
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: config/SSSDConfig.py:148
+#: src/config/SSSDConfig.py:148
 msgid "memberOf attribute"
 msgstr "Attributo memberOf"
 
-#: config/SSSDConfig.py:149
+#: src/config/SSSDConfig.py:149
 msgid "Modification time attribute"
 msgstr "Attributo data di modifica"
 
-#: config/SSSDConfig.py:152
+#: src/config/SSSDConfig.py:152
 msgid "Policy to evaluate the password expiration"
 msgstr "Politica per controllare la scadenza della password"
 
-#: config/SSSDConfig.py:155
+#: src/config/SSSDConfig.py:155
 msgid "LDAP filter to determine access privileges"
 msgstr ""
 
-#: config/SSSDConfig.py:158
+#: src/config/SSSDConfig.py:158
 msgid "Comma separated list of allowed users"
 msgstr "Lista separata da virgola degli utenti abilitati"
 
-#: config/SSSDConfig.py:159
+#: src/config/SSSDConfig.py:159
 msgid "Comma separated list of prohibited users"
 msgstr "Lista separata da virgola degli utenti non abilitati"
 
-#: config/SSSDConfig.py:162
+#: src/config/SSSDConfig.py:162
 msgid "Default shell, /bin/bash"
 msgstr "Shell predefinita, /bin/bash"
 
-#: config/SSSDConfig.py:163
+#: src/config/SSSDConfig.py:163
 msgid "Base for home directories"
 msgstr "Base delle home directory"
 
-#: config/SSSDConfig.py:166
+#: src/config/SSSDConfig.py:166
 msgid "The name of the NSS library to use"
 msgstr "Il nome della libreria NSS da usare"
 
-#: config/SSSDConfig.py:169
+#: src/config/SSSDConfig.py:169
 msgid "PAM stack to use"
 msgstr "Stack PAM da usare"
 
-#: monitor/monitor.c:2137
+#: src/monitor/monitor.c:2140
 msgid "Become a daemon (default)"
 msgstr "Esegui come demone (default)"
 
-#: monitor/monitor.c:2139
+#: src/monitor/monitor.c:2142
 msgid "Run interactive (not a daemon)"
 msgstr "Esegui interattivamente (non come demone)"
 
-#: monitor/monitor.c:2141
+#: src/monitor/monitor.c:2144
 msgid "Specify a non-default config file"
 msgstr "Specificare un file di configurazione specifico"
 
-#: monitor/monitor.c:2167
+#: src/monitor/monitor.c:2170
 msgid "sssd must be run as root\n"
 msgstr "sssd deve essere eseguito come root\n"
 
-#: monitor/monitor.c:2202
+#: src/monitor/monitor.c:2205
 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"
@@ -440,7 +440,7 @@ msgstr ""
 "potrebbero generare conflitti con SSSD, non è consigliato eseguirlo in "
 "parallelo a SSSD\n"
 
-#: monitor/monitor.c:2212
+#: src/monitor/monitor.c:2215
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
@@ -449,280 +449,293 @@ msgstr ""
 "Impossibile leggere il file di configurazione %s, controllare che i permessi "
 "siano impostati a 0600 e che il file sia proprietà di root.root\n"
 
-#: monitor/monitor.c:2217
+#: src/monitor/monitor.c:2220
 msgid "Cannot load configuration database\n"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:993 providers/ldap/ldap_child.c:361
-#: util/util.h:61
+#: src/providers/krb5/krb5_child.c:1043 src/providers/ldap/ldap_child.c:359
+#: src/util/util.h:63
 msgid "Debug level"
 msgstr "Livello debug"
 
-#: providers/krb5/krb5_child.c:995 providers/ldap/ldap_child.c:363
-#: util/util.h:65
+#: src/providers/krb5/krb5_child.c:1045 src/providers/ldap/ldap_child.c:361
+#: src/util/util.h:67
 msgid "Add debug timestamps"
 msgstr "Includi timestamp di debug"
 
-#: providers/krb5/krb5_child.c:997 providers/ldap/ldap_child.c:365
+#: src/providers/krb5/krb5_child.c:1047 src/providers/ldap/ldap_child.c:363
 msgid "An open file descriptor for the debug logs"
 msgstr "Un descrittore di file aperto per l'output di debug"
 
-#: providers/data_provider_be.c:1165
+#: src/providers/data_provider_be.c:1165
 msgid "Domain of the information provider (mandatory)"
 msgstr "Dominio del provider di informazioni (obbligatorio)"
 
-#: sss_client/common.c:742
+#: src/sss_client/common.c:742
 msgid "Privileged socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:745
+#: src/sss_client/common.c:745
 msgid "Public socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:748
+#: src/sss_client/common.c:748
 #, fuzzy
 msgid "Unexpected format of the server credential message."
 msgstr "Percorso della cache delle credenziali utente"
 
-#: sss_client/common.c:751
+#: src/sss_client/common.c:751
 msgid "SSSD is not run by root."
 msgstr ""
 
-#: sss_client/common.c:756
+#: src/sss_client/common.c:756
 msgid "An error occurred, but no description can be found."
 msgstr ""
 
-#: sss_client/common.c:762
+#: src/sss_client/common.c:762
 msgid "Unexpected error while looking for an error description"
 msgstr ""
 
-#: sss_client/pam_sss.c:372
+#: src/sss_client/pam_sss.c:372
 msgid "Passwords do not match"
 msgstr "Le password non coincidono"
 
-#: sss_client/pam_sss.c:556
+#: src/sss_client/pam_sss.c:556
 msgid "Password reset by root is not supported."
 msgstr ""
 
-#: sss_client/pam_sss.c:597
+#: src/sss_client/pam_sss.c:597
 msgid "Authenticated with cached credentials"
 msgstr ""
 
-#: sss_client/pam_sss.c:598
+#: src/sss_client/pam_sss.c:598
 msgid ", your cached password will expire at: "
 msgstr ", la password in cache scadrà il: "
 
-#: sss_client/pam_sss.c:628
+#: src/sss_client/pam_sss.c:628
 #, c-format
 msgid "Your password has expired. You have %d grace login(s) remaining."
 msgstr ""
 
-#: sss_client/pam_sss.c:674
+#: src/sss_client/pam_sss.c:674
 #, fuzzy, c-format
 msgid "Your password will expire in %d %s."
 msgstr ", la password in cache scadrà il: "
 
-#: sss_client/pam_sss.c:723
+#: src/sss_client/pam_sss.c:723
 #, fuzzy
 msgid "Authentication is denied until: "
 msgstr "Autenticazione offline, l'autenticazione sarà negata fino a:"
 
-#: sss_client/pam_sss.c:750
+#: src/sss_client/pam_sss.c:750
 msgid "System is offline, password change not possible"
 msgstr "Il sistema è offline, non è possibile richiedere un cambio password"
 
-#: sss_client/pam_sss.c:780 sss_client/pam_sss.c:793
+#: src/sss_client/pam_sss.c:780 src/sss_client/pam_sss.c:793
 msgid "Password change failed. "
 msgstr "Cambio password fallito."
 
-#: sss_client/pam_sss.c:783 sss_client/pam_sss.c:794
+#: src/sss_client/pam_sss.c:783 src/sss_client/pam_sss.c:794
 msgid "Server message: "
 msgstr "Messaggio del server:"
 
-#: sss_client/pam_sss.c:1197
+#: src/sss_client/pam_sss.c:1197
 msgid "New Password: "
 msgstr "Nuova password: "
 
-#: sss_client/pam_sss.c:1198
+#: src/sss_client/pam_sss.c:1198
 msgid "Reenter new Password: "
 msgstr "Conferma nuova password: "
 
-#: sss_client/pam_sss.c:1280
+#: src/sss_client/pam_sss.c:1280
 msgid "Password: "
 msgstr "Password: "
 
-#: sss_client/pam_sss.c:1312
+#: src/sss_client/pam_sss.c:1312
 msgid "Current Password: "
 msgstr "Password corrente: "
 
-#: sss_client/pam_sss.c:1458
+#: src/sss_client/pam_sss.c:1458
 msgid "Password expired. Change your password now."
 msgstr "Password scaduta. Cambiare la password ora."
 
-#: tools/sss_useradd.c:48 tools/sss_groupadd.c:41 tools/sss_groupdel.c:43
-#: tools/sss_groupmod.c:42 tools/sss_groupshow.c:620 tools/sss_userdel.c:131
-#: tools/sss_usermod.c:47
+#: src/tools/sss_useradd.c:48 src/tools/sss_groupadd.c:41
+#: src/tools/sss_groupdel.c:43 src/tools/sss_groupmod.c:42
+#: src/tools/sss_groupshow.c:620 src/tools/sss_userdel.c:131
+#: src/tools/sss_usermod.c:47
 msgid "The debug level to run with"
 msgstr "Il livello di debug da utilizzare"
 
-#: tools/sss_useradd.c:49 tools/sss_usermod.c:48
+#: src/tools/sss_useradd.c:49 src/tools/sss_usermod.c:48
 msgid "The UID of the user"
 msgstr "L'UID dell'utente"
 
-#: tools/sss_useradd.c:50 tools/sss_usermod.c:50
+#: src/tools/sss_useradd.c:50 src/tools/sss_usermod.c:50
 msgid "The comment string"
 msgstr "La stringa di commento"
 
-#: tools/sss_useradd.c:51 tools/sss_usermod.c:51
+#: src/tools/sss_useradd.c:51 src/tools/sss_usermod.c:51
 msgid "Home directory"
 msgstr "Home directory"
 
-#: tools/sss_useradd.c:52 tools/sss_usermod.c:52
+#: src/tools/sss_useradd.c:52 src/tools/sss_usermod.c:52
 msgid "Login shell"
 msgstr "Shell di login"
 
-#: tools/sss_useradd.c:53
+#: src/tools/sss_useradd.c:53
 msgid "Groups"
 msgstr "Gruppi"
 
-#: tools/sss_useradd.c:54
+#: src/tools/sss_useradd.c:54
 msgid "Create user's directory if it does not exist"
 msgstr "Creare la directory utente se non esiste"
 
-#: tools/sss_useradd.c:55
+#: src/tools/sss_useradd.c:55
 msgid "Never create user's directory, overrides config"
 msgstr "Non creare mai le directory utente, forza la configurazione"
 
-#: tools/sss_useradd.c:56
+#: src/tools/sss_useradd.c:56
 msgid "Specify an alternative skeleton directory"
 msgstr "Specificare una directory skeleton alternativa"
 
-#: tools/sss_useradd.c:57 tools/sss_usermod.c:57
+#: src/tools/sss_useradd.c:57 src/tools/sss_usermod.c:57
 msgid "The SELinux user for user's login"
 msgstr ""
 
 # locale nel senso di LANG=C, LANG=it_IT.utf8
-#: tools/sss_useradd.c:71 tools/sss_groupadd.c:56 tools/sss_groupdel.c:52
-#: tools/sss_groupmod.c:63 tools/sss_groupshow.c:631 tools/sss_userdel.c:148
-#: tools/sss_usermod.c:72
+#: src/tools/sss_useradd.c:71 src/tools/sss_groupadd.c:56
+#: src/tools/sss_groupdel.c:52 src/tools/sss_groupmod.c:63
+#: src/tools/sss_groupshow.c:631 src/tools/sss_userdel.c:148
+#: src/tools/sss_usermod.c:72
 msgid "Error setting the locale\n"
 msgstr "Errore di impostazione del locale\n"
 
-#: tools/sss_useradd.c:107
+#: src/tools/sss_useradd.c:84 src/tools/sss_groupmod.c:76
+#: src/tools/sss_usermod.c:85
+#, fuzzy
+msgid "Specify group to add to\n"
+msgstr "Specificare un gruppo da aggiungere\n"
+
+#: src/tools/sss_useradd.c:108
 msgid "Specify user to add\n"
 msgstr "Specificare un utente da aggiungere\n"
 
-#: tools/sss_useradd.c:118 tools/sss_groupadd.c:86 tools/sss_groupdel.c:81
-#: tools/sss_groupmod.c:111 tools/sss_groupshow.c:668 tools/sss_userdel.c:197
-#: tools/sss_usermod.c:128
+#: src/tools/sss_useradd.c:117 src/tools/sss_groupadd.c:82
+#: src/tools/sss_groupdel.c:77 src/tools/sss_groupmod.c:109
+#: src/tools/sss_groupshow.c:664 src/tools/sss_userdel.c:193
+#: src/tools/sss_usermod.c:126
 msgid "Error initializing the tools - no local domain\n"
 msgstr "Errore durante l'inizializzazione degli strumenti - nessun dominio\n"
 
-#: tools/sss_useradd.c:120 tools/sss_groupadd.c:88 tools/sss_groupdel.c:83
-#: tools/sss_groupmod.c:113 tools/sss_groupshow.c:670 tools/sss_userdel.c:199
-#: tools/sss_usermod.c:130
+#: src/tools/sss_useradd.c:119 src/tools/sss_groupadd.c:84
+#: src/tools/sss_groupdel.c:79 src/tools/sss_groupmod.c:111
+#: src/tools/sss_groupshow.c:666 src/tools/sss_userdel.c:195
+#: src/tools/sss_usermod.c:128
 msgid "Error initializing the tools\n"
 msgstr "Errore durante l'inizializzazione degli strumenti\n"
 
-#: tools/sss_useradd.c:129 tools/sss_groupadd.c:97 tools/sss_groupdel.c:92
-#: tools/sss_groupmod.c:121 tools/sss_groupshow.c:679 tools/sss_userdel.c:208
-#: tools/sss_usermod.c:139
+#: src/tools/sss_useradd.c:128 src/tools/sss_groupadd.c:93
+#: src/tools/sss_groupdel.c:88 src/tools/sss_groupmod.c:119
+#: src/tools/sss_groupshow.c:675 src/tools/sss_userdel.c:204
+#: src/tools/sss_usermod.c:137
 msgid "Invalid domain specified in FQDN\n"
 msgstr "Il dominio specificato nel FQDN non è valido\n"
 
-#: tools/sss_useradd.c:138 tools/sss_groupmod.c:143 tools/sss_groupmod.c:170
-#: tools/sss_usermod.c:164 tools/sss_usermod.c:191
+#: src/tools/sss_useradd.c:137 src/tools/sss_groupmod.c:141
+#: src/tools/sss_groupmod.c:168 src/tools/sss_usermod.c:162
+#: src/tools/sss_usermod.c:189
 msgid "Internal error while parsing parameters\n"
 msgstr "Errore interno nel parsing dei parametri\n"
 
-#: tools/sss_useradd.c:146 tools/sss_usermod.c:172 tools/sss_usermod.c:199
+#: src/tools/sss_useradd.c:145 src/tools/sss_usermod.c:170
+#: src/tools/sss_usermod.c:197
 msgid "Groups must be in the same domain as user\n"
 msgstr "I gruppi devono essere nello stesso dominio dell'utente\n"
 
-#: tools/sss_useradd.c:154
+#: src/tools/sss_useradd.c:153
 #, c-format
 msgid "Cannot find group %s in local domain\n"
 msgstr "Impossibile trovare il gruppo %s nel dominio locale\n"
 
-#: tools/sss_useradd.c:169 tools/sss_userdel.c:218
+#: src/tools/sss_useradd.c:168 src/tools/sss_userdel.c:214
 msgid "Cannot set default values\n"
 msgstr "Impossibile impostare i valori predefiniti\n"
 
-#: tools/sss_useradd.c:176 tools/sss_usermod.c:155
+#: src/tools/sss_useradd.c:175 src/tools/sss_usermod.c:153
 msgid "The selected UID is outside the allowed range\n"
 msgstr "L'UID specificato non rientra nel range permesso\n"
 
-#: tools/sss_useradd.c:203 tools/sss_usermod.c:240
+#: src/tools/sss_useradd.c:202 src/tools/sss_usermod.c:238
 msgid "Cannot set SELinux login context\n"
 msgstr ""
 
-#: tools/sss_useradd.c:219
+#: src/tools/sss_useradd.c:218
 msgid "Cannot get info about the user\n"
 msgstr "Impossibile determinare le informazioni dell'utente\n"
 
-#: tools/sss_useradd.c:233
+#: src/tools/sss_useradd.c:232
 msgid "User's home directory already exists, not copying data from skeldir\n"
 msgstr ""
 "La directory home dell'utente esiste, non vengono copiati dati dalla "
 "directory skeleton\n"
 
-#: tools/sss_useradd.c:236
+#: src/tools/sss_useradd.c:235
 #, c-format
 msgid "Cannot create user's home directory: %s\n"
 msgstr "Impossibile creare la directory home dell'utente: %s\n"
 
-#: tools/sss_useradd.c:247
+#: src/tools/sss_useradd.c:246
 #, c-format
 msgid "Cannot create user's mail spool: %s\n"
 msgstr "Impossibile creare lo spool di mail dell'utente: %s\n"
 
-#: tools/sss_useradd.c:259
+#: src/tools/sss_useradd.c:258
 msgid "Could not allocate ID for the user - domain full?\n"
 msgstr "Impossibile allocare l'ID utente - dominio pieno?\n"
 
-#: tools/sss_useradd.c:263
+#: src/tools/sss_useradd.c:262
 msgid "A user or group with the same name or ID already exists\n"
 msgstr "Utente o gruppo con lo stesso nome o ID già presente\n"
 
-#: tools/sss_useradd.c:269
+#: src/tools/sss_useradd.c:268
 msgid "Transaction error. Could not add user.\n"
 msgstr "Errore nella transazione. L'utente non è stato aggiunto.\n"
 
-#: tools/sss_groupadd.c:43 tools/sss_groupmod.c:48
+#: src/tools/sss_groupadd.c:43 src/tools/sss_groupmod.c:48
 msgid "The GID of the group"
 msgstr "Il GID del gruppo"
 
-#: tools/sss_groupadd.c:75
+#: src/tools/sss_groupadd.c:73
 msgid "Specify group to add\n"
 msgstr "Specificare un gruppo da aggiungere\n"
 
-#: tools/sss_groupadd.c:106 tools/sss_groupmod.c:194
+#: src/tools/sss_groupadd.c:102 src/tools/sss_groupmod.c:192
 msgid "The selected GID is outside the allowed range\n"
 msgstr "Il GID specificato non è nel range permesso\n"
 
-#: tools/sss_groupadd.c:131
+#: src/tools/sss_groupadd.c:127
 msgid "Could not allocate ID for the group - domain full?\n"
 msgstr "Impossibile allocare l'ID per il gruppo - dominio pieno?\n"
 
-#: tools/sss_groupadd.c:135
+#: src/tools/sss_groupadd.c:131
 msgid "A group with the same name or GID already exists\n"
 msgstr "Gruppo con lo stesso nome o GID già esistente\n"
 
-#: tools/sss_groupadd.c:140
+#: src/tools/sss_groupadd.c:136
 msgid "Transaction error. Could not add group.\n"
 msgstr "Errore della transazione. Impossibile aggiungere il gruppo.\n"
 
-#: tools/sss_groupdel.c:70
+#: src/tools/sss_groupdel.c:68
 msgid "Specify group to delete\n"
 msgstr "Specificare il gruppo da eliminare\n"
 
-#: tools/sss_groupdel.c:107
+#: src/tools/sss_groupdel.c:103
 #, c-format
 msgid "Group %s is outside the defined ID range for domain\n"
 msgstr ""
 "Il gruppo %s è al di fuori del range di ID specificato per il dominio\n"
 
-#: tools/sss_groupdel.c:121
+#: src/tools/sss_groupdel.c:117
 msgid ""
 "No such group in local domain. Removing groups only allowed in local "
 "domain.\n"
@@ -730,23 +743,28 @@ msgstr ""
 "Gruppo non presente nel dominio locale. L'eliminazione di gruppi è permessa "
 "solo nel dominio locale.\n"
 
-#: tools/sss_groupdel.c:126
+#: src/tools/sss_groupdel.c:122
 msgid "Internal error. Could not remove group.\n"
 msgstr "Errore interno. Impossibile rimuovere il gruppo.\n"
 
-#: tools/sss_groupmod.c:44
+#: src/tools/sss_groupmod.c:44
 msgid "Groups to add this group to"
 msgstr "Gruppi a cui aggiungere questo gruppo"
 
-#: tools/sss_groupmod.c:46
+#: src/tools/sss_groupmod.c:46
 msgid "Groups to remove this group from"
 msgstr "Gruppi da cui eliminare questo gruppo"
 
-#: tools/sss_groupmod.c:98
+#: src/tools/sss_groupmod.c:84 src/tools/sss_usermod.c:93
+#, fuzzy
+msgid "Specify group to remove from\n"
+msgstr "Specificare il gruppo da modificare\n"
+
+#: src/tools/sss_groupmod.c:98
 msgid "Specify group to modify\n"
 msgstr "Specificare il gruppo da modificare\n"
 
-#: tools/sss_groupmod.c:130
+#: src/tools/sss_groupmod.c:128
 msgid ""
 "Cannot find group in local domain, modifying groups is allowed only in local "
 "domain\n"
@@ -754,13 +772,13 @@ msgstr ""
 "Gruppo non presente nel dominio locale. La modifica dei gruppi è permessa "
 "solo nel dominio locale.\n"
 
-#: tools/sss_groupmod.c:151 tools/sss_groupmod.c:178
+#: src/tools/sss_groupmod.c:149 src/tools/sss_groupmod.c:176
 msgid "Member groups must be in the same domain as parent group\n"
 msgstr ""
 "I gruppi membri devono appartenere allo stesso dominio del gruppo radice\n"
 
-#: tools/sss_groupmod.c:159 tools/sss_groupmod.c:186 tools/sss_usermod.c:180
-#: tools/sss_usermod.c:207
+#: src/tools/sss_groupmod.c:157 src/tools/sss_groupmod.c:184
+#: src/tools/sss_usermod.c:178 src/tools/sss_usermod.c:205
 #, c-format
 msgid ""
 "Cannot find group %s in local domain, only groups in local domain are "
@@ -769,42 +787,42 @@ msgstr ""
 "Impossibile trovare il gruppo %s nel dominio locale, solo i gruppi nel "
 "dominio locale sono permessi\n"
 
-#: tools/sss_groupmod.c:220
+#: src/tools/sss_groupmod.c:218
 msgid "Could not modify group - check if member group names are correct\n"
 msgstr ""
 "Impossibile modificare il gruppo - controllare che i nomi dei gruppi siano "
 "corretti\n"
 
-#: tools/sss_groupmod.c:224
+#: src/tools/sss_groupmod.c:222
 msgid "Could not modify group - check if groupname is correct\n"
 msgstr ""
 "Impossibile modificare il gruppo - controllare che il nome del gruppo sia "
 "corretto\n"
 
-#: tools/sss_groupmod.c:228
+#: src/tools/sss_groupmod.c:226
 msgid "Transaction error. Could not modify group.\n"
 msgstr "Errore della transazione. Impossibile modificare il gruppo.\n"
 
-#: tools/sss_groupshow.c:567
+#: src/tools/sss_groupshow.c:567
 #, c-format
 msgid "%s%sGroup: %s\n"
 msgstr "%s%sGruppo: %s\n"
 
-#: tools/sss_groupshow.c:568
+#: src/tools/sss_groupshow.c:568
 msgid "Magic Private "
 msgstr "Magic Private "
 
-#: tools/sss_groupshow.c:570
+#: src/tools/sss_groupshow.c:570
 #, c-format
 msgid "%sGID number: %d\n"
 msgstr "%sNumero GID: %d\n"
 
-#: tools/sss_groupshow.c:572
+#: src/tools/sss_groupshow.c:572
 #, c-format
 msgid "%sMember users: "
 msgstr "%sUtenti membri: "
 
-#: tools/sss_groupshow.c:579
+#: src/tools/sss_groupshow.c:579
 #, c-format
 msgid ""
 "\n"
@@ -813,7 +831,7 @@ msgstr ""
 "\n"
 "%sE' membro di: "
 
-#: tools/sss_groupshow.c:586
+#: src/tools/sss_groupshow.c:586
 #, c-format
 msgid ""
 "\n"
@@ -822,15 +840,15 @@ msgstr ""
 "\n"
 "%sGruppi membro: "
 
-#: tools/sss_groupshow.c:622
+#: src/tools/sss_groupshow.c:622
 msgid "Print indirect group members recursively"
 msgstr "Mostra ricorsivamente i membri indiretti del gruppo"
 
-#: tools/sss_groupshow.c:657
+#: src/tools/sss_groupshow.c:655
 msgid "Specify group to show\n"
 msgstr "Specificare il gruppo da mostrate\n"
 
-#: tools/sss_groupshow.c:698
+#: src/tools/sss_groupshow.c:694
 msgid ""
 "No such group in local domain. Printing groups only allowed in local "
 "domain.\n"
@@ -838,102 +856,102 @@ msgstr ""
 "Gruppo non presente nel dominio locale. La stampa dei gruppi è permessa solo "
 "nel dominio locale.\n"
 
-#: tools/sss_groupshow.c:703
+#: src/tools/sss_groupshow.c:699
 msgid "Internal error. Could not print group.\n"
 msgstr "Errore interno. Impossibile stampare il gruppo.\n"
 
-#: tools/sss_userdel.c:133
+#: src/tools/sss_userdel.c:133
 msgid "Remove home directory and mail spool"
 msgstr "Eliminare home directory e spool di mail"
 
-#: tools/sss_userdel.c:135
+#: src/tools/sss_userdel.c:135
 msgid "Do not remove home directory and mail spool"
 msgstr "Non eliminare la home directory e lo spool di mail"
 
-#: tools/sss_userdel.c:137
+#: src/tools/sss_userdel.c:137
 msgid "Force removal of files not owned by the user"
 msgstr "Forza la rimozione dei file non di proprietà dell'utente"
 
-#: tools/sss_userdel.c:139
+#: src/tools/sss_userdel.c:139
 msgid "Kill users' processes before removing him"
 msgstr ""
 
-#: tools/sss_userdel.c:186
+#: src/tools/sss_userdel.c:184
 msgid "Specify user to delete\n"
 msgstr "Specificare l'utente da cancellare\n"
 
-#: tools/sss_userdel.c:235
+#: src/tools/sss_userdel.c:231
 #, c-format
 msgid "User %s is outside the defined ID range for domain\n"
 msgstr "L'utente %s è all'interno del range di ID definito per il dominio\n"
 
-#: tools/sss_userdel.c:260
+#: src/tools/sss_userdel.c:256
 msgid "Cannot reset SELinux login context\n"
 msgstr ""
 
-#: tools/sss_userdel.c:272
+#: src/tools/sss_userdel.c:268
 #, c-format
 msgid "WARNING: The user (uid %lu) was still logged in when deleted.\n"
 msgstr ""
 
-#: tools/sss_userdel.c:277
+#: src/tools/sss_userdel.c:273
 msgid "Cannot determine if the user was logged in on this platform"
 msgstr ""
 
-#: tools/sss_userdel.c:282
+#: src/tools/sss_userdel.c:278
 msgid "Error while checking if the user was logged in\n"
 msgstr ""
 
-#: tools/sss_userdel.c:289
+#: src/tools/sss_userdel.c:285
 #, c-format
 msgid "The post-delete command failed: %s\n"
 msgstr ""
 
-#: tools/sss_userdel.c:301
+#: src/tools/sss_userdel.c:297
 msgid "Not removing home dir - not owned by user\n"
 msgstr "Home directory non eliminata - non appartiene all'utente\n"
 
-#: tools/sss_userdel.c:303
+#: src/tools/sss_userdel.c:299
 #, c-format
 msgid "Cannot remove homedir: %s\n"
 msgstr "Impossibile rimuovere la home directory: %s\n"
 
-#: tools/sss_userdel.c:314
+#: src/tools/sss_userdel.c:310
 msgid ""
 "No such user in local domain. Removing users only allowed in local domain.\n"
 msgstr ""
 "Utente non presente nel dominio locale. L'eliminazione degli utenti è "
 "permessa solo nel dominio locale.\n"
 
-#: tools/sss_userdel.c:319
+#: src/tools/sss_userdel.c:315
 msgid "Internal error. Could not remove user.\n"
 msgstr "Errore interno. Impossibile rimuovere l'utente.\n"
 
-#: tools/sss_usermod.c:49
+#: src/tools/sss_usermod.c:49
 msgid "The GID of the user"
 msgstr "Il GID dell'utente"
 
-#: tools/sss_usermod.c:53
+#: src/tools/sss_usermod.c:53
 msgid "Groups to add this user to"
 msgstr "Gruppi a cui aggiungere questo utente"
 
-#: tools/sss_usermod.c:54
+#: src/tools/sss_usermod.c:54
 msgid "Groups to remove this user from"
 msgstr "Gruppi da cui rimuovere questo utente"
 
-#: tools/sss_usermod.c:55
+#: src/tools/sss_usermod.c:55
 msgid "Lock the account"
 msgstr "Bloccare l'account"
 
-#: tools/sss_usermod.c:56
+#: src/tools/sss_usermod.c:56
 msgid "Unlock the account"
 msgstr "Sbloccare l'account"
 
-#: tools/sss_usermod.c:117
+#: src/tools/sss_usermod.c:117
 msgid "Specify user to modify\n"
 msgstr "Specificare l'utente da modificare\n"
 
-#: tools/sss_usermod.c:148
+#: src/tools/sss_usermod.c:146
 msgid ""
 "Cannot find user in local domain, modifying users is allowed only in local "
 "domain\n"
@@ -941,30 +959,30 @@ msgstr ""
 "Utente non presente nel dominio locale. La modifica degli utenti è permessa "
 "solo nel dominio locale.\n"
 
-#: tools/sss_usermod.c:250
+#: src/tools/sss_usermod.c:248
 msgid "Could not modify user - check if group names are correct\n"
 msgstr ""
 "Impossibile modificare l'utente - controllare che i nomi dei gruppi siano "
 "corretti\n"
 
-#: tools/sss_usermod.c:254
+#: src/tools/sss_usermod.c:252
 msgid "Could not modify user - user already member of groups?\n"
 msgstr "Impossibile modificare l'utente - utente già membro di gruppi?\n"
 
-#: tools/sss_usermod.c:258
+#: src/tools/sss_usermod.c:256
 msgid "Transaction error. Could not modify user.\n"
 msgstr "Errore nella transazione. Impossibile modificare l'utente.\n"
 
-#: tools/tools_util.c:285
+#: src/tools/tools_util.c:290
 msgid "Out of memory\n"
 msgstr "Memoria esaurita\n"
 
-#: tools/tools_util.h:34
+#: src/tools/tools_util.h:40
 #, c-format
 msgid "%s must be run as root\n"
 msgstr "%s deve essere eseguito come root\n"
 
-#: util/util.h:63
+#: src/util/util.h:65
 msgid "Send the debug output to files instead of stderr"
 msgstr "Redirigere l'output di debug su file anzichè stderr"
 
diff --git a/po/ja.po b/po/ja.po
index 9087812a..f863e9cc 100644
--- a/po/ja.po
+++ b/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-08-03 18:24-0400\n"
+"POT-Creation-Date: 2010-10-18 13:14-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"
@@ -18,904 +18,920 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=1; plural=0;\n"
 
-#: config/SSSDConfig.py:39
+#: src/config/SSSDConfig.py:39
 msgid "Set the verbosity of the debug logging"
 msgstr ""
 
-#: config/SSSDConfig.py:40
+#: src/config/SSSDConfig.py:40
 msgid "Include timestamps in debug logs"
 msgstr ""
 
-#: config/SSSDConfig.py:41
+#: src/config/SSSDConfig.py:41
 msgid "Write debug messages to logfiles"
 msgstr ""
 
-#: config/SSSDConfig.py:42
+#: src/config/SSSDConfig.py:42
 msgid "Ping timeout before restarting service"
 msgstr ""
 
-#: config/SSSDConfig.py:43
+#: src/config/SSSDConfig.py:43
 msgid "Command to start service"
 msgstr ""
 
-#: config/SSSDConfig.py:44
+#: src/config/SSSDConfig.py:44
 msgid "Number of times to attempt connection to Data Providers"
 msgstr ""
 
-#: config/SSSDConfig.py:47
+#: src/config/SSSDConfig.py:47
 msgid "SSSD Services to start"
 msgstr ""
 
-#: config/SSSDConfig.py:48
+#: src/config/SSSDConfig.py:48
 msgid "SSSD Domains to start"
 msgstr ""
 
-#: config/SSSDConfig.py:49
+#: src/config/SSSDConfig.py:49
 msgid "Timeout for messages sent over the SBUS"
 msgstr ""
 
-#: config/SSSDConfig.py:50
+#: src/config/SSSDConfig.py:50
 msgid "Regex to parse username and domain"
 msgstr ""
 
-#: config/SSSDConfig.py:51
+#: src/config/SSSDConfig.py:51
 msgid "Printf-compatible format for displaying fully-qualified names"
 msgstr ""
 
-#: config/SSSDConfig.py:54
+#: src/config/SSSDConfig.py:54
 msgid "Enumeration cache timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:55
+#: src/config/SSSDConfig.py:55
 msgid "Entry cache background update timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:56
+#: src/config/SSSDConfig.py:56
 msgid "Negative cache timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:57
+#: src/config/SSSDConfig.py:57
 msgid "Users that SSSD should explicitly ignore"
 msgstr ""
 
-#: config/SSSDConfig.py:58
+#: src/config/SSSDConfig.py:58
 msgid "Groups that SSSD should explicitly ignore"
 msgstr ""
 
-#: config/SSSDConfig.py:59
+#: src/config/SSSDConfig.py:59
 msgid "Should filtered users appear in groups"
 msgstr ""
 
-#: config/SSSDConfig.py:60
+#: src/config/SSSDConfig.py:60
 msgid "The value of the password field the NSS provider should return"
 msgstr ""
 
-#: config/SSSDConfig.py:63
+#: src/config/SSSDConfig.py:63
 msgid "How long to allow cached logins between online logins (days)"
 msgstr ""
 
-#: config/SSSDConfig.py:64
+#: src/config/SSSDConfig.py:64
 msgid "How many failed logins attempts are allowed when offline"
 msgstr ""
 
-#: config/SSSDConfig.py:65
+#: src/config/SSSDConfig.py:65
 msgid ""
 "How long (minutes) to deny login after offline_failed_login_attempts has "
 "been reached"
 msgstr ""
 
-#: config/SSSDConfig.py:68
+#: src/config/SSSDConfig.py:68
 msgid "Identity provider"
 msgstr ""
 
-#: config/SSSDConfig.py:69
+#: src/config/SSSDConfig.py:69
 msgid "Authentication provider"
 msgstr ""
 
-#: config/SSSDConfig.py:70
+#: src/config/SSSDConfig.py:70
 msgid "Access control provider"
 msgstr ""
 
-#: config/SSSDConfig.py:71
+#: src/config/SSSDConfig.py:71
 msgid "Password change provider"
 msgstr ""
 
-#: config/SSSDConfig.py:74
+#: src/config/SSSDConfig.py:74
 msgid "Minimum user ID"
 msgstr ""
 
-#: config/SSSDConfig.py:75
+#: src/config/SSSDConfig.py:75
 msgid "Maximum user ID"
 msgstr ""
 
-#: config/SSSDConfig.py:76
+#: src/config/SSSDConfig.py:76
 msgid "Ping timeout before restarting domain"
 msgstr ""
 
-#: config/SSSDConfig.py:77
+#: src/config/SSSDConfig.py:77
 msgid "Enable enumerating all users/groups"
 msgstr ""
 
-#: config/SSSDConfig.py:78
+#: src/config/SSSDConfig.py:78
 msgid "Cache credentials for offline login"
 msgstr ""
 
-#: config/SSSDConfig.py:79
+#: src/config/SSSDConfig.py:79
 msgid "Store password hashes"
 msgstr ""
 
-#: config/SSSDConfig.py:80
+#: src/config/SSSDConfig.py:80
 msgid "Display users/groups in fully-qualified form"
 msgstr ""
 
-#: config/SSSDConfig.py:81
+#: src/config/SSSDConfig.py:81
 msgid "Entry cache timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:82
+#: src/config/SSSDConfig.py:82
 msgid ""
 "Restrict or prefer a specific address family when performing DNS lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:83
+#: src/config/SSSDConfig.py:83
 msgid "How long to keep cached entries after last successful login (days)"
 msgstr ""
 
-#: config/SSSDConfig.py:84
+#: src/config/SSSDConfig.py:84
 msgid "How long to wait for replies from DNS when resolving servers (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:85
+#: src/config/SSSDConfig.py:85
 msgid "The domain part of service discovery DNS query"
 msgstr ""
 
-#: config/SSSDConfig.py:88
+#: src/config/SSSDConfig.py:88
 msgid "IPA domain"
 msgstr ""
 
-#: config/SSSDConfig.py:89
+#: src/config/SSSDConfig.py:89
 msgid "IPA server address"
 msgstr ""
 
-#: config/SSSDConfig.py:90
+#: src/config/SSSDConfig.py:90
 msgid "IPA client hostname"
 msgstr ""
 
-#: config/SSSDConfig.py:91
+#: src/config/SSSDConfig.py:91
 msgid "Whether to automatically update the client's DNS entry in FreeIPA"
 msgstr ""
 
-#: config/SSSDConfig.py:92
+#: src/config/SSSDConfig.py:92
 msgid "The interface whose IP should be used for dynamic DNS updates"
 msgstr ""
 
-#: config/SSSDConfig.py:95 config/SSSDConfig.py:124
+#: src/config/SSSDConfig.py:95 src/config/SSSDConfig.py:124
 msgid "Kerberos server address"
 msgstr ""
 
-#: config/SSSDConfig.py:96 config/SSSDConfig.py:125
+#: src/config/SSSDConfig.py:96 src/config/SSSDConfig.py:125
 msgid "Kerberos realm"
 msgstr ""
 
-#: config/SSSDConfig.py:97
+#: src/config/SSSDConfig.py:97
 msgid "Authentication timeout"
 msgstr ""
 
-#: config/SSSDConfig.py:100
+#: src/config/SSSDConfig.py:100
 msgid "Directory to store credential caches"
 msgstr ""
 
-#: config/SSSDConfig.py:101
+#: src/config/SSSDConfig.py:101
 msgid "Location of the user's credential cache"
 msgstr ""
 
-#: config/SSSDConfig.py:102
+#: src/config/SSSDConfig.py:102
 msgid "Location of the keytab to validate credentials"
 msgstr ""
 
-#: config/SSSDConfig.py:103
+#: src/config/SSSDConfig.py:103
 msgid "Enable credential validation"
 msgstr ""
 
-#: config/SSSDConfig.py:104
+#: src/config/SSSDConfig.py:104
 msgid "Store password if offline for later online authentication"
 msgstr ""
 
-#: config/SSSDConfig.py:107
+#: src/config/SSSDConfig.py:107
 msgid "Server where the change password service is running if not on the KDC"
 msgstr ""
 
-#: config/SSSDConfig.py:110
+#: src/config/SSSDConfig.py:110
 msgid "ldap_uri, The URI of the LDAP server"
 msgstr ""
 
-#: config/SSSDConfig.py:111
+#: src/config/SSSDConfig.py:111
 msgid "The default base DN"
 msgstr ""
 
-#: config/SSSDConfig.py:112
+#: src/config/SSSDConfig.py:112
 msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr ""
 
-#: config/SSSDConfig.py:113
+#: src/config/SSSDConfig.py:113
 msgid "The default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:114
+#: src/config/SSSDConfig.py:114
 msgid "The type of the authentication token of the default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:115
+#: src/config/SSSDConfig.py:115
 msgid "The authentication token of the default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:116
+#: src/config/SSSDConfig.py:116
 msgid "Length of time to attempt connection"
 msgstr ""
 
-#: config/SSSDConfig.py:117
+#: src/config/SSSDConfig.py:117
 msgid "Length of time to attempt synchronous LDAP operations"
 msgstr ""
 
-#: config/SSSDConfig.py:118
+#: src/config/SSSDConfig.py:118
 msgid "Length of time between attempts to reconnect while offline"
 msgstr ""
 
-#: config/SSSDConfig.py:119
+#: src/config/SSSDConfig.py:119
 msgid "File that contains CA certificates"
 msgstr ""
 
-#: config/SSSDConfig.py:120
+#: src/config/SSSDConfig.py:120
 msgid "Path to CA certificate directory"
 msgstr ""
 
-#: config/SSSDConfig.py:121
+#: src/config/SSSDConfig.py:121
 msgid "Require TLS certificate verification"
 msgstr ""
 
-#: config/SSSDConfig.py:122
+#: src/config/SSSDConfig.py:122
 msgid "Specify the sasl mechanism to use"
 msgstr ""
 
-#: config/SSSDConfig.py:123
+#: src/config/SSSDConfig.py:123
 msgid "Specify the sasl authorization id to use"
 msgstr ""
 
-#: config/SSSDConfig.py:126
+#: src/config/SSSDConfig.py:126
 msgid "Kerberos service keytab"
 msgstr ""
 
-#: config/SSSDConfig.py:127
+#: src/config/SSSDConfig.py:127
 msgid "Use Kerberos auth for LDAP connection"
 msgstr ""
 
-#: config/SSSDConfig.py:128
+#: src/config/SSSDConfig.py:128
 msgid "Follow LDAP referrals"
 msgstr ""
 
-#: config/SSSDConfig.py:129
+#: src/config/SSSDConfig.py:129
 msgid "Lifetime of TGT for LDAP connection"
 msgstr ""
 
-#: config/SSSDConfig.py:132
+#: src/config/SSSDConfig.py:132
 msgid "Length of time to wait for a search request"
 msgstr ""
 
-#: config/SSSDConfig.py:133
+#: src/config/SSSDConfig.py:133
 msgid "Length of time between enumeration updates"
 msgstr ""
 
-#: config/SSSDConfig.py:134
+#: src/config/SSSDConfig.py:134
 msgid "Require TLS for ID lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:135
+#: src/config/SSSDConfig.py:135
 msgid "Base DN for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:136
+#: src/config/SSSDConfig.py:136
 msgid "Scope of user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:137
+#: src/config/SSSDConfig.py:137
 msgid "Filter for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:138
+#: src/config/SSSDConfig.py:138
 msgid "Objectclass for users"
 msgstr ""
 
-#: config/SSSDConfig.py:139
+#: src/config/SSSDConfig.py:139
 msgid "Username attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:140
+#: src/config/SSSDConfig.py:140
 msgid "UID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:141
+#: src/config/SSSDConfig.py:141
 msgid "Primary GID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:142
+#: src/config/SSSDConfig.py:142
 msgid "GECOS attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:143
+#: src/config/SSSDConfig.py:143
 msgid "Home directory attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:144
+#: src/config/SSSDConfig.py:144
 msgid "Shell attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:145
+#: src/config/SSSDConfig.py:145
 msgid "UUID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:146
+#: src/config/SSSDConfig.py:146
 msgid "User principal attribute (for Kerberos)"
 msgstr ""
 
-#: config/SSSDConfig.py:147
+#: src/config/SSSDConfig.py:147
 msgid "Full Name"
 msgstr ""
 
-#: config/SSSDConfig.py:148
+#: src/config/SSSDConfig.py:148
 msgid "memberOf attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:149
+#: src/config/SSSDConfig.py:149
 msgid "Modification time attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:152
+#: src/config/SSSDConfig.py:152
 msgid "Policy to evaluate the password expiration"
 msgstr ""
 
-#: config/SSSDConfig.py:155
+#: src/config/SSSDConfig.py:155
 msgid "LDAP filter to determine access privileges"
 msgstr ""
 
-#: config/SSSDConfig.py:158
+#: src/config/SSSDConfig.py:158
 msgid "Comma separated list of allowed users"
 msgstr ""
 
-#: config/SSSDConfig.py:159
+#: src/config/SSSDConfig.py:159
 msgid "Comma separated list of prohibited users"
 msgstr ""
 
-#: config/SSSDConfig.py:162
+#: src/config/SSSDConfig.py:162
 msgid "Default shell, /bin/bash"
 msgstr ""
 
-#: config/SSSDConfig.py:163
+#: src/config/SSSDConfig.py:163
 msgid "Base for home directories"
 msgstr ""
 
-#: config/SSSDConfig.py:166
+#: src/config/SSSDConfig.py:166
 msgid "The name of the NSS library to use"
 msgstr ""
 
-#: config/SSSDConfig.py:169
+#: src/config/SSSDConfig.py:169
 msgid "PAM stack to use"
 msgstr ""
 
-#: monitor/monitor.c:2137
+#: src/monitor/monitor.c:2140
 msgid "Become a daemon (default)"
 msgstr ""
 
-#: monitor/monitor.c:2139
+#: src/monitor/monitor.c:2142
 msgid "Run interactive (not a daemon)"
 msgstr ""
 
-#: monitor/monitor.c:2141
+#: src/monitor/monitor.c:2144
 msgid "Specify a non-default config file"
 msgstr ""
 
-#: monitor/monitor.c:2167
+#: src/monitor/monitor.c:2170
 msgid "sssd must be run as root\n"
 msgstr ""
 
-#: monitor/monitor.c:2202
+#: src/monitor/monitor.c:2205
 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:2212
+#: src/monitor/monitor.c:2215
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
 "file is owned by root.root\n"
 msgstr ""
 
-#: monitor/monitor.c:2217
+#: src/monitor/monitor.c:2220
 msgid "Cannot load configuration database\n"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:993 providers/ldap/ldap_child.c:361
-#: util/util.h:61
+#: src/providers/krb5/krb5_child.c:1043 src/providers/ldap/ldap_child.c:359
+#: src/util/util.h:63
 msgid "Debug level"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:995 providers/ldap/ldap_child.c:363
-#: util/util.h:65
+#: src/providers/krb5/krb5_child.c:1045 src/providers/ldap/ldap_child.c:361
+#: src/util/util.h:67
 msgid "Add debug timestamps"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:997 providers/ldap/ldap_child.c:365
+#: src/providers/krb5/krb5_child.c:1047 src/providers/ldap/ldap_child.c:363
 msgid "An open file descriptor for the debug logs"
 msgstr ""
 
-#: providers/data_provider_be.c:1165
+#: src/providers/data_provider_be.c:1165
 msgid "Domain of the information provider (mandatory)"
 msgstr ""
 
-#: sss_client/common.c:742
+#: src/sss_client/common.c:742
 msgid "Privileged socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:745
+#: src/sss_client/common.c:745
 msgid "Public socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:748
+#: src/sss_client/common.c:748
 msgid "Unexpected format of the server credential message."
 msgstr ""
 
-#: sss_client/common.c:751
+#: src/sss_client/common.c:751
 msgid "SSSD is not run by root."
 msgstr ""
 
-#: sss_client/common.c:756
+#: src/sss_client/common.c:756
 msgid "An error occurred, but no description can be found."
 msgstr ""
 
-#: sss_client/common.c:762
+#: src/sss_client/common.c:762
 msgid "Unexpected error while looking for an error description"
 msgstr ""
 
-#: sss_client/pam_sss.c:372
+#: src/sss_client/pam_sss.c:372
 msgid "Passwords do not match"
 msgstr ""
 
-#: sss_client/pam_sss.c:556
+#: src/sss_client/pam_sss.c:556
 msgid "Password reset by root is not supported."
 msgstr ""
 
-#: sss_client/pam_sss.c:597
+#: src/sss_client/pam_sss.c:597
 msgid "Authenticated with cached credentials"
 msgstr ""
 
-#: sss_client/pam_sss.c:598
+#: src/sss_client/pam_sss.c:598
 msgid ", your cached password will expire at: "
 msgstr ""
 
-#: sss_client/pam_sss.c:628
+#: src/sss_client/pam_sss.c:628
 #, c-format
 msgid "Your password has expired. You have %d grace login(s) remaining."
 msgstr ""
 
-#: sss_client/pam_sss.c:674
+#: src/sss_client/pam_sss.c:674
 #, c-format
 msgid "Your password will expire in %d %s."
 msgstr ""
 
-#: sss_client/pam_sss.c:723
+#: src/sss_client/pam_sss.c:723
 msgid "Authentication is denied until: "
 msgstr ""
 
-#: sss_client/pam_sss.c:750
+#: src/sss_client/pam_sss.c:750
 msgid "System is offline, password change not possible"
 msgstr ""
 
-#: sss_client/pam_sss.c:780 sss_client/pam_sss.c:793
+#: src/sss_client/pam_sss.c:780 src/sss_client/pam_sss.c:793
 msgid "Password change failed. "
 msgstr ""
 
-#: sss_client/pam_sss.c:783 sss_client/pam_sss.c:794
+#: src/sss_client/pam_sss.c:783 src/sss_client/pam_sss.c:794
 msgid "Server message: "
 msgstr ""
 
-#: sss_client/pam_sss.c:1197
+#: src/sss_client/pam_sss.c:1197
 msgid "New Password: "
 msgstr ""
 
-#: sss_client/pam_sss.c:1198
+#: src/sss_client/pam_sss.c:1198
 msgid "Reenter new Password: "
 msgstr ""
 
-#: sss_client/pam_sss.c:1280
+#: src/sss_client/pam_sss.c:1280
 msgid "Password: "
 msgstr ""
 
-#: sss_client/pam_sss.c:1312
+#: src/sss_client/pam_sss.c:1312
 msgid "Current Password: "
 msgstr ""
 
-#: sss_client/pam_sss.c:1458
+#: src/sss_client/pam_sss.c:1458
 msgid "Password expired. Change your password now."
 msgstr ""
 
-#: tools/sss_useradd.c:48 tools/sss_groupadd.c:41 tools/sss_groupdel.c:43
-#: tools/sss_groupmod.c:42 tools/sss_groupshow.c:620 tools/sss_userdel.c:131
-#: tools/sss_usermod.c:47
+#: src/tools/sss_useradd.c:48 src/tools/sss_groupadd.c:41
+#: src/tools/sss_groupdel.c:43 src/tools/sss_groupmod.c:42
+#: src/tools/sss_groupshow.c:620 src/tools/sss_userdel.c:131
+#: src/tools/sss_usermod.c:47
 msgid "The debug level to run with"
 msgstr ""
 
-#: tools/sss_useradd.c:49 tools/sss_usermod.c:48
+#: src/tools/sss_useradd.c:49 src/tools/sss_usermod.c:48
 msgid "The UID of the user"
 msgstr ""
 
-#: tools/sss_useradd.c:50 tools/sss_usermod.c:50
+#: src/tools/sss_useradd.c:50 src/tools/sss_usermod.c:50
 msgid "The comment string"
 msgstr ""
 
-#: tools/sss_useradd.c:51 tools/sss_usermod.c:51
+#: src/tools/sss_useradd.c:51 src/tools/sss_usermod.c:51
 msgid "Home directory"
 msgstr ""
 
-#: tools/sss_useradd.c:52 tools/sss_usermod.c:52
+#: src/tools/sss_useradd.c:52 src/tools/sss_usermod.c:52
 msgid "Login shell"
 msgstr ""
 
-#: tools/sss_useradd.c:53
+#: src/tools/sss_useradd.c:53
 msgid "Groups"
 msgstr ""
 
-#: tools/sss_useradd.c:54
+#: src/tools/sss_useradd.c:54
 msgid "Create user's directory if it does not exist"
 msgstr ""
 
-#: tools/sss_useradd.c:55
+#: src/tools/sss_useradd.c:55
 msgid "Never create user's directory, overrides config"
 msgstr ""
 
-#: tools/sss_useradd.c:56
+#: src/tools/sss_useradd.c:56
 msgid "Specify an alternative skeleton directory"
 msgstr ""
 
-#: tools/sss_useradd.c:57 tools/sss_usermod.c:57
+#: src/tools/sss_useradd.c:57 src/tools/sss_usermod.c:57
 msgid "The SELinux user for user's login"
 msgstr ""
 
-#: tools/sss_useradd.c:71 tools/sss_groupadd.c:56 tools/sss_groupdel.c:52
-#: tools/sss_groupmod.c:63 tools/sss_groupshow.c:631 tools/sss_userdel.c:148
-#: tools/sss_usermod.c:72
+#: src/tools/sss_useradd.c:71 src/tools/sss_groupadd.c:56
+#: src/tools/sss_groupdel.c:52 src/tools/sss_groupmod.c:63
+#: src/tools/sss_groupshow.c:631 src/tools/sss_userdel.c:148
+#: src/tools/sss_usermod.c:72
 msgid "Error setting the locale\n"
 msgstr ""
 
-#: tools/sss_useradd.c:107
+#: src/tools/sss_useradd.c:84 src/tools/sss_groupmod.c:76
+#: src/tools/sss_usermod.c:85
+msgid "Specify group to add to\n"
+msgstr ""
+
+#: src/tools/sss_useradd.c:108
 msgid "Specify user to add\n"
 msgstr ""
 
-#: tools/sss_useradd.c:118 tools/sss_groupadd.c:86 tools/sss_groupdel.c:81
-#: tools/sss_groupmod.c:111 tools/sss_groupshow.c:668 tools/sss_userdel.c:197
-#: tools/sss_usermod.c:128
+#: src/tools/sss_useradd.c:117 src/tools/sss_groupadd.c:82
+#: src/tools/sss_groupdel.c:77 src/tools/sss_groupmod.c:109
+#: src/tools/sss_groupshow.c:664 src/tools/sss_userdel.c:193
+#: src/tools/sss_usermod.c:126
 msgid "Error initializing the tools - no local domain\n"
 msgstr ""
 
-#: tools/sss_useradd.c:120 tools/sss_groupadd.c:88 tools/sss_groupdel.c:83
-#: tools/sss_groupmod.c:113 tools/sss_groupshow.c:670 tools/sss_userdel.c:199
-#: tools/sss_usermod.c:130
+#: src/tools/sss_useradd.c:119 src/tools/sss_groupadd.c:84
+#: src/tools/sss_groupdel.c:79 src/tools/sss_groupmod.c:111
+#: src/tools/sss_groupshow.c:666 src/tools/sss_userdel.c:195
+#: src/tools/sss_usermod.c:128
 msgid "Error initializing the tools\n"
 msgstr ""
 
-#: tools/sss_useradd.c:129 tools/sss_groupadd.c:97 tools/sss_groupdel.c:92
-#: tools/sss_groupmod.c:121 tools/sss_groupshow.c:679 tools/sss_userdel.c:208
-#: tools/sss_usermod.c:139
+#: src/tools/sss_useradd.c:128 src/tools/sss_groupadd.c:93
+#: src/tools/sss_groupdel.c:88 src/tools/sss_groupmod.c:119
+#: src/tools/sss_groupshow.c:675 src/tools/sss_userdel.c:204
+#: src/tools/sss_usermod.c:137
 msgid "Invalid domain specified in FQDN\n"
 msgstr ""
 
-#: tools/sss_useradd.c:138 tools/sss_groupmod.c:143 tools/sss_groupmod.c:170
-#: tools/sss_usermod.c:164 tools/sss_usermod.c:191
+#: src/tools/sss_useradd.c:137 src/tools/sss_groupmod.c:141
+#: src/tools/sss_groupmod.c:168 src/tools/sss_usermod.c:162
+#: src/tools/sss_usermod.c:189
 msgid "Internal error while parsing parameters\n"
 msgstr ""
 
-#: tools/sss_useradd.c:146 tools/sss_usermod.c:172 tools/sss_usermod.c:199
+#: src/tools/sss_useradd.c:145 src/tools/sss_usermod.c:170
+#: src/tools/sss_usermod.c:197
 msgid "Groups must be in the same domain as user\n"
 msgstr ""
 
-#: tools/sss_useradd.c:154
+#: src/tools/sss_useradd.c:153
 #, c-format
 msgid "Cannot find group %s in local domain\n"
 msgstr ""
 
-#: tools/sss_useradd.c:169 tools/sss_userdel.c:218
+#: src/tools/sss_useradd.c:168 src/tools/sss_userdel.c:214
 msgid "Cannot set default values\n"
 msgstr ""
 
-#: tools/sss_useradd.c:176 tools/sss_usermod.c:155
+#: src/tools/sss_useradd.c:175 src/tools/sss_usermod.c:153
 msgid "The selected UID is outside the allowed range\n"
 msgstr ""
 
-#: tools/sss_useradd.c:203 tools/sss_usermod.c:240
+#: src/tools/sss_useradd.c:202 src/tools/sss_usermod.c:238
 msgid "Cannot set SELinux login context\n"
 msgstr ""
 
-#: tools/sss_useradd.c:219
+#: src/tools/sss_useradd.c:218
 msgid "Cannot get info about the user\n"
 msgstr ""
 
-#: tools/sss_useradd.c:233
+#: src/tools/sss_useradd.c:232
 msgid "User's home directory already exists, not copying data from skeldir\n"
 msgstr ""
 
-#: tools/sss_useradd.c:236
+#: src/tools/sss_useradd.c:235
 #, c-format
 msgid "Cannot create user's home directory: %s\n"
 msgstr ""
 
-#: tools/sss_useradd.c:247
+#: src/tools/sss_useradd.c:246
 #, c-format
 msgid "Cannot create user's mail spool: %s\n"
 msgstr ""
 
-#: tools/sss_useradd.c:259
+#: src/tools/sss_useradd.c:258
 msgid "Could not allocate ID for the user - domain full?\n"
 msgstr ""
 
-#: tools/sss_useradd.c:263
+#: src/tools/sss_useradd.c:262
 msgid "A user or group with the same name or ID already exists\n"
 msgstr ""
 
-#: tools/sss_useradd.c:269
+#: src/tools/sss_useradd.c:268
 msgid "Transaction error. Could not add user.\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:43 tools/sss_groupmod.c:48
+#: src/tools/sss_groupadd.c:43 src/tools/sss_groupmod.c:48
 msgid "The GID of the group"
 msgstr ""
 
-#: tools/sss_groupadd.c:75
+#: src/tools/sss_groupadd.c:73
 msgid "Specify group to add\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:106 tools/sss_groupmod.c:194
+#: src/tools/sss_groupadd.c:102 src/tools/sss_groupmod.c:192
 msgid "The selected GID is outside the allowed range\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:131
+#: src/tools/sss_groupadd.c:127
 msgid "Could not allocate ID for the group - domain full?\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:135
+#: src/tools/sss_groupadd.c:131
 msgid "A group with the same name or GID already exists\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:140
+#: src/tools/sss_groupadd.c:136
 msgid "Transaction error. Could not add group.\n"
 msgstr ""
 
-#: tools/sss_groupdel.c:70
+#: src/tools/sss_groupdel.c:68
 msgid "Specify group to delete\n"
 msgstr ""
 
-#: tools/sss_groupdel.c:107
+#: src/tools/sss_groupdel.c:103
 #, c-format
 msgid "Group %s is outside the defined ID range for domain\n"
 msgstr ""
 
-#: tools/sss_groupdel.c:121
+#: src/tools/sss_groupdel.c:117
 msgid ""
 "No such group in local domain. Removing groups only allowed in local "
 "domain.\n"
 msgstr ""
 
-#: tools/sss_groupdel.c:126
+#: src/tools/sss_groupdel.c:122
 msgid "Internal error. Could not remove group.\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:44
+#: src/tools/sss_groupmod.c:44
 msgid "Groups to add this group to"
 msgstr ""
 
-#: tools/sss_groupmod.c:46
+#: src/tools/sss_groupmod.c:46
 msgid "Groups to remove this group from"
 msgstr ""
 
-#: tools/sss_groupmod.c:98
+#: src/tools/sss_groupmod.c:84 src/tools/sss_usermod.c:93
+msgid "Specify group to remove from\n"
+msgstr ""
+
+#: src/tools/sss_groupmod.c:98
 msgid "Specify group to modify\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:130
+#: src/tools/sss_groupmod.c:128
 msgid ""
 "Cannot find group in local domain, modifying groups is allowed only in local "
 "domain\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:151 tools/sss_groupmod.c:178
+#: src/tools/sss_groupmod.c:149 src/tools/sss_groupmod.c:176
 msgid "Member groups must be in the same domain as parent group\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:159 tools/sss_groupmod.c:186 tools/sss_usermod.c:180
-#: tools/sss_usermod.c:207
+#: src/tools/sss_groupmod.c:157 src/tools/sss_groupmod.c:184
+#: src/tools/sss_usermod.c:178 src/tools/sss_usermod.c:205
 #, c-format
 msgid ""
 "Cannot find group %s in local domain, only groups in local domain are "
 "allowed\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:220
+#: src/tools/sss_groupmod.c:218
 msgid "Could not modify group - check if member group names are correct\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:224
+#: src/tools/sss_groupmod.c:222
 msgid "Could not modify group - check if groupname is correct\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:228
+#: src/tools/sss_groupmod.c:226
 msgid "Transaction error. Could not modify group.\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:567
+#: src/tools/sss_groupshow.c:567
 #, c-format
 msgid "%s%sGroup: %s\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:568
+#: src/tools/sss_groupshow.c:568
 msgid "Magic Private "
 msgstr ""
 
-#: tools/sss_groupshow.c:570
+#: src/tools/sss_groupshow.c:570
 #, c-format
 msgid "%sGID number: %d\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:572
+#: src/tools/sss_groupshow.c:572
 #, c-format
 msgid "%sMember users: "
 msgstr ""
 
-#: tools/sss_groupshow.c:579
+#: src/tools/sss_groupshow.c:579
 #, c-format
 msgid ""
 "\n"
 "%sIs a member of: "
 msgstr ""
 
-#: tools/sss_groupshow.c:586
+#: src/tools/sss_groupshow.c:586
 #, c-format
 msgid ""
 "\n"
 "%sMember groups: "
 msgstr ""
 
-#: tools/sss_groupshow.c:622
+#: src/tools/sss_groupshow.c:622
 msgid "Print indirect group members recursively"
 msgstr ""
 
-#: tools/sss_groupshow.c:657
+#: src/tools/sss_groupshow.c:655
 msgid "Specify group to show\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:698
+#: src/tools/sss_groupshow.c:694
 msgid ""
 "No such group in local domain. Printing groups only allowed in local "
 "domain.\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:703
+#: src/tools/sss_groupshow.c:699
 msgid "Internal error. Could not print group.\n"
 msgstr ""
 
-#: tools/sss_userdel.c:133
+#: src/tools/sss_userdel.c:133
 msgid "Remove home directory and mail spool"
 msgstr ""
 
-#: tools/sss_userdel.c:135
+#: src/tools/sss_userdel.c:135
 msgid "Do not remove home directory and mail spool"
 msgstr ""
 
-#: tools/sss_userdel.c:137
+#: src/tools/sss_userdel.c:137
 msgid "Force removal of files not owned by the user"
 msgstr ""
 
-#: tools/sss_userdel.c:139
+#: src/tools/sss_userdel.c:139
 msgid "Kill users' processes before removing him"
 msgstr ""
 
-#: tools/sss_userdel.c:186
+#: src/tools/sss_userdel.c:184
 msgid "Specify user to delete\n"
 msgstr ""
 
-#: tools/sss_userdel.c:235
+#: src/tools/sss_userdel.c:231
 #, c-format
 msgid "User %s is outside the defined ID range for domain\n"
 msgstr ""
 
-#: tools/sss_userdel.c:260
+#: src/tools/sss_userdel.c:256
 msgid "Cannot reset SELinux login context\n"
 msgstr ""
 
-#: tools/sss_userdel.c:272
+#: src/tools/sss_userdel.c:268
 #, c-format
 msgid "WARNING: The user (uid %lu) was still logged in when deleted.\n"
 msgstr ""
 
-#: tools/sss_userdel.c:277
+#: src/tools/sss_userdel.c:273
 msgid "Cannot determine if the user was logged in on this platform"
 msgstr ""
 
-#: tools/sss_userdel.c:282
+#: src/tools/sss_userdel.c:278
 msgid "Error while checking if the user was logged in\n"
 msgstr ""
 
-#: tools/sss_userdel.c:289
+#: src/tools/sss_userdel.c:285
 #, c-format
 msgid "The post-delete command failed: %s\n"
 msgstr ""
 
-#: tools/sss_userdel.c:301
+#: src/tools/sss_userdel.c:297
 msgid "Not removing home dir - not owned by user\n"
 msgstr ""
 
-#: tools/sss_userdel.c:303
+#: src/tools/sss_userdel.c:299
 #, c-format
 msgid "Cannot remove homedir: %s\n"
 msgstr ""
 
-#: tools/sss_userdel.c:314
+#: src/tools/sss_userdel.c:310
 msgid ""
 "No such user in local domain. Removing users only allowed in local domain.\n"
 msgstr ""
 
-#: tools/sss_userdel.c:319
+#: src/tools/sss_userdel.c:315
 msgid "Internal error. Could not remove user.\n"
 msgstr ""
 
-#: tools/sss_usermod.c:49
+#: src/tools/sss_usermod.c:49
 msgid "The GID of the user"
 msgstr ""
 
-#: tools/sss_usermod.c:53
+#: src/tools/sss_usermod.c:53
 msgid "Groups to add this user to"
 msgstr ""
 
-#: tools/sss_usermod.c:54
+#: src/tools/sss_usermod.c:54
 msgid "Groups to remove this user from"
 msgstr ""
 
-#: tools/sss_usermod.c:55
+#: src/tools/sss_usermod.c:55
 msgid "Lock the account"
 msgstr ""
 
-#: tools/sss_usermod.c:56
+#: src/tools/sss_usermod.c:56
 msgid "Unlock the account"
 msgstr ""
 
-#: tools/sss_usermod.c:117
+#: src/tools/sss_usermod.c:117
 msgid "Specify user to modify\n"
 msgstr ""
 
-#: tools/sss_usermod.c:148
+#: src/tools/sss_usermod.c:146
 msgid ""
 "Cannot find user in local domain, modifying users is allowed only in local "
 "domain\n"
 msgstr ""
 
-#: tools/sss_usermod.c:250
+#: src/tools/sss_usermod.c:248
 msgid "Could not modify user - check if group names are correct\n"
 msgstr ""
 
-#: tools/sss_usermod.c:254
+#: src/tools/sss_usermod.c:252
 msgid "Could not modify user - user already member of groups?\n"
 msgstr ""
 
-#: tools/sss_usermod.c:258
+#: src/tools/sss_usermod.c:256
 msgid "Transaction error. Could not modify user.\n"
 msgstr ""
 
-#: tools/tools_util.c:285
+#: src/tools/tools_util.c:290
 msgid "Out of memory\n"
 msgstr ""
 
-#: tools/tools_util.h:34
+#: src/tools/tools_util.h:40
 #, c-format
 msgid "%s must be run as root\n"
 msgstr ""
 
-#: util/util.h:63
+#: src/util/util.h:65
 msgid "Send the debug output to files instead of stderr"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 92fe1560..f650f023 100644
--- a/po/nl.po
+++ b/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-08-03 18:24-0400\n"
+"POT-Creation-Date: 2010-10-18 13:14-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"
@@ -18,906 +18,922 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: config/SSSDConfig.py:39
+#: src/config/SSSDConfig.py:39
 msgid "Set the verbosity of the debug logging"
 msgstr ""
 
-#: config/SSSDConfig.py:40
+#: src/config/SSSDConfig.py:40
 msgid "Include timestamps in debug logs"
 msgstr ""
 
-#: config/SSSDConfig.py:41
+#: src/config/SSSDConfig.py:41
 msgid "Write debug messages to logfiles"
 msgstr ""
 
-#: config/SSSDConfig.py:42
+#: src/config/SSSDConfig.py:42
 msgid "Ping timeout before restarting service"
 msgstr ""
 
-#: config/SSSDConfig.py:43
+#: src/config/SSSDConfig.py:43
 msgid "Command to start service"
 msgstr ""
 
-#: config/SSSDConfig.py:44
+#: src/config/SSSDConfig.py:44
 msgid "Number of times to attempt connection to Data Providers"
 msgstr ""
 
-#: config/SSSDConfig.py:47
+#: src/config/SSSDConfig.py:47
 msgid "SSSD Services to start"
 msgstr ""
 
-#: config/SSSDConfig.py:48
+#: src/config/SSSDConfig.py:48
 msgid "SSSD Domains to start"
 msgstr ""
 
-#: config/SSSDConfig.py:49
+#: src/config/SSSDConfig.py:49
 msgid "Timeout for messages sent over the SBUS"
 msgstr ""
 
-#: config/SSSDConfig.py:50
+#: src/config/SSSDConfig.py:50
 msgid "Regex to parse username and domain"
 msgstr ""
 
-#: config/SSSDConfig.py:51
+#: src/config/SSSDConfig.py:51
 msgid "Printf-compatible format for displaying fully-qualified names"
 msgstr ""
 
-#: config/SSSDConfig.py:54
+#: src/config/SSSDConfig.py:54
 msgid "Enumeration cache timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:55
+#: src/config/SSSDConfig.py:55
 msgid "Entry cache background update timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:56
+#: src/config/SSSDConfig.py:56
 msgid "Negative cache timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:57
+#: src/config/SSSDConfig.py:57
 msgid "Users that SSSD should explicitly ignore"
 msgstr ""
 
-#: config/SSSDConfig.py:58
+#: src/config/SSSDConfig.py:58
 msgid "Groups that SSSD should explicitly ignore"
 msgstr ""
 
-#: config/SSSDConfig.py:59
+#: src/config/SSSDConfig.py:59
 msgid "Should filtered users appear in groups"
 msgstr ""
 
-#: config/SSSDConfig.py:60
+#: src/config/SSSDConfig.py:60
 msgid "The value of the password field the NSS provider should return"
 msgstr ""
 
-#: config/SSSDConfig.py:63
+#: src/config/SSSDConfig.py:63
 msgid "How long to allow cached logins between online logins (days)"
 msgstr ""
 
-#: config/SSSDConfig.py:64
+#: src/config/SSSDConfig.py:64
 msgid "How many failed logins attempts are allowed when offline"
 msgstr ""
 
-#: config/SSSDConfig.py:65
+#: src/config/SSSDConfig.py:65
 msgid ""
 "How long (minutes) to deny login after offline_failed_login_attempts has "
 "been reached"
 msgstr ""
 
-#: config/SSSDConfig.py:68
+#: src/config/SSSDConfig.py:68
 msgid "Identity provider"
 msgstr ""
 
-#: config/SSSDConfig.py:69
+#: src/config/SSSDConfig.py:69
 msgid "Authentication provider"
 msgstr ""
 
-#: config/SSSDConfig.py:70
+#: src/config/SSSDConfig.py:70
 msgid "Access control provider"
 msgstr ""
 
-#: config/SSSDConfig.py:71
+#: src/config/SSSDConfig.py:71
 msgid "Password change provider"
 msgstr ""
 
-#: config/SSSDConfig.py:74
+#: src/config/SSSDConfig.py:74
 msgid "Minimum user ID"
 msgstr ""
 
-#: config/SSSDConfig.py:75
+#: src/config/SSSDConfig.py:75
 msgid "Maximum user ID"
 msgstr ""
 
-#: config/SSSDConfig.py:76
+#: src/config/SSSDConfig.py:76
 msgid "Ping timeout before restarting domain"
 msgstr ""
 
-#: config/SSSDConfig.py:77
+#: src/config/SSSDConfig.py:77
 msgid "Enable enumerating all users/groups"
 msgstr ""
 
-#: config/SSSDConfig.py:78
+#: src/config/SSSDConfig.py:78
 msgid "Cache credentials for offline login"
 msgstr ""
 
-#: config/SSSDConfig.py:79
+#: src/config/SSSDConfig.py:79
 msgid "Store password hashes"
 msgstr ""
 
-#: config/SSSDConfig.py:80
+#: src/config/SSSDConfig.py:80
 msgid "Display users/groups in fully-qualified form"
 msgstr ""
 
-#: config/SSSDConfig.py:81
+#: src/config/SSSDConfig.py:81
 msgid "Entry cache timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:82
+#: src/config/SSSDConfig.py:82
 msgid ""
 "Restrict or prefer a specific address family when performing DNS lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:83
+#: src/config/SSSDConfig.py:83
 msgid "How long to keep cached entries after last successful login (days)"
 msgstr ""
 
-#: config/SSSDConfig.py:84
+#: src/config/SSSDConfig.py:84
 msgid "How long to wait for replies from DNS when resolving servers (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:85
+#: src/config/SSSDConfig.py:85
 msgid "The domain part of service discovery DNS query"
 msgstr ""
 
-#: config/SSSDConfig.py:88
+#: src/config/SSSDConfig.py:88
 msgid "IPA domain"
 msgstr ""
 
-#: config/SSSDConfig.py:89
+#: src/config/SSSDConfig.py:89
 msgid "IPA server address"
 msgstr ""
 
-#: config/SSSDConfig.py:90
+#: src/config/SSSDConfig.py:90
 msgid "IPA client hostname"
 msgstr ""
 
-#: config/SSSDConfig.py:91
+#: src/config/SSSDConfig.py:91
 msgid "Whether to automatically update the client's DNS entry in FreeIPA"
 msgstr ""
 
-#: config/SSSDConfig.py:92
+#: src/config/SSSDConfig.py:92
 msgid "The interface whose IP should be used for dynamic DNS updates"
 msgstr ""
 
-#: config/SSSDConfig.py:95 config/SSSDConfig.py:124
+#: src/config/SSSDConfig.py:95 src/config/SSSDConfig.py:124
 msgid "Kerberos server address"
 msgstr ""
 
-#: config/SSSDConfig.py:96 config/SSSDConfig.py:125
+#: src/config/SSSDConfig.py:96 src/config/SSSDConfig.py:125
 msgid "Kerberos realm"
 msgstr ""
 
-#: config/SSSDConfig.py:97
+#: src/config/SSSDConfig.py:97
 msgid "Authentication timeout"
 msgstr ""
 
-#: config/SSSDConfig.py:100
+#: src/config/SSSDConfig.py:100
 msgid "Directory to store credential caches"
 msgstr ""
 
-#: config/SSSDConfig.py:101
+#: src/config/SSSDConfig.py:101
 msgid "Location of the user's credential cache"
 msgstr ""
 
-#: config/SSSDConfig.py:102
+#: src/config/SSSDConfig.py:102
 msgid "Location of the keytab to validate credentials"
 msgstr ""
 
-#: config/SSSDConfig.py:103
+#: src/config/SSSDConfig.py:103
 msgid "Enable credential validation"
 msgstr ""
 
-#: config/SSSDConfig.py:104
+#: src/config/SSSDConfig.py:104
 msgid "Store password if offline for later online authentication"
 msgstr ""
 
-#: config/SSSDConfig.py:107
+#: src/config/SSSDConfig.py:107
 msgid "Server where the change password service is running if not on the KDC"
 msgstr ""
 
-#: config/SSSDConfig.py:110
+#: src/config/SSSDConfig.py:110
 msgid "ldap_uri, The URI of the LDAP server"
 msgstr ""
 
-#: config/SSSDConfig.py:111
+#: src/config/SSSDConfig.py:111
 msgid "The default base DN"
 msgstr ""
 
-#: config/SSSDConfig.py:112
+#: src/config/SSSDConfig.py:112
 msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr ""
 
-#: config/SSSDConfig.py:113
+#: src/config/SSSDConfig.py:113
 msgid "The default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:114
+#: src/config/SSSDConfig.py:114
 msgid "The type of the authentication token of the default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:115
+#: src/config/SSSDConfig.py:115
 msgid "The authentication token of the default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:116
+#: src/config/SSSDConfig.py:116
 msgid "Length of time to attempt connection"
 msgstr ""
 
-#: config/SSSDConfig.py:117
+#: src/config/SSSDConfig.py:117
 msgid "Length of time to attempt synchronous LDAP operations"
 msgstr ""
 
-#: config/SSSDConfig.py:118
+#: src/config/SSSDConfig.py:118
 msgid "Length of time between attempts to reconnect while offline"
 msgstr ""
 
-#: config/SSSDConfig.py:119
+#: src/config/SSSDConfig.py:119
 msgid "File that contains CA certificates"
 msgstr ""
 
-#: config/SSSDConfig.py:120
+#: src/config/SSSDConfig.py:120
 msgid "Path to CA certificate directory"
 msgstr ""
 
-#: config/SSSDConfig.py:121
+#: src/config/SSSDConfig.py:121
 msgid "Require TLS certificate verification"
 msgstr ""
 
-#: config/SSSDConfig.py:122
+#: src/config/SSSDConfig.py:122
 msgid "Specify the sasl mechanism to use"
 msgstr ""
 
-#: config/SSSDConfig.py:123
+#: src/config/SSSDConfig.py:123
 msgid "Specify the sasl authorization id to use"
 msgstr ""
 
-#: config/SSSDConfig.py:126
+#: src/config/SSSDConfig.py:126
 msgid "Kerberos service keytab"
 msgstr ""
 
-#: config/SSSDConfig.py:127
+#: src/config/SSSDConfig.py:127
 msgid "Use Kerberos auth for LDAP connection"
 msgstr ""
 
-#: config/SSSDConfig.py:128
+#: src/config/SSSDConfig.py:128
 msgid "Follow LDAP referrals"
 msgstr ""
 
-#: config/SSSDConfig.py:129
+#: src/config/SSSDConfig.py:129
 msgid "Lifetime of TGT for LDAP connection"
 msgstr ""
 
-#: config/SSSDConfig.py:132
+#: src/config/SSSDConfig.py:132
 msgid "Length of time to wait for a search request"
 msgstr ""
 
-#: config/SSSDConfig.py:133
+#: src/config/SSSDConfig.py:133
 msgid "Length of time between enumeration updates"
 msgstr ""
 
-#: config/SSSDConfig.py:134
+#: src/config/SSSDConfig.py:134
 msgid "Require TLS for ID lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:135
+#: src/config/SSSDConfig.py:135
 msgid "Base DN for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:136
+#: src/config/SSSDConfig.py:136
 msgid "Scope of user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:137
+#: src/config/SSSDConfig.py:137
 msgid "Filter for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:138
+#: src/config/SSSDConfig.py:138
 msgid "Objectclass for users"
 msgstr ""
 
-#: config/SSSDConfig.py:139
+#: src/config/SSSDConfig.py:139
 msgid "Username attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:140
+#: src/config/SSSDConfig.py:140
 msgid "UID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:141
+#: src/config/SSSDConfig.py:141
 msgid "Primary GID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:142
+#: src/config/SSSDConfig.py:142
 msgid "GECOS attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:143
+#: src/config/SSSDConfig.py:143
 msgid "Home directory attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:144
+#: src/config/SSSDConfig.py:144
 msgid "Shell attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:145
+#: src/config/SSSDConfig.py:145
 msgid "UUID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:146
+#: src/config/SSSDConfig.py:146
 msgid "User principal attribute (for Kerberos)"
 msgstr ""
 
-#: config/SSSDConfig.py:147
+#: src/config/SSSDConfig.py:147
 msgid "Full Name"
 msgstr ""
 
-#: config/SSSDConfig.py:148
+#: src/config/SSSDConfig.py:148
 msgid "memberOf attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:149
+#: src/config/SSSDConfig.py:149
 msgid "Modification time attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:152
+#: src/config/SSSDConfig.py:152
 msgid "Policy to evaluate the password expiration"
 msgstr ""
 
-#: config/SSSDConfig.py:155
+#: src/config/SSSDConfig.py:155
 msgid "LDAP filter to determine access privileges"
 msgstr ""
 
-#: config/SSSDConfig.py:158
+#: src/config/SSSDConfig.py:158
 msgid "Comma separated list of allowed users"
 msgstr ""
 
-#: config/SSSDConfig.py:159
+#: src/config/SSSDConfig.py:159
 msgid "Comma separated list of prohibited users"
 msgstr ""
 
-#: config/SSSDConfig.py:162
+#: src/config/SSSDConfig.py:162
 msgid "Default shell, /bin/bash"
 msgstr ""
 
-#: config/SSSDConfig.py:163
+#: src/config/SSSDConfig.py:163
 msgid "Base for home directories"
 msgstr ""
 
-#: config/SSSDConfig.py:166
+#: src/config/SSSDConfig.py:166
 msgid "The name of the NSS library to use"
 msgstr ""
 
-#: config/SSSDConfig.py:169
+#: src/config/SSSDConfig.py:169
 msgid "PAM stack to use"
 msgstr ""
 
-#: monitor/monitor.c:2137
+#: src/monitor/monitor.c:2140
 msgid "Become a daemon (default)"
 msgstr ""
 
-#: monitor/monitor.c:2139
+#: src/monitor/monitor.c:2142
 msgid "Run interactive (not a daemon)"
 msgstr ""
 
-#: monitor/monitor.c:2141
+#: src/monitor/monitor.c:2144
 msgid "Specify a non-default config file"
 msgstr ""
 
-#: monitor/monitor.c:2167
+#: src/monitor/monitor.c:2170
 msgid "sssd must be run as root\n"
 msgstr ""
 
-#: monitor/monitor.c:2202
+#: src/monitor/monitor.c:2205
 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:2212
+#: src/monitor/monitor.c:2215
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
 "file is owned by root.root\n"
 msgstr ""
 
-#: monitor/monitor.c:2217
+#: src/monitor/monitor.c:2220
 msgid "Cannot load configuration database\n"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:993 providers/ldap/ldap_child.c:361
-#: util/util.h:61
+#: src/providers/krb5/krb5_child.c:1043 src/providers/ldap/ldap_child.c:359
+#: src/util/util.h:63
 msgid "Debug level"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:995 providers/ldap/ldap_child.c:363
-#: util/util.h:65
+#: src/providers/krb5/krb5_child.c:1045 src/providers/ldap/ldap_child.c:361
+#: src/util/util.h:67
 msgid "Add debug timestamps"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:997 providers/ldap/ldap_child.c:365
+#: src/providers/krb5/krb5_child.c:1047 src/providers/ldap/ldap_child.c:363
 msgid "An open file descriptor for the debug logs"
 msgstr ""
 
-#: providers/data_provider_be.c:1165
+#: src/providers/data_provider_be.c:1165
 msgid "Domain of the information provider (mandatory)"
 msgstr ""
 
-#: sss_client/common.c:742
+#: src/sss_client/common.c:742
 msgid "Privileged socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:745
+#: src/sss_client/common.c:745
 msgid "Public socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:748
+#: src/sss_client/common.c:748
 msgid "Unexpected format of the server credential message."
 msgstr ""
 
-#: sss_client/common.c:751
+#: src/sss_client/common.c:751
 msgid "SSSD is not run by root."
 msgstr ""
 
-#: sss_client/common.c:756
+#: src/sss_client/common.c:756
 msgid "An error occurred, but no description can be found."
 msgstr ""
 
-#: sss_client/common.c:762
+#: src/sss_client/common.c:762
 msgid "Unexpected error while looking for an error description"
 msgstr ""
 
-#: sss_client/pam_sss.c:372
+#: src/sss_client/pam_sss.c:372
 msgid "Passwords do not match"
 msgstr "Wachtwoorden komen niet overeen"
 
-#: sss_client/pam_sss.c:556
+#: src/sss_client/pam_sss.c:556
 msgid "Password reset by root is not supported."
 msgstr ""
 
-#: sss_client/pam_sss.c:597
+#: src/sss_client/pam_sss.c:597
 msgid "Authenticated with cached credentials"
 msgstr ""
 
-#: sss_client/pam_sss.c:598
+#: src/sss_client/pam_sss.c:598
 msgid ", your cached password will expire at: "
 msgstr ""
 
-#: sss_client/pam_sss.c:628
+#: src/sss_client/pam_sss.c:628
 #, c-format
 msgid "Your password has expired. You have %d grace login(s) remaining."
 msgstr ""
 
-#: sss_client/pam_sss.c:674
+#: src/sss_client/pam_sss.c:674
 #, fuzzy, c-format
 msgid "Your password will expire in %d %s."
 msgstr "Wachtwoord is verlopen."
 
-#: sss_client/pam_sss.c:723
+#: src/sss_client/pam_sss.c:723
 msgid "Authentication is denied until: "
 msgstr ""
 
-#: sss_client/pam_sss.c:750
+#: src/sss_client/pam_sss.c:750
 msgid "System is offline, password change not possible"
 msgstr ""
 
-#: sss_client/pam_sss.c:780 sss_client/pam_sss.c:793
+#: src/sss_client/pam_sss.c:780 src/sss_client/pam_sss.c:793
 #, fuzzy
 msgid "Password change failed. "
 msgstr "Wachtwoord is verlopen."
 
-#: sss_client/pam_sss.c:783 sss_client/pam_sss.c:794
+#: src/sss_client/pam_sss.c:783 src/sss_client/pam_sss.c:794
 msgid "Server message: "
 msgstr ""
 
-#: sss_client/pam_sss.c:1197
+#: src/sss_client/pam_sss.c:1197
 msgid "New Password: "
 msgstr "Nieuw Wachtwoord: "
 
-#: sss_client/pam_sss.c:1198
+#: src/sss_client/pam_sss.c:1198
 msgid "Reenter new Password: "
 msgstr "Voer nieuw wachtwoord nogmaals in: "
 
-#: sss_client/pam_sss.c:1280
+#: src/sss_client/pam_sss.c:1280
 msgid "Password: "
 msgstr "Wachtwoord: "
 
-#: sss_client/pam_sss.c:1312
+#: src/sss_client/pam_sss.c:1312
 #, fuzzy
 msgid "Current Password: "
 msgstr "Nieuw Wachtwoord: "
 
-#: sss_client/pam_sss.c:1458
+#: src/sss_client/pam_sss.c:1458
 msgid "Password expired. Change your password now."
 msgstr ""
 
-#: tools/sss_useradd.c:48 tools/sss_groupadd.c:41 tools/sss_groupdel.c:43
-#: tools/sss_groupmod.c:42 tools/sss_groupshow.c:620 tools/sss_userdel.c:131
-#: tools/sss_usermod.c:47
+#: src/tools/sss_useradd.c:48 src/tools/sss_groupadd.c:41
+#: src/tools/sss_groupdel.c:43 src/tools/sss_groupmod.c:42
+#: src/tools/sss_groupshow.c:620 src/tools/sss_userdel.c:131
+#: src/tools/sss_usermod.c:47
 msgid "The debug level to run with"
 msgstr ""
 
-#: tools/sss_useradd.c:49 tools/sss_usermod.c:48
+#: src/tools/sss_useradd.c:49 src/tools/sss_usermod.c:48
 msgid "The UID of the user"
 msgstr ""
 
-#: tools/sss_useradd.c:50 tools/sss_usermod.c:50
+#: src/tools/sss_useradd.c:50 src/tools/sss_usermod.c:50
 msgid "The comment string"
 msgstr ""
 
-#: tools/sss_useradd.c:51 tools/sss_usermod.c:51
+#: src/tools/sss_useradd.c:51 src/tools/sss_usermod.c:51
 msgid "Home directory"
 msgstr ""
 
-#: tools/sss_useradd.c:52 tools/sss_usermod.c:52
+#: src/tools/sss_useradd.c:52 src/tools/sss_usermod.c:52
 msgid "Login shell"
 msgstr ""
 
-#: tools/sss_useradd.c:53
+#: src/tools/sss_useradd.c:53
 msgid "Groups"
 msgstr ""
 
-#: tools/sss_useradd.c:54
+#: src/tools/sss_useradd.c:54
 msgid "Create user's directory if it does not exist"
 msgstr ""
 
-#: tools/sss_useradd.c:55
+#: src/tools/sss_useradd.c:55
 msgid "Never create user's directory, overrides config"
 msgstr ""
 
-#: tools/sss_useradd.c:56
+#: src/tools/sss_useradd.c:56
 msgid "Specify an alternative skeleton directory"
 msgstr ""
 
-#: tools/sss_useradd.c:57 tools/sss_usermod.c:57
+#: src/tools/sss_useradd.c:57 src/tools/sss_usermod.c:57
 msgid "The SELinux user for user's login"
 msgstr ""
 
-#: tools/sss_useradd.c:71 tools/sss_groupadd.c:56 tools/sss_groupdel.c:52
-#: tools/sss_groupmod.c:63 tools/sss_groupshow.c:631 tools/sss_userdel.c:148
-#: tools/sss_usermod.c:72
+#: src/tools/sss_useradd.c:71 src/tools/sss_groupadd.c:56
+#: src/tools/sss_groupdel.c:52 src/tools/sss_groupmod.c:63
+#: src/tools/sss_groupshow.c:631 src/tools/sss_userdel.c:148
+#: src/tools/sss_usermod.c:72
 msgid "Error setting the locale\n"
 msgstr ""
 
-#: tools/sss_useradd.c:107
+#: src/tools/sss_useradd.c:84 src/tools/sss_groupmod.c:76
+#: src/tools/sss_usermod.c:85
+msgid "Specify group to add to\n"
+msgstr ""
+
+#: src/tools/sss_useradd.c:108
 msgid "Specify user to add\n"
 msgstr ""
 
-#: tools/sss_useradd.c:118 tools/sss_groupadd.c:86 tools/sss_groupdel.c:81
-#: tools/sss_groupmod.c:111 tools/sss_groupshow.c:668 tools/sss_userdel.c:197
-#: tools/sss_usermod.c:128
+#: src/tools/sss_useradd.c:117 src/tools/sss_groupadd.c:82
+#: src/tools/sss_groupdel.c:77 src/tools/sss_groupmod.c:109
+#: src/tools/sss_groupshow.c:664 src/tools/sss_userdel.c:193
+#: src/tools/sss_usermod.c:126
 msgid "Error initializing the tools - no local domain\n"
 msgstr ""
 
-#: tools/sss_useradd.c:120 tools/sss_groupadd.c:88 tools/sss_groupdel.c:83
-#: tools/sss_groupmod.c:113 tools/sss_groupshow.c:670 tools/sss_userdel.c:199
-#: tools/sss_usermod.c:130
+#: src/tools/sss_useradd.c:119 src/tools/sss_groupadd.c:84
+#: src/tools/sss_groupdel.c:79 src/tools/sss_groupmod.c:111
+#: src/tools/sss_groupshow.c:666 src/tools/sss_userdel.c:195
+#: src/tools/sss_usermod.c:128
 msgid "Error initializing the tools\n"
 msgstr ""
 
-#: tools/sss_useradd.c:129 tools/sss_groupadd.c:97 tools/sss_groupdel.c:92
-#: tools/sss_groupmod.c:121 tools/sss_groupshow.c:679 tools/sss_userdel.c:208
-#: tools/sss_usermod.c:139
+#: src/tools/sss_useradd.c:128 src/tools/sss_groupadd.c:93
+#: src/tools/sss_groupdel.c:88 src/tools/sss_groupmod.c:119
+#: src/tools/sss_groupshow.c:675 src/tools/sss_userdel.c:204
+#: src/tools/sss_usermod.c:137
 msgid "Invalid domain specified in FQDN\n"
 msgstr ""
 
-#: tools/sss_useradd.c:138 tools/sss_groupmod.c:143 tools/sss_groupmod.c:170
-#: tools/sss_usermod.c:164 tools/sss_usermod.c:191
+#: src/tools/sss_useradd.c:137 src/tools/sss_groupmod.c:141
+#: src/tools/sss_groupmod.c:168 src/tools/sss_usermod.c:162
+#: src/tools/sss_usermod.c:189
 msgid "Internal error while parsing parameters\n"
 msgstr ""
 
-#: tools/sss_useradd.c:146 tools/sss_usermod.c:172 tools/sss_usermod.c:199
+#: src/tools/sss_useradd.c:145 src/tools/sss_usermod.c:170
+#: src/tools/sss_usermod.c:197
 msgid "Groups must be in the same domain as user\n"
 msgstr ""
 
-#: tools/sss_useradd.c:154
+#: src/tools/sss_useradd.c:153
 #, c-format
 msgid "Cannot find group %s in local domain\n"
 msgstr ""
 
-#: tools/sss_useradd.c:169 tools/sss_userdel.c:218
+#: src/tools/sss_useradd.c:168 src/tools/sss_userdel.c:214
 msgid "Cannot set default values\n"
 msgstr ""
 
-#: tools/sss_useradd.c:176 tools/sss_usermod.c:155
+#: src/tools/sss_useradd.c:175 src/tools/sss_usermod.c:153
 msgid "The selected UID is outside the allowed range\n"
 msgstr ""
 
-#: tools/sss_useradd.c:203 tools/sss_usermod.c:240
+#: src/tools/sss_useradd.c:202 src/tools/sss_usermod.c:238
 msgid "Cannot set SELinux login context\n"
 msgstr ""
 
-#: tools/sss_useradd.c:219
+#: src/tools/sss_useradd.c:218
 msgid "Cannot get info about the user\n"
 msgstr ""
 
-#: tools/sss_useradd.c:233
+#: src/tools/sss_useradd.c:232
 msgid "User's home directory already exists, not copying data from skeldir\n"
 msgstr ""
 
-#: tools/sss_useradd.c:236
+#: src/tools/sss_useradd.c:235
 #, c-format
 msgid "Cannot create user's home directory: %s\n"
 msgstr ""
 
-#: tools/sss_useradd.c:247
+#: src/tools/sss_useradd.c:246
 #, c-format
 msgid "Cannot create user's mail spool: %s\n"
 msgstr ""
 
-#: tools/sss_useradd.c:259
+#: src/tools/sss_useradd.c:258
 msgid "Could not allocate ID for the user - domain full?\n"
 msgstr ""
 
-#: tools/sss_useradd.c:263
+#: src/tools/sss_useradd.c:262
 msgid "A user or group with the same name or ID already exists\n"
 msgstr ""
 
-#: tools/sss_useradd.c:269
+#: src/tools/sss_useradd.c:268
 msgid "Transaction error. Could not add user.\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:43 tools/sss_groupmod.c:48
+#: src/tools/sss_groupadd.c:43 src/tools/sss_groupmod.c:48
 msgid "The GID of the group"
 msgstr ""
 
-#: tools/sss_groupadd.c:75
+#: src/tools/sss_groupadd.c:73
 msgid "Specify group to add\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:106 tools/sss_groupmod.c:194
+#: src/tools/sss_groupadd.c:102 src/tools/sss_groupmod.c:192
 msgid "The selected GID is outside the allowed range\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:131
+#: src/tools/sss_groupadd.c:127
 msgid "Could not allocate ID for the group - domain full?\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:135
+#: src/tools/sss_groupadd.c:131
 msgid "A group with the same name or GID already exists\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:140
+#: src/tools/sss_groupadd.c:136
 msgid "Transaction error. Could not add group.\n"
 msgstr ""
 
-#: tools/sss_groupdel.c:70
+#: src/tools/sss_groupdel.c:68
 msgid "Specify group to delete\n"
 msgstr ""
 
-#: tools/sss_groupdel.c:107
+#: src/tools/sss_groupdel.c:103
 #, c-format
 msgid "Group %s is outside the defined ID range for domain\n"
 msgstr ""
 
-#: tools/sss_groupdel.c:121
+#: src/tools/sss_groupdel.c:117
 msgid ""
 "No such group in local domain. Removing groups only allowed in local "
 "domain.\n"
 msgstr ""
 
-#: tools/sss_groupdel.c:126
+#: src/tools/sss_groupdel.c:122
 msgid "Internal error. Could not remove group.\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:44
+#: src/tools/sss_groupmod.c:44
 msgid "Groups to add this group to"
 msgstr ""
 
-#: tools/sss_groupmod.c:46
+#: src/tools/sss_groupmod.c:46
 msgid "Groups to remove this group from"
 msgstr ""
 
-#: tools/sss_groupmod.c:98
+#: src/tools/sss_groupmod.c:84 src/tools/sss_usermod.c:93
+msgid "Specify group to remove from\n"
+msgstr ""
+
+#: src/tools/sss_groupmod.c:98
 msgid "Specify group to modify\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:130
+#: src/tools/sss_groupmod.c:128
 msgid ""
 "Cannot find group in local domain, modifying groups is allowed only in local "
 "domain\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:151 tools/sss_groupmod.c:178
+#: src/tools/sss_groupmod.c:149 src/tools/sss_groupmod.c:176
 msgid "Member groups must be in the same domain as parent group\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:159 tools/sss_groupmod.c:186 tools/sss_usermod.c:180
-#: tools/sss_usermod.c:207
+#: src/tools/sss_groupmod.c:157 src/tools/sss_groupmod.c:184
+#: src/tools/sss_usermod.c:178 src/tools/sss_usermod.c:205
 #, c-format
 msgid ""
 "Cannot find group %s in local domain, only groups in local domain are "
 "allowed\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:220
+#: src/tools/sss_groupmod.c:218
 msgid "Could not modify group - check if member group names are correct\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:224
+#: src/tools/sss_groupmod.c:222
 msgid "Could not modify group - check if groupname is correct\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:228
+#: src/tools/sss_groupmod.c:226
 msgid "Transaction error. Could not modify group.\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:567
+#: src/tools/sss_groupshow.c:567
 #, c-format
 msgid "%s%sGroup: %s\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:568
+#: src/tools/sss_groupshow.c:568
 msgid "Magic Private "
 msgstr ""
 
-#: tools/sss_groupshow.c:570
+#: src/tools/sss_groupshow.c:570
 #, c-format
 msgid "%sGID number: %d\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:572
+#: src/tools/sss_groupshow.c:572
 #, c-format
 msgid "%sMember users: "
 msgstr ""
 
-#: tools/sss_groupshow.c:579
+#: src/tools/sss_groupshow.c:579
 #, c-format
 msgid ""
 "\n"
 "%sIs a member of: "
 msgstr ""
 
-#: tools/sss_groupshow.c:586
+#: src/tools/sss_groupshow.c:586
 #, c-format
 msgid ""
 "\n"
 "%sMember groups: "
 msgstr ""
 
-#: tools/sss_groupshow.c:622
+#: src/tools/sss_groupshow.c:622
 msgid "Print indirect group members recursively"
 msgstr ""
 
-#: tools/sss_groupshow.c:657
+#: src/tools/sss_groupshow.c:655
 msgid "Specify group to show\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:698
+#: src/tools/sss_groupshow.c:694
 msgid ""
 "No such group in local domain. Printing groups only allowed in local "
 "domain.\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:703
+#: src/tools/sss_groupshow.c:699
 msgid "Internal error. Could not print group.\n"
 msgstr ""
 
-#: tools/sss_userdel.c:133
+#: src/tools/sss_userdel.c:133
 msgid "Remove home directory and mail spool"
 msgstr ""
 
-#: tools/sss_userdel.c:135
+#: src/tools/sss_userdel.c:135
 msgid "Do not remove home directory and mail spool"
 msgstr ""
 
-#: tools/sss_userdel.c:137
+#: src/tools/sss_userdel.c:137
 msgid "Force removal of files not owned by the user"
 msgstr ""
 
-#: tools/sss_userdel.c:139
+#: src/tools/sss_userdel.c:139
 msgid "Kill users' processes before removing him"
 msgstr ""
 
-#: tools/sss_userdel.c:186
+#: src/tools/sss_userdel.c:184
 msgid "Specify user to delete\n"
 msgstr ""
 
-#: tools/sss_userdel.c:235
+#: src/tools/sss_userdel.c:231
 #, c-format
 msgid "User %s is outside the defined ID range for domain\n"
 msgstr ""
 
-#: tools/sss_userdel.c:260
+#: src/tools/sss_userdel.c:256
 msgid "Cannot reset SELinux login context\n"
 msgstr ""
 
-#: tools/sss_userdel.c:272
+#: src/tools/sss_userdel.c:268
 #, c-format
 msgid "WARNING: The user (uid %lu) was still logged in when deleted.\n"
 msgstr ""
 
-#: tools/sss_userdel.c:277
+#: src/tools/sss_userdel.c:273
 msgid "Cannot determine if the user was logged in on this platform"
 msgstr ""
 
-#: tools/sss_userdel.c:282
+#: src/tools/sss_userdel.c:278
 msgid "Error while checking if the user was logged in\n"
 msgstr ""
 
-#: tools/sss_userdel.c:289
+#: src/tools/sss_userdel.c:285
 #, c-format
 msgid "The post-delete command failed: %s\n"
 msgstr ""
 
-#: tools/sss_userdel.c:301
+#: src/tools/sss_userdel.c:297
 msgid "Not removing home dir - not owned by user\n"
 msgstr ""
 
-#: tools/sss_userdel.c:303
+#: src/tools/sss_userdel.c:299
 #, c-format
 msgid "Cannot remove homedir: %s\n"
 msgstr ""
 
-#: tools/sss_userdel.c:314
+#: src/tools/sss_userdel.c:310
 msgid ""
 "No such user in local domain. Removing users only allowed in local domain.\n"
 msgstr ""
 
-#: tools/sss_userdel.c:319
+#: src/tools/sss_userdel.c:315
 msgid "Internal error. Could not remove user.\n"
 msgstr ""
 
-#: tools/sss_usermod.c:49
+#: src/tools/sss_usermod.c:49
 msgid "The GID of the user"
 msgstr ""
 
-#: tools/sss_usermod.c:53
+#: src/tools/sss_usermod.c:53
 msgid "Groups to add this user to"
 msgstr ""
 
-#: tools/sss_usermod.c:54
+#: src/tools/sss_usermod.c:54
 msgid "Groups to remove this user from"
 msgstr ""
 
-#: tools/sss_usermod.c:55
+#: src/tools/sss_usermod.c:55
 msgid "Lock the account"
 msgstr ""
 
-#: tools/sss_usermod.c:56
+#: src/tools/sss_usermod.c:56
 msgid "Unlock the account"
 msgstr ""
 
-#: tools/sss_usermod.c:117
+#: src/tools/sss_usermod.c:117
 msgid "Specify user to modify\n"
 msgstr ""
 
-#: tools/sss_usermod.c:148
+#: src/tools/sss_usermod.c:146
 msgid ""
 "Cannot find user in local domain, modifying users is allowed only in local "
 "domain\n"
 msgstr ""
 
-#: tools/sss_usermod.c:250
+#: src/tools/sss_usermod.c:248
 msgid "Could not modify user - check if group names are correct\n"
 msgstr ""
 
-#: tools/sss_usermod.c:254
+#: src/tools/sss_usermod.c:252
 msgid "Could not modify user - user already member of groups?\n"
 msgstr ""
 
-#: tools/sss_usermod.c:258
+#: src/tools/sss_usermod.c:256
 msgid "Transaction error. Could not modify user.\n"
 msgstr ""
 
-#: tools/tools_util.c:285
+#: src/tools/tools_util.c:290
 msgid "Out of memory\n"
 msgstr ""
 
-#: tools/tools_util.h:34
+#: src/tools/tools_util.h:40
 #, c-format
 msgid "%s must be run as root\n"
 msgstr ""
 
-#: util/util.h:63
+#: src/util/util.h:65
 msgid "Send the debug output to files instead of stderr"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 8cc665ea..f10f7f55 100644
--- a/po/pl.po
+++ b/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-08-03 18:24-0400\n"
+"POT-Creation-Date: 2010-10-18 13:14-0400\n"
 "PO-Revision-Date: 2010-07-15 16:47+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
@@ -14,89 +14,89 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: config/SSSDConfig.py:39
+#: src/config/SSSDConfig.py:39
 msgid "Set the verbosity of the debug logging"
 msgstr "Ustawia liczbę komunikatów dziennika debugowania"
 
-#: config/SSSDConfig.py:40
+#: src/config/SSSDConfig.py:40
 msgid "Include timestamps in debug logs"
 msgstr "Dołącza daty w dziennikach debugowania"
 
-#: config/SSSDConfig.py:41
+#: src/config/SSSDConfig.py:41
 msgid "Write debug messages to logfiles"
 msgstr "Zapisuje komunikaty debugowania do plików dziennika"
 
-#: config/SSSDConfig.py:42
+#: src/config/SSSDConfig.py:42
 msgid "Ping timeout before restarting service"
 msgstr "Czas oczekiwania na ping przed ponownym uruchomieniem usługi"
 
-#: config/SSSDConfig.py:43
+#: src/config/SSSDConfig.py:43
 msgid "Command to start service"
 msgstr "Polecenie do uruchomienia usługi"
 
-#: config/SSSDConfig.py:44
+#: src/config/SSSDConfig.py:44
 msgid "Number of times to attempt connection to Data Providers"
 msgstr "Liczba prób połączenia do dostawców danych"
 
-#: config/SSSDConfig.py:47
+#: src/config/SSSDConfig.py:47
 msgid "SSSD Services to start"
 msgstr "Usługi SSSD do uruchomienia"
 
-#: config/SSSDConfig.py:48
+#: src/config/SSSDConfig.py:48
 msgid "SSSD Domains to start"
 msgstr "Domeny SSSD do uruchomienia"
 
-#: config/SSSDConfig.py:49
+#: src/config/SSSDConfig.py:49
 msgid "Timeout for messages sent over the SBUS"
 msgstr "Czas oczekiwania na komunikaty wysyłane przez SBUS"
 
-#: config/SSSDConfig.py:50
+#: src/config/SSSDConfig.py:50
 msgid "Regex to parse username and domain"
 msgstr "Wyrażenie regularne do przetworzenia nazwy użytkownika i domeny"
 
-#: config/SSSDConfig.py:51
+#: src/config/SSSDConfig.py:51
 msgid "Printf-compatible format for displaying fully-qualified names"
 msgstr "Format zgodny z printf do wyświetlania pełnych nazw"
 
-#: config/SSSDConfig.py:54
+#: src/config/SSSDConfig.py:54
 msgid "Enumeration cache timeout length (seconds)"
 msgstr "Czas oczekiwania pamięci podręcznej wyliczania (sekundy)"
 
-#: config/SSSDConfig.py:55
+#: src/config/SSSDConfig.py:55
 msgid "Entry cache background update timeout length (seconds)"
 msgstr "Czas oczekiwania aktualizacji tła pamięci podręcznej wpisów (sekundy)"
 
-#: config/SSSDConfig.py:56
+#: src/config/SSSDConfig.py:56
 msgid "Negative cache timeout length (seconds)"
 msgstr "Ujemny czas oczekiwania pamięci podręcznej (sekundy)"
 
-#: config/SSSDConfig.py:57
+#: src/config/SSSDConfig.py:57
 msgid "Users that SSSD should explicitly ignore"
 msgstr "Użytkownicy, którzy powinni być bezpośrednio ignorowani przez SSSD"
 
-#: config/SSSDConfig.py:58
+#: src/config/SSSDConfig.py:58
 msgid "Groups that SSSD should explicitly ignore"
 msgstr "Grupy, które powinny być bezpośrednio ignorowane przez SSSD"
 
-#: config/SSSDConfig.py:59
+#: src/config/SSSDConfig.py:59
 msgid "Should filtered users appear in groups"
 msgstr "Czy filtrowani użytkownicy powinni pojawiać się w grupach"
 
-#: config/SSSDConfig.py:60
+#: src/config/SSSDConfig.py:60
 msgid "The value of the password field the NSS provider should return"
 msgstr "Wartość pola hasła, jaką dostawca NSS powinien zwrócić"
 
-#: config/SSSDConfig.py:63
+#: src/config/SSSDConfig.py:63
 msgid "How long to allow cached logins between online logins (days)"
 msgstr ""
 "Jak długo umożliwiać logowania w pamięci podręcznej między logowaniami w "
 "trybie online (dni)"
 
-#: config/SSSDConfig.py:64
+#: src/config/SSSDConfig.py:64
 msgid "How many failed logins attempts are allowed when offline"
 msgstr "Ile nieudanych prób zalogowania jest dozwolonych w trybie offline"
 
-#: config/SSSDConfig.py:65
+#: src/config/SSSDConfig.py:65
 msgid ""
 "How long (minutes) to deny login after offline_failed_login_attempts has "
 "been reached"
@@ -104,334 +104,334 @@ msgstr ""
 "Ile czasu (minut) nie pozwalać na zalogowanie po osiągnięciu "
 "offline_failed_login_attempts"
 
-#: config/SSSDConfig.py:68
+#: src/config/SSSDConfig.py:68
 msgid "Identity provider"
 msgstr "Dostawca tożsamości"
 
-#: config/SSSDConfig.py:69
+#: src/config/SSSDConfig.py:69
 msgid "Authentication provider"
 msgstr "Dostawca uwierzytelniania"
 
-#: config/SSSDConfig.py:70
+#: src/config/SSSDConfig.py:70
 msgid "Access control provider"
 msgstr "Dostawca kontroli dostępu"
 
-#: config/SSSDConfig.py:71
+#: src/config/SSSDConfig.py:71
 msgid "Password change provider"
 msgstr "Dostawca zmiany hasła"
 
-#: config/SSSDConfig.py:74
+#: src/config/SSSDConfig.py:74
 msgid "Minimum user ID"
 msgstr "Minimalny identyfikator użytkownika"
 
-#: config/SSSDConfig.py:75
+#: src/config/SSSDConfig.py:75
 msgid "Maximum user ID"
 msgstr "Maksymalny identyfikator użytkownika"
 
-#: config/SSSDConfig.py:76
+#: src/config/SSSDConfig.py:76
 msgid "Ping timeout before restarting domain"
 msgstr "Czas oczekiwania na ping przed ponownym uruchomieniem domeny"
 
-#: config/SSSDConfig.py:77
+#: src/config/SSSDConfig.py:77
 msgid "Enable enumerating all users/groups"
 msgstr "Włącza wyliczanie wszystkich użytkowników/grup"
 
-#: config/SSSDConfig.py:78
+#: src/config/SSSDConfig.py:78
 msgid "Cache credentials for offline login"
 msgstr "Dane uwierzytelniające pamięci podręcznej dla logowań w trybie offline"
 
-#: config/SSSDConfig.py:79
+#: src/config/SSSDConfig.py:79
 msgid "Store password hashes"
 msgstr "Przechowuje mieszanie haseł"
 
-#: config/SSSDConfig.py:80
+#: src/config/SSSDConfig.py:80
 msgid "Display users/groups in fully-qualified form"
 msgstr "Wyświetla użytkowników/grupy w pełnej formie"
 
-#: config/SSSDConfig.py:81
+#: src/config/SSSDConfig.py:81
 msgid "Entry cache timeout length (seconds)"
 msgstr "Czas oczekiwania pamięci podręcznej wpisów (sekundy)"
 
-#: config/SSSDConfig.py:82
+#: src/config/SSSDConfig.py:82
 msgid ""
 "Restrict or prefer a specific address family when performing DNS lookups"
 msgstr ""
 "Ogranicza lub preferuje podaną rodzinę adresów podczas wykonywania "
 "wyszukiwań DNS"
 
-#: config/SSSDConfig.py:83
+#: src/config/SSSDConfig.py:83
 msgid "How long to keep cached entries after last successful login (days)"
 msgstr ""
 "Jak długo utrzymywać wpisy logowania w pamięci podręcznej po ostatnim udanym "
 "zalogowaniu (dni)"
 
-#: config/SSSDConfig.py:84
+#: src/config/SSSDConfig.py:84
 msgid "How long to wait for replies from DNS when resolving servers (seconds)"
 msgstr ""
 "Jak długo czekać na odpowiedzi od serwera DNS podczas rozwiązywania serwerów "
 "(sekundy)"
 
-#: config/SSSDConfig.py:85
+#: src/config/SSSDConfig.py:85
 msgid "The domain part of service discovery DNS query"
 msgstr "Część domeny zapytania DNS wykrywania usługi"
 
-#: config/SSSDConfig.py:88
+#: src/config/SSSDConfig.py:88
 msgid "IPA domain"
 msgstr "Domena IPA"
 
-#: config/SSSDConfig.py:89
+#: src/config/SSSDConfig.py:89
 msgid "IPA server address"
 msgstr "Adres serwera IPA"
 
-#: config/SSSDConfig.py:90
+#: src/config/SSSDConfig.py:90
 msgid "IPA client hostname"
 msgstr "Nazwa komputera klienta IPA"
 
-#: config/SSSDConfig.py:91
+#: src/config/SSSDConfig.py:91
 msgid "Whether to automatically update the client's DNS entry in FreeIPA"
 msgstr ""
 "Czy automatycznie aktualizować wpis DNS klienta w oprogramowaniu FreeIPA"
 
-#: config/SSSDConfig.py:92
+#: src/config/SSSDConfig.py:92
 msgid "The interface whose IP should be used for dynamic DNS updates"
 msgstr ""
 "Interfejs, którego adres IP powinien być używany do dynamicznych "
 "aktualizacji DNS"
 
-#: config/SSSDConfig.py:95 config/SSSDConfig.py:124
+#: src/config/SSSDConfig.py:95 src/config/SSSDConfig.py:124
 msgid "Kerberos server address"
 msgstr "Adres serwera Kerberos"
 
-#: config/SSSDConfig.py:96 config/SSSDConfig.py:125
+#: src/config/SSSDConfig.py:96 src/config/SSSDConfig.py:125
 msgid "Kerberos realm"
 msgstr "Obszar Kerberos"
 
-#: config/SSSDConfig.py:97
+#: src/config/SSSDConfig.py:97
 msgid "Authentication timeout"
 msgstr "Czas oczekiwania na uwierzytelnienie"
 
-#: config/SSSDConfig.py:100
+#: src/config/SSSDConfig.py:100
 msgid "Directory to store credential caches"
 msgstr ""
 "Katalog do przechowywania pamięci podręcznych danych uwierzytelniających"
 
-#: config/SSSDConfig.py:101
+#: src/config/SSSDConfig.py:101
 msgid "Location of the user's credential cache"
 msgstr "Położenie pamięci podręcznej danych uwierzytelniających użytkownika"
 
-#: config/SSSDConfig.py:102
+#: src/config/SSSDConfig.py:102
 msgid "Location of the keytab to validate credentials"
 msgstr "Położenie tablicy kluczy do sprawdzania danych uwierzytelniających"
 
-#: config/SSSDConfig.py:103
+#: src/config/SSSDConfig.py:103
 msgid "Enable credential validation"
 msgstr "Włącza sprawdzanie danych uwierzytelniających"
 
-#: config/SSSDConfig.py:104
+#: src/config/SSSDConfig.py:104
 msgid "Store password if offline for later online authentication"
 msgstr ""
 "Przechowuje hasło, jeśli w trybie offline do późniejszego uwierzytelnienia w "
 "trybie online"
 
-#: config/SSSDConfig.py:107
+#: src/config/SSSDConfig.py:107
 msgid "Server where the change password service is running if not on the KDC"
 msgstr ""
 "Serwer, w którym jest uruchomiona usługa zmiany haseł, jeśli nie znajduje "
 "się w KDC"
 
-#: config/SSSDConfig.py:110
+#: src/config/SSSDConfig.py:110
 msgid "ldap_uri, The URI of the LDAP server"
 msgstr "ldap_uri, adres URI serwera LDAP"
 
-#: config/SSSDConfig.py:111
+#: src/config/SSSDConfig.py:111
 msgid "The default base DN"
 msgstr "Domyślna podstawowa DN"
 
-#: config/SSSDConfig.py:112
+#: src/config/SSSDConfig.py:112
 msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr "Typ Schema do użycia na serwerze LDAP, RFC2307"
 
-#: config/SSSDConfig.py:113
+#: src/config/SSSDConfig.py:113
 msgid "The default bind DN"
 msgstr "Domyślne DN dowiązania"
 
-#: config/SSSDConfig.py:114
+#: src/config/SSSDConfig.py:114
 msgid "The type of the authentication token of the default bind DN"
 msgstr "Typ tokenu uwierzytelniania domyślnego DN dowiązania"
 
-#: config/SSSDConfig.py:115
+#: src/config/SSSDConfig.py:115
 msgid "The authentication token of the default bind DN"
 msgstr "Token uwierzytelniania domyślnego DN dowiązania"
 
-#: config/SSSDConfig.py:116
+#: src/config/SSSDConfig.py:116
 msgid "Length of time to attempt connection"
 msgstr "Czas do próby połączenia"
 
-#: config/SSSDConfig.py:117
+#: src/config/SSSDConfig.py:117
 msgid "Length of time to attempt synchronous LDAP operations"
 msgstr "Czas do próby synchronicznych działań LDAP"
 
-#: config/SSSDConfig.py:118
+#: src/config/SSSDConfig.py:118
 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:119
+#: src/config/SSSDConfig.py:119
 msgid "File that contains CA certificates"
 msgstr "Plik zawierający certyfikaty CA"
 
-#: config/SSSDConfig.py:120
+#: src/config/SSSDConfig.py:120
 msgid "Path to CA certificate directory"
 msgstr "Ścieżka do katalogu certyfikatów CA"
 
-#: config/SSSDConfig.py:121
+#: src/config/SSSDConfig.py:121
 msgid "Require TLS certificate verification"
 msgstr "Wymaga sprawdzenia certyfikatu TLS"
 
-#: config/SSSDConfig.py:122
+#: src/config/SSSDConfig.py:122
 msgid "Specify the sasl mechanism to use"
 msgstr "Podaje używany mechanizm SASL"
 
-#: config/SSSDConfig.py:123
+#: src/config/SSSDConfig.py:123
 msgid "Specify the sasl authorization id to use"
 msgstr "Podaje używany identyfikator upoważnienia SASL"
 
-#: config/SSSDConfig.py:126
+#: src/config/SSSDConfig.py:126
 msgid "Kerberos service keytab"
 msgstr "Tablica kluczy usługi Kerberos"
 
-#: config/SSSDConfig.py:127
+#: src/config/SSSDConfig.py:127
 msgid "Use Kerberos auth for LDAP connection"
 msgstr "Używa uwierzytelniania Kerberos dla połączenia LDAP"
 
-#: config/SSSDConfig.py:128
+#: src/config/SSSDConfig.py:128
 msgid "Follow LDAP referrals"
 msgstr "Podąża za odsyłaniami LDAP"
 
-#: config/SSSDConfig.py:129
+#: src/config/SSSDConfig.py:129
 msgid "Lifetime of TGT for LDAP connection"
 msgstr "Czas trwania TGT dla połączenia LDAP"
 
-#: config/SSSDConfig.py:132
+#: src/config/SSSDConfig.py:132
 msgid "Length of time to wait for a search request"
 msgstr "Czas oczekiwania na żądanie wyszukiwania"
 
-#: config/SSSDConfig.py:133
+#: src/config/SSSDConfig.py:133
 msgid "Length of time between enumeration updates"
 msgstr "Czas między aktualizacjami wyliczania"
 
-#: config/SSSDConfig.py:134
+#: src/config/SSSDConfig.py:134
 msgid "Require TLS for ID lookups"
 msgstr "Wymaga TLS dla wyszukiwania identyfikatorów"
 
-#: config/SSSDConfig.py:135
+#: src/config/SSSDConfig.py:135
 msgid "Base DN for user lookups"
 msgstr "Podstawowe DN dla wyszukiwania użytkowników"
 
-#: config/SSSDConfig.py:136
+#: src/config/SSSDConfig.py:136
 msgid "Scope of user lookups"
 msgstr "Zakres wyszukiwania użytkowników"
 
-#: config/SSSDConfig.py:137
+#: src/config/SSSDConfig.py:137
 msgid "Filter for user lookups"
 msgstr "Filtruje wyszukiwania użytkowników"
 
-#: config/SSSDConfig.py:138
+#: src/config/SSSDConfig.py:138
 msgid "Objectclass for users"
 msgstr "Klasa obiektów dla użytkowników"
 
-#: config/SSSDConfig.py:139
+#: src/config/SSSDConfig.py:139
 msgid "Username attribute"
 msgstr "Atrybut nazwy użytkownika"
 
-#: config/SSSDConfig.py:140
+#: src/config/SSSDConfig.py:140
 msgid "UID attribute"
 msgstr "Atrybut UID"
 
-#: config/SSSDConfig.py:141
+#: src/config/SSSDConfig.py:141
 msgid "Primary GID attribute"
 msgstr "Pierwszy atrybut GID"
 
-#: config/SSSDConfig.py:142
+#: src/config/SSSDConfig.py:142
 msgid "GECOS attribute"
 msgstr "Atrybut GECOS"
 
-#: config/SSSDConfig.py:143
+#: src/config/SSSDConfig.py:143
 msgid "Home directory attribute"
 msgstr "Atrybut katalogu domowego"
 
-#: config/SSSDConfig.py:144
+#: src/config/SSSDConfig.py:144
 msgid "Shell attribute"
 msgstr "Atrybut powłoki"
 
-#: config/SSSDConfig.py:145
+#: src/config/SSSDConfig.py:145
 msgid "UUID attribute"
 msgstr "Atrybut UUID"
 
-#: config/SSSDConfig.py:146
+#: src/config/SSSDConfig.py:146
 msgid "User principal attribute (for Kerberos)"
 msgstr "Atrybut głównego użytkownika (dla Kerberos)"
 
-#: config/SSSDConfig.py:147
+#: src/config/SSSDConfig.py:147
 msgid "Full Name"
 msgstr "Imię i nazwisko"
 
-#: config/SSSDConfig.py:148
+#: src/config/SSSDConfig.py:148
 msgid "memberOf attribute"
 msgstr "Atrybut memberOf"
 
-#: config/SSSDConfig.py:149
+#: src/config/SSSDConfig.py:149
 msgid "Modification time attribute"
 msgstr "Atrybut czasu modyfikacji"
 
-#: config/SSSDConfig.py:152
+#: src/config/SSSDConfig.py:152
 msgid "Policy to evaluate the password expiration"
 msgstr "Polityka do oszacowania wygaszenia hasła"
 
-#: config/SSSDConfig.py:155
+#: src/config/SSSDConfig.py:155
 msgid "LDAP filter to determine access privileges"
 msgstr "Filtr LDAP do określenia uprawnień dostępu"
 
-#: config/SSSDConfig.py:158
+#: src/config/SSSDConfig.py:158
 msgid "Comma separated list of allowed users"
 msgstr "Lista dozwolonych użytkowników oddzielonych przecinkami"
 
-#: config/SSSDConfig.py:159
+#: src/config/SSSDConfig.py:159
 msgid "Comma separated list of prohibited users"
 msgstr "Lista zabronionych użytkowników oddzielonych przecinkami"
 
-#: config/SSSDConfig.py:162
+#: src/config/SSSDConfig.py:162
 msgid "Default shell, /bin/bash"
 msgstr "Domyślna powłoka, /bin/bash"
 
-#: config/SSSDConfig.py:163
+#: src/config/SSSDConfig.py:163
 msgid "Base for home directories"
 msgstr "Podstawa katalogów domowych"
 
-#: config/SSSDConfig.py:166
+#: src/config/SSSDConfig.py:166
 msgid "The name of the NSS library to use"
 msgstr "Nazwa używanej biblioteki NSS"
 
-#: config/SSSDConfig.py:169
+#: src/config/SSSDConfig.py:169
 msgid "PAM stack to use"
 msgstr "Używany stos PAM"
 
-#: monitor/monitor.c:2137
+#: src/monitor/monitor.c:2140
 msgid "Become a daemon (default)"
 msgstr "Uruchamia jako demon (domyślnie)"
 
-#: monitor/monitor.c:2139
+#: src/monitor/monitor.c:2142
 msgid "Run interactive (not a daemon)"
 msgstr "Uruchamia interaktywnie (nie jako demon)"
 
-#: monitor/monitor.c:2141
+#: src/monitor/monitor.c:2144
 msgid "Specify a non-default config file"
 msgstr "Podaje niedomyślny plik konfiguracji"
 
-#: monitor/monitor.c:2167
+#: src/monitor/monitor.c:2170
 msgid "sssd must be run as root\n"
 msgstr "sssd musi zostać uruchomione jako root\n"
 
-#: monitor/monitor.c:2202
+#: src/monitor/monitor.c:2205
 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"
@@ -439,7 +439,7 @@ msgstr ""
 "Wykryto gniazdo nscd. Możliwości pamięci podręcznej nscd mogą konfliktować z "
 "SSSD, więc nie jest zalecane uruchamianie nscd jednocześnie z SSSD\n"
 
-#: monitor/monitor.c:2212
+#: src/monitor/monitor.c:2215
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
@@ -448,278 +448,291 @@ msgstr ""
 "Nie można odczytać pliku konfiguracji %s. Proszę sprawdzić, czy uprawnienia "
 "wynoszą 0600, a właścicielem pliku jest root.root\n"
 
-#: monitor/monitor.c:2217
+#: src/monitor/monitor.c:2220
 msgid "Cannot load configuration database\n"
 msgstr "Nie można wczytać bazy danych konfiguracji\n"
 
-#: providers/krb5/krb5_child.c:993 providers/ldap/ldap_child.c:361
-#: util/util.h:61
+#: src/providers/krb5/krb5_child.c:1043 src/providers/ldap/ldap_child.c:359
+#: src/util/util.h:63
 msgid "Debug level"
 msgstr "Poziom debugowania"
 
-#: providers/krb5/krb5_child.c:995 providers/ldap/ldap_child.c:363
-#: util/util.h:65
+#: src/providers/krb5/krb5_child.c:1045 src/providers/ldap/ldap_child.c:361
+#: src/util/util.h:67
 msgid "Add debug timestamps"
 msgstr "Dodaje czasy debugowania"
 
-#: providers/krb5/krb5_child.c:997 providers/ldap/ldap_child.c:365
+#: src/providers/krb5/krb5_child.c:1047 src/providers/ldap/ldap_child.c:363
 msgid "An open file descriptor for the debug logs"
 msgstr "Otwiera deskryptor pliku dla dzienników debugowania"
 
-#: providers/data_provider_be.c:1165
+#: src/providers/data_provider_be.c:1165
 msgid "Domain of the information provider (mandatory)"
 msgstr "Domena dostawcy informacji (wymagane)"
 
-#: sss_client/common.c:742
+#: src/sss_client/common.c:742
 msgid "Privileged socket has wrong ownership or permissions."
 msgstr "Uprawnione gniazdo posiada błędnego właściciela lub uprawnienia."
 
-#: sss_client/common.c:745
+#: src/sss_client/common.c:745
 msgid "Public socket has wrong ownership or permissions."
 msgstr "Publiczne gniazdo posiada błędnego właściciela lub uprawnienia"
 
-#: sss_client/common.c:748
+#: src/sss_client/common.c:748
 msgid "Unexpected format of the server credential message."
 msgstr "Nieoczekiwany format komunikatu uwierzytelniającego serwera."
 
-#: sss_client/common.c:751
+#: src/sss_client/common.c:751
 msgid "SSSD is not run by root."
 msgstr "SSSD nie zostało uruchomione w trybie roota."
 
-#: sss_client/common.c:756
+#: src/sss_client/common.c:756
 msgid "An error occurred, but no description can be found."
 msgstr "Wystąpił błąd, ale nie odnaleziono jego opisu."
 
-#: sss_client/common.c:762
+#: src/sss_client/common.c:762
 msgid "Unexpected error while looking for an error description"
 msgstr "Nieoczekiwany błąd podczas wyszukiwania opisu błędu"
 
-#: sss_client/pam_sss.c:372
+#: src/sss_client/pam_sss.c:372
 msgid "Passwords do not match"
 msgstr "Hasła nie zgadzają się"
 
-#: sss_client/pam_sss.c:556
+#: src/sss_client/pam_sss.c:556
 msgid "Password reset by root is not supported."
 msgstr "Przywrócenie hasła przez użytkownika root nie jest obsługiwane."
 
-#: sss_client/pam_sss.c:597
+#: src/sss_client/pam_sss.c:597
 msgid "Authenticated with cached credentials"
 msgstr "Uwierzytelniono za pomocą danych z pamięci podręcznej"
 
-#: sss_client/pam_sss.c:598
+#: src/sss_client/pam_sss.c:598
 msgid ", your cached password will expire at: "
 msgstr ", hasło w pamięci podręcznej wygaśnie za: "
 
-#: sss_client/pam_sss.c:628
+#: src/sss_client/pam_sss.c:628
 #, c-format
 msgid "Your password has expired. You have %d grace login(s) remaining."
 msgstr "Hasło wygasło. Pozostało %d możliwych logowań."
 
-#: sss_client/pam_sss.c:674
+#: src/sss_client/pam_sss.c:674
 #, c-format
 msgid "Your password will expire in %d %s."
 msgstr "Hasło wygaśnie za %d %s."
 
-#: sss_client/pam_sss.c:723
+#: src/sss_client/pam_sss.c:723
 msgid "Authentication is denied until: "
 msgstr "Uwierzytelnianie jest zabronione do: "
 
-#: sss_client/pam_sss.c:750
+#: src/sss_client/pam_sss.c:750
 msgid "System is offline, password change not possible"
 msgstr "System jest w trybie offline, zmiana hasła nie jest możliwa"
 
-#: sss_client/pam_sss.c:780 sss_client/pam_sss.c:793
+#: src/sss_client/pam_sss.c:780 src/sss_client/pam_sss.c:793
 msgid "Password change failed. "
 msgstr "Zmiana hasła nie powiodła się. "
 
-#: sss_client/pam_sss.c:783 sss_client/pam_sss.c:794
+#: src/sss_client/pam_sss.c:783 src/sss_client/pam_sss.c:794
 msgid "Server message: "
 msgstr "Komunikat serwera: "
 
-#: sss_client/pam_sss.c:1197
+#: src/sss_client/pam_sss.c:1197
 msgid "New Password: "
 msgstr "Nowe hasło: "
 
-#: sss_client/pam_sss.c:1198
+#: src/sss_client/pam_sss.c:1198
 msgid "Reenter new Password: "
 msgstr "Proszę ponownie podać nowe hasło: "
 
-#: sss_client/pam_sss.c:1280
+#: src/sss_client/pam_sss.c:1280
 msgid "Password: "
 msgstr "Hasło: "
 
-#: sss_client/pam_sss.c:1312
+#: src/sss_client/pam_sss.c:1312
 msgid "Current Password: "
 msgstr "Bieżące hasło: "
 
-#: sss_client/pam_sss.c:1458
+#: src/sss_client/pam_sss.c:1458
 msgid "Password expired. Change your password now."
 msgstr "Hasło wygasło. Proszę je zmienić teraz."
 
-#: tools/sss_useradd.c:48 tools/sss_groupadd.c:41 tools/sss_groupdel.c:43
-#: tools/sss_groupmod.c:42 tools/sss_groupshow.c:620 tools/sss_userdel.c:131
-#: tools/sss_usermod.c:47
+#: src/tools/sss_useradd.c:48 src/tools/sss_groupadd.c:41
+#: src/tools/sss_groupdel.c:43 src/tools/sss_groupmod.c:42
+#: src/tools/sss_groupshow.c:620 src/tools/sss_userdel.c:131
+#: src/tools/sss_usermod.c:47
 msgid "The debug level to run with"
 msgstr "Poziom debugowania, z jakim uruchomić"
 
-#: tools/sss_useradd.c:49 tools/sss_usermod.c:48
+#: src/tools/sss_useradd.c:49 src/tools/sss_usermod.c:48
 msgid "The UID of the user"
 msgstr "UID użytkownika"
 
-#: tools/sss_useradd.c:50 tools/sss_usermod.c:50
+#: src/tools/sss_useradd.c:50 src/tools/sss_usermod.c:50
 msgid "The comment string"
 msgstr "Ciąg komentarza"
 
-#: tools/sss_useradd.c:51 tools/sss_usermod.c:51
+#: src/tools/sss_useradd.c:51 src/tools/sss_usermod.c:51
 msgid "Home directory"
 msgstr "Katalog domowy"
 
-#: tools/sss_useradd.c:52 tools/sss_usermod.c:52
+#: src/tools/sss_useradd.c:52 src/tools/sss_usermod.c:52
 msgid "Login shell"
 msgstr "Powłoka logowania"
 
-#: tools/sss_useradd.c:53
+#: src/tools/sss_useradd.c:53
 msgid "Groups"
 msgstr "Grupy"
 
-#: tools/sss_useradd.c:54
+#: src/tools/sss_useradd.c:54
 msgid "Create user's directory if it does not exist"
 msgstr "Utworzy katalog użytkownika, jeśli nie istnieje"
 
-#: tools/sss_useradd.c:55
+#: src/tools/sss_useradd.c:55
 msgid "Never create user's directory, overrides config"
 msgstr "Nigdy nie tworzy katalogu użytkownika, zastępuje konfigurację"
 
-#: tools/sss_useradd.c:56
+#: src/tools/sss_useradd.c:56
 msgid "Specify an alternative skeleton directory"
 msgstr "Proszę podać alternatywny katalog szkieletu"
 
-#: tools/sss_useradd.c:57 tools/sss_usermod.c:57
+#: src/tools/sss_useradd.c:57 src/tools/sss_usermod.c:57
 msgid "The SELinux user for user's login"
 msgstr "Użytkownik SELinuksa dla loginu użytkownika"
 
-#: tools/sss_useradd.c:71 tools/sss_groupadd.c:56 tools/sss_groupdel.c:52
-#: tools/sss_groupmod.c:63 tools/sss_groupshow.c:631 tools/sss_userdel.c:148
-#: tools/sss_usermod.c:72
+#: src/tools/sss_useradd.c:71 src/tools/sss_groupadd.c:56
+#: src/tools/sss_groupdel.c:52 src/tools/sss_groupmod.c:63
+#: src/tools/sss_groupshow.c:631 src/tools/sss_userdel.c:148
+#: src/tools/sss_usermod.c:72
 msgid "Error setting the locale\n"
 msgstr "Błąd podczas ustawiania lokalizacji\n"
 
-#: tools/sss_useradd.c:107
+#: src/tools/sss_useradd.c:84 src/tools/sss_groupmod.c:76
+#: src/tools/sss_usermod.c:85
+#, fuzzy
+msgid "Specify group to add to\n"
+msgstr "Proszę podać grupę do dodania\n"
+
+#: src/tools/sss_useradd.c:108
 msgid "Specify user to add\n"
 msgstr "Proszę podać użytkownika do dodania\n"
 
-#: tools/sss_useradd.c:118 tools/sss_groupadd.c:86 tools/sss_groupdel.c:81
-#: tools/sss_groupmod.c:111 tools/sss_groupshow.c:668 tools/sss_userdel.c:197
-#: tools/sss_usermod.c:128
+#: src/tools/sss_useradd.c:117 src/tools/sss_groupadd.c:82
+#: src/tools/sss_groupdel.c:77 src/tools/sss_groupmod.c:109
+#: src/tools/sss_groupshow.c:664 src/tools/sss_userdel.c:193
+#: src/tools/sss_usermod.c:126
 msgid "Error initializing the tools - no local domain\n"
 msgstr "Błąd podczas inicjowania narzędzi - brak lokalnej domeny\n"
 
-#: tools/sss_useradd.c:120 tools/sss_groupadd.c:88 tools/sss_groupdel.c:83
-#: tools/sss_groupmod.c:113 tools/sss_groupshow.c:670 tools/sss_userdel.c:199
-#: tools/sss_usermod.c:130
+#: src/tools/sss_useradd.c:119 src/tools/sss_groupadd.c:84
+#: src/tools/sss_groupdel.c:79 src/tools/sss_groupmod.c:111
+#: src/tools/sss_groupshow.c:666 src/tools/sss_userdel.c:195
+#: src/tools/sss_usermod.c:128
 msgid "Error initializing the tools\n"
 msgstr "Błąd podczas inicjowania narzędzi\n"
 
-#: tools/sss_useradd.c:129 tools/sss_groupadd.c:97 tools/sss_groupdel.c:92
-#: tools/sss_groupmod.c:121 tools/sss_groupshow.c:679 tools/sss_userdel.c:208
-#: tools/sss_usermod.c:139
+#: src/tools/sss_useradd.c:128 src/tools/sss_groupadd.c:93
+#: src/tools/sss_groupdel.c:88 src/tools/sss_groupmod.c:119
+#: src/tools/sss_groupshow.c:675 src/tools/sss_userdel.c:204
+#: src/tools/sss_usermod.c:137
 msgid "Invalid domain specified in FQDN\n"
 msgstr "Podano nieprawidłową domenę w FQDN\n"
 
-#: tools/sss_useradd.c:138 tools/sss_groupmod.c:143 tools/sss_groupmod.c:170
-#: tools/sss_usermod.c:164 tools/sss_usermod.c:191
+#: src/tools/sss_useradd.c:137 src/tools/sss_groupmod.c:141
+#: src/tools/sss_groupmod.c:168 src/tools/sss_usermod.c:162
+#: src/tools/sss_usermod.c:189
 msgid "Internal error while parsing parameters\n"
 msgstr "Wewnętrzny błąd podczas przetwarzania parametrów\n"
 
-#: tools/sss_useradd.c:146 tools/sss_usermod.c:172 tools/sss_usermod.c:199
+#: src/tools/sss_useradd.c:145 src/tools/sss_usermod.c:170
+#: src/tools/sss_usermod.c:197
 msgid "Groups must be in the same domain as user\n"
 msgstr "Grupy muszą być w tej samej domenie co użytkownik\n"
 
-#: tools/sss_useradd.c:154
+#: src/tools/sss_useradd.c:153
 #, c-format
 msgid "Cannot find group %s in local domain\n"
 msgstr "Nie można odnaleźć grupy %s w lokalnej domenie\n"
 
-#: tools/sss_useradd.c:169 tools/sss_userdel.c:218
+#: src/tools/sss_useradd.c:168 src/tools/sss_userdel.c:214
 msgid "Cannot set default values\n"
 msgstr "Nie można ustawić domyślnych wartości\n"
 
-#: tools/sss_useradd.c:176 tools/sss_usermod.c:155
+#: src/tools/sss_useradd.c:175 src/tools/sss_usermod.c:153
 msgid "The selected UID is outside the allowed range\n"
 msgstr "Wybrany UID jest spoza dozwolonego zakresu\n"
 
-#: tools/sss_useradd.c:203 tools/sss_usermod.c:240
+#: src/tools/sss_useradd.c:202 src/tools/sss_usermod.c:238
 msgid "Cannot set SELinux login context\n"
 msgstr "Nie można ustawić kontekstu loginu SELinuksa\n"
 
-#: tools/sss_useradd.c:219
+#: src/tools/sss_useradd.c:218
 msgid "Cannot get info about the user\n"
 msgstr "Nie można uzyskać informacji o użytkowniku\n"
 
-#: tools/sss_useradd.c:233
+#: src/tools/sss_useradd.c:232
 msgid "User's home directory already exists, not copying data from skeldir\n"
 msgstr ""
 "Katalog domowy użytkownika już istnieje, dane z katalogu szkieletu nie "
 "zostaną skopiowane\n"
 
-#: tools/sss_useradd.c:236
+#: src/tools/sss_useradd.c:235
 #, c-format
 msgid "Cannot create user's home directory: %s\n"
 msgstr "Nie można utworzyć katalogu domowego użytkownika: %s\n"
 
-#: tools/sss_useradd.c:247
+#: src/tools/sss_useradd.c:246
 #, c-format
 msgid "Cannot create user's mail spool: %s\n"
 msgstr "Nie można utworzyć buforu poczty użytkownika: %s\n"
 
-#: tools/sss_useradd.c:259
+#: src/tools/sss_useradd.c:258
 msgid "Could not allocate ID for the user - domain full?\n"
 msgstr ""
 "Nie można przydzielić identyfikatora użytkownikowi - czy domena jest pełna?\n"
 
-#: tools/sss_useradd.c:263
+#: src/tools/sss_useradd.c:262
 msgid "A user or group with the same name or ID already exists\n"
 msgstr ""
 "Użytkownik lub grupa o tej samej nazwie lub identyfikatorze już istnieje\n"
 
-#: tools/sss_useradd.c:269
+#: src/tools/sss_useradd.c:268
 msgid "Transaction error. Could not add user.\n"
 msgstr "Błąd transakcji. Nie można dodać użytkownika.\n"
 
-#: tools/sss_groupadd.c:43 tools/sss_groupmod.c:48
+#: src/tools/sss_groupadd.c:43 src/tools/sss_groupmod.c:48
 msgid "The GID of the group"
 msgstr "GID grupy"
 
-#: tools/sss_groupadd.c:75
+#: src/tools/sss_groupadd.c:73
 msgid "Specify group to add\n"
 msgstr "Proszę podać grupę do dodania\n"
 
-#: tools/sss_groupadd.c:106 tools/sss_groupmod.c:194
+#: src/tools/sss_groupadd.c:102 src/tools/sss_groupmod.c:192
 msgid "The selected GID is outside the allowed range\n"
 msgstr "Wybrany GID jest spoza dozwolonego zakresu\n"
 
-#: tools/sss_groupadd.c:131
+#: src/tools/sss_groupadd.c:127
 msgid "Could not allocate ID for the group - domain full?\n"
 msgstr "Nie można przydzielić identyfikatora grupie - czy domena jest pełna?\n"
 
-#: tools/sss_groupadd.c:135
+#: src/tools/sss_groupadd.c:131
 msgid "A group with the same name or GID already exists\n"
 msgstr "Grupa o tej samej nazwie lub GID już istnieje\n"
 
-#: tools/sss_groupadd.c:140
+#: src/tools/sss_groupadd.c:136
 msgid "Transaction error. Could not add group.\n"
 msgstr "Błąd transakcji. Nie można dodać grupy.\n"
 
-#: tools/sss_groupdel.c:70
+#: src/tools/sss_groupdel.c:68
 msgid "Specify group to delete\n"
 msgstr "Proszę podać grupę do usunięcia\n"
 
-#: tools/sss_groupdel.c:107
+#: src/tools/sss_groupdel.c:103
 #, c-format
 msgid "Group %s is outside the defined ID range for domain\n"
 msgstr "Grupa %s jest poza określonym zakresem identyfikatorów dla domeny\n"
 
-#: tools/sss_groupdel.c:121
+#: src/tools/sss_groupdel.c:117
 msgid ""
 "No such group in local domain. Removing groups only allowed in local "
 "domain.\n"
@@ -727,23 +740,28 @@ msgstr ""
 "Nie ma takiej grupy w lokalnej domenie. Usuwanie grup jest dozwolone tylko w "
 "lokalnej domenie.\n"
 
-#: tools/sss_groupdel.c:126
+#: src/tools/sss_groupdel.c:122
 msgid "Internal error. Could not remove group.\n"
 msgstr "Wewnętrzny błąd. Nie można usunąć grupy.\n"
 
-#: tools/sss_groupmod.c:44
+#: src/tools/sss_groupmod.c:44
 msgid "Groups to add this group to"
 msgstr "Grupy, do których dodać tę grupę"
 
-#: tools/sss_groupmod.c:46
+#: src/tools/sss_groupmod.c:46
 msgid "Groups to remove this group from"
 msgstr "Grupy, z których usunąć tę grupę"
 
-#: tools/sss_groupmod.c:98
+#: src/tools/sss_groupmod.c:84 src/tools/sss_usermod.c:93
+#, fuzzy
+msgid "Specify group to remove from\n"
+msgstr "Proszę podać grupę do zmodyfikowania\n"
+
+#: src/tools/sss_groupmod.c:98
 msgid "Specify group to modify\n"
 msgstr "Proszę podać grupę do zmodyfikowania\n"
 
-#: tools/sss_groupmod.c:130
+#: src/tools/sss_groupmod.c:128
 msgid ""
 "Cannot find group in local domain, modifying groups is allowed only in local "
 "domain\n"
@@ -751,12 +769,12 @@ msgstr ""
 "Nie można odnaleźć grupy w lokalnej domenie, modyfikowanie grup jest "
 "dozwolone tylko w lokalnej domenie\n"
 
-#: tools/sss_groupmod.c:151 tools/sss_groupmod.c:178
+#: src/tools/sss_groupmod.c:149 src/tools/sss_groupmod.c:176
 msgid "Member groups must be in the same domain as parent group\n"
 msgstr "Członkowie grupy muszą być w tej samej domenie co grupa nadrzędna\n"
 
-#: tools/sss_groupmod.c:159 tools/sss_groupmod.c:186 tools/sss_usermod.c:180
-#: tools/sss_usermod.c:207
+#: src/tools/sss_groupmod.c:157 src/tools/sss_groupmod.c:184
+#: src/tools/sss_usermod.c:178 src/tools/sss_usermod.c:205
 #, c-format
 msgid ""
 "Cannot find group %s in local domain, only groups in local domain are "
@@ -765,42 +783,42 @@ msgstr ""
 "Nie można odnaleźć grupy %s w lokalnej domenie, tylko grupy w lokalnej "
 "domenie są dozwolone\n"
 
-#: tools/sss_groupmod.c:220
+#: src/tools/sss_groupmod.c:218
 msgid "Could not modify group - check if member group names are correct\n"
 msgstr ""
 "Nie można zmodyfikować grupy - proszę sprawdzić, czy nazwy członków grupy są "
 "poprawne\n"
 
-#: tools/sss_groupmod.c:224
+#: src/tools/sss_groupmod.c:222
 msgid "Could not modify group - check if groupname is correct\n"
 msgstr ""
 "Nie można zmodyfikować grupy - proszę sprawdzić, czy nazwa grupy jest "
 "poprawna\n"
 
-#: tools/sss_groupmod.c:228
+#: src/tools/sss_groupmod.c:226
 msgid "Transaction error. Could not modify group.\n"
 msgstr "Błąd transakcji. Nie można zmodyfikować grupy.\n"
 
-#: tools/sss_groupshow.c:567
+#: src/tools/sss_groupshow.c:567
 #, c-format
 msgid "%s%sGroup: %s\n"
 msgstr "%s%sGrupa: %s\n"
 
-#: tools/sss_groupshow.c:568
+#: src/tools/sss_groupshow.c:568
 msgid "Magic Private "
 msgstr "Prywatne magic "
 
-#: tools/sss_groupshow.c:570
+#: src/tools/sss_groupshow.c:570
 #, c-format
 msgid "%sGID number: %d\n"
 msgstr "%sNumer GID: %d\n"
 
-#: tools/sss_groupshow.c:572
+#: src/tools/sss_groupshow.c:572
 #, c-format
 msgid "%sMember users: "
 msgstr "%sUżytkownicy będący członkami: "
 
-#: tools/sss_groupshow.c:579
+#: src/tools/sss_groupshow.c:579
 #, c-format
 msgid ""
 "\n"
@@ -809,7 +827,7 @@ msgstr ""
 "\n"
 "%sJest członkiem: "
 
-#: tools/sss_groupshow.c:586
+#: src/tools/sss_groupshow.c:586
 #, c-format
 msgid ""
 "\n"
@@ -818,15 +836,15 @@ msgstr ""
 "\n"
 "%sGrupy będące członkami: "
 
-#: tools/sss_groupshow.c:622
+#: src/tools/sss_groupshow.c:622
 msgid "Print indirect group members recursively"
 msgstr "Rekursywnie drukuje niebezpośrednich członków grupy"
 
-#: tools/sss_groupshow.c:657
+#: src/tools/sss_groupshow.c:655
 msgid "Specify group to show\n"
 msgstr "Proszę podać grupę do wyświetlenia\n"
 
-#: tools/sss_groupshow.c:698
+#: src/tools/sss_groupshow.c:694
 msgid ""
 "No such group in local domain. Printing groups only allowed in local "
 "domain.\n"
@@ -834,105 +852,105 @@ msgstr ""
 "Nie ma takiej grupy w lokalnej domenie. Drukowanie grup jest dozwolone tylko "
 "w lokalnej domenie.\n"
 
-#: tools/sss_groupshow.c:703
+#: src/tools/sss_groupshow.c:699
 msgid "Internal error. Could not print group.\n"
 msgstr "Wewnętrzny błąd. Nie można wydrukować grupy.\n"
 
-#: tools/sss_userdel.c:133
+#: src/tools/sss_userdel.c:133
 msgid "Remove home directory and mail spool"
 msgstr "Usuwa katalog domowy i bufor poczty"
 
-#: tools/sss_userdel.c:135
+#: src/tools/sss_userdel.c:135
 msgid "Do not remove home directory and mail spool"
 msgstr "Nie usuwa katalogu domowego i bufora poczty"
 
-#: tools/sss_userdel.c:137
+#: src/tools/sss_userdel.c:137
 msgid "Force removal of files not owned by the user"
 msgstr "Wymusza usunięcie plików, których właścicielem nie jest użytkownik"
 
-#: tools/sss_userdel.c:139
+#: src/tools/sss_userdel.c:139
 msgid "Kill users' processes before removing him"
 msgstr "Usuwa procesy użytkownika przed jego usunięciem"
 
-#: tools/sss_userdel.c:186
+#: src/tools/sss_userdel.c:184
 msgid "Specify user to delete\n"
 msgstr "Proszę podać użytkownika do usunięcia\n"
 
-#: tools/sss_userdel.c:235
+#: src/tools/sss_userdel.c:231
 #, c-format
 msgid "User %s is outside the defined ID range for domain\n"
 msgstr ""
 "Użytkownik %s jest poza określonym zakresem identyfikatorów dla domeny\n"
 
-#: tools/sss_userdel.c:260
+#: src/tools/sss_userdel.c:256
 msgid "Cannot reset SELinux login context\n"
 msgstr "Nie można przywrócić kontekstu loginu SELinuksa\n"
 
-#: tools/sss_userdel.c:272
+#: src/tools/sss_userdel.c:268
 #, c-format
 msgid "WARNING: The user (uid %lu) was still logged in when deleted.\n"
 msgstr ""
 "OSTRZEŻENIE: użytkownik (UID %lu) był zalogowany podczas jego usunięcia.\n"
 
-#: tools/sss_userdel.c:277
+#: src/tools/sss_userdel.c:273
 msgid "Cannot determine if the user was logged in on this platform"
 msgstr "Nie można określić, czy użytkownik był zalogowany na tej platformie"
 
-#: tools/sss_userdel.c:282
+#: src/tools/sss_userdel.c:278
 msgid "Error while checking if the user was logged in\n"
 msgstr "Błąd podczas sprawdzania, czy użytkownik był zalogowany\n"
 
-#: tools/sss_userdel.c:289
+#: src/tools/sss_userdel.c:285
 #, c-format
 msgid "The post-delete command failed: %s\n"
 msgstr "Polecenie po usunięciu nie powiodło się: %s\n"
 
-#: tools/sss_userdel.c:301
+#: src/tools/sss_userdel.c:297
 msgid "Not removing home dir - not owned by user\n"
 msgstr ""
 "Katalog domowy nie zostanie usunięty - użytkownik nie jest właścicielem\n"
 
-#: tools/sss_userdel.c:303
+#: src/tools/sss_userdel.c:299
 #, c-format
 msgid "Cannot remove homedir: %s\n"
 msgstr "Nie można usunąć katalogu domowego: %s\n"
 
-#: tools/sss_userdel.c:314
+#: src/tools/sss_userdel.c:310
 msgid ""
 "No such user in local domain. Removing users only allowed in local domain.\n"
 msgstr ""
 "Nie ma takiego użytkownika w lokalnej domenie. Usuwanie użytkowników jest "
 "dozwolone tylko w lokalnej domenie.\n"
 
-#: tools/sss_userdel.c:319
+#: src/tools/sss_userdel.c:315
 msgid "Internal error. Could not remove user.\n"
 msgstr "Wewnętrzny błąd. Nie można usunąć użytkownika.\n"
 
-#: tools/sss_usermod.c:49
+#: src/tools/sss_usermod.c:49
 msgid "The GID of the user"
 msgstr "GID użytkownika"
 
-#: tools/sss_usermod.c:53
+#: src/tools/sss_usermod.c:53
 msgid "Groups to add this user to"
 msgstr "Grupy, do których dodać tego użytkownika"
 
-#: tools/sss_usermod.c:54
+#: src/tools/sss_usermod.c:54
 msgid "Groups to remove this user from"
 msgstr "Grupy, z których usunąć tego użytkownika"
 
-#: tools/sss_usermod.c:55
+#: src/tools/sss_usermod.c:55
 msgid "Lock the account"
 msgstr "Zablokowanie konta"
 
-#: tools/sss_usermod.c:56
+#: src/tools/sss_usermod.c:56
 msgid "Unlock the account"
 msgstr "Odblokowanie konta"
 
-#: tools/sss_usermod.c:117
+#: src/tools/sss_usermod.c:117
 msgid "Specify user to modify\n"
 msgstr "Proszę podać użytkownika do zmodyfikowania\n"
 
-#: tools/sss_usermod.c:148
+#: src/tools/sss_usermod.c:146
 msgid ""
 "Cannot find user in local domain, modifying users is allowed only in local "
 "domain\n"
@@ -940,32 +958,32 @@ msgstr ""
 "Nie można odnaleźć użytkownika w lokalnej domenie, modyfikowanie "
 "użytkowników jest dozwolone tylko w lokalnej domenie\n"
 
-#: tools/sss_usermod.c:250
+#: src/tools/sss_usermod.c:248
 msgid "Could not modify user - check if group names are correct\n"
 msgstr ""
 "Nie można zmodyfikować użytkownika - proszę sprawdzić, czy nazwy grup są "
 "poprawne\n"
 
-#: tools/sss_usermod.c:254
+#: src/tools/sss_usermod.c:252
 msgid "Could not modify user - user already member of groups?\n"
 msgstr ""
 "Nie można zmodyfikować użytkownika - czy użytkownik jest już członkiem "
 "grup?\n"
 
-#: tools/sss_usermod.c:258
+#: src/tools/sss_usermod.c:256
 msgid "Transaction error. Could not modify user.\n"
 msgstr "Błąd transakcji. Nie można zmodyfikować użytkownika.\n"
 
-#: tools/tools_util.c:285
+#: src/tools/tools_util.c:290
 msgid "Out of memory\n"
 msgstr "Brak pamięci\n"
 
-#: tools/tools_util.h:34
+#: src/tools/tools_util.h:40
 #, c-format
 msgid "%s must be run as root\n"
 msgstr "%s musi zostać uruchomione jako root\n"
 
-#: util/util.h:63
+#: src/util/util.h:65
 msgid "Send the debug output to files instead of stderr"
 msgstr ""
 "Wysyła wyjście debugowania do plików, zamiast do standardowego wyjścia błędów"
diff --git a/po/pt.po b/po/pt.po
index 625e9d88..6b0c73d2 100644
--- a/po/pt.po
+++ b/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-08-03 18:24-0400\n"
+"POT-Creation-Date: 2010-10-18 13:14-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"
@@ -19,90 +19,90 @@ msgstr ""
 "X-Poedit-Country: PORTUGAL\n"
 "X-Generator: Virtaal 0.5.2\n"
 
-#: config/SSSDConfig.py:39
+#: src/config/SSSDConfig.py:39
 msgid "Set the verbosity of the debug logging"
 msgstr "Definir a verbosidade dos registos de depuração"
 
-#: config/SSSDConfig.py:40
+#: src/config/SSSDConfig.py:40
 msgid "Include timestamps in debug logs"
 msgstr "Incluir data e hora nos registos de depuração"
 
-#: config/SSSDConfig.py:41
+#: src/config/SSSDConfig.py:41
 msgid "Write debug messages to logfiles"
 msgstr "Gravar as mensagens de depuração em ficheiros de registo"
 
-#: config/SSSDConfig.py:42
+#: src/config/SSSDConfig.py:42
 msgid "Ping timeout before restarting service"
 msgstr "Foi excedido o tempo do ping antes de reiniciar o serviço"
 
-#: config/SSSDConfig.py:43
+#: src/config/SSSDConfig.py:43
 msgid "Command to start service"
 msgstr "Comando para iniciar serviço"
 
-#: config/SSSDConfig.py:44
+#: src/config/SSSDConfig.py:44
 msgid "Number of times to attempt connection to Data Providers"
 msgstr "Número de vezes para tentar ligação aos Fornecedores de Dados"
 
-#: config/SSSDConfig.py:47
+#: src/config/SSSDConfig.py:47
 msgid "SSSD Services to start"
 msgstr "Serviços SSSD a iniciar"
 
-#: config/SSSDConfig.py:48
+#: src/config/SSSDConfig.py:48
 msgid "SSSD Domains to start"
 msgstr "Domínios SSSD a iniciar"
 
-#: config/SSSDConfig.py:49
+#: src/config/SSSDConfig.py:49
 msgid "Timeout for messages sent over the SBUS"
 msgstr "Limite de tempo para mensagens enviadas sobre SBUS"
 
-#: config/SSSDConfig.py:50
+#: src/config/SSSDConfig.py:50
 msgid "Regex to parse username and domain"
 msgstr "Expressão regular para obter nome do utilizar e domínio"
 
-#: config/SSSDConfig.py:51
+#: src/config/SSSDConfig.py:51
 msgid "Printf-compatible format for displaying fully-qualified names"
 msgstr "Formato compatível com o printf para apresentar nomes completos"
 
-#: config/SSSDConfig.py:54
+#: src/config/SSSDConfig.py:54
 msgid "Enumeration cache timeout length (seconds)"
 msgstr "Validade da cache de enumeração (segundos)"
 
-#: config/SSSDConfig.py:55
+#: src/config/SSSDConfig.py:55
 msgid "Entry cache background update timeout length (seconds)"
 msgstr "Validade da actualização da cache em segundo plano (segundos)"
 
-#: config/SSSDConfig.py:56
+#: src/config/SSSDConfig.py:56
 msgid "Negative cache timeout length (seconds)"
 msgstr "Validade da cache negativa (segundos)"
 
-#: config/SSSDConfig.py:57
+#: src/config/SSSDConfig.py:57
 msgid "Users that SSSD should explicitly ignore"
 msgstr "Utilizadores que o SSSD devem explicitamente ignorar"
 
-#: config/SSSDConfig.py:58
+#: src/config/SSSDConfig.py:58
 msgid "Groups that SSSD should explicitly ignore"
 msgstr "Grupos que o SSSD devem explicitamente ignorar"
 
-#: config/SSSDConfig.py:59
+#: src/config/SSSDConfig.py:59
 msgid "Should filtered users appear in groups"
 msgstr "Devem os utilizadores filtrados aparecer em grupos"
 
-#: config/SSSDConfig.py:60
+#: src/config/SSSDConfig.py:60
 msgid "The value of the password field the NSS provider should return"
 msgstr "O valor do campo da senha que o fornecedor NSS deve retornar"
 
-#: config/SSSDConfig.py:63
+#: src/config/SSSDConfig.py:63
 msgid "How long to allow cached logins between online logins (days)"
 msgstr ""
 "Durante quanto tempo devem ser permitidas as caches de sessões entre sessões "
 "online (dias)"
 
-#: config/SSSDConfig.py:64
+#: src/config/SSSDConfig.py:64
 msgid "How many failed logins attempts are allowed when offline"
 msgstr ""
 "Quantas tentativas falhadas de inicio de sessão são permitidas quando offline"
 
-#: config/SSSDConfig.py:65
+#: src/config/SSSDConfig.py:65
 msgid ""
 "How long (minutes) to deny login after offline_failed_login_attempts has "
 "been reached"
@@ -110,327 +110,327 @@ msgstr ""
 "Quanto tempo (minutos) para negar a sessão após "
 "offline_failed_login_attempts ter sido atingido"
 
-#: config/SSSDConfig.py:68
+#: src/config/SSSDConfig.py:68
 msgid "Identity provider"
 msgstr "Fornecedor de identidade"
 
-#: config/SSSDConfig.py:69
+#: src/config/SSSDConfig.py:69
 msgid "Authentication provider"
 msgstr "Fornecedor de autenticação"
 
-#: config/SSSDConfig.py:70
+#: src/config/SSSDConfig.py:70
 msgid "Access control provider"
 msgstr "Fornecedor de controle de acesso"
 
-#: config/SSSDConfig.py:71
+#: src/config/SSSDConfig.py:71
 msgid "Password change provider"
 msgstr "Fornecedor de Alteração de Senha"
 
-#: config/SSSDConfig.py:74
+#: src/config/SSSDConfig.py:74
 msgid "Minimum user ID"
 msgstr "ID de utilizador mínimo"
 
-#: config/SSSDConfig.py:75
+#: src/config/SSSDConfig.py:75
 msgid "Maximum user ID"
 msgstr "ID de utilizador máximo"
 
-#: config/SSSDConfig.py:76
+#: src/config/SSSDConfig.py:76
 msgid "Ping timeout before restarting domain"
 msgstr "Duração do ping antes de reiniciar o domínio"
 
-#: config/SSSDConfig.py:77
+#: src/config/SSSDConfig.py:77
 msgid "Enable enumerating all users/groups"
 msgstr "Permitir enumeração de todos os utilizadores/grupos"
 
-#: config/SSSDConfig.py:78
+#: src/config/SSSDConfig.py:78
 msgid "Cache credentials for offline login"
 msgstr "Efectuar cache de credenciais para sessões em modo desligado"
 
-#: config/SSSDConfig.py:79
+#: src/config/SSSDConfig.py:79
 msgid "Store password hashes"
 msgstr "Guardar hashes da senha"
 
-#: config/SSSDConfig.py:80
+#: src/config/SSSDConfig.py:80
 msgid "Display users/groups in fully-qualified form"
 msgstr "Apresentar utilizadores/grupos na forma completa"
 
-#: config/SSSDConfig.py:81
+#: src/config/SSSDConfig.py:81
 msgid "Entry cache timeout length (seconds)"
 msgstr "Validade da cache (segundos)"
 
-#: config/SSSDConfig.py:82
+#: src/config/SSSDConfig.py:82
 msgid ""
 "Restrict or prefer a specific address family when performing DNS lookups"
 msgstr ""
 "Restringir ou preferir famílias de endereços especificas quando efectua "
 "consultas DNS"
 
-#: config/SSSDConfig.py:83
+#: src/config/SSSDConfig.py:83
 msgid "How long to keep cached entries after last successful login (days)"
 msgstr ""
 "Durante quanto tempo devem ser permitidas as caches de sessões entre sessões "
 "bem sucedidas (dias)"
 
-#: config/SSSDConfig.py:84
+#: src/config/SSSDConfig.py:84
 msgid "How long to wait for replies from DNS when resolving servers (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:85
+#: src/config/SSSDConfig.py:85
 msgid "The domain part of service discovery DNS query"
 msgstr ""
 
-#: config/SSSDConfig.py:88
+#: src/config/SSSDConfig.py:88
 msgid "IPA domain"
 msgstr "Domínio IPA"
 
-#: config/SSSDConfig.py:89
+#: src/config/SSSDConfig.py:89
 msgid "IPA server address"
 msgstr "Endereço do servidor IPA"
 
-#: config/SSSDConfig.py:90
+#: src/config/SSSDConfig.py:90
 msgid "IPA client hostname"
 msgstr "Nome da máquina do cliente IPA"
 
-#: config/SSSDConfig.py:91
+#: src/config/SSSDConfig.py:91
 msgid "Whether to automatically update the client's DNS entry in FreeIPA"
 msgstr ""
 
-#: config/SSSDConfig.py:92
+#: src/config/SSSDConfig.py:92
 msgid "The interface whose IP should be used for dynamic DNS updates"
 msgstr ""
 
-#: config/SSSDConfig.py:95 config/SSSDConfig.py:124
+#: src/config/SSSDConfig.py:95 src/config/SSSDConfig.py:124
 msgid "Kerberos server address"
 msgstr "Endereço do servidor Kerberos"
 
-#: config/SSSDConfig.py:96 config/SSSDConfig.py:125
+#: src/config/SSSDConfig.py:96 src/config/SSSDConfig.py:125
 msgid "Kerberos realm"
 msgstr "Reino Kerberos"
 
-#: config/SSSDConfig.py:97
+#: src/config/SSSDConfig.py:97
 msgid "Authentication timeout"
 msgstr "Tempo de expiração da autenticação"
 
-#: config/SSSDConfig.py:100
+#: src/config/SSSDConfig.py:100
 msgid "Directory to store credential caches"
 msgstr "Directório para armazenar as caches de credenciais"
 
-#: config/SSSDConfig.py:101
+#: src/config/SSSDConfig.py:101
 msgid "Location of the user's credential cache"
 msgstr "Localização da cache de credenciais dos utilizadores"
 
-#: config/SSSDConfig.py:102
+#: src/config/SSSDConfig.py:102
 msgid "Location of the keytab to validate credentials"
 msgstr "Localização da tabela de chaves (keytab) para validar credenciais"
 
-#: config/SSSDConfig.py:103
+#: src/config/SSSDConfig.py:103
 msgid "Enable credential validation"
 msgstr "Activar validação de credenciais"
 
-#: config/SSSDConfig.py:104
+#: src/config/SSSDConfig.py:104
 msgid "Store password if offline for later online authentication"
 msgstr ""
 
-#: config/SSSDConfig.py:107
+#: src/config/SSSDConfig.py:107
 msgid "Server where the change password service is running if not on the KDC"
 msgstr ""
 "Servidor onde está em execução o serviço de alteração de senha, se não "
 "coincide com o KDC"
 
-#: config/SSSDConfig.py:110
+#: src/config/SSSDConfig.py:110
 msgid "ldap_uri, The URI of the LDAP server"
 msgstr "ldap_uri, O URI do servidor LDAP"
 
-#: config/SSSDConfig.py:111
+#: src/config/SSSDConfig.py:111
 msgid "The default base DN"
 msgstr "A base DN por omissão"
 
-#: config/SSSDConfig.py:112
+#: src/config/SSSDConfig.py:112
 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:113
+#: src/config/SSSDConfig.py:113
 msgid "The default bind DN"
 msgstr "O DN por omissão para a ligação"
 
-#: config/SSSDConfig.py:114
+#: src/config/SSSDConfig.py:114
 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:115
+#: src/config/SSSDConfig.py:115
 msgid "The authentication token of the default bind DN"
 msgstr "O token de autenticação do bind DN por omissão"
 
-#: config/SSSDConfig.py:116
+#: src/config/SSSDConfig.py:116
 msgid "Length of time to attempt connection"
 msgstr "Período de tempo para tentar ligação"
 
-#: config/SSSDConfig.py:117
+#: src/config/SSSDConfig.py:117
 msgid "Length of time to attempt synchronous LDAP operations"
 msgstr "Tempo de espera para tentar operações LDAP síncronas"
 
-#: config/SSSDConfig.py:118
+#: src/config/SSSDConfig.py:118
 msgid "Length of time between attempts to reconnect while offline"
 msgstr "Tempo de espera entre tentativas para re-conectar quando desligado"
 
-#: config/SSSDConfig.py:119
+#: src/config/SSSDConfig.py:119
 msgid "File that contains CA certificates"
 msgstr "Ficheiro que contêm os certificados CA"
 
-#: config/SSSDConfig.py:120
+#: src/config/SSSDConfig.py:120
 msgid "Path to CA certificate directory"
 msgstr "Caminho para o directório do certificado CA"
 
-#: config/SSSDConfig.py:121
+#: src/config/SSSDConfig.py:121
 msgid "Require TLS certificate verification"
 msgstr "Obriga a verificação de certificados TLS"
 
-#: config/SSSDConfig.py:122
+#: src/config/SSSDConfig.py:122
 msgid "Specify the sasl mechanism to use"
 msgstr "Especificar mecanismo sasl a utilizar"
 
-#: config/SSSDConfig.py:123
+#: src/config/SSSDConfig.py:123
 msgid "Specify the sasl authorization id to use"
 msgstr "Especifique o id sasl para utilizar na autorização"
 
-#: config/SSSDConfig.py:126
+#: src/config/SSSDConfig.py:126
 msgid "Kerberos service keytab"
 msgstr "Separador chave do serviço Kerberos"
 
-#: config/SSSDConfig.py:127
+#: src/config/SSSDConfig.py:127
 msgid "Use Kerberos auth for LDAP connection"
 msgstr "Utilizar autenticação Kerberos para ligações LDAP"
 
-#: config/SSSDConfig.py:128
+#: src/config/SSSDConfig.py:128
 msgid "Follow LDAP referrals"
 msgstr "Seguir os referrals LDAP"
 
-#: config/SSSDConfig.py:129
+#: src/config/SSSDConfig.py:129
 #, fuzzy
 msgid "Lifetime of TGT for LDAP connection"
 msgstr "Utilizar autenticação Kerberos para ligações LDAP"
 
-#: config/SSSDConfig.py:132
+#: src/config/SSSDConfig.py:132
 msgid "Length of time to wait for a search request"
 msgstr "Tempo de espera por um pedido de pesquisa"
 
-#: config/SSSDConfig.py:133
+#: src/config/SSSDConfig.py:133
 msgid "Length of time between enumeration updates"
 msgstr "Período de tempo entre enumeração de actualizações"
 
-#: config/SSSDConfig.py:134
+#: src/config/SSSDConfig.py:134
 msgid "Require TLS for ID lookups"
 msgstr "Requer TLS para consultas de ID"
 
-#: config/SSSDConfig.py:135
+#: src/config/SSSDConfig.py:135
 msgid "Base DN for user lookups"
 msgstr "DN base para pesquisa de utilizadores"
 
-#: config/SSSDConfig.py:136
+#: src/config/SSSDConfig.py:136
 msgid "Scope of user lookups"
 msgstr "Âmbito das pesquisas do utilizador"
 
-#: config/SSSDConfig.py:137
+#: src/config/SSSDConfig.py:137
 msgid "Filter for user lookups"
 msgstr "Filtro para as pesquisas do utilizador"
 
-#: config/SSSDConfig.py:138
+#: src/config/SSSDConfig.py:138
 msgid "Objectclass for users"
 msgstr "Objectclass para utilizadores"
 
-#: config/SSSDConfig.py:139
+#: src/config/SSSDConfig.py:139
 msgid "Username attribute"
 msgstr "Atributo do nome do utilizador"
 
-#: config/SSSDConfig.py:140
+#: src/config/SSSDConfig.py:140
 msgid "UID attribute"
 msgstr "Atributo UID"
 
-#: config/SSSDConfig.py:141
+#: src/config/SSSDConfig.py:141
 msgid "Primary GID attribute"
 msgstr "Atributo GID primário"
 
-#: config/SSSDConfig.py:142
+#: src/config/SSSDConfig.py:142
 msgid "GECOS attribute"
 msgstr "Atributo GECOS"
 
-#: config/SSSDConfig.py:143
+#: src/config/SSSDConfig.py:143
 msgid "Home directory attribute"
 msgstr "Atributo da pasta pessoal"
 
-#: config/SSSDConfig.py:144
+#: src/config/SSSDConfig.py:144
 msgid "Shell attribute"
 msgstr "Atributo da Shell"
 
-#: config/SSSDConfig.py:145
+#: src/config/SSSDConfig.py:145
 msgid "UUID attribute"
 msgstr "Atributo UUID"
 
-#: config/SSSDConfig.py:146
+#: src/config/SSSDConfig.py:146
 msgid "User principal attribute (for Kerberos)"
 msgstr "Atributo principal do utilizador (para Kerberos)"
 
-#: config/SSSDConfig.py:147
+#: src/config/SSSDConfig.py:147
 msgid "Full Name"
 msgstr "Nome Completo"
 
-#: config/SSSDConfig.py:148
+#: src/config/SSSDConfig.py:148
 msgid "memberOf attribute"
 msgstr "Atributo memberOf"
 
-#: config/SSSDConfig.py:149
+#: src/config/SSSDConfig.py:149
 msgid "Modification time attribute"
 msgstr "Atributo da alteração da data"
 
-#: config/SSSDConfig.py:152
+#: src/config/SSSDConfig.py:152
 msgid "Policy to evaluate the password expiration"
 msgstr "Politica para avaliar a expiração da senha"
 
-#: config/SSSDConfig.py:155
+#: src/config/SSSDConfig.py:155
 msgid "LDAP filter to determine access privileges"
 msgstr ""
 
-#: config/SSSDConfig.py:158
+#: src/config/SSSDConfig.py:158
 msgid "Comma separated list of allowed users"
 msgstr "Lista de utilizadores autorizados separados por vírgulas"
 
-#: config/SSSDConfig.py:159
+#: src/config/SSSDConfig.py:159
 msgid "Comma separated list of prohibited users"
 msgstr "Lista de utilizadores não autorizados separados por vírgulas"
 
-#: config/SSSDConfig.py:162
+#: src/config/SSSDConfig.py:162
 msgid "Default shell, /bin/bash"
 msgstr "Shell pré-definida, /bin/bash"
 
-#: config/SSSDConfig.py:163
+#: src/config/SSSDConfig.py:163
 msgid "Base for home directories"
 msgstr "Directório base para as pastas pessoais"
 
-#: config/SSSDConfig.py:166
+#: src/config/SSSDConfig.py:166
 msgid "The name of the NSS library to use"
 msgstr "O nome da biblioteca NSS a utilizar"
 
-#: config/SSSDConfig.py:169
+#: src/config/SSSDConfig.py:169
 msgid "PAM stack to use"
 msgstr "Stack PAM a utilizar"
 
-#: monitor/monitor.c:2137
+#: src/monitor/monitor.c:2140
 msgid "Become a daemon (default)"
 msgstr "Tornar-se num serviço (omissão)"
 
-#: monitor/monitor.c:2139
+#: src/monitor/monitor.c:2142
 msgid "Run interactive (not a daemon)"
 msgstr "Executar interactivamente (não como serviço)"
 
-#: monitor/monitor.c:2141
+#: src/monitor/monitor.c:2144
 msgid "Specify a non-default config file"
 msgstr "Especificar um ficheiro de configuração não standard"
 
-#: monitor/monitor.c:2167
+#: src/monitor/monitor.c:2170
 msgid "sssd must be run as root\n"
 msgstr "sssd tem de executar como root\n"
 
-#: monitor/monitor.c:2202
+#: src/monitor/monitor.c:2205
 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"
@@ -439,7 +439,7 @@ msgstr ""
 "em conflito com o SSSD. Não é recomendado executar o nscd em paralelo com o "
 "SSSD\n"
 
-#: monitor/monitor.c:2212
+#: src/monitor/monitor.c:2215
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
@@ -448,277 +448,290 @@ 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"
 
-#: monitor/monitor.c:2217
+#: src/monitor/monitor.c:2220
 msgid "Cannot load configuration database\n"
 msgstr "Não é possível carregar a configuração da base de dados\n"
 
-#: providers/krb5/krb5_child.c:993 providers/ldap/ldap_child.c:361
-#: util/util.h:61
+#: src/providers/krb5/krb5_child.c:1043 src/providers/ldap/ldap_child.c:359
+#: src/util/util.h:63
 msgid "Debug level"
 msgstr "Nível de depuração"
 
-#: providers/krb5/krb5_child.c:995 providers/ldap/ldap_child.c:363
-#: util/util.h:65
+#: src/providers/krb5/krb5_child.c:1045 src/providers/ldap/ldap_child.c:361
+#: src/util/util.h:67
 msgid "Add debug timestamps"
 msgstr "Adicionar tempos na depuração"
 
-#: providers/krb5/krb5_child.c:997 providers/ldap/ldap_child.c:365
+#: src/providers/krb5/krb5_child.c:1047 src/providers/ldap/ldap_child.c:363
 msgid "An open file descriptor for the debug logs"
 msgstr "Um descritor de ficheiro aberto para os registos de depuração"
 
-#: providers/data_provider_be.c:1165
+#: src/providers/data_provider_be.c:1165
 msgid "Domain of the information provider (mandatory)"
 msgstr "Domínio do fornecedor de informação (obrigatório)"
 
-#: sss_client/common.c:742
+#: src/sss_client/common.c:742
 msgid "Privileged socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:745
+#: src/sss_client/common.c:745
 msgid "Public socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:748
+#: src/sss_client/common.c:748
 #, fuzzy
 msgid "Unexpected format of the server credential message."
 msgstr "Localização da cache de credenciais dos utilizadores"
 
-#: sss_client/common.c:751
+#: src/sss_client/common.c:751
 msgid "SSSD is not run by root."
 msgstr ""
 
-#: sss_client/common.c:756
+#: src/sss_client/common.c:756
 msgid "An error occurred, but no description can be found."
 msgstr ""
 
-#: sss_client/common.c:762
+#: src/sss_client/common.c:762
 msgid "Unexpected error while looking for an error description"
 msgstr ""
 
-#: sss_client/pam_sss.c:372
+#: src/sss_client/pam_sss.c:372
 msgid "Passwords do not match"
 msgstr "Senhas não coincidem"
 
-#: sss_client/pam_sss.c:556
+#: src/sss_client/pam_sss.c:556
 msgid "Password reset by root is not supported."
 msgstr ""
 
-#: sss_client/pam_sss.c:597
+#: src/sss_client/pam_sss.c:597
 msgid "Authenticated with cached credentials"
 msgstr ""
 
-#: sss_client/pam_sss.c:598
+#: src/sss_client/pam_sss.c:598
 msgid ", your cached password will expire at: "
 msgstr ", a sua senha guardada em cache irá expirar em: "
 
-#: sss_client/pam_sss.c:628
+#: src/sss_client/pam_sss.c:628
 #, c-format
 msgid "Your password has expired. You have %d grace login(s) remaining."
 msgstr "A sua senha expirou. Restam-lhe %d sessões de tolerância."
 
-#: sss_client/pam_sss.c:674
+#: src/sss_client/pam_sss.c:674
 #, c-format
 msgid "Your password will expire in %d %s."
 msgstr "A sua senha irá expirar em %d %s."
 
-#: sss_client/pam_sss.c:723
+#: src/sss_client/pam_sss.c:723
 #, fuzzy
 msgid "Authentication is denied until: "
 msgstr "Autenticação offline, a autenticação é negada até: "
 
-#: sss_client/pam_sss.c:750
+#: src/sss_client/pam_sss.c:750
 msgid "System is offline, password change not possible"
 msgstr "O sistema está offline, a mudança de senha não é possível"
 
-#: sss_client/pam_sss.c:780 sss_client/pam_sss.c:793
+#: src/sss_client/pam_sss.c:780 src/sss_client/pam_sss.c:793
 msgid "Password change failed. "
 msgstr "Alteração da senha falhou."
 
-#: sss_client/pam_sss.c:783 sss_client/pam_sss.c:794
+#: src/sss_client/pam_sss.c:783 src/sss_client/pam_sss.c:794
 msgid "Server message: "
 msgstr "Mensagem do Servidor: "
 
-#: sss_client/pam_sss.c:1197
+#: src/sss_client/pam_sss.c:1197
 msgid "New Password: "
 msgstr "Nova Senha: "
 
-#: sss_client/pam_sss.c:1198
+#: src/sss_client/pam_sss.c:1198
 msgid "Reenter new Password: "
 msgstr "Digite a senha novamente: "
 
-#: sss_client/pam_sss.c:1280
+#: src/sss_client/pam_sss.c:1280
 msgid "Password: "
 msgstr "Senha: "
 
-#: sss_client/pam_sss.c:1312
+#: src/sss_client/pam_sss.c:1312
 msgid "Current Password: "
 msgstr "Senha actual: "
 
-#: sss_client/pam_sss.c:1458
+#: src/sss_client/pam_sss.c:1458
 msgid "Password expired. Change your password now."
 msgstr "A senha expirou. Altere a sua senha agora."
 
-#: tools/sss_useradd.c:48 tools/sss_groupadd.c:41 tools/sss_groupdel.c:43
-#: tools/sss_groupmod.c:42 tools/sss_groupshow.c:620 tools/sss_userdel.c:131
-#: tools/sss_usermod.c:47
+#: src/tools/sss_useradd.c:48 src/tools/sss_groupadd.c:41
+#: src/tools/sss_groupdel.c:43 src/tools/sss_groupmod.c:42
+#: src/tools/sss_groupshow.c:620 src/tools/sss_userdel.c:131
+#: src/tools/sss_usermod.c:47
 msgid "The debug level to run with"
 msgstr "O nível de depuração a utilizar durante a execução"
 
-#: tools/sss_useradd.c:49 tools/sss_usermod.c:48
+#: src/tools/sss_useradd.c:49 src/tools/sss_usermod.c:48
 msgid "The UID of the user"
 msgstr "O UID do utilizador"
 
-#: tools/sss_useradd.c:50 tools/sss_usermod.c:50
+#: src/tools/sss_useradd.c:50 src/tools/sss_usermod.c:50
 msgid "The comment string"
 msgstr "Texto do comentário"
 
-#: tools/sss_useradd.c:51 tools/sss_usermod.c:51
+#: src/tools/sss_useradd.c:51 src/tools/sss_usermod.c:51
 msgid "Home directory"
 msgstr "Pasta pessoal"
 
-#: tools/sss_useradd.c:52 tools/sss_usermod.c:52
+#: src/tools/sss_useradd.c:52 src/tools/sss_usermod.c:52
 msgid "Login shell"
 msgstr "Shell"
 
-#: tools/sss_useradd.c:53
+#: src/tools/sss_useradd.c:53
 msgid "Groups"
 msgstr "Grupos"
 
-#: tools/sss_useradd.c:54
+#: src/tools/sss_useradd.c:54
 msgid "Create user's directory if it does not exist"
 msgstr "Criar pasta pessoal do utilizador, se ainda não existir"
 
-#: tools/sss_useradd.c:55
+#: src/tools/sss_useradd.c:55
 msgid "Never create user's directory, overrides config"
 msgstr "Nunca criar pasta pessoal do utilizador. Sobrepõem-se à configuração"
 
-#: tools/sss_useradd.c:56
+#: src/tools/sss_useradd.c:56
 msgid "Specify an alternative skeleton directory"
 msgstr "Indique um directório skeleton alternativo"
 
-#: tools/sss_useradd.c:57 tools/sss_usermod.c:57
+#: src/tools/sss_useradd.c:57 src/tools/sss_usermod.c:57
 msgid "The SELinux user for user's login"
 msgstr "O utilizador SELinux para a sessão do utilizador"
 
-#: tools/sss_useradd.c:71 tools/sss_groupadd.c:56 tools/sss_groupdel.c:52
-#: tools/sss_groupmod.c:63 tools/sss_groupshow.c:631 tools/sss_userdel.c:148
-#: tools/sss_usermod.c:72
+#: src/tools/sss_useradd.c:71 src/tools/sss_groupadd.c:56
+#: src/tools/sss_groupdel.c:52 src/tools/sss_groupmod.c:63
+#: src/tools/sss_groupshow.c:631 src/tools/sss_userdel.c:148
+#: src/tools/sss_usermod.c:72
 msgid "Error setting the locale\n"
 msgstr "Erro ao definir a configuração regional\n"
 
-#: tools/sss_useradd.c:107
+#: src/tools/sss_useradd.c:84 src/tools/sss_groupmod.c:76
+#: src/tools/sss_usermod.c:85
+#, fuzzy
+msgid "Specify group to add to\n"
+msgstr "Indique grupo a adicionar\n"
+
+#: src/tools/sss_useradd.c:108
 msgid "Specify user to add\n"
 msgstr "Indique utilizador a adicionar\n"
 
-#: tools/sss_useradd.c:118 tools/sss_groupadd.c:86 tools/sss_groupdel.c:81
-#: tools/sss_groupmod.c:111 tools/sss_groupshow.c:668 tools/sss_userdel.c:197
-#: tools/sss_usermod.c:128
+#: src/tools/sss_useradd.c:117 src/tools/sss_groupadd.c:82
+#: src/tools/sss_groupdel.c:77 src/tools/sss_groupmod.c:109
+#: src/tools/sss_groupshow.c:664 src/tools/sss_userdel.c:193
+#: src/tools/sss_usermod.c:126
 msgid "Error initializing the tools - no local domain\n"
 msgstr "Erro ao inicializar as ferramentas - não existe domínio local\n"
 
-#: tools/sss_useradd.c:120 tools/sss_groupadd.c:88 tools/sss_groupdel.c:83
-#: tools/sss_groupmod.c:113 tools/sss_groupshow.c:670 tools/sss_userdel.c:199
-#: tools/sss_usermod.c:130
+#: src/tools/sss_useradd.c:119 src/tools/sss_groupadd.c:84
+#: src/tools/sss_groupdel.c:79 src/tools/sss_groupmod.c:111
+#: src/tools/sss_groupshow.c:666 src/tools/sss_userdel.c:195
+#: src/tools/sss_usermod.c:128
 msgid "Error initializing the tools\n"
 msgstr "Erro ao inicializar as ferramentas\n"
 
-#: tools/sss_useradd.c:129 tools/sss_groupadd.c:97 tools/sss_groupdel.c:92
-#: tools/sss_groupmod.c:121 tools/sss_groupshow.c:679 tools/sss_userdel.c:208
-#: tools/sss_usermod.c:139
+#: src/tools/sss_useradd.c:128 src/tools/sss_groupadd.c:93
+#: src/tools/sss_groupdel.c:88 src/tools/sss_groupmod.c:119
+#: src/tools/sss_groupshow.c:675 src/tools/sss_userdel.c:204
+#: src/tools/sss_usermod.c:137
 msgid "Invalid domain specified in FQDN\n"
 msgstr "Domínio inválido especificado no FQDN\n"
 
-#: tools/sss_useradd.c:138 tools/sss_groupmod.c:143 tools/sss_groupmod.c:170
-#: tools/sss_usermod.c:164 tools/sss_usermod.c:191
+#: src/tools/sss_useradd.c:137 src/tools/sss_groupmod.c:141
+#: src/tools/sss_groupmod.c:168 src/tools/sss_usermod.c:162
+#: src/tools/sss_usermod.c:189
 msgid "Internal error while parsing parameters\n"
 msgstr "Erro interno ao processar parâmetros\n"
 
-#: tools/sss_useradd.c:146 tools/sss_usermod.c:172 tools/sss_usermod.c:199
+#: src/tools/sss_useradd.c:145 src/tools/sss_usermod.c:170
+#: src/tools/sss_usermod.c:197
 msgid "Groups must be in the same domain as user\n"
 msgstr "Os grupos têm de pertencer ao mesmo domínio que o utilizador\n"
 
-#: tools/sss_useradd.c:154
+#: src/tools/sss_useradd.c:153
 #, c-format
 msgid "Cannot find group %s in local domain\n"
 msgstr "Incapaz de encontrar o grupo %s no domínio local\n"
 
-#: tools/sss_useradd.c:169 tools/sss_userdel.c:218
+#: src/tools/sss_useradd.c:168 src/tools/sss_userdel.c:214
 msgid "Cannot set default values\n"
 msgstr "Incapaz de definir valores por omissão\n"
 
-#: tools/sss_useradd.c:176 tools/sss_usermod.c:155
+#: src/tools/sss_useradd.c:175 src/tools/sss_usermod.c:153
 msgid "The selected UID is outside the allowed range\n"
 msgstr "O UID seleccionado está fora do intervalo permitido\n"
 
-#: tools/sss_useradd.c:203 tools/sss_usermod.c:240
+#: src/tools/sss_useradd.c:202 src/tools/sss_usermod.c:238
 msgid "Cannot set SELinux login context\n"
 msgstr "Não foi possível definir o contexto SELinux para a sessão\n"
 
-#: tools/sss_useradd.c:219
+#: src/tools/sss_useradd.c:218
 msgid "Cannot get info about the user\n"
 msgstr "Incapaz de obter informação acerca do utilizador\n"
 
-#: tools/sss_useradd.c:233
+#: src/tools/sss_useradd.c:232
 msgid "User's home directory already exists, not copying data from skeldir\n"
 msgstr ""
 "A pasta pessoal do utilizador já existe. Conteúdo skeldir não copiado\n"
 
-#: tools/sss_useradd.c:236
+#: src/tools/sss_useradd.c:235
 #, c-format
 msgid "Cannot create user's home directory: %s\n"
 msgstr "Incapaz de criar pasta pessoal do utilizador: %s\n"
 
-#: tools/sss_useradd.c:247
+#: src/tools/sss_useradd.c:246
 #, c-format
 msgid "Cannot create user's mail spool: %s\n"
 msgstr "Incapaz de criar o ficheiro de correio do utilizador: %s\n"
 
-#: tools/sss_useradd.c:259
+#: src/tools/sss_useradd.c:258
 msgid "Could not allocate ID for the user - domain full?\n"
 msgstr "Incapaz de alocar um ID para o utilizador - domínio cheio?\n"
 
-#: tools/sss_useradd.c:263
+#: src/tools/sss_useradd.c:262
 msgid "A user or group with the same name or ID already exists\n"
 msgstr "Já existe um utilizador ou grupo com o mesmo nome ou ID\n"
 
-#: tools/sss_useradd.c:269
+#: src/tools/sss_useradd.c:268
 msgid "Transaction error. Could not add user.\n"
 msgstr "Erro na transacção. Não foi possível adicionar o utilizador.\n"
 
-#: tools/sss_groupadd.c:43 tools/sss_groupmod.c:48
+#: src/tools/sss_groupadd.c:43 src/tools/sss_groupmod.c:48
 msgid "The GID of the group"
 msgstr "O GID do grupo"
 
-#: tools/sss_groupadd.c:75
+#: src/tools/sss_groupadd.c:73
 msgid "Specify group to add\n"
 msgstr "Indique grupo a adicionar\n"
 
-#: tools/sss_groupadd.c:106 tools/sss_groupmod.c:194
+#: src/tools/sss_groupadd.c:102 src/tools/sss_groupmod.c:192
 msgid "The selected GID is outside the allowed range\n"
 msgstr "O GID seleccionado está fora do intervalo permitido\n"
 
-#: tools/sss_groupadd.c:131
+#: src/tools/sss_groupadd.c:127
 msgid "Could not allocate ID for the group - domain full?\n"
 msgstr "Incapaz de alocar um ID para o grupo - domínio cheio?\n"
 
-#: tools/sss_groupadd.c:135
+#: src/tools/sss_groupadd.c:131
 msgid "A group with the same name or GID already exists\n"
 msgstr "Já existe um grupo com o mesmo nome ou GID\n"
 
-#: tools/sss_groupadd.c:140
+#: src/tools/sss_groupadd.c:136
 msgid "Transaction error. Could not add group.\n"
 msgstr "Erro de transacção. Não foi possível adicionar o grupo.\n"
 
-#: tools/sss_groupdel.c:70
+#: src/tools/sss_groupdel.c:68
 msgid "Specify group to delete\n"
 msgstr "Especifique grupo a remover\n"
 
-#: tools/sss_groupdel.c:107
+#: src/tools/sss_groupdel.c:103
 #, c-format
 msgid "Group %s is outside the defined ID range for domain\n"
 msgstr "O grupo %s está fora do intervalo de IDs para o domínio\n"
 
-#: tools/sss_groupdel.c:121
+#: src/tools/sss_groupdel.c:117
 msgid ""
 "No such group in local domain. Removing groups only allowed in local "
 "domain.\n"
@@ -726,23 +739,28 @@ msgstr ""
 "Grupo não existe no domínio local. Apenas é permitido remover grupos no "
 "domínio local.\n"
 
-#: tools/sss_groupdel.c:126
+#: src/tools/sss_groupdel.c:122
 msgid "Internal error. Could not remove group.\n"
 msgstr "Erro interno. Incapaz de remover grupo.\n"
 
-#: tools/sss_groupmod.c:44
+#: src/tools/sss_groupmod.c:44
 msgid "Groups to add this group to"
 msgstr "Grupos para adicionar este grupo"
 
-#: tools/sss_groupmod.c:46
+#: src/tools/sss_groupmod.c:46
 msgid "Groups to remove this group from"
 msgstr "Grupos para remover este projecto"
 
-#: tools/sss_groupmod.c:98
+#: src/tools/sss_groupmod.c:84 src/tools/sss_usermod.c:93
+#, fuzzy
+msgid "Specify group to remove from\n"
+msgstr "Especifique grupo a modificar\n"
+
+#: src/tools/sss_groupmod.c:98
 msgid "Specify group to modify\n"
 msgstr "Especifique grupo a modificar\n"
 
-#: tools/sss_groupmod.c:130
+#: src/tools/sss_groupmod.c:128
 msgid ""
 "Cannot find group in local domain, modifying groups is allowed only in local "
 "domain\n"
@@ -750,12 +768,12 @@ msgstr ""
 "Grupo não foi encontrado no domínio local. Apenas é permitido modificar "
 "grupos no domínio local\n"
 
-#: tools/sss_groupmod.c:151 tools/sss_groupmod.c:178
+#: src/tools/sss_groupmod.c:149 src/tools/sss_groupmod.c:176
 msgid "Member groups must be in the same domain as parent group\n"
 msgstr "Grupos membro têm de estar no mesmo domínio do grupo pai\n"
 
-#: tools/sss_groupmod.c:159 tools/sss_groupmod.c:186 tools/sss_usermod.c:180
-#: tools/sss_usermod.c:207
+#: src/tools/sss_groupmod.c:157 src/tools/sss_groupmod.c:184
+#: src/tools/sss_usermod.c:178 src/tools/sss_usermod.c:205
 #, c-format
 msgid ""
 "Cannot find group %s in local domain, only groups in local domain are "
@@ -764,41 +782,41 @@ msgstr ""
 "Grupo %s não foi encontrado no domínio local. Apenas são permitidos grupos "
 "no domínio local\n"
 
-#: tools/sss_groupmod.c:220
+#: src/tools/sss_groupmod.c:218
 msgid "Could not modify group - check if member group names are correct\n"
 msgstr ""
 "Incapaz de modificar grupo - verifique que o nome do grupo membro está "
 "correcto\n"
 
-#: tools/sss_groupmod.c:224
+#: src/tools/sss_groupmod.c:222
 msgid "Could not modify group - check if groupname is correct\n"
 msgstr ""
 "Incapaz de modificar grupo - verifique que o nome do grupo está correcto\n"
 
-#: tools/sss_groupmod.c:228
+#: src/tools/sss_groupmod.c:226
 msgid "Transaction error. Could not modify group.\n"
 msgstr "Erro de transacção. Não foi possível modificar o grupo.\n"
 
-#: tools/sss_groupshow.c:567
+#: src/tools/sss_groupshow.c:567
 #, c-format
 msgid "%s%sGroup: %s\n"
 msgstr "%s%sGrupo: %s\n"
 
-#: tools/sss_groupshow.c:568
+#: src/tools/sss_groupshow.c:568
 msgid "Magic Private "
 msgstr "\"Magic\" Privada"
 
-#: tools/sss_groupshow.c:570
+#: src/tools/sss_groupshow.c:570
 #, c-format
 msgid "%sGID number: %d\n"
 msgstr "%sNúmero GID: %d\n"
 
-#: tools/sss_groupshow.c:572
+#: src/tools/sss_groupshow.c:572
 #, c-format
 msgid "%sMember users: "
 msgstr "%sUtilizadores Membros: "
 
-#: tools/sss_groupshow.c:579
+#: src/tools/sss_groupshow.c:579
 #, c-format
 msgid ""
 "\n"
@@ -807,7 +825,7 @@ msgstr ""
 "\n"
 "%sIs um membro de: "
 
-#: tools/sss_groupshow.c:586
+#: src/tools/sss_groupshow.c:586
 #, c-format
 msgid ""
 "\n"
@@ -816,15 +834,15 @@ msgstr ""
 "\n"
 "%sGrupos Membros: "
 
-#: tools/sss_groupshow.c:622
+#: src/tools/sss_groupshow.c:622
 msgid "Print indirect group members recursively"
 msgstr "Imprimir membros de grupos indirectos recursivamente"
 
-#: tools/sss_groupshow.c:657
+#: src/tools/sss_groupshow.c:655
 msgid "Specify group to show\n"
 msgstr "Especifique grupo a apresentar\n"
 
-#: tools/sss_groupshow.c:698
+#: src/tools/sss_groupshow.c:694
 msgid ""
 "No such group in local domain. Printing groups only allowed in local "
 "domain.\n"
@@ -832,105 +850,105 @@ msgstr ""
 "Grupo não existe no domínio local. Grupos de impressão apenas permitidos no "
 "domínio local.\n"
 
-#: tools/sss_groupshow.c:703
+#: src/tools/sss_groupshow.c:699
 msgid "Internal error. Could not print group.\n"
 msgstr "Erro interno. Incapaz de imprimir grupo.\n"
 
-#: tools/sss_userdel.c:133
+#: src/tools/sss_userdel.c:133
 msgid "Remove home directory and mail spool"
 msgstr "Remover pasta pessoal e spool de correio"
 
-#: tools/sss_userdel.c:135
+#: src/tools/sss_userdel.c:135
 msgid "Do not remove home directory and mail spool"
 msgstr "Não remover pasta pessoal e spool de correio"
 
-#: tools/sss_userdel.c:137
+#: src/tools/sss_userdel.c:137
 msgid "Force removal of files not owned by the user"
 msgstr "Forçar a remoção de ficheiros não pertencentes ao utilizador"
 
-#: tools/sss_userdel.c:139
+#: src/tools/sss_userdel.c:139
 msgid "Kill users' processes before removing him"
 msgstr "Mate os processos do utilizador antes de o remover"
 
-#: tools/sss_userdel.c:186
+#: src/tools/sss_userdel.c:184
 msgid "Specify user to delete\n"
 msgstr "Especificar o utilizador a remover\n"
 
-#: tools/sss_userdel.c:235
+#: src/tools/sss_userdel.c:231
 #, c-format
 msgid "User %s is outside the defined ID range for domain\n"
 msgstr "O utilizador %s está fora do intervalo de IDs para o domínio\n"
 
-#: tools/sss_userdel.c:260
+#: src/tools/sss_userdel.c:256
 msgid "Cannot reset SELinux login context\n"
 msgstr "Não foi possível redefinir o contexto SELinux para a sessão\n"
 
-#: tools/sss_userdel.c:272
+#: src/tools/sss_userdel.c:268
 #, c-format
 msgid "WARNING: The user (uid %lu) was still logged in when deleted.\n"
 msgstr ""
 "AVISO: O utilizador (uid %lu) ainda estava numa sessão quando foi removido.\n"
 
-#: tools/sss_userdel.c:277
+#: src/tools/sss_userdel.c:273
 msgid "Cannot determine if the user was logged in on this platform"
 msgstr ""
 "Não foi possível determinar se o utilizador estava autenticado nesta "
 "plataforma"
 
-#: tools/sss_userdel.c:282
+#: src/tools/sss_userdel.c:278
 msgid "Error while checking if the user was logged in\n"
 msgstr "Erro ao verificar se o utilizador estava autenticado\n"
 
-#: tools/sss_userdel.c:289
+#: src/tools/sss_userdel.c:285
 #, c-format
 msgid "The post-delete command failed: %s\n"
 msgstr "O comando após-remoção falhou: %s\n"
 
-#: tools/sss_userdel.c:301
+#: src/tools/sss_userdel.c:297
 msgid "Not removing home dir - not owned by user\n"
 msgstr "Pasta pessoal não removida - não pertence ao utilizador\n"
 
-#: tools/sss_userdel.c:303
+#: src/tools/sss_userdel.c:299
 #, c-format
 msgid "Cannot remove homedir: %s\n"
 msgstr "Incapaz de remover pasta pessoal: %s\n"
 
-#: tools/sss_userdel.c:314
+#: src/tools/sss_userdel.c:310
 msgid ""
 "No such user in local domain. Removing users only allowed in local domain.\n"
 msgstr ""
 "Utilizador não existe no domínio local. Apenas é permitido remover "
 "utilizadores no domínio local.\n"
 
-#: tools/sss_userdel.c:319
+#: src/tools/sss_userdel.c:315
 msgid "Internal error. Could not remove user.\n"
 msgstr "Erro interno. Incapaz de remover utilizador.\n"
 
-#: tools/sss_usermod.c:49
+#: src/tools/sss_usermod.c:49
 msgid "The GID of the user"
 msgstr "O GID do utilizador"
 
-#: tools/sss_usermod.c:53
+#: src/tools/sss_usermod.c:53
 msgid "Groups to add this user to"
 msgstr "Grupos para adicionar este utilizador"
 
-#: tools/sss_usermod.c:54
+#: src/tools/sss_usermod.c:54
 msgid "Groups to remove this user from"
 msgstr "Grupos para remover este utilizador"
 
-#: tools/sss_usermod.c:55
+#: src/tools/sss_usermod.c:55
 msgid "Lock the account"
 msgstr "Desactivar Conta"
 
-#: tools/sss_usermod.c:56
+#: src/tools/sss_usermod.c:56
 msgid "Unlock the account"
 msgstr "Activar a Conta"
 
-#: tools/sss_usermod.c:117
+#: src/tools/sss_usermod.c:117
 msgid "Specify user to modify\n"
 msgstr "Especifique utilizador a modificar\n"
 
-#: tools/sss_usermod.c:148
+#: src/tools/sss_usermod.c:146
 msgid ""
 "Cannot find user in local domain, modifying users is allowed only in local "
 "domain\n"
@@ -938,30 +956,30 @@ msgstr ""
 "Utilizador não foi encontrado no domínio local. Apenas é permitido modificar "
 "utilizadores no domínio local\n"
 
-#: tools/sss_usermod.c:250
+#: src/tools/sss_usermod.c:248
 msgid "Could not modify user - check if group names are correct\n"
 msgstr ""
 "Incapaz de modificar utilizador - verifique se o nome do grupo está "
 "correcto\n"
 
-#: tools/sss_usermod.c:254
+#: src/tools/sss_usermod.c:252
 msgid "Could not modify user - user already member of groups?\n"
 msgstr "Incapaz de modificar utilizador - utilizador já é membro de grupos?\n"
 
-#: tools/sss_usermod.c:258
+#: src/tools/sss_usermod.c:256
 msgid "Transaction error. Could not modify user.\n"
 msgstr "Erro na transacção. Não foi possível modificar o utilizador.\n"
 
-#: tools/tools_util.c:285
+#: src/tools/tools_util.c:290
 msgid "Out of memory\n"
 msgstr "Memória esgotada\n"
 
-#: tools/tools_util.h:34
+#: src/tools/tools_util.h:40
 #, c-format
 msgid "%s must be run as root\n"
 msgstr "%s tem de executar como root\n"
 
-#: util/util.h:63
+#: src/util/util.h:65
 msgid "Send the debug output to files instead of stderr"
 msgstr "Enviar o resultado de depuração para ficheiro em vez do stderr"
 
diff --git a/po/ru.po b/po/ru.po
index 62bdb2df..5c03d036 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2010-08-03 18:24-0400\n"
+"POT-Creation-Date: 2010-10-18 13:14-0400\n"
 "PO-Revision-Date: 2010-04-07 21:39+0300\n"
 "Last-Translator: Dmitry Drozdov <dmi3652@gmail.com>\n"
 "Language-Team: Russian <fedora-trans-ru@redhat.com>\n"
@@ -19,89 +19,89 @@ msgstr ""
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-Bookmarks: 78,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
-#: config/SSSDConfig.py:39
+#: src/config/SSSDConfig.py:39
 msgid "Set the verbosity of the debug logging"
 msgstr "Установить подробность журнала отладки"
 
-#: config/SSSDConfig.py:40
+#: src/config/SSSDConfig.py:40
 msgid "Include timestamps in debug logs"
 msgstr "Добавить отметки времени в журнал отладки"
 
-#: config/SSSDConfig.py:41
+#: src/config/SSSDConfig.py:41
 msgid "Write debug messages to logfiles"
 msgstr "Записывать отладочные сообщения в файлы журнала"
 
-#: config/SSSDConfig.py:42
+#: src/config/SSSDConfig.py:42
 msgid "Ping timeout before restarting service"
 msgstr "Тайм-аут ping до перезапуска службы"
 
-#: config/SSSDConfig.py:43
+#: src/config/SSSDConfig.py:43
 msgid "Command to start service"
 msgstr "Команда для запуска службы"
 
-#: config/SSSDConfig.py:44
+#: src/config/SSSDConfig.py:44
 msgid "Number of times to attempt connection to Data Providers"
 msgstr "Количество попыток подключения к поставщикам данных"
 
-#: config/SSSDConfig.py:47
+#: src/config/SSSDConfig.py:47
 msgid "SSSD Services to start"
 msgstr "SSSD службы для запуска"
 
-#: config/SSSDConfig.py:48
+#: src/config/SSSDConfig.py:48
 msgid "SSSD Domains to start"
 msgstr "SSSD домены для запуска"
 
-#: config/SSSDConfig.py:49
+#: src/config/SSSDConfig.py:49
 msgid "Timeout for messages sent over the SBUS"
 msgstr "Тайм-аут для сообщений, отправленных через SBUS"
 
-#: config/SSSDConfig.py:50
+#: src/config/SSSDConfig.py:50
 msgid "Regex to parse username and domain"
 msgstr "Разбирать имя пользователя и домен с помощью регулярных выражений"
 
-#: config/SSSDConfig.py:51
+#: src/config/SSSDConfig.py:51
 msgid "Printf-compatible format for displaying fully-qualified names"
 msgstr "Отображать полные имена в формате, совместимом с printf"
 
-#: config/SSSDConfig.py:54
+#: src/config/SSSDConfig.py:54
 msgid "Enumeration cache timeout length (seconds)"
 msgstr "Длина тайм-аута кэша перечисления (в секундах)"
 
-#: config/SSSDConfig.py:55
+#: src/config/SSSDConfig.py:55
 msgid "Entry cache background update timeout length (seconds)"
 msgstr "Тайм-аут фонового обновления элемента списка кэша (в секундах)"
 
-#: config/SSSDConfig.py:56
+#: src/config/SSSDConfig.py:56
 msgid "Negative cache timeout length (seconds)"
 msgstr "Отрицательная длина тайм-аута кэша (в секундах)"
 
-#: config/SSSDConfig.py:57
+#: src/config/SSSDConfig.py:57
 msgid "Users that SSSD should explicitly ignore"
 msgstr "Пользователи, которых SSSD должен явно игнорировать "
 
-#: config/SSSDConfig.py:58
+#: src/config/SSSDConfig.py:58
 msgid "Groups that SSSD should explicitly ignore"
 msgstr "Группы, которые SSSD должен явно игнорировать "
 
-#: config/SSSDConfig.py:59
+#: src/config/SSSDConfig.py:59
 msgid "Should filtered users appear in groups"
 msgstr "Должны ли отфильтрованные пользователи появляться в группах"
 
-#: config/SSSDConfig.py:60
+#: src/config/SSSDConfig.py:60
 msgid "The value of the password field the NSS provider should return"
 msgstr "Значение поля пароля, которое должен вернуть поставщик NSS"
 
-#: config/SSSDConfig.py:63
+#: src/config/SSSDConfig.py:63
 msgid "How long to allow cached logins between online logins (days)"
 msgstr ""
 "Разрешённый интервал кэшированных входов между интерактивными входами (в "
 "днях)"
 
-#: config/SSSDConfig.py:64
+#: src/config/SSSDConfig.py:64
 msgid "How many failed logins attempts are allowed when offline"
 msgstr "Разрешённое количество неудачных попыток неинтерактивного входа"
 
-#: config/SSSDConfig.py:65
+#: src/config/SSSDConfig.py:65
 msgid ""
 "How long (minutes) to deny login after offline_failed_login_attempts has "
 "been reached"
@@ -109,329 +109,329 @@ msgstr ""
 "Временной интервал (в минутах), в течение которого будет запрещён вход после "
 "достижения offline_failed_login_attempts"
 
-#: config/SSSDConfig.py:68
+#: src/config/SSSDConfig.py:68
 msgid "Identity provider"
 msgstr "Поставщик данных для идентификации"
 
-#: config/SSSDConfig.py:69
+#: src/config/SSSDConfig.py:69
 msgid "Authentication provider"
 msgstr "Поставщик данных для проверки подлинности"
 
-#: config/SSSDConfig.py:70
+#: src/config/SSSDConfig.py:70
 msgid "Access control provider"
 msgstr "Поставщик данных для контроля доступа"
 
-#: config/SSSDConfig.py:71
+#: src/config/SSSDConfig.py:71
 msgid "Password change provider"
 msgstr "Поставщик операции смены пароля"
 
-#: config/SSSDConfig.py:74
+#: src/config/SSSDConfig.py:74
 msgid "Minimum user ID"
 msgstr "Минимальный ID пользователя"
 
-#: config/SSSDConfig.py:75
+#: src/config/SSSDConfig.py:75
 msgid "Maximum user ID"
 msgstr "Максимальный ID пользователя"
 
-#: config/SSSDConfig.py:76
+#: src/config/SSSDConfig.py:76
 msgid "Ping timeout before restarting domain"
 msgstr "Тайм-аут ping до перезапуска домена"
 
-#: config/SSSDConfig.py:77
+#: src/config/SSSDConfig.py:77
 msgid "Enable enumerating all users/groups"
 msgstr "Включить перечисление всех пользователей/групп"
 
-#: config/SSSDConfig.py:78
+#: src/config/SSSDConfig.py:78
 msgid "Cache credentials for offline login"
 msgstr "Кэшировать учётные данные для неинтерактивного входа"
 
-#: config/SSSDConfig.py:79
+#: src/config/SSSDConfig.py:79
 msgid "Store password hashes"
 msgstr "Хранить хеши паролей"
 
-#: config/SSSDConfig.py:80
+#: src/config/SSSDConfig.py:80
 msgid "Display users/groups in fully-qualified form"
 msgstr "Отображать пользователей/группы в полной форме"
 
-#: config/SSSDConfig.py:81
+#: src/config/SSSDConfig.py:81
 msgid "Entry cache timeout length (seconds)"
 msgstr "Тайм-аут элемента списка кэша (в секундах)"
 
-#: config/SSSDConfig.py:82
+#: src/config/SSSDConfig.py:82
 msgid ""
 "Restrict or prefer a specific address family when performing DNS lookups"
 msgstr ""
 "Ограничивать или предпочитать определённое семейство адресов при выполнении "
 "запросов DNS"
 
-#: config/SSSDConfig.py:83
+#: src/config/SSSDConfig.py:83
 msgid "How long to keep cached entries after last successful login (days)"
 msgstr ""
 "Как долго хранить кэшированные элементы списка после последнего успешного "
 "входа (в днях)"
 
-#: config/SSSDConfig.py:84
+#: src/config/SSSDConfig.py:84
 msgid "How long to wait for replies from DNS when resolving servers (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:85
+#: src/config/SSSDConfig.py:85
 msgid "The domain part of service discovery DNS query"
 msgstr ""
 
-#: config/SSSDConfig.py:88
+#: src/config/SSSDConfig.py:88
 msgid "IPA domain"
 msgstr "IPA-домен"
 
-#: config/SSSDConfig.py:89
+#: src/config/SSSDConfig.py:89
 msgid "IPA server address"
 msgstr "адрес сервера IPA"
 
-#: config/SSSDConfig.py:90
+#: src/config/SSSDConfig.py:90
 msgid "IPA client hostname"
 msgstr "имя узла клиента IPA"
 
-#: config/SSSDConfig.py:91
+#: src/config/SSSDConfig.py:91
 msgid "Whether to automatically update the client's DNS entry in FreeIPA"
 msgstr ""
 
-#: config/SSSDConfig.py:92
+#: src/config/SSSDConfig.py:92
 msgid "The interface whose IP should be used for dynamic DNS updates"
 msgstr ""
 
-#: config/SSSDConfig.py:95 config/SSSDConfig.py:124
+#: src/config/SSSDConfig.py:95 src/config/SSSDConfig.py:124
 msgid "Kerberos server address"
 msgstr "Имя сервера Kerberos"
 
-#: config/SSSDConfig.py:96 config/SSSDConfig.py:125
+#: src/config/SSSDConfig.py:96 src/config/SSSDConfig.py:125
 msgid "Kerberos realm"
 msgstr "Область действия Kerberos"
 
-#: config/SSSDConfig.py:97
+#: src/config/SSSDConfig.py:97
 msgid "Authentication timeout"
 msgstr "Тайм-аут проверки подлинности"
 
-#: config/SSSDConfig.py:100
+#: src/config/SSSDConfig.py:100
 msgid "Directory to store credential caches"
 msgstr "Каталог для хранения кэшей учётных данных"
 
-#: config/SSSDConfig.py:101
+#: src/config/SSSDConfig.py:101
 msgid "Location of the user's credential cache"
 msgstr "Расположения кэша учётных данных пользователей"
 
-#: config/SSSDConfig.py:102
+#: src/config/SSSDConfig.py:102
 msgid "Location of the keytab to validate credentials"
 msgstr "Расположение keytab-файла для проверки учётных данных"
 
-#: config/SSSDConfig.py:103
+#: src/config/SSSDConfig.py:103
 msgid "Enable credential validation"
 msgstr "Включить проверку учётных данных"
 
-#: config/SSSDConfig.py:104
+#: src/config/SSSDConfig.py:104
 msgid "Store password if offline for later online authentication"
 msgstr ""
 
-#: config/SSSDConfig.py:107
+#: src/config/SSSDConfig.py:107
 msgid "Server where the change password service is running if not on the KDC"
 msgstr "Сервер, на котором запущена служба смены пароля (если не на KDC)"
 
-#: config/SSSDConfig.py:110
+#: src/config/SSSDConfig.py:110
 msgid "ldap_uri, The URI of the LDAP server"
 msgstr "ldap_uri, URI сервера LDAP "
 
-#: config/SSSDConfig.py:111
+#: src/config/SSSDConfig.py:111
 msgid "The default base DN"
 msgstr "Base DN по умолчанию"
 
-#: config/SSSDConfig.py:112
+#: src/config/SSSDConfig.py:112
 msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr "Тип схемы, используемой на LDAP-сервере, rfc2307"
 
-#: config/SSSDConfig.py:113
+#: src/config/SSSDConfig.py:113
 msgid "The default bind DN"
 msgstr "Bind DN по умолчанию"
 
-#: config/SSSDConfig.py:114
+#: src/config/SSSDConfig.py:114
 msgid "The type of the authentication token of the default bind DN"
 msgstr "Тип маркера проверки подлинности для bind DN по умолчанию"
 
-#: config/SSSDConfig.py:115
+#: src/config/SSSDConfig.py:115
 msgid "The authentication token of the default bind DN"
 msgstr "Маркер проверки подлинности для bind DN по умолчанию"
 
-#: config/SSSDConfig.py:116
+#: src/config/SSSDConfig.py:116
 msgid "Length of time to attempt connection"
 msgstr "Временной интервал для попытки соединения"
 
-#: config/SSSDConfig.py:117
+#: src/config/SSSDConfig.py:117
 msgid "Length of time to attempt synchronous LDAP operations"
 msgstr "Временной интервал для попытки синхронизации операций LDAP"
 
-#: config/SSSDConfig.py:118
+#: src/config/SSSDConfig.py:118
 msgid "Length of time between attempts to reconnect while offline"
 msgstr ""
 "Временной интервал между попытками возобновления соединения в автономного "
 "режиме"
 
-#: config/SSSDConfig.py:119
+#: src/config/SSSDConfig.py:119
 #, fuzzy
 msgid "File that contains CA certificates"
 msgstr "Файл, содержащий CA сертификаты"
 
-#: config/SSSDConfig.py:120
+#: src/config/SSSDConfig.py:120
 msgid "Path to CA certificate directory"
 msgstr ""
 
-#: config/SSSDConfig.py:121
+#: src/config/SSSDConfig.py:121
 msgid "Require TLS certificate verification"
 msgstr "Требуется проверка сертификата TLS"
 
-#: config/SSSDConfig.py:122
+#: src/config/SSSDConfig.py:122
 msgid "Specify the sasl mechanism to use"
 msgstr "Укажите механизм sasl"
 
-#: config/SSSDConfig.py:123
+#: src/config/SSSDConfig.py:123
 msgid "Specify the sasl authorization id to use"
 msgstr "Укажите идентификатор авторизации sasl"
 
-#: config/SSSDConfig.py:126
+#: src/config/SSSDConfig.py:126
 msgid "Kerberos service keytab"
 msgstr "Keytab-файл службы Kerberos"
 
-#: config/SSSDConfig.py:127
+#: src/config/SSSDConfig.py:127
 msgid "Use Kerberos auth for LDAP connection"
 msgstr "Использовать проверку подлинности Kerberos для LDAP-соединения"
 
-#: config/SSSDConfig.py:128
+#: src/config/SSSDConfig.py:128
 msgid "Follow LDAP referrals"
 msgstr "Следовать ссылкам LDAP"
 
-#: config/SSSDConfig.py:129
+#: src/config/SSSDConfig.py:129
 #, fuzzy
 msgid "Lifetime of TGT for LDAP connection"
 msgstr "Использовать проверку подлинности Kerberos для LDAP-соединения"
 
-#: config/SSSDConfig.py:132
+#: src/config/SSSDConfig.py:132
 msgid "Length of time to wait for a search request"
 msgstr "Временной интервал, в течение которого ожидать поискового запроса"
 
-#: config/SSSDConfig.py:133
+#: src/config/SSSDConfig.py:133
 msgid "Length of time between enumeration updates"
 msgstr "Временной интервал между обновлениями перечисления"
 
-#: config/SSSDConfig.py:134
+#: src/config/SSSDConfig.py:134
 #, fuzzy
 msgid "Require TLS for ID lookups"
 msgstr "Требуется TLS для поиска ID"
 
-#: config/SSSDConfig.py:135
+#: src/config/SSSDConfig.py:135
 msgid "Base DN for user lookups"
 msgstr "Base DN для поиска"
 
-#: config/SSSDConfig.py:136
+#: src/config/SSSDConfig.py:136
 msgid "Scope of user lookups"
 msgstr "Глубина поиска"
 
-#: config/SSSDConfig.py:137
+#: src/config/SSSDConfig.py:137
 msgid "Filter for user lookups"
 msgstr "Фильтр поиска"
 
-#: config/SSSDConfig.py:138
+#: src/config/SSSDConfig.py:138
 msgid "Objectclass for users"
 msgstr "Objectclass для пользователей"
 
-#: config/SSSDConfig.py:139
+#: src/config/SSSDConfig.py:139
 msgid "Username attribute"
 msgstr "Атрибут «username»"
 
-#: config/SSSDConfig.py:140
+#: src/config/SSSDConfig.py:140
 msgid "UID attribute"
 msgstr "Атрибут «UID»"
 
-#: config/SSSDConfig.py:141
+#: src/config/SSSDConfig.py:141
 msgid "Primary GID attribute"
 msgstr "Атрибут «primary GID»"
 
-#: config/SSSDConfig.py:142
+#: src/config/SSSDConfig.py:142
 msgid "GECOS attribute"
 msgstr "Атрибут «GECOS»"
 
-#: config/SSSDConfig.py:143
+#: src/config/SSSDConfig.py:143
 msgid "Home directory attribute"
 msgstr "Атрибут домашнего каталога"
 
-#: config/SSSDConfig.py:144
+#: src/config/SSSDConfig.py:144
 msgid "Shell attribute"
 msgstr "Атрибут оболочки"
 
-#: config/SSSDConfig.py:145
+#: src/config/SSSDConfig.py:145
 msgid "UUID attribute"
 msgstr "Атрибут «UUID»"
 
-#: config/SSSDConfig.py:146
+#: src/config/SSSDConfig.py:146
 msgid "User principal attribute (for Kerberos)"
 msgstr "Атрибут участника-пользователя (для Kerberos)"
 
-#: config/SSSDConfig.py:147
+#: src/config/SSSDConfig.py:147
 msgid "Full Name"
 msgstr "Полное имя"
 
-#: config/SSSDConfig.py:148
+#: src/config/SSSDConfig.py:148
 msgid "memberOf attribute"
 msgstr "Атрибут memberOf"
 
-#: config/SSSDConfig.py:149
+#: src/config/SSSDConfig.py:149
 msgid "Modification time attribute"
 msgstr "Атрибут времени изменения"
 
-#: config/SSSDConfig.py:152
+#: src/config/SSSDConfig.py:152
 msgid "Policy to evaluate the password expiration"
 msgstr "Политика вычисления окончания срока действия пароля"
 
-#: config/SSSDConfig.py:155
+#: src/config/SSSDConfig.py:155
 msgid "LDAP filter to determine access privileges"
 msgstr ""
 
-#: config/SSSDConfig.py:158
+#: src/config/SSSDConfig.py:158
 msgid "Comma separated list of allowed users"
 msgstr "Разделённый запятыми список разрешённых пользователей"
 
-#: config/SSSDConfig.py:159
+#: src/config/SSSDConfig.py:159
 msgid "Comma separated list of prohibited users"
 msgstr "Разделённый запятыми список запрещённых пользователей"
 
-#: config/SSSDConfig.py:162
+#: src/config/SSSDConfig.py:162
 msgid "Default shell, /bin/bash"
 msgstr "Оболочка по умолчанию, /bin/bash"
 
-#: config/SSSDConfig.py:163
+#: src/config/SSSDConfig.py:163
 msgid "Base for home directories"
 msgstr "Место для домашних каталогов"
 
-#: config/SSSDConfig.py:166
+#: src/config/SSSDConfig.py:166
 msgid "The name of the NSS library to use"
 msgstr "Имя используемой библиотеки NSS"
 
-#: config/SSSDConfig.py:169
+#: src/config/SSSDConfig.py:169
 msgid "PAM stack to use"
 msgstr "Используемый стек PAM"
 
-#: monitor/monitor.c:2137
+#: src/monitor/monitor.c:2140
 msgid "Become a daemon (default)"
 msgstr "Запускаться в качестве службы (по умолчанию)"
 
-#: monitor/monitor.c:2139
+#: src/monitor/monitor.c:2142
 msgid "Run interactive (not a daemon)"
 msgstr "Запускаться интерактивно (не службой)"
 
-#: monitor/monitor.c:2141
+#: src/monitor/monitor.c:2144
 msgid "Specify a non-default config file"
 msgstr "Указать файл конфигурации"
 
-#: monitor/monitor.c:2167
+#: src/monitor/monitor.c:2170
 msgid "sssd must be run as root\n"
 msgstr "sssd должен выполняться от имени root\n"
 
-#: monitor/monitor.c:2202
+#: src/monitor/monitor.c:2205
 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"
@@ -440,7 +440,7 @@ msgstr ""
 "конфликтовать с SSSD, поэтому рекомендуется не запускать nscd одновременно с "
 "SSSD\n"
 
-#: monitor/monitor.c:2212
+#: src/monitor/monitor.c:2215
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
@@ -449,280 +449,293 @@ msgstr ""
 "Не удалось прочитать файл конфигурации %s, убедитесь, что права доступа "
 "файла 0600 и владелец - root.root\n"
 
-#: monitor/monitor.c:2217
+#: src/monitor/monitor.c:2220
 msgid "Cannot load configuration database\n"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:993 providers/ldap/ldap_child.c:361
-#: util/util.h:61
+#: src/providers/krb5/krb5_child.c:1043 src/providers/ldap/ldap_child.c:359
+#: src/util/util.h:63
 msgid "Debug level"
 msgstr "Уровень отладки"
 
-#: providers/krb5/krb5_child.c:995 providers/ldap/ldap_child.c:363
-#: util/util.h:65
+#: src/providers/krb5/krb5_child.c:1045 src/providers/ldap/ldap_child.c:361
+#: src/util/util.h:67
 msgid "Add debug timestamps"
 msgstr "Добавить отладочные отметки времени"
 
-#: providers/krb5/krb5_child.c:997 providers/ldap/ldap_child.c:365
+#: src/providers/krb5/krb5_child.c:1047 src/providers/ldap/ldap_child.c:363
 msgid "An open file descriptor for the debug logs"
 msgstr "Открытый дескриптор файла для журналов отладки"
 
-#: providers/data_provider_be.c:1165
+#: src/providers/data_provider_be.c:1165
 msgid "Domain of the information provider (mandatory)"
 msgstr "Домен поставщика информации (обязательный)"
 
-#: sss_client/common.c:742
+#: src/sss_client/common.c:742
 msgid "Privileged socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:745
+#: src/sss_client/common.c:745
 msgid "Public socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:748
+#: src/sss_client/common.c:748
 #, fuzzy
 msgid "Unexpected format of the server credential message."
 msgstr "Расположения кэша учётных данных пользователей"
 
-#: sss_client/common.c:751
+#: src/sss_client/common.c:751
 msgid "SSSD is not run by root."
 msgstr ""
 
-#: sss_client/common.c:756
+#: src/sss_client/common.c:756
 msgid "An error occurred, but no description can be found."
 msgstr ""
 
-#: sss_client/common.c:762
+#: src/sss_client/common.c:762
 msgid "Unexpected error while looking for an error description"
 msgstr ""
 
-#: sss_client/pam_sss.c:372
+#: src/sss_client/pam_sss.c:372
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: sss_client/pam_sss.c:556
+#: src/sss_client/pam_sss.c:556
 msgid "Password reset by root is not supported."
 msgstr ""
 
-#: sss_client/pam_sss.c:597
+#: src/sss_client/pam_sss.c:597
 msgid "Authenticated with cached credentials"
 msgstr ""
 
-#: sss_client/pam_sss.c:598
+#: src/sss_client/pam_sss.c:598
 msgid ", your cached password will expire at: "
 msgstr ", срок действия вашего кэшированного пароль истечёт:"
 
-#: sss_client/pam_sss.c:628
+#: src/sss_client/pam_sss.c:628
 #, c-format
 msgid "Your password has expired. You have %d grace login(s) remaining."
 msgstr ""
 
-#: sss_client/pam_sss.c:674
+#: src/sss_client/pam_sss.c:674
 #, fuzzy, c-format
 msgid "Your password will expire in %d %s."
 msgstr ", срок действия вашего кэшированного пароль истечёт:"
 
-#: sss_client/pam_sss.c:723
+#: src/sss_client/pam_sss.c:723
 #, fuzzy
 msgid "Authentication is denied until: "
 msgstr "Автономная проверка подлинности, проверка подлинности запрещена до:"
 
-#: sss_client/pam_sss.c:750
+#: src/sss_client/pam_sss.c:750
 msgid "System is offline, password change not possible"
 msgstr "Система находится в автономном режиме, невозможно сменить пароль"
 
-#: sss_client/pam_sss.c:780 sss_client/pam_sss.c:793
+#: src/sss_client/pam_sss.c:780 src/sss_client/pam_sss.c:793
 msgid "Password change failed. "
 msgstr "Не удалось сменить пароль."
 
-#: sss_client/pam_sss.c:783 sss_client/pam_sss.c:794
+#: src/sss_client/pam_sss.c:783 src/sss_client/pam_sss.c:794
 msgid "Server message: "
 msgstr "Сообщение сервера:"
 
-#: sss_client/pam_sss.c:1197
+#: src/sss_client/pam_sss.c:1197
 msgid "New Password: "
 msgstr "Новый пароль:"
 
-#: sss_client/pam_sss.c:1198
+#: src/sss_client/pam_sss.c:1198
 msgid "Reenter new Password: "
 msgstr "Введите новый пароль ещё раз:"
 
-#: sss_client/pam_sss.c:1280
+#: src/sss_client/pam_sss.c:1280
 msgid "Password: "
 msgstr "Пароль:"
 
-#: sss_client/pam_sss.c:1312
+#: src/sss_client/pam_sss.c:1312
 msgid "Current Password: "
 msgstr "Текущий пароль:"
 
-#: sss_client/pam_sss.c:1458
+#: src/sss_client/pam_sss.c:1458
 msgid "Password expired. Change your password now."
 msgstr "Срок действия пароля истёк. Необходимо сейчас изменить ваш пароль."
 
-#: tools/sss_useradd.c:48 tools/sss_groupadd.c:41 tools/sss_groupdel.c:43
-#: tools/sss_groupmod.c:42 tools/sss_groupshow.c:620 tools/sss_userdel.c:131
-#: tools/sss_usermod.c:47
+#: src/tools/sss_useradd.c:48 src/tools/sss_groupadd.c:41
+#: src/tools/sss_groupdel.c:43 src/tools/sss_groupmod.c:42
+#: src/tools/sss_groupshow.c:620 src/tools/sss_userdel.c:131
+#: src/tools/sss_usermod.c:47
 msgid "The debug level to run with"
 msgstr "Уровень отладки для запуска"
 
-#: tools/sss_useradd.c:49 tools/sss_usermod.c:48
+#: src/tools/sss_useradd.c:49 src/tools/sss_usermod.c:48
 msgid "The UID of the user"
 msgstr "UID пользователя"
 
-#: tools/sss_useradd.c:50 tools/sss_usermod.c:50
+#: src/tools/sss_useradd.c:50 src/tools/sss_usermod.c:50
 msgid "The comment string"
 msgstr "Строка комментария"
 
-#: tools/sss_useradd.c:51 tools/sss_usermod.c:51
+#: src/tools/sss_useradd.c:51 src/tools/sss_usermod.c:51
 msgid "Home directory"
 msgstr "Домашний каталог"
 
-#: tools/sss_useradd.c:52 tools/sss_usermod.c:52
+#: src/tools/sss_useradd.c:52 src/tools/sss_usermod.c:52
 msgid "Login shell"
 msgstr "Исходная оболочка"
 
-#: tools/sss_useradd.c:53
+#: src/tools/sss_useradd.c:53
 msgid "Groups"
 msgstr "Группы"
 
-#: tools/sss_useradd.c:54
+#: src/tools/sss_useradd.c:54
 msgid "Create user's directory if it does not exist"
 msgstr "Создать каталог пользователя, если он не существует"
 
-#: tools/sss_useradd.c:55
+#: src/tools/sss_useradd.c:55
 #, fuzzy
 msgid "Never create user's directory, overrides config"
 msgstr "Никогда не создавать каталог пользователя"
 
-#: tools/sss_useradd.c:56
+#: src/tools/sss_useradd.c:56
 msgid "Specify an alternative skeleton directory"
 msgstr "Укажите альтернативный скелетный каталог"
 
-#: tools/sss_useradd.c:57 tools/sss_usermod.c:57
+#: src/tools/sss_useradd.c:57 src/tools/sss_usermod.c:57
 msgid "The SELinux user for user's login"
 msgstr ""
 
-#: tools/sss_useradd.c:71 tools/sss_groupadd.c:56 tools/sss_groupdel.c:52
-#: tools/sss_groupmod.c:63 tools/sss_groupshow.c:631 tools/sss_userdel.c:148
-#: tools/sss_usermod.c:72
+#: src/tools/sss_useradd.c:71 src/tools/sss_groupadd.c:56
+#: src/tools/sss_groupdel.c:52 src/tools/sss_groupmod.c:63
+#: src/tools/sss_groupshow.c:631 src/tools/sss_userdel.c:148
+#: src/tools/sss_usermod.c:72
 #, fuzzy
 msgid "Error setting the locale\n"
 msgstr "Ошибка установки локали\n"
 
-#: tools/sss_useradd.c:107
+#: src/tools/sss_useradd.c:84 src/tools/sss_groupmod.c:76
+#: src/tools/sss_usermod.c:85
+#, fuzzy
+msgid "Specify group to add to\n"
+msgstr "Укажите группу для добавления\n"
+
+#: src/tools/sss_useradd.c:108
 msgid "Specify user to add\n"
 msgstr "Укажите добавляемого пользователя\n"
 
-#: tools/sss_useradd.c:118 tools/sss_groupadd.c:86 tools/sss_groupdel.c:81
-#: tools/sss_groupmod.c:111 tools/sss_groupshow.c:668 tools/sss_userdel.c:197
-#: tools/sss_usermod.c:128
+#: src/tools/sss_useradd.c:117 src/tools/sss_groupadd.c:82
+#: src/tools/sss_groupdel.c:77 src/tools/sss_groupmod.c:109
+#: src/tools/sss_groupshow.c:664 src/tools/sss_userdel.c:193
+#: src/tools/sss_usermod.c:126
 msgid "Error initializing the tools - no local domain\n"
 msgstr "Ошибка инициализации инструментов - не найден локальный домен\n"
 
-#: tools/sss_useradd.c:120 tools/sss_groupadd.c:88 tools/sss_groupdel.c:83
-#: tools/sss_groupmod.c:113 tools/sss_groupshow.c:670 tools/sss_userdel.c:199
-#: tools/sss_usermod.c:130
+#: src/tools/sss_useradd.c:119 src/tools/sss_groupadd.c:84
+#: src/tools/sss_groupdel.c:79 src/tools/sss_groupmod.c:111
+#: src/tools/sss_groupshow.c:666 src/tools/sss_userdel.c:195
+#: src/tools/sss_usermod.c:128
 msgid "Error initializing the tools\n"
 msgstr "Ошибка инициализации инструментов\n"
 
-#: tools/sss_useradd.c:129 tools/sss_groupadd.c:97 tools/sss_groupdel.c:92
-#: tools/sss_groupmod.c:121 tools/sss_groupshow.c:679 tools/sss_userdel.c:208
-#: tools/sss_usermod.c:139
+#: src/tools/sss_useradd.c:128 src/tools/sss_groupadd.c:93
+#: src/tools/sss_groupdel.c:88 src/tools/sss_groupmod.c:119
+#: src/tools/sss_groupshow.c:675 src/tools/sss_userdel.c:204
+#: src/tools/sss_usermod.c:137
 msgid "Invalid domain specified in FQDN\n"
 msgstr "В FQDN указан неверный домен\n"
 
-#: tools/sss_useradd.c:138 tools/sss_groupmod.c:143 tools/sss_groupmod.c:170
-#: tools/sss_usermod.c:164 tools/sss_usermod.c:191
+#: src/tools/sss_useradd.c:137 src/tools/sss_groupmod.c:141
+#: src/tools/sss_groupmod.c:168 src/tools/sss_usermod.c:162
+#: src/tools/sss_usermod.c:189
 msgid "Internal error while parsing parameters\n"
 msgstr "При разборе параметров возникла внутренняя ошибка\n"
 
-#: tools/sss_useradd.c:146 tools/sss_usermod.c:172 tools/sss_usermod.c:199
+#: src/tools/sss_useradd.c:145 src/tools/sss_usermod.c:170
+#: src/tools/sss_usermod.c:197
 msgid "Groups must be in the same domain as user\n"
 msgstr "Группы должны быть в том же домене, что и пользователь\n"
 
-#: tools/sss_useradd.c:154
+#: src/tools/sss_useradd.c:153
 #, c-format
 msgid "Cannot find group %s in local domain\n"
 msgstr "Не удалось найти группу %s в локальном домене\n"
 
-#: tools/sss_useradd.c:169 tools/sss_userdel.c:218
+#: src/tools/sss_useradd.c:168 src/tools/sss_userdel.c:214
 msgid "Cannot set default values\n"
 msgstr "Не удалось установить значения по умолчанию\n"
 
-#: tools/sss_useradd.c:176 tools/sss_usermod.c:155
+#: src/tools/sss_useradd.c:175 src/tools/sss_usermod.c:153
 msgid "The selected UID is outside the allowed range\n"
 msgstr "Выбранный UID находится за пределами доступного диапазона\n"
 
-#: tools/sss_useradd.c:203 tools/sss_usermod.c:240
+#: src/tools/sss_useradd.c:202 src/tools/sss_usermod.c:238
 msgid "Cannot set SELinux login context\n"
 msgstr ""
 
-#: tools/sss_useradd.c:219
+#: src/tools/sss_useradd.c:218
 msgid "Cannot get info about the user\n"
 msgstr "Не удалось получить информацию о пользователе\n"
 
-#: tools/sss_useradd.c:233
+#: src/tools/sss_useradd.c:232
 msgid "User's home directory already exists, not copying data from skeldir\n"
 msgstr ""
 "Домашний каталог пользователя уже существует, копирования данных из "
 "скелетной директории выполнено не будет\n"
 
-#: tools/sss_useradd.c:236
+#: src/tools/sss_useradd.c:235
 #, c-format
 msgid "Cannot create user's home directory: %s\n"
 msgstr "Не удалось создать домашний каталог пользователя: %s\n"
 
-#: tools/sss_useradd.c:247
+#: src/tools/sss_useradd.c:246
 #, c-format
 msgid "Cannot create user's mail spool: %s\n"
 msgstr "Не удалось создать пользовательскую почтовую очередь: %s\n"
 
-#: tools/sss_useradd.c:259
+#: src/tools/sss_useradd.c:258
 msgid "Could not allocate ID for the user - domain full?\n"
 msgstr "Для пользователя  не удалось выделить ID - домен заполнен?\n"
 
-#: tools/sss_useradd.c:263
+#: src/tools/sss_useradd.c:262
 msgid "A user or group with the same name or ID already exists\n"
 msgstr "Пользователь или группа с таким именем или ID уже существует\n"
 
-#: tools/sss_useradd.c:269
+#: src/tools/sss_useradd.c:268
 msgid "Transaction error. Could not add user.\n"
 msgstr "Ошибка в транзакции. Невозможно добавить пользователя.\n"
 
-#: tools/sss_groupadd.c:43 tools/sss_groupmod.c:48
+#: src/tools/sss_groupadd.c:43 src/tools/sss_groupmod.c:48
 msgid "The GID of the group"
 msgstr "GID группы"
 
-#: tools/sss_groupadd.c:75
+#: src/tools/sss_groupadd.c:73
 msgid "Specify group to add\n"
 msgstr "Укажите группу для добавления\n"
 
-#: tools/sss_groupadd.c:106 tools/sss_groupmod.c:194
+#: src/tools/sss_groupadd.c:102 src/tools/sss_groupmod.c:192
 msgid "The selected GID is outside the allowed range\n"
 msgstr "Выбранный GID находится вне разрешённого диапазона\n"
 
-#: tools/sss_groupadd.c:131
+#: src/tools/sss_groupadd.c:127
 msgid "Could not allocate ID for the group - domain full?\n"
 msgstr "Не удалось выделить ID для группы - домен заполнен?\n"
 
-#: tools/sss_groupadd.c:135
+#: src/tools/sss_groupadd.c:131
 msgid "A group with the same name or GID already exists\n"
 msgstr "Группа с таким же именем или GID уже существует\n"
 
-#: tools/sss_groupadd.c:140
+#: src/tools/sss_groupadd.c:136
 msgid "Transaction error. Could not add group.\n"
 msgstr "Ошибка в транзакции. Не удалось добавить группу.\n"
 
-#: tools/sss_groupdel.c:70
+#: src/tools/sss_groupdel.c:68
 msgid "Specify group to delete\n"
 msgstr "Укажите группу для удаления\n"
 
-#: tools/sss_groupdel.c:107
+#: src/tools/sss_groupdel.c:103
 #, c-format
 msgid "Group %s is outside the defined ID range for domain\n"
 msgstr "Группа %s находится вне назначенного для домена диапазона ID\n"
 
-#: tools/sss_groupdel.c:121
+#: src/tools/sss_groupdel.c:117
 msgid ""
 "No such group in local domain. Removing groups only allowed in local "
 "domain.\n"
@@ -730,23 +743,28 @@ msgstr ""
 "В локальном домене такой группы нет. Удаление групп разрешено только в "
 "локальном домене.\n"
 
-#: tools/sss_groupdel.c:126
+#: src/tools/sss_groupdel.c:122
 msgid "Internal error. Could not remove group.\n"
 msgstr "Внутренняя ошибка. Не удалось удалить группу.\n"
 
-#: tools/sss_groupmod.c:44
+#: src/tools/sss_groupmod.c:44
 msgid "Groups to add this group to"
 msgstr "Группы, к которым добавить эту группу"
 
-#: tools/sss_groupmod.c:46
+#: src/tools/sss_groupmod.c:46
 msgid "Groups to remove this group from"
 msgstr "Группы, из которых удалить эту группу"
 
-#: tools/sss_groupmod.c:98
+#: src/tools/sss_groupmod.c:84 src/tools/sss_usermod.c:93
+#, fuzzy
+msgid "Specify group to remove from\n"
+msgstr "Укажите группу для изменения\n"
+
+#: src/tools/sss_groupmod.c:98
 msgid "Specify group to modify\n"
 msgstr "Укажите группу для изменения\n"
 
-#: tools/sss_groupmod.c:130
+#: src/tools/sss_groupmod.c:128
 msgid ""
 "Cannot find group in local domain, modifying groups is allowed only in local "
 "domain\n"
@@ -754,13 +772,13 @@ msgstr ""
 "Не удалось найти группу в локальном домене, изменение групп разрешено только "
 "в локальном домене\n"
 
-#: tools/sss_groupmod.c:151 tools/sss_groupmod.c:178
+#: src/tools/sss_groupmod.c:149 src/tools/sss_groupmod.c:176
 msgid "Member groups must be in the same domain as parent group\n"
 msgstr ""
 "Группы-участники должны быть в том же домене, что и родительская группа\n"
 
-#: tools/sss_groupmod.c:159 tools/sss_groupmod.c:186 tools/sss_usermod.c:180
-#: tools/sss_usermod.c:207
+#: src/tools/sss_groupmod.c:157 src/tools/sss_groupmod.c:184
+#: src/tools/sss_usermod.c:178 src/tools/sss_usermod.c:205
 #, c-format
 msgid ""
 "Cannot find group %s in local domain, only groups in local domain are "
@@ -769,39 +787,39 @@ msgstr ""
 "Не удалось найти группу %s в локальном домене, разрешены только группы "
 "локального домена\n"
 
-#: tools/sss_groupmod.c:220
+#: src/tools/sss_groupmod.c:218
 msgid "Could not modify group - check if member group names are correct\n"
 msgstr ""
 "Не удалось изменить группу — проверьте правильность имён групп-участников\n"
 
-#: tools/sss_groupmod.c:224
+#: src/tools/sss_groupmod.c:222
 msgid "Could not modify group - check if groupname is correct\n"
 msgstr "Не удалось изменить группу — проверьте правильность имени группы\n"
 
-#: tools/sss_groupmod.c:228
+#: src/tools/sss_groupmod.c:226
 msgid "Transaction error. Could not modify group.\n"
 msgstr "Ошибка в транзакции. Не удалось изменить группу.\n"
 
-#: tools/sss_groupshow.c:567
+#: src/tools/sss_groupshow.c:567
 #, c-format
 msgid "%s%sGroup: %s\n"
 msgstr "%s%sГруппа: %s\n"
 
-#: tools/sss_groupshow.c:568
+#: src/tools/sss_groupshow.c:568
 msgid "Magic Private "
 msgstr "Magic Private"
 
-#: tools/sss_groupshow.c:570
+#: src/tools/sss_groupshow.c:570
 #, c-format
 msgid "%sGID number: %d\n"
 msgstr "%sНомер GID: %d\n"
 
-#: tools/sss_groupshow.c:572
+#: src/tools/sss_groupshow.c:572
 #, c-format
 msgid "%sMember users: "
 msgstr "%sПользователи: "
 
-#: tools/sss_groupshow.c:579
+#: src/tools/sss_groupshow.c:579
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -810,7 +828,7 @@ msgstr ""
 "\n"
 "%sIs является участником: "
 
-#: tools/sss_groupshow.c:586
+#: src/tools/sss_groupshow.c:586
 #, c-format
 msgid ""
 "\n"
@@ -819,15 +837,15 @@ msgstr ""
 "\n"
 "%sГруппы-участники: "
 
-#: tools/sss_groupshow.c:622
+#: src/tools/sss_groupshow.c:622
 msgid "Print indirect group members recursively"
 msgstr "Рекурсивно выводить непрямых участников группы"
 
-#: tools/sss_groupshow.c:657
+#: src/tools/sss_groupshow.c:655
 msgid "Specify group to show\n"
 msgstr "Укажите группу\n"
 
-#: tools/sss_groupshow.c:698
+#: src/tools/sss_groupshow.c:694
 msgid ""
 "No such group in local domain. Printing groups only allowed in local "
 "domain.\n"
@@ -835,103 +853,103 @@ msgstr ""
 "В локальном домене нет такой группы. Печать групп разрешена только в "
 "локальном домене.\n"
 
-#: tools/sss_groupshow.c:703
+#: src/tools/sss_groupshow.c:699
 msgid "Internal error. Could not print group.\n"
 msgstr "Внутренняя ошибка. Невозможно напечатать группу.\n"
 
-#: tools/sss_userdel.c:133
+#: src/tools/sss_userdel.c:133
 msgid "Remove home directory and mail spool"
 msgstr "Удалить домашний каталог и почтовую очередь"
 
-#: tools/sss_userdel.c:135
+#: src/tools/sss_userdel.c:135
 msgid "Do not remove home directory and mail spool"
 msgstr "Не удалять домашний каталог и почтовую очередь"
 
-#: tools/sss_userdel.c:137
+#: src/tools/sss_userdel.c:137
 msgid "Force removal of files not owned by the user"
 msgstr "Принудительно удалять файлы, не принадлежащие пользователю"
 
-#: tools/sss_userdel.c:139
+#: src/tools/sss_userdel.c:139
 msgid "Kill users' processes before removing him"
 msgstr ""
 
-#: tools/sss_userdel.c:186
+#: src/tools/sss_userdel.c:184
 msgid "Specify user to delete\n"
 msgstr "Укажите пользователя для удаления\n"
 
-#: tools/sss_userdel.c:235
+#: src/tools/sss_userdel.c:231
 #, c-format
 msgid "User %s is outside the defined ID range for domain\n"
 msgstr "Пользователь %s находится вне определённого диапазона ID для домена\n"
 
-#: tools/sss_userdel.c:260
+#: src/tools/sss_userdel.c:256
 msgid "Cannot reset SELinux login context\n"
 msgstr ""
 
-#: tools/sss_userdel.c:272
+#: src/tools/sss_userdel.c:268
 #, c-format
 msgid "WARNING: The user (uid %lu) was still logged in when deleted.\n"
 msgstr ""
 
-#: tools/sss_userdel.c:277
+#: src/tools/sss_userdel.c:273
 msgid "Cannot determine if the user was logged in on this platform"
 msgstr ""
 
-#: tools/sss_userdel.c:282
+#: src/tools/sss_userdel.c:278
 msgid "Error while checking if the user was logged in\n"
 msgstr ""
 
-#: tools/sss_userdel.c:289
+#: src/tools/sss_userdel.c:285
 #, c-format
 msgid "The post-delete command failed: %s\n"
 msgstr ""
 
-#: tools/sss_userdel.c:301
+#: src/tools/sss_userdel.c:297
 msgid "Not removing home dir - not owned by user\n"
 msgstr ""
 "Домашняя директория не удалена — пользователь не является её владельцем\n"
 
-#: tools/sss_userdel.c:303
+#: src/tools/sss_userdel.c:299
 #, c-format
 msgid "Cannot remove homedir: %s\n"
 msgstr "Не удалось удалить домашнюю директорию: %s\n"
 
-#: tools/sss_userdel.c:314
+#: src/tools/sss_userdel.c:310
 msgid ""
 "No such user in local domain. Removing users only allowed in local domain.\n"
 msgstr ""
 "В локальном домене нет такого пользователя. Удаление пользователей разрешено "
 "только для локального домена.\n"
 
-#: tools/sss_userdel.c:319
+#: src/tools/sss_userdel.c:315
 msgid "Internal error. Could not remove user.\n"
 msgstr "Внутренняя ошибка. Не удалось удалить пользователя.\n"
 
-#: tools/sss_usermod.c:49
+#: src/tools/sss_usermod.c:49
 msgid "The GID of the user"
 msgstr "GID пользователя"
 
-#: tools/sss_usermod.c:53
+#: src/tools/sss_usermod.c:53
 msgid "Groups to add this user to"
 msgstr "Группы, к которым добавить этого пользователя"
 
-#: tools/sss_usermod.c:54
+#: src/tools/sss_usermod.c:54
 msgid "Groups to remove this user from"
 msgstr "Группы, из которых удалить этого пользователя"
 
-#: tools/sss_usermod.c:55
+#: src/tools/sss_usermod.c:55
 msgid "Lock the account"
 msgstr "Заблокировать учётную запись"
 
-#: tools/sss_usermod.c:56
+#: src/tools/sss_usermod.c:56
 msgid "Unlock the account"
 msgstr "Разблокировать учётную запись"
 
-#: tools/sss_usermod.c:117
+#: src/tools/sss_usermod.c:117
 msgid "Specify user to modify\n"
 msgstr "Укажите пользователя для изменения\n"
 
-#: tools/sss_usermod.c:148
+#: src/tools/sss_usermod.c:146
 msgid ""
 "Cannot find user in local domain, modifying users is allowed only in local "
 "domain\n"
@@ -939,28 +957,28 @@ msgstr ""
 "Не удалось найти пользователя в локальном домене, изменение пользователей "
 "разрешено только в локальном домене\n"
 
-#: tools/sss_usermod.c:250
+#: src/tools/sss_usermod.c:248
 msgid "Could not modify user - check if group names are correct\n"
 msgstr "Не удалось изменить пользователя — проверьте правильность имён групп\n"
 
-#: tools/sss_usermod.c:254
+#: src/tools/sss_usermod.c:252
 msgid "Could not modify user - user already member of groups?\n"
 msgstr "Не удалось изменить пользователя — он уже является членом групп?\n"
 
-#: tools/sss_usermod.c:258
+#: src/tools/sss_usermod.c:256
 msgid "Transaction error. Could not modify user.\n"
 msgstr "Ошибка в транзакции. Не удалось изменить пользователя.\n"
 
-#: tools/tools_util.c:285
+#: src/tools/tools_util.c:290
 msgid "Out of memory\n"
 msgstr "Недостаточно памяти\n"
 
-#: tools/tools_util.h:34
+#: src/tools/tools_util.h:40
 #, c-format
 msgid "%s must be run as root\n"
 msgstr "%s должно выполняться от имени root\n"
 
-#: util/util.h:63
+#: src/util/util.h:65
 msgid "Send the debug output to files instead of stderr"
 msgstr "Отправлять отладочные сообщения в файлы, а не в stderr"
 
diff --git a/po/sssd.pot b/po/sssd.pot
index 8be41202..c1389de1 100644
--- a/po/sssd.pot
+++ b/po/sssd.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2010-08-03 18:24-0400\n"
+"POT-Creation-Date: 2010-10-18 13:14-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"
@@ -17,904 +17,920 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: config/SSSDConfig.py:39
+#: src/config/SSSDConfig.py:39
 msgid "Set the verbosity of the debug logging"
 msgstr ""
 
-#: config/SSSDConfig.py:40
+#: src/config/SSSDConfig.py:40
 msgid "Include timestamps in debug logs"
 msgstr ""
 
-#: config/SSSDConfig.py:41
+#: src/config/SSSDConfig.py:41
 msgid "Write debug messages to logfiles"
 msgstr ""
 
-#: config/SSSDConfig.py:42
+#: src/config/SSSDConfig.py:42
 msgid "Ping timeout before restarting service"
 msgstr ""
 
-#: config/SSSDConfig.py:43
+#: src/config/SSSDConfig.py:43
 msgid "Command to start service"
 msgstr ""
 
-#: config/SSSDConfig.py:44
+#: src/config/SSSDConfig.py:44
 msgid "Number of times to attempt connection to Data Providers"
 msgstr ""
 
-#: config/SSSDConfig.py:47
+#: src/config/SSSDConfig.py:47
 msgid "SSSD Services to start"
 msgstr ""
 
-#: config/SSSDConfig.py:48
+#: src/config/SSSDConfig.py:48
 msgid "SSSD Domains to start"
 msgstr ""
 
-#: config/SSSDConfig.py:49
+#: src/config/SSSDConfig.py:49
 msgid "Timeout for messages sent over the SBUS"
 msgstr ""
 
-#: config/SSSDConfig.py:50
+#: src/config/SSSDConfig.py:50
 msgid "Regex to parse username and domain"
 msgstr ""
 
-#: config/SSSDConfig.py:51
+#: src/config/SSSDConfig.py:51
 msgid "Printf-compatible format for displaying fully-qualified names"
 msgstr ""
 
-#: config/SSSDConfig.py:54
+#: src/config/SSSDConfig.py:54
 msgid "Enumeration cache timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:55
+#: src/config/SSSDConfig.py:55
 msgid "Entry cache background update timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:56
+#: src/config/SSSDConfig.py:56
 msgid "Negative cache timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:57
+#: src/config/SSSDConfig.py:57
 msgid "Users that SSSD should explicitly ignore"
 msgstr ""
 
-#: config/SSSDConfig.py:58
+#: src/config/SSSDConfig.py:58
 msgid "Groups that SSSD should explicitly ignore"
 msgstr ""
 
-#: config/SSSDConfig.py:59
+#: src/config/SSSDConfig.py:59
 msgid "Should filtered users appear in groups"
 msgstr ""
 
-#: config/SSSDConfig.py:60
+#: src/config/SSSDConfig.py:60
 msgid "The value of the password field the NSS provider should return"
 msgstr ""
 
-#: config/SSSDConfig.py:63
+#: src/config/SSSDConfig.py:63
 msgid "How long to allow cached logins between online logins (days)"
 msgstr ""
 
-#: config/SSSDConfig.py:64
+#: src/config/SSSDConfig.py:64
 msgid "How many failed logins attempts are allowed when offline"
 msgstr ""
 
-#: config/SSSDConfig.py:65
+#: src/config/SSSDConfig.py:65
 msgid ""
 "How long (minutes) to deny login after offline_failed_login_attempts has "
 "been reached"
 msgstr ""
 
-#: config/SSSDConfig.py:68
+#: src/config/SSSDConfig.py:68
 msgid "Identity provider"
 msgstr ""
 
-#: config/SSSDConfig.py:69
+#: src/config/SSSDConfig.py:69
 msgid "Authentication provider"
 msgstr ""
 
-#: config/SSSDConfig.py:70
+#: src/config/SSSDConfig.py:70
 msgid "Access control provider"
 msgstr ""
 
-#: config/SSSDConfig.py:71
+#: src/config/SSSDConfig.py:71
 msgid "Password change provider"
 msgstr ""
 
-#: config/SSSDConfig.py:74
+#: src/config/SSSDConfig.py:74
 msgid "Minimum user ID"
 msgstr ""
 
-#: config/SSSDConfig.py:75
+#: src/config/SSSDConfig.py:75
 msgid "Maximum user ID"
 msgstr ""
 
-#: config/SSSDConfig.py:76
+#: src/config/SSSDConfig.py:76
 msgid "Ping timeout before restarting domain"
 msgstr ""
 
-#: config/SSSDConfig.py:77
+#: src/config/SSSDConfig.py:77
 msgid "Enable enumerating all users/groups"
 msgstr ""
 
-#: config/SSSDConfig.py:78
+#: src/config/SSSDConfig.py:78
 msgid "Cache credentials for offline login"
 msgstr ""
 
-#: config/SSSDConfig.py:79
+#: src/config/SSSDConfig.py:79
 msgid "Store password hashes"
 msgstr ""
 
-#: config/SSSDConfig.py:80
+#: src/config/SSSDConfig.py:80
 msgid "Display users/groups in fully-qualified form"
 msgstr ""
 
-#: config/SSSDConfig.py:81
+#: src/config/SSSDConfig.py:81
 msgid "Entry cache timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:82
+#: src/config/SSSDConfig.py:82
 msgid ""
 "Restrict or prefer a specific address family when performing DNS lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:83
+#: src/config/SSSDConfig.py:83
 msgid "How long to keep cached entries after last successful login (days)"
 msgstr ""
 
-#: config/SSSDConfig.py:84
+#: src/config/SSSDConfig.py:84
 msgid "How long to wait for replies from DNS when resolving servers (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:85
+#: src/config/SSSDConfig.py:85
 msgid "The domain part of service discovery DNS query"
 msgstr ""
 
-#: config/SSSDConfig.py:88
+#: src/config/SSSDConfig.py:88
 msgid "IPA domain"
 msgstr ""
 
-#: config/SSSDConfig.py:89
+#: src/config/SSSDConfig.py:89
 msgid "IPA server address"
 msgstr ""
 
-#: config/SSSDConfig.py:90
+#: src/config/SSSDConfig.py:90
 msgid "IPA client hostname"
 msgstr ""
 
-#: config/SSSDConfig.py:91
+#: src/config/SSSDConfig.py:91
 msgid "Whether to automatically update the client's DNS entry in FreeIPA"
 msgstr ""
 
-#: config/SSSDConfig.py:92
+#: src/config/SSSDConfig.py:92
 msgid "The interface whose IP should be used for dynamic DNS updates"
 msgstr ""
 
-#: config/SSSDConfig.py:95 config/SSSDConfig.py:124
+#: src/config/SSSDConfig.py:95 src/config/SSSDConfig.py:124
 msgid "Kerberos server address"
 msgstr ""
 
-#: config/SSSDConfig.py:96 config/SSSDConfig.py:125
+#: src/config/SSSDConfig.py:96 src/config/SSSDConfig.py:125
 msgid "Kerberos realm"
 msgstr ""
 
-#: config/SSSDConfig.py:97
+#: src/config/SSSDConfig.py:97
 msgid "Authentication timeout"
 msgstr ""
 
-#: config/SSSDConfig.py:100
+#: src/config/SSSDConfig.py:100
 msgid "Directory to store credential caches"
 msgstr ""
 
-#: config/SSSDConfig.py:101
+#: src/config/SSSDConfig.py:101
 msgid "Location of the user's credential cache"
 msgstr ""
 
-#: config/SSSDConfig.py:102
+#: src/config/SSSDConfig.py:102
 msgid "Location of the keytab to validate credentials"
 msgstr ""
 
-#: config/SSSDConfig.py:103
+#: src/config/SSSDConfig.py:103
 msgid "Enable credential validation"
 msgstr ""
 
-#: config/SSSDConfig.py:104
+#: src/config/SSSDConfig.py:104
 msgid "Store password if offline for later online authentication"
 msgstr ""
 
-#: config/SSSDConfig.py:107
+#: src/config/SSSDConfig.py:107
 msgid "Server where the change password service is running if not on the KDC"
 msgstr ""
 
-#: config/SSSDConfig.py:110
+#: src/config/SSSDConfig.py:110
 msgid "ldap_uri, The URI of the LDAP server"
 msgstr ""
 
-#: config/SSSDConfig.py:111
+#: src/config/SSSDConfig.py:111
 msgid "The default base DN"
 msgstr ""
 
-#: config/SSSDConfig.py:112
+#: src/config/SSSDConfig.py:112
 msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr ""
 
-#: config/SSSDConfig.py:113
+#: src/config/SSSDConfig.py:113
 msgid "The default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:114
+#: src/config/SSSDConfig.py:114
 msgid "The type of the authentication token of the default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:115
+#: src/config/SSSDConfig.py:115
 msgid "The authentication token of the default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:116
+#: src/config/SSSDConfig.py:116
 msgid "Length of time to attempt connection"
 msgstr ""
 
-#: config/SSSDConfig.py:117
+#: src/config/SSSDConfig.py:117
 msgid "Length of time to attempt synchronous LDAP operations"
 msgstr ""
 
-#: config/SSSDConfig.py:118
+#: src/config/SSSDConfig.py:118
 msgid "Length of time between attempts to reconnect while offline"
 msgstr ""
 
-#: config/SSSDConfig.py:119
+#: src/config/SSSDConfig.py:119
 msgid "File that contains CA certificates"
 msgstr ""
 
-#: config/SSSDConfig.py:120
+#: src/config/SSSDConfig.py:120
 msgid "Path to CA certificate directory"
 msgstr ""
 
-#: config/SSSDConfig.py:121
+#: src/config/SSSDConfig.py:121
 msgid "Require TLS certificate verification"
 msgstr ""
 
-#: config/SSSDConfig.py:122
+#: src/config/SSSDConfig.py:122
 msgid "Specify the sasl mechanism to use"
 msgstr ""
 
-#: config/SSSDConfig.py:123
+#: src/config/SSSDConfig.py:123
 msgid "Specify the sasl authorization id to use"
 msgstr ""
 
-#: config/SSSDConfig.py:126
+#: src/config/SSSDConfig.py:126
 msgid "Kerberos service keytab"
 msgstr ""
 
-#: config/SSSDConfig.py:127
+#: src/config/SSSDConfig.py:127
 msgid "Use Kerberos auth for LDAP connection"
 msgstr ""
 
-#: config/SSSDConfig.py:128
+#: src/config/SSSDConfig.py:128
 msgid "Follow LDAP referrals"
 msgstr ""
 
-#: config/SSSDConfig.py:129
+#: src/config/SSSDConfig.py:129
 msgid "Lifetime of TGT for LDAP connection"
 msgstr ""
 
-#: config/SSSDConfig.py:132
+#: src/config/SSSDConfig.py:132
 msgid "Length of time to wait for a search request"
 msgstr ""
 
-#: config/SSSDConfig.py:133
+#: src/config/SSSDConfig.py:133
 msgid "Length of time between enumeration updates"
 msgstr ""
 
-#: config/SSSDConfig.py:134
+#: src/config/SSSDConfig.py:134
 msgid "Require TLS for ID lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:135
+#: src/config/SSSDConfig.py:135
 msgid "Base DN for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:136
+#: src/config/SSSDConfig.py:136
 msgid "Scope of user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:137
+#: src/config/SSSDConfig.py:137
 msgid "Filter for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:138
+#: src/config/SSSDConfig.py:138
 msgid "Objectclass for users"
 msgstr ""
 
-#: config/SSSDConfig.py:139
+#: src/config/SSSDConfig.py:139
 msgid "Username attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:140
+#: src/config/SSSDConfig.py:140
 msgid "UID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:141
+#: src/config/SSSDConfig.py:141
 msgid "Primary GID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:142
+#: src/config/SSSDConfig.py:142
 msgid "GECOS attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:143
+#: src/config/SSSDConfig.py:143
 msgid "Home directory attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:144
+#: src/config/SSSDConfig.py:144
 msgid "Shell attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:145
+#: src/config/SSSDConfig.py:145
 msgid "UUID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:146
+#: src/config/SSSDConfig.py:146
 msgid "User principal attribute (for Kerberos)"
 msgstr ""
 
-#: config/SSSDConfig.py:147
+#: src/config/SSSDConfig.py:147
 msgid "Full Name"
 msgstr ""
 
-#: config/SSSDConfig.py:148
+#: src/config/SSSDConfig.py:148
 msgid "memberOf attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:149
+#: src/config/SSSDConfig.py:149
 msgid "Modification time attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:152
+#: src/config/SSSDConfig.py:152
 msgid "Policy to evaluate the password expiration"
 msgstr ""
 
-#: config/SSSDConfig.py:155
+#: src/config/SSSDConfig.py:155
 msgid "LDAP filter to determine access privileges"
 msgstr ""
 
-#: config/SSSDConfig.py:158
+#: src/config/SSSDConfig.py:158
 msgid "Comma separated list of allowed users"
 msgstr ""
 
-#: config/SSSDConfig.py:159
+#: src/config/SSSDConfig.py:159
 msgid "Comma separated list of prohibited users"
 msgstr ""
 
-#: config/SSSDConfig.py:162
+#: src/config/SSSDConfig.py:162
 msgid "Default shell, /bin/bash"
 msgstr ""
 
-#: config/SSSDConfig.py:163
+#: src/config/SSSDConfig.py:163
 msgid "Base for home directories"
 msgstr ""
 
-#: config/SSSDConfig.py:166
+#: src/config/SSSDConfig.py:166
 msgid "The name of the NSS library to use"
 msgstr ""
 
-#: config/SSSDConfig.py:169
+#: src/config/SSSDConfig.py:169
 msgid "PAM stack to use"
 msgstr ""
 
-#: monitor/monitor.c:2137
+#: src/monitor/monitor.c:2140
 msgid "Become a daemon (default)"
 msgstr ""
 
-#: monitor/monitor.c:2139
+#: src/monitor/monitor.c:2142
 msgid "Run interactive (not a daemon)"
 msgstr ""
 
-#: monitor/monitor.c:2141
+#: src/monitor/monitor.c:2144
 msgid "Specify a non-default config file"
 msgstr ""
 
-#: monitor/monitor.c:2167
+#: src/monitor/monitor.c:2170
 msgid "sssd must be run as root\n"
 msgstr ""
 
-#: monitor/monitor.c:2202
+#: src/monitor/monitor.c:2205
 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:2212
+#: src/monitor/monitor.c:2215
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
 "file is owned by root.root\n"
 msgstr ""
 
-#: monitor/monitor.c:2217
+#: src/monitor/monitor.c:2220
 msgid "Cannot load configuration database\n"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:993 providers/ldap/ldap_child.c:361
-#: util/util.h:61
+#: src/providers/krb5/krb5_child.c:1043 src/providers/ldap/ldap_child.c:359
+#: src/util/util.h:63
 msgid "Debug level"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:995 providers/ldap/ldap_child.c:363
-#: util/util.h:65
+#: src/providers/krb5/krb5_child.c:1045 src/providers/ldap/ldap_child.c:361
+#: src/util/util.h:67
 msgid "Add debug timestamps"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:997 providers/ldap/ldap_child.c:365
+#: src/providers/krb5/krb5_child.c:1047 src/providers/ldap/ldap_child.c:363
 msgid "An open file descriptor for the debug logs"
 msgstr ""
 
-#: providers/data_provider_be.c:1165
+#: src/providers/data_provider_be.c:1165
 msgid "Domain of the information provider (mandatory)"
 msgstr ""
 
-#: sss_client/common.c:742
+#: src/sss_client/common.c:742
 msgid "Privileged socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:745
+#: src/sss_client/common.c:745
 msgid "Public socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:748
+#: src/sss_client/common.c:748
 msgid "Unexpected format of the server credential message."
 msgstr ""
 
-#: sss_client/common.c:751
+#: src/sss_client/common.c:751
 msgid "SSSD is not run by root."
 msgstr ""
 
-#: sss_client/common.c:756
+#: src/sss_client/common.c:756
 msgid "An error occurred, but no description can be found."
 msgstr ""
 
-#: sss_client/common.c:762
+#: src/sss_client/common.c:762
 msgid "Unexpected error while looking for an error description"
 msgstr ""
 
-#: sss_client/pam_sss.c:372
+#: src/sss_client/pam_sss.c:372
 msgid "Passwords do not match"
 msgstr ""
 
-#: sss_client/pam_sss.c:556
+#: src/sss_client/pam_sss.c:556
 msgid "Password reset by root is not supported."
 msgstr ""
 
-#: sss_client/pam_sss.c:597
+#: src/sss_client/pam_sss.c:597
 msgid "Authenticated with cached credentials"
 msgstr ""
 
-#: sss_client/pam_sss.c:598
+#: src/sss_client/pam_sss.c:598
 msgid ", your cached password will expire at: "
 msgstr ""
 
-#: sss_client/pam_sss.c:628
+#: src/sss_client/pam_sss.c:628
 #, c-format
 msgid "Your password has expired. You have %d grace login(s) remaining."
 msgstr ""
 
-#: sss_client/pam_sss.c:674
+#: src/sss_client/pam_sss.c:674
 #, c-format
 msgid "Your password will expire in %d %s."
 msgstr ""
 
-#: sss_client/pam_sss.c:723
+#: src/sss_client/pam_sss.c:723
 msgid "Authentication is denied until: "
 msgstr ""
 
-#: sss_client/pam_sss.c:750
+#: src/sss_client/pam_sss.c:750
 msgid "System is offline, password change not possible"
 msgstr ""
 
-#: sss_client/pam_sss.c:780 sss_client/pam_sss.c:793
+#: src/sss_client/pam_sss.c:780 src/sss_client/pam_sss.c:793
 msgid "Password change failed. "
 msgstr ""
 
-#: sss_client/pam_sss.c:783 sss_client/pam_sss.c:794
+#: src/sss_client/pam_sss.c:783 src/sss_client/pam_sss.c:794
 msgid "Server message: "
 msgstr ""
 
-#: sss_client/pam_sss.c:1197
+#: src/sss_client/pam_sss.c:1197
 msgid "New Password: "
 msgstr ""
 
-#: sss_client/pam_sss.c:1198
+#: src/sss_client/pam_sss.c:1198
 msgid "Reenter new Password: "
 msgstr ""
 
-#: sss_client/pam_sss.c:1280
+#: src/sss_client/pam_sss.c:1280
 msgid "Password: "
 msgstr ""
 
-#: sss_client/pam_sss.c:1312
+#: src/sss_client/pam_sss.c:1312
 msgid "Current Password: "
 msgstr ""
 
-#: sss_client/pam_sss.c:1458
+#: src/sss_client/pam_sss.c:1458
 msgid "Password expired. Change your password now."
 msgstr ""
 
-#: tools/sss_useradd.c:48 tools/sss_groupadd.c:41 tools/sss_groupdel.c:43
-#: tools/sss_groupmod.c:42 tools/sss_groupshow.c:620 tools/sss_userdel.c:131
-#: tools/sss_usermod.c:47
+#: src/tools/sss_useradd.c:48 src/tools/sss_groupadd.c:41
+#: src/tools/sss_groupdel.c:43 src/tools/sss_groupmod.c:42
+#: src/tools/sss_groupshow.c:620 src/tools/sss_userdel.c:131
+#: src/tools/sss_usermod.c:47
 msgid "The debug level to run with"
 msgstr ""
 
-#: tools/sss_useradd.c:49 tools/sss_usermod.c:48
+#: src/tools/sss_useradd.c:49 src/tools/sss_usermod.c:48
 msgid "The UID of the user"
 msgstr ""
 
-#: tools/sss_useradd.c:50 tools/sss_usermod.c:50
+#: src/tools/sss_useradd.c:50 src/tools/sss_usermod.c:50
 msgid "The comment string"
 msgstr ""
 
-#: tools/sss_useradd.c:51 tools/sss_usermod.c:51
+#: src/tools/sss_useradd.c:51 src/tools/sss_usermod.c:51
 msgid "Home directory"
 msgstr ""
 
-#: tools/sss_useradd.c:52 tools/sss_usermod.c:52
+#: src/tools/sss_useradd.c:52 src/tools/sss_usermod.c:52
 msgid "Login shell"
 msgstr ""
 
-#: tools/sss_useradd.c:53
+#: src/tools/sss_useradd.c:53
 msgid "Groups"
 msgstr ""
 
-#: tools/sss_useradd.c:54
+#: src/tools/sss_useradd.c:54
 msgid "Create user's directory if it does not exist"
 msgstr ""
 
-#: tools/sss_useradd.c:55
+#: src/tools/sss_useradd.c:55
 msgid "Never create user's directory, overrides config"
 msgstr ""
 
-#: tools/sss_useradd.c:56
+#: src/tools/sss_useradd.c:56
 msgid "Specify an alternative skeleton directory"
 msgstr ""
 
-#: tools/sss_useradd.c:57 tools/sss_usermod.c:57
+#: src/tools/sss_useradd.c:57 src/tools/sss_usermod.c:57
 msgid "The SELinux user for user's login"
 msgstr ""
 
-#: tools/sss_useradd.c:71 tools/sss_groupadd.c:56 tools/sss_groupdel.c:52
-#: tools/sss_groupmod.c:63 tools/sss_groupshow.c:631 tools/sss_userdel.c:148
-#: tools/sss_usermod.c:72
+#: src/tools/sss_useradd.c:71 src/tools/sss_groupadd.c:56
+#: src/tools/sss_groupdel.c:52 src/tools/sss_groupmod.c:63
+#: src/tools/sss_groupshow.c:631 src/tools/sss_userdel.c:148
+#: src/tools/sss_usermod.c:72
 msgid "Error setting the locale\n"
 msgstr ""
 
-#: tools/sss_useradd.c:107
+#: src/tools/sss_useradd.c:84 src/tools/sss_groupmod.c:76
+#: src/tools/sss_usermod.c:85
+msgid "Specify group to add to\n"
+msgstr ""
+
+#: src/tools/sss_useradd.c:108
 msgid "Specify user to add\n"
 msgstr ""
 
-#: tools/sss_useradd.c:118 tools/sss_groupadd.c:86 tools/sss_groupdel.c:81
-#: tools/sss_groupmod.c:111 tools/sss_groupshow.c:668 tools/sss_userdel.c:197
-#: tools/sss_usermod.c:128
+#: src/tools/sss_useradd.c:117 src/tools/sss_groupadd.c:82
+#: src/tools/sss_groupdel.c:77 src/tools/sss_groupmod.c:109
+#: src/tools/sss_groupshow.c:664 src/tools/sss_userdel.c:193
+#: src/tools/sss_usermod.c:126
 msgid "Error initializing the tools - no local domain\n"
 msgstr ""
 
-#: tools/sss_useradd.c:120 tools/sss_groupadd.c:88 tools/sss_groupdel.c:83
-#: tools/sss_groupmod.c:113 tools/sss_groupshow.c:670 tools/sss_userdel.c:199
-#: tools/sss_usermod.c:130
+#: src/tools/sss_useradd.c:119 src/tools/sss_groupadd.c:84
+#: src/tools/sss_groupdel.c:79 src/tools/sss_groupmod.c:111
+#: src/tools/sss_groupshow.c:666 src/tools/sss_userdel.c:195
+#: src/tools/sss_usermod.c:128
 msgid "Error initializing the tools\n"
 msgstr ""
 
-#: tools/sss_useradd.c:129 tools/sss_groupadd.c:97 tools/sss_groupdel.c:92
-#: tools/sss_groupmod.c:121 tools/sss_groupshow.c:679 tools/sss_userdel.c:208
-#: tools/sss_usermod.c:139
+#: src/tools/sss_useradd.c:128 src/tools/sss_groupadd.c:93
+#: src/tools/sss_groupdel.c:88 src/tools/sss_groupmod.c:119
+#: src/tools/sss_groupshow.c:675 src/tools/sss_userdel.c:204
+#: src/tools/sss_usermod.c:137
 msgid "Invalid domain specified in FQDN\n"
 msgstr ""
 
-#: tools/sss_useradd.c:138 tools/sss_groupmod.c:143 tools/sss_groupmod.c:170
-#: tools/sss_usermod.c:164 tools/sss_usermod.c:191
+#: src/tools/sss_useradd.c:137 src/tools/sss_groupmod.c:141
+#: src/tools/sss_groupmod.c:168 src/tools/sss_usermod.c:162
+#: src/tools/sss_usermod.c:189
 msgid "Internal error while parsing parameters\n"
 msgstr ""
 
-#: tools/sss_useradd.c:146 tools/sss_usermod.c:172 tools/sss_usermod.c:199
+#: src/tools/sss_useradd.c:145 src/tools/sss_usermod.c:170
+#: src/tools/sss_usermod.c:197
 msgid "Groups must be in the same domain as user\n"
 msgstr ""
 
-#: tools/sss_useradd.c:154
+#: src/tools/sss_useradd.c:153
 #, c-format
 msgid "Cannot find group %s in local domain\n"
 msgstr ""
 
-#: tools/sss_useradd.c:169 tools/sss_userdel.c:218
+#: src/tools/sss_useradd.c:168 src/tools/sss_userdel.c:214
 msgid "Cannot set default values\n"
 msgstr ""
 
-#: tools/sss_useradd.c:176 tools/sss_usermod.c:155
+#: src/tools/sss_useradd.c:175 src/tools/sss_usermod.c:153
 msgid "The selected UID is outside the allowed range\n"
 msgstr ""
 
-#: tools/sss_useradd.c:203 tools/sss_usermod.c:240
+#: src/tools/sss_useradd.c:202 src/tools/sss_usermod.c:238
 msgid "Cannot set SELinux login context\n"
 msgstr ""
 
-#: tools/sss_useradd.c:219
+#: src/tools/sss_useradd.c:218
 msgid "Cannot get info about the user\n"
 msgstr ""
 
-#: tools/sss_useradd.c:233
+#: src/tools/sss_useradd.c:232
 msgid "User's home directory already exists, not copying data from skeldir\n"
 msgstr ""
 
-#: tools/sss_useradd.c:236
+#: src/tools/sss_useradd.c:235
 #, c-format
 msgid "Cannot create user's home directory: %s\n"
 msgstr ""
 
-#: tools/sss_useradd.c:247
+#: src/tools/sss_useradd.c:246
 #, c-format
 msgid "Cannot create user's mail spool: %s\n"
 msgstr ""
 
-#: tools/sss_useradd.c:259
+#: src/tools/sss_useradd.c:258
 msgid "Could not allocate ID for the user - domain full?\n"
 msgstr ""
 
-#: tools/sss_useradd.c:263
+#: src/tools/sss_useradd.c:262
 msgid "A user or group with the same name or ID already exists\n"
 msgstr ""
 
-#: tools/sss_useradd.c:269
+#: src/tools/sss_useradd.c:268
 msgid "Transaction error. Could not add user.\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:43 tools/sss_groupmod.c:48
+#: src/tools/sss_groupadd.c:43 src/tools/sss_groupmod.c:48
 msgid "The GID of the group"
 msgstr ""
 
-#: tools/sss_groupadd.c:75
+#: src/tools/sss_groupadd.c:73
 msgid "Specify group to add\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:106 tools/sss_groupmod.c:194
+#: src/tools/sss_groupadd.c:102 src/tools/sss_groupmod.c:192
 msgid "The selected GID is outside the allowed range\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:131
+#: src/tools/sss_groupadd.c:127
 msgid "Could not allocate ID for the group - domain full?\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:135
+#: src/tools/sss_groupadd.c:131
 msgid "A group with the same name or GID already exists\n"
 msgstr ""
 
-#: tools/sss_groupadd.c:140
+#: src/tools/sss_groupadd.c:136
 msgid "Transaction error. Could not add group.\n"
 msgstr ""
 
-#: tools/sss_groupdel.c:70
+#: src/tools/sss_groupdel.c:68
 msgid "Specify group to delete\n"
 msgstr ""
 
-#: tools/sss_groupdel.c:107
+#: src/tools/sss_groupdel.c:103
 #, c-format
 msgid "Group %s is outside the defined ID range for domain\n"
 msgstr ""
 
-#: tools/sss_groupdel.c:121
+#: src/tools/sss_groupdel.c:117
 msgid ""
 "No such group in local domain. Removing groups only allowed in local "
 "domain.\n"
 msgstr ""
 
-#: tools/sss_groupdel.c:126
+#: src/tools/sss_groupdel.c:122
 msgid "Internal error. Could not remove group.\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:44
+#: src/tools/sss_groupmod.c:44
 msgid "Groups to add this group to"
 msgstr ""
 
-#: tools/sss_groupmod.c:46
+#: src/tools/sss_groupmod.c:46
 msgid "Groups to remove this group from"
 msgstr ""
 
-#: tools/sss_groupmod.c:98
+#: src/tools/sss_groupmod.c:84 src/tools/sss_usermod.c:93
+msgid "Specify group to remove from\n"
+msgstr ""
+
+#: src/tools/sss_groupmod.c:98
 msgid "Specify group to modify\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:130
+#: src/tools/sss_groupmod.c:128
 msgid ""
 "Cannot find group in local domain, modifying groups is allowed only in local "
 "domain\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:151 tools/sss_groupmod.c:178
+#: src/tools/sss_groupmod.c:149 src/tools/sss_groupmod.c:176
 msgid "Member groups must be in the same domain as parent group\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:159 tools/sss_groupmod.c:186 tools/sss_usermod.c:180
-#: tools/sss_usermod.c:207
+#: src/tools/sss_groupmod.c:157 src/tools/sss_groupmod.c:184
+#: src/tools/sss_usermod.c:178 src/tools/sss_usermod.c:205
 #, c-format
 msgid ""
 "Cannot find group %s in local domain, only groups in local domain are "
 "allowed\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:220
+#: src/tools/sss_groupmod.c:218
 msgid "Could not modify group - check if member group names are correct\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:224
+#: src/tools/sss_groupmod.c:222
 msgid "Could not modify group - check if groupname is correct\n"
 msgstr ""
 
-#: tools/sss_groupmod.c:228
+#: src/tools/sss_groupmod.c:226
 msgid "Transaction error. Could not modify group.\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:567
+#: src/tools/sss_groupshow.c:567
 #, c-format
 msgid "%s%sGroup: %s\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:568
+#: src/tools/sss_groupshow.c:568
 msgid "Magic Private "
 msgstr ""
 
-#: tools/sss_groupshow.c:570
+#: src/tools/sss_groupshow.c:570
 #, c-format
 msgid "%sGID number: %d\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:572
+#: src/tools/sss_groupshow.c:572
 #, c-format
 msgid "%sMember users: "
 msgstr ""
 
-#: tools/sss_groupshow.c:579
+#: src/tools/sss_groupshow.c:579
 #, c-format
 msgid ""
 "\n"
 "%sIs a member of: "
 msgstr ""
 
-#: tools/sss_groupshow.c:586
+#: src/tools/sss_groupshow.c:586
 #, c-format
 msgid ""
 "\n"
 "%sMember groups: "
 msgstr ""
 
-#: tools/sss_groupshow.c:622
+#: src/tools/sss_groupshow.c:622
 msgid "Print indirect group members recursively"
 msgstr ""
 
-#: tools/sss_groupshow.c:657
+#: src/tools/sss_groupshow.c:655
 msgid "Specify group to show\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:698
+#: src/tools/sss_groupshow.c:694
 msgid ""
 "No such group in local domain. Printing groups only allowed in local "
 "domain.\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:703
+#: src/tools/sss_groupshow.c:699
 msgid "Internal error. Could not print group.\n"
 msgstr ""
 
-#: tools/sss_userdel.c:133
+#: src/tools/sss_userdel.c:133
 msgid "Remove home directory and mail spool"
 msgstr ""
 
-#: tools/sss_userdel.c:135
+#: src/tools/sss_userdel.c:135
 msgid "Do not remove home directory and mail spool"
 msgstr ""
 
-#: tools/sss_userdel.c:137
+#: src/tools/sss_userdel.c:137
 msgid "Force removal of files not owned by the user"
 msgstr ""
 
-#: tools/sss_userdel.c:139
+#: src/tools/sss_userdel.c:139
 msgid "Kill users' processes before removing him"
 msgstr ""
 
-#: tools/sss_userdel.c:186
+#: src/tools/sss_userdel.c:184
 msgid "Specify user to delete\n"
 msgstr ""
 
-#: tools/sss_userdel.c:235
+#: src/tools/sss_userdel.c:231
 #, c-format
 msgid "User %s is outside the defined ID range for domain\n"
 msgstr ""
 
-#: tools/sss_userdel.c:260
+#: src/tools/sss_userdel.c:256
 msgid "Cannot reset SELinux login context\n"
 msgstr ""
 
-#: tools/sss_userdel.c:272
+#: src/tools/sss_userdel.c:268
 #, c-format
 msgid "WARNING: The user (uid %lu) was still logged in when deleted.\n"
 msgstr ""
 
-#: tools/sss_userdel.c:277
+#: src/tools/sss_userdel.c:273
 msgid "Cannot determine if the user was logged in on this platform"
 msgstr ""
 
-#: tools/sss_userdel.c:282
+#: src/tools/sss_userdel.c:278
 msgid "Error while checking if the user was logged in\n"
 msgstr ""
 
-#: tools/sss_userdel.c:289
+#: src/tools/sss_userdel.c:285
 #, c-format
 msgid "The post-delete command failed: %s\n"
 msgstr ""
 
-#: tools/sss_userdel.c:301
+#: src/tools/sss_userdel.c:297
 msgid "Not removing home dir - not owned by user\n"
 msgstr ""
 
-#: tools/sss_userdel.c:303
+#: src/tools/sss_userdel.c:299
 #, c-format
 msgid "Cannot remove homedir: %s\n"
 msgstr ""
 
-#: tools/sss_userdel.c:314
+#: src/tools/sss_userdel.c:310
 msgid ""
 "No such user in local domain. Removing users only allowed in local domain.\n"
 msgstr ""
 
-#: tools/sss_userdel.c:319
+#: src/tools/sss_userdel.c:315
 msgid "Internal error. Could not remove user.\n"
 msgstr ""
 
-#: tools/sss_usermod.c:49
+#: src/tools/sss_usermod.c:49
 msgid "The GID of the user"
 msgstr ""
 
-#: tools/sss_usermod.c:53
+#: src/tools/sss_usermod.c:53
 msgid "Groups to add this user to"
 msgstr ""
 
-#: tools/sss_usermod.c:54
+#: src/tools/sss_usermod.c:54
 msgid "Groups to remove this user from"
 msgstr ""
 
-#: tools/sss_usermod.c:55
+#: src/tools/sss_usermod.c:55
 msgid "Lock the account"
 msgstr ""
 
-#: tools/sss_usermod.c:56
+#: src/tools/sss_usermod.c:56
 msgid "Unlock the account"
 msgstr ""
 
-#: tools/sss_usermod.c:117
+#: src/tools/sss_usermod.c:117
 msgid "Specify user to modify\n"
 msgstr ""
 
-#: tools/sss_usermod.c:148
+#: src/tools/sss_usermod.c:146
 msgid ""
 "Cannot find user in local domain, modifying users is allowed only in local "
 "domain\n"
 msgstr ""
 
-#: tools/sss_usermod.c:250
+#: src/tools/sss_usermod.c:248
 msgid "Could not modify user - check if group names are correct\n"
 msgstr ""
 
-#: tools/sss_usermod.c:254
+#: src/tools/sss_usermod.c:252
 msgid "Could not modify user - user already member of groups?\n"
 msgstr ""
 
-#: tools/sss_usermod.c:258
+#: src/tools/sss_usermod.c:256
 msgid "Transaction error. Could not modify user.\n"
 msgstr ""
 
-#: tools/tools_util.c:285
+#: src/tools/tools_util.c:290
 msgid "Out of memory\n"
 msgstr ""
 
-#: tools/tools_util.h:34
+#: src/tools/tools_util.h:40
 #, c-format
 msgid "%s must be run as root\n"
 msgstr ""
 
-#: util/util.h:63
+#: src/util/util.h:65
 msgid "Send the debug output to files instead of stderr"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 77d8f09f..e1cb4c27 100644
--- a/po/sv.po
+++ b/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-08-03 18:24-0400\n"
+"POT-Creation-Date: 2010-10-18 13:14-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"
@@ -17,701 +17,714 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: config/SSSDConfig.py:39
+#: src/config/SSSDConfig.py:39
 msgid "Set the verbosity of the debug logging"
 msgstr "Ange pratsamhet för felsökningsloggning"
 
-#: config/SSSDConfig.py:40
+#: src/config/SSSDConfig.py:40
 msgid "Include timestamps in debug logs"
 msgstr "Inkludera tidsstämplar i felsökningsloggar"
 
-#: config/SSSDConfig.py:41
+#: src/config/SSSDConfig.py:41
 msgid "Write debug messages to logfiles"
 msgstr "Skriv felmeddelanden till loggfiler"
 
-#: config/SSSDConfig.py:42
+#: src/config/SSSDConfig.py:42
 msgid "Ping timeout before restarting service"
 msgstr "Ping-tidsgräns före tjänst startas om"
 
-#: config/SSSDConfig.py:43
+#: src/config/SSSDConfig.py:43
 msgid "Command to start service"
 msgstr "Kommando för att starta tjänst"
 
-#: config/SSSDConfig.py:44
+#: src/config/SSSDConfig.py:44
 msgid "Number of times to attempt connection to Data Providers"
 msgstr "Antal gånger att försöka ansluta till dataleverantörer"
 
-#: config/SSSDConfig.py:47
+#: src/config/SSSDConfig.py:47
 msgid "SSSD Services to start"
 msgstr "SSSD-tjänster att starta"
 
-#: config/SSSDConfig.py:48
+#: src/config/SSSDConfig.py:48
 msgid "SSSD Domains to start"
 msgstr "SSSD-domäner att starta"
 
-#: config/SSSDConfig.py:49
+#: src/config/SSSDConfig.py:49
 msgid "Timeout for messages sent over the SBUS"
 msgstr "Tidsgräns för meddelanden skickade via SBUS"
 
-#: config/SSSDConfig.py:50
+#: src/config/SSSDConfig.py:50
 msgid "Regex to parse username and domain"
 msgstr "Reguljäruttryck för att tolka användarnamn och domän"
 
-#: config/SSSDConfig.py:51
+#: src/config/SSSDConfig.py:51
 msgid "Printf-compatible format for displaying fully-qualified names"
 msgstr "Printf-kompatibla format för att visa fullständigt kvalificerade namn"
 
-#: config/SSSDConfig.py:54
+#: src/config/SSSDConfig.py:54
 msgid "Enumeration cache timeout length (seconds)"
 msgstr "Tidsgränslängd för uppräkningscache (sekunder)"
 
-#: config/SSSDConfig.py:55
+#: src/config/SSSDConfig.py:55
 msgid "Entry cache background update timeout length (seconds)"
 msgstr "Tidsgränslängd för bakgrundsuppdateringar av postcache (sekunder)"
 
-#: config/SSSDConfig.py:56
+#: src/config/SSSDConfig.py:56
 msgid "Negative cache timeout length (seconds)"
 msgstr "Tidsgränslängd för negativ cache (sekunder)"
 
-#: config/SSSDConfig.py:57
+#: src/config/SSSDConfig.py:57
 msgid "Users that SSSD should explicitly ignore"
 msgstr "Användare som SSSD uttryckligen skall bortse ifrån"
 
-#: config/SSSDConfig.py:58
+#: src/config/SSSDConfig.py:58
 msgid "Groups that SSSD should explicitly ignore"
 msgstr "Grupper som SSSD uttryckligen skall bortse ifrån"
 
-#: config/SSSDConfig.py:59
+#: src/config/SSSDConfig.py:59
 msgid "Should filtered users appear in groups"
 msgstr "Skall filtrerade användare förekomma i grupper"
 
-#: config/SSSDConfig.py:60
+#: src/config/SSSDConfig.py:60
 msgid "The value of the password field the NSS provider should return"
 msgstr "Värdet på lösenordfältet som NSS-leverantörer skall returnera"
 
-#: config/SSSDConfig.py:63
+#: src/config/SSSDConfig.py:63
 msgid "How long to allow cached logins between online logins (days)"
 msgstr ""
 "Hur länge sparade inloggningar tillåts mellan online-inloggningar (dagar)"
 
-#: config/SSSDConfig.py:64
+#: src/config/SSSDConfig.py:64
 msgid "How many failed logins attempts are allowed when offline"
 msgstr ""
 
-#: config/SSSDConfig.py:65
+#: src/config/SSSDConfig.py:65
 msgid ""
 "How long (minutes) to deny login after offline_failed_login_attempts has "
 "been reached"
 msgstr ""
 
-#: config/SSSDConfig.py:68
+#: src/config/SSSDConfig.py:68
 msgid "Identity provider"
 msgstr "Identifiera leverantör"
 
-#: config/SSSDConfig.py:69
+#: src/config/SSSDConfig.py:69
 msgid "Authentication provider"
 msgstr "Autentiseringsleverantör"
 
-#: config/SSSDConfig.py:70
+#: src/config/SSSDConfig.py:70
 msgid "Access control provider"
 msgstr "Leverantör av åtkomstkontroll"
 
-#: config/SSSDConfig.py:71
+#: src/config/SSSDConfig.py:71
 msgid "Password change provider"
 msgstr "Leverantör av lösenordsändringar"
 
-#: config/SSSDConfig.py:74
+#: src/config/SSSDConfig.py:74
 msgid "Minimum user ID"
 msgstr "Minsta användar-ID"
 
-#: config/SSSDConfig.py:75
+#: src/config/SSSDConfig.py:75
 msgid "Maximum user ID"
 msgstr "Största användar-ID"
 
-#: config/SSSDConfig.py:76
+#: src/config/SSSDConfig.py:76
 msgid "Ping timeout before restarting domain"
 msgstr "Ping-tidsgräns före domän startas om"
 
-#: config/SSSDConfig.py:77
+#: src/config/SSSDConfig.py:77
 msgid "Enable enumerating all users/groups"
 msgstr "Aktivera uppräkning av alla användare/grupper"
 
-#: config/SSSDConfig.py:78
+#: src/config/SSSDConfig.py:78
 msgid "Cache credentials for offline login"
 msgstr "Cache-kreditiv för frånkopplad inloggning"
 
-#: config/SSSDConfig.py:79
+#: src/config/SSSDConfig.py:79
 msgid "Store password hashes"
 msgstr "Lagra lösenords-kontrollsummor"
 
-#: config/SSSDConfig.py:80
+#: src/config/SSSDConfig.py:80
 msgid "Display users/groups in fully-qualified form"
 msgstr "Visa användare/grupper i fullständigt kvalificerat format"
 
-#: config/SSSDConfig.py:81
+#: src/config/SSSDConfig.py:81
 msgid "Entry cache timeout length (seconds)"
 msgstr "Tidsgränslängd för postcache (sekunder)"
 
-#: config/SSSDConfig.py:82
+#: src/config/SSSDConfig.py:82
 msgid ""
 "Restrict or prefer a specific address family when performing DNS lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:83
+#: src/config/SSSDConfig.py:83
 #, fuzzy
 msgid "How long to keep cached entries after last successful login (days)"
 msgstr ""
 "Hur länge sparade inloggningar tillåts mellan online-inloggningar (dagar)"
 
-#: config/SSSDConfig.py:84
+#: src/config/SSSDConfig.py:84
 msgid "How long to wait for replies from DNS when resolving servers (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:85
+#: src/config/SSSDConfig.py:85
 msgid "The domain part of service discovery DNS query"
 msgstr ""
 
-#: config/SSSDConfig.py:88
+#: src/config/SSSDConfig.py:88
 msgid "IPA domain"
 msgstr "IPA-domän"
 
-#: config/SSSDConfig.py:89
+#: src/config/SSSDConfig.py:89
 msgid "IPA server address"
 msgstr "IPA-serveradress"
 
-#: config/SSSDConfig.py:90
+#: src/config/SSSDConfig.py:90
 msgid "IPA client hostname"
 msgstr "IPA-klienvärdnamn"
 
-#: config/SSSDConfig.py:91
+#: src/config/SSSDConfig.py:91
 msgid "Whether to automatically update the client's DNS entry in FreeIPA"
 msgstr ""
 
-#: config/SSSDConfig.py:92
+#: src/config/SSSDConfig.py:92
 msgid "The interface whose IP should be used for dynamic DNS updates"
 msgstr ""
 
-#: config/SSSDConfig.py:95 config/SSSDConfig.py:124
+#: src/config/SSSDConfig.py:95 src/config/SSSDConfig.py:124
 msgid "Kerberos server address"
 msgstr "Kerberosserveradress"
 
-#: config/SSSDConfig.py:96 config/SSSDConfig.py:125
+#: src/config/SSSDConfig.py:96 src/config/SSSDConfig.py:125
 msgid "Kerberos realm"
 msgstr "Kerberosrike"
 
-#: config/SSSDConfig.py:97
+#: src/config/SSSDConfig.py:97
 msgid "Authentication timeout"
 msgstr "Autentiseringstidsgräns"
 
-#: config/SSSDConfig.py:100
+#: src/config/SSSDConfig.py:100
 msgid "Directory to store credential caches"
 msgstr "Katalog att lagra kreditiv-cachar i"
 
-#: config/SSSDConfig.py:101
+#: src/config/SSSDConfig.py:101
 msgid "Location of the user's credential cache"
 msgstr "Plats för användarens kreditiv-cache"
 
-#: config/SSSDConfig.py:102
+#: src/config/SSSDConfig.py:102
 msgid "Location of the keytab to validate credentials"
 msgstr "Plats för nyckeltabellen för att validera kreditiv"
 
-#: config/SSSDConfig.py:103
+#: src/config/SSSDConfig.py:103
 msgid "Enable credential validation"
 msgstr "Aktivera validering av kreditiv"
 
-#: config/SSSDConfig.py:104
+#: src/config/SSSDConfig.py:104
 msgid "Store password if offline for later online authentication"
 msgstr ""
 
-#: config/SSSDConfig.py:107
+#: src/config/SSSDConfig.py:107
 msgid "Server where the change password service is running if not on the KDC"
 msgstr ""
 
-#: config/SSSDConfig.py:110
+#: src/config/SSSDConfig.py:110
 msgid "ldap_uri, The URI of the LDAP server"
 msgstr "ldap_uri, URI:n för LDAP-servern"
 
-#: config/SSSDConfig.py:111
+#: src/config/SSSDConfig.py:111
 msgid "The default base DN"
 msgstr "Standard bas-DN"
 
-#: config/SSSDConfig.py:112
+#: src/config/SSSDConfig.py:112
 msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr "Schematypen som används i LDAP-servern, rfc2307"
 
-#: config/SSSDConfig.py:113
+#: src/config/SSSDConfig.py:113
 msgid "The default bind DN"
 msgstr "Standard bindnings-DN"
 
-#: config/SSSDConfig.py:114
+#: src/config/SSSDConfig.py:114
 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:115
+#: src/config/SSSDConfig.py:115
 msgid "The authentication token of the default bind DN"
 msgstr "Autenticerings-token för standard bindnings-DN"
 
-#: config/SSSDConfig.py:116
+#: src/config/SSSDConfig.py:116
 msgid "Length of time to attempt connection"
 msgstr "Tidslängd att försöka ansluta"
 
-#: config/SSSDConfig.py:117
+#: src/config/SSSDConfig.py:117
 msgid "Length of time to attempt synchronous LDAP operations"
 msgstr "Tidslängd att försök synkrona LDAP-operationer"
 
-#: config/SSSDConfig.py:118
+#: src/config/SSSDConfig.py:118
 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:119
+#: src/config/SSSDConfig.py:119
 #, fuzzy
 msgid "File that contains CA certificates"
 msgstr "fil som innehåller CA-certifikat"
 
-#: config/SSSDConfig.py:120
+#: src/config/SSSDConfig.py:120
 msgid "Path to CA certificate directory"
 msgstr ""
 
-#: config/SSSDConfig.py:121
+#: src/config/SSSDConfig.py:121
 msgid "Require TLS certificate verification"
 msgstr "Kräv TLS-certifikatverifiering"
 
-#: config/SSSDConfig.py:122
+#: src/config/SSSDConfig.py:122
 msgid "Specify the sasl mechanism to use"
 msgstr "Ange sasl-mekanismen att använda"
 
-#: config/SSSDConfig.py:123
+#: src/config/SSSDConfig.py:123
 msgid "Specify the sasl authorization id to use"
 msgstr "Ange sasl-auktorisering-id att använda"
 
-#: config/SSSDConfig.py:126
+#: src/config/SSSDConfig.py:126
 msgid "Kerberos service keytab"
 msgstr "Kerberostjänstens nyckeltabell"
 
-#: config/SSSDConfig.py:127
+#: src/config/SSSDConfig.py:127
 msgid "Use Kerberos auth for LDAP connection"
 msgstr "Avnänd Kerberosautenticering för LDAP-anslutning"
 
-#: config/SSSDConfig.py:128
+#: src/config/SSSDConfig.py:128
 msgid "Follow LDAP referrals"
 msgstr ""
 
-#: config/SSSDConfig.py:129
+#: src/config/SSSDConfig.py:129
 #, fuzzy
 msgid "Lifetime of TGT for LDAP connection"
 msgstr "Avnänd Kerberosautenticering för LDAP-anslutning"
 
-#: config/SSSDConfig.py:132
+#: src/config/SSSDConfig.py:132
 msgid "Length of time to wait for a search request"
 msgstr "Tidslängd att vänta på en sökbegäran"
 
-#: config/SSSDConfig.py:133
+#: src/config/SSSDConfig.py:133
 msgid "Length of time between enumeration updates"
 msgstr "Tidslängd mellan uppräkningsuppdateringar"
 
-#: config/SSSDConfig.py:134
+#: src/config/SSSDConfig.py:134
 #, fuzzy
 msgid "Require TLS for ID lookups"
 msgstr "Kräv TLS för ID-uppslagningar, falsk"
 
-#: config/SSSDConfig.py:135
+#: src/config/SSSDConfig.py:135
 msgid "Base DN for user lookups"
 msgstr "Bas-DN för användaruppslagningar"
 
-#: config/SSSDConfig.py:136
+#: src/config/SSSDConfig.py:136
 msgid "Scope of user lookups"
 msgstr "Omfång av användaruppslagningar"
 
-#: config/SSSDConfig.py:137
+#: src/config/SSSDConfig.py:137
 msgid "Filter for user lookups"
 msgstr "Filter för användaruppslagningar"
 
-#: config/SSSDConfig.py:138
+#: src/config/SSSDConfig.py:138
 msgid "Objectclass for users"
 msgstr "Objektklass för användare"
 
-#: config/SSSDConfig.py:139
+#: src/config/SSSDConfig.py:139
 msgid "Username attribute"
 msgstr "Användarnamnsattribut"
 
-#: config/SSSDConfig.py:140
+#: src/config/SSSDConfig.py:140
 msgid "UID attribute"
 msgstr "UID-attribut"
 
-#: config/SSSDConfig.py:141
+#: src/config/SSSDConfig.py:141
 msgid "Primary GID attribute"
 msgstr "Primärt GID-attribut"
 
-#: config/SSSDConfig.py:142
+#: src/config/SSSDConfig.py:142
 msgid "GECOS attribute"
 msgstr "GECOS-attribut"
 
-#: config/SSSDConfig.py:143
+#: src/config/SSSDConfig.py:143
 msgid "Home directory attribute"
 msgstr "Hemkatalogattribut"
 
-#: config/SSSDConfig.py:144
+#: src/config/SSSDConfig.py:144
 msgid "Shell attribute"
 msgstr "Skalattribut"
 
-#: config/SSSDConfig.py:145
+#: src/config/SSSDConfig.py:145
 msgid "UUID attribute"
 msgstr "UUID-attribut"
 
-#: config/SSSDConfig.py:146
+#: src/config/SSSDConfig.py:146
 msgid "User principal attribute (for Kerberos)"
 msgstr "Användarens huvudmansattribut (för Kerberos)"
 
-#: config/SSSDConfig.py:147
+#: src/config/SSSDConfig.py:147
 msgid "Full Name"
 msgstr "Fullständigt namn"
 
-#: config/SSSDConfig.py:148
+#: src/config/SSSDConfig.py:148
 msgid "memberOf attribute"
 msgstr "medlemAv-attribut"
 
-#: config/SSSDConfig.py:149
+#: src/config/SSSDConfig.py:149
 msgid "Modification time attribute"
 msgstr "Modifieringstidsattribut"
 
-#: config/SSSDConfig.py:152
+#: src/config/SSSDConfig.py:152
 msgid "Policy to evaluate the password expiration"
 msgstr "Policy för att utvärdera utgång av lösenord"
 
-#: config/SSSDConfig.py:155
+#: src/config/SSSDConfig.py:155
 msgid "LDAP filter to determine access privileges"
 msgstr ""
 
-#: config/SSSDConfig.py:158
+#: src/config/SSSDConfig.py:158
 msgid "Comma separated list of allowed users"
 msgstr ""
 
-#: config/SSSDConfig.py:159
+#: src/config/SSSDConfig.py:159
 msgid "Comma separated list of prohibited users"
 msgstr ""
 
-#: config/SSSDConfig.py:162
+#: src/config/SSSDConfig.py:162
 msgid "Default shell, /bin/bash"
 msgstr "Standardskal, /bin/bash"
 
-#: config/SSSDConfig.py:163
+#: src/config/SSSDConfig.py:163
 msgid "Base for home directories"
 msgstr "Bas för hemkataloger"
 
-#: config/SSSDConfig.py:166
+#: src/config/SSSDConfig.py:166
 msgid "The name of the NSS library to use"
 msgstr "Namnet på NSS-biblioteket att använda"
 
-#: config/SSSDConfig.py:169
+#: src/config/SSSDConfig.py:169
 msgid "PAM stack to use"
 msgstr "PAM-stack att använda"
 
-#: monitor/monitor.c:2137
+#: src/monitor/monitor.c:2140
 msgid "Become a daemon (default)"
 msgstr ""
 
-#: monitor/monitor.c:2139
+#: src/monitor/monitor.c:2142
 msgid "Run interactive (not a daemon)"
 msgstr ""
 
-#: monitor/monitor.c:2141
+#: src/monitor/monitor.c:2144
 msgid "Specify a non-default config file"
 msgstr ""
 
-#: monitor/monitor.c:2167
+#: src/monitor/monitor.c:2170
 #, fuzzy
 msgid "sssd must be run as root\n"
 msgstr "%s måste köras som root\n"
 
-#: monitor/monitor.c:2202
+#: src/monitor/monitor.c:2205
 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:2212
+#: src/monitor/monitor.c:2215
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
 "file is owned by root.root\n"
 msgstr ""
 
-#: monitor/monitor.c:2217
+#: src/monitor/monitor.c:2220
 msgid "Cannot load configuration database\n"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:993 providers/ldap/ldap_child.c:361
-#: util/util.h:61
+#: src/providers/krb5/krb5_child.c:1043 src/providers/ldap/ldap_child.c:359
+#: src/util/util.h:63
 msgid "Debug level"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:995 providers/ldap/ldap_child.c:363
-#: util/util.h:65
+#: src/providers/krb5/krb5_child.c:1045 src/providers/ldap/ldap_child.c:361
+#: src/util/util.h:67
 msgid "Add debug timestamps"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:997 providers/ldap/ldap_child.c:365
+#: src/providers/krb5/krb5_child.c:1047 src/providers/ldap/ldap_child.c:363
 #, fuzzy
 msgid "An open file descriptor for the debug logs"
 msgstr "Ange pratsamhet för felsökningsloggning"
 
-#: providers/data_provider_be.c:1165
+#: src/providers/data_provider_be.c:1165
 msgid "Domain of the information provider (mandatory)"
 msgstr ""
 
-#: sss_client/common.c:742
+#: src/sss_client/common.c:742
 msgid "Privileged socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:745
+#: src/sss_client/common.c:745
 msgid "Public socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:748
+#: src/sss_client/common.c:748
 #, fuzzy
 msgid "Unexpected format of the server credential message."
 msgstr "Plats för användarens kreditiv-cache"
 
-#: sss_client/common.c:751
+#: src/sss_client/common.c:751
 msgid "SSSD is not run by root."
 msgstr ""
 
-#: sss_client/common.c:756
+#: src/sss_client/common.c:756
 msgid "An error occurred, but no description can be found."
 msgstr ""
 
-#: sss_client/common.c:762
+#: src/sss_client/common.c:762
 msgid "Unexpected error while looking for an error description"
 msgstr ""
 
-#: sss_client/pam_sss.c:372
+#: src/sss_client/pam_sss.c:372
 msgid "Passwords do not match"
 msgstr "Lösenorden stämmer inte överens"
 
-#: sss_client/pam_sss.c:556
+#: src/sss_client/pam_sss.c:556
 msgid "Password reset by root is not supported."
 msgstr ""
 
-#: sss_client/pam_sss.c:597
+#: src/sss_client/pam_sss.c:597
 msgid "Authenticated with cached credentials"
 msgstr ""
 
-#: sss_client/pam_sss.c:598
+#: src/sss_client/pam_sss.c:598
 msgid ", your cached password will expire at: "
 msgstr ""
 
-#: sss_client/pam_sss.c:628
+#: src/sss_client/pam_sss.c:628
 #, c-format
 msgid "Your password has expired. You have %d grace login(s) remaining."
 msgstr ""
 
-#: sss_client/pam_sss.c:674
+#: src/sss_client/pam_sss.c:674
 #, fuzzy, c-format
 msgid "Your password will expire in %d %s."
 msgstr "Lösenordet har gått ut."
 
-#: sss_client/pam_sss.c:723
+#: src/sss_client/pam_sss.c:723
 #, fuzzy
 msgid "Authentication is denied until: "
 msgstr "Autentiseringstidsgräns"
 
-#: sss_client/pam_sss.c:750
+#: src/sss_client/pam_sss.c:750
 msgid "System is offline, password change not possible"
 msgstr ""
 
-#: sss_client/pam_sss.c:780 sss_client/pam_sss.c:793
+#: src/sss_client/pam_sss.c:780 src/sss_client/pam_sss.c:793
 #, fuzzy
 msgid "Password change failed. "
 msgstr "Leverantör av lösenordsändringar"
 
-#: sss_client/pam_sss.c:783 sss_client/pam_sss.c:794
+#: src/sss_client/pam_sss.c:783 src/sss_client/pam_sss.c:794
 msgid "Server message: "
 msgstr ""
 
-#: sss_client/pam_sss.c:1197
+#: src/sss_client/pam_sss.c:1197
 msgid "New Password: "
 msgstr "Nytt lösenord: "
 
-#: sss_client/pam_sss.c:1198
+#: src/sss_client/pam_sss.c:1198
 msgid "Reenter new Password: "
 msgstr "Skriv det nya lösenordet igen: "
 
-#: sss_client/pam_sss.c:1280
+#: src/sss_client/pam_sss.c:1280
 msgid "Password: "
 msgstr "Lösenord: "
 
-#: sss_client/pam_sss.c:1312
+#: src/sss_client/pam_sss.c:1312
 #, fuzzy
 msgid "Current Password: "
 msgstr "Nytt lösenord: "
 
-#: sss_client/pam_sss.c:1458
+#: src/sss_client/pam_sss.c:1458
 msgid "Password expired. Change your password now."
 msgstr ""
 
-#: tools/sss_useradd.c:48 tools/sss_groupadd.c:41 tools/sss_groupdel.c:43
-#: tools/sss_groupmod.c:42 tools/sss_groupshow.c:620 tools/sss_userdel.c:131
-#: tools/sss_usermod.c:47
+#: src/tools/sss_useradd.c:48 src/tools/sss_groupadd.c:41
+#: src/tools/sss_groupdel.c:43 src/tools/sss_groupmod.c:42
+#: src/tools/sss_groupshow.c:620 src/tools/sss_userdel.c:131
+#: src/tools/sss_usermod.c:47
 msgid "The debug level to run with"
 msgstr "Felsökningsnivå att köra med"
 
-#: tools/sss_useradd.c:49 tools/sss_usermod.c:48
+#: src/tools/sss_useradd.c:49 src/tools/sss_usermod.c:48
 msgid "The UID of the user"
 msgstr "Användarens UID"
 
-#: tools/sss_useradd.c:50 tools/sss_usermod.c:50
+#: src/tools/sss_useradd.c:50 src/tools/sss_usermod.c:50
 msgid "The comment string"
 msgstr "Kommentarsträngen"
 
-#: tools/sss_useradd.c:51 tools/sss_usermod.c:51
+#: src/tools/sss_useradd.c:51 src/tools/sss_usermod.c:51
 msgid "Home directory"
 msgstr "Hemkatalogen"
 
-#: tools/sss_useradd.c:52 tools/sss_usermod.c:52
+#: src/tools/sss_useradd.c:52 src/tools/sss_usermod.c:52
 msgid "Login shell"
 msgstr "Inloggningsskalet"
 
-#: tools/sss_useradd.c:53
+#: src/tools/sss_useradd.c:53
 msgid "Groups"
 msgstr "Grupper"
 
-#: tools/sss_useradd.c:54
+#: src/tools/sss_useradd.c:54
 msgid "Create user's directory if it does not exist"
 msgstr "Skapa användarens katalog om den inte redan finns"
 
-#: tools/sss_useradd.c:55
+#: src/tools/sss_useradd.c:55
 msgid "Never create user's directory, overrides config"
 msgstr "Skapa aldrig användarens katalog, åsidosätter konfigurationen"
 
-#: tools/sss_useradd.c:56
+#: src/tools/sss_useradd.c:56
 msgid "Specify an alternative skeleton directory"
 msgstr "Ange en alternativ skelettkatalog"
 
-#: tools/sss_useradd.c:57 tools/sss_usermod.c:57
+#: src/tools/sss_useradd.c:57 src/tools/sss_usermod.c:57
 msgid "The SELinux user for user's login"
 msgstr ""
 
-#: tools/sss_useradd.c:71 tools/sss_groupadd.c:56 tools/sss_groupdel.c:52
-#: tools/sss_groupmod.c:63 tools/sss_groupshow.c:631 tools/sss_userdel.c:148
-#: tools/sss_usermod.c:72
+#: src/tools/sss_useradd.c:71 src/tools/sss_groupadd.c:56
+#: src/tools/sss_groupdel.c:52 src/tools/sss_groupmod.c:63
+#: src/tools/sss_groupshow.c:631 src/tools/sss_userdel.c:148
+#: src/tools/sss_usermod.c:72
 msgid "Error setting the locale\n"
 msgstr "Fel när lokalen sattes\n"
 
-#: tools/sss_useradd.c:107
+#: src/tools/sss_useradd.c:84 src/tools/sss_groupmod.c:76
+#: src/tools/sss_usermod.c:85
+#, fuzzy
+msgid "Specify group to add to\n"
+msgstr "Ange en grupp att lägga till\n"
+
+#: src/tools/sss_useradd.c:108
 msgid "Specify user to add\n"
 msgstr "Ange en användare att lägga till\n"
 
-#: tools/sss_useradd.c:118 tools/sss_groupadd.c:86 tools/sss_groupdel.c:81
-#: tools/sss_groupmod.c:111 tools/sss_groupshow.c:668 tools/sss_userdel.c:197
-#: tools/sss_usermod.c:128
+#: src/tools/sss_useradd.c:117 src/tools/sss_groupadd.c:82
+#: src/tools/sss_groupdel.c:77 src/tools/sss_groupmod.c:109
+#: src/tools/sss_groupshow.c:664 src/tools/sss_userdel.c:193
+#: src/tools/sss_usermod.c:126
 #, fuzzy
 msgid "Error initializing the tools - no local domain\n"
 msgstr "Fel vid initiering av verktygen\n"
 
-#: tools/sss_useradd.c:120 tools/sss_groupadd.c:88 tools/sss_groupdel.c:83
-#: tools/sss_groupmod.c:113 tools/sss_groupshow.c:670 tools/sss_userdel.c:199
-#: tools/sss_usermod.c:130
+#: src/tools/sss_useradd.c:119 src/tools/sss_groupadd.c:84
+#: src/tools/sss_groupdel.c:79 src/tools/sss_groupmod.c:111
+#: src/tools/sss_groupshow.c:666 src/tools/sss_userdel.c:195
+#: src/tools/sss_usermod.c:128
 msgid "Error initializing the tools\n"
 msgstr "Fel vid initiering av verktygen\n"
 
-#: tools/sss_useradd.c:129 tools/sss_groupadd.c:97 tools/sss_groupdel.c:92
-#: tools/sss_groupmod.c:121 tools/sss_groupshow.c:679 tools/sss_userdel.c:208
-#: tools/sss_usermod.c:139
+#: src/tools/sss_useradd.c:128 src/tools/sss_groupadd.c:93
+#: src/tools/sss_groupdel.c:88 src/tools/sss_groupmod.c:119
+#: src/tools/sss_groupshow.c:675 src/tools/sss_userdel.c:204
+#: src/tools/sss_usermod.c:137
 msgid "Invalid domain specified in FQDN\n"
 msgstr "Ogiltig domän angiven i FQDN\n"
 
-#: tools/sss_useradd.c:138 tools/sss_groupmod.c:143 tools/sss_groupmod.c:170
-#: tools/sss_usermod.c:164 tools/sss_usermod.c:191
+#: src/tools/sss_useradd.c:137 src/tools/sss_groupmod.c:141
+#: src/tools/sss_groupmod.c:168 src/tools/sss_usermod.c:162
+#: src/tools/sss_usermod.c:189
 msgid "Internal error while parsing parameters\n"
 msgstr "Internt fel vid tolkning av parametrar\n"
 
-#: tools/sss_useradd.c:146 tools/sss_usermod.c:172 tools/sss_usermod.c:199
+#: src/tools/sss_useradd.c:145 src/tools/sss_usermod.c:170
+#: src/tools/sss_usermod.c:197
 msgid "Groups must be in the same domain as user\n"
 msgstr "Grupper måste finnas i samma domän som användaren\n"
 
-#: tools/sss_useradd.c:154
+#: src/tools/sss_useradd.c:153
 #, c-format
 msgid "Cannot find group %s in local domain\n"
 msgstr "Hittar inte grupp %s i den lokala domänen\n"
 
-#: tools/sss_useradd.c:169 tools/sss_userdel.c:218
+#: src/tools/sss_useradd.c:168 src/tools/sss_userdel.c:214
 msgid "Cannot set default values\n"
 msgstr "Kan inte sätta standardvärden\n"
 
-#: tools/sss_useradd.c:176 tools/sss_usermod.c:155
+#: src/tools/sss_useradd.c:175 src/tools/sss_usermod.c:153
 msgid "The selected UID is outside the allowed range\n"
 msgstr "Den valda UID:n är utanför det tillåtna intervallet\n"
 
-#: tools/sss_useradd.c:203 tools/sss_usermod.c:240
+#: src/tools/sss_useradd.c:202 src/tools/sss_usermod.c:238
 msgid "Cannot set SELinux login context\n"
 msgstr ""
 
-#: tools/sss_useradd.c:219
+#: src/tools/sss_useradd.c:218
 msgid "Cannot get info about the user\n"
 msgstr "Kan inte få information om användaren\n"
 
-#: tools/sss_useradd.c:233
+#: src/tools/sss_useradd.c:232
 msgid "User's home directory already exists, not copying data from skeldir\n"
 msgstr ""
 "Användarens hemkatalog finns redan, kopierar inte data från "
 "skelettkatalogen\n"
 
-#: tools/sss_useradd.c:236
+#: src/tools/sss_useradd.c:235
 #, c-format
 msgid "Cannot create user's home directory: %s\n"
 msgstr "Kan inte skapa användarens hemkatalog: %s\n"
 
-#: tools/sss_useradd.c:247
+#: src/tools/sss_useradd.c:246
 #, c-format
 msgid "Cannot create user's mail spool: %s\n"
 msgstr "Kan inte skapa användarens brevlåda: %s\n"
 
-#: tools/sss_useradd.c:259
+#: src/tools/sss_useradd.c:258
 msgid "Could not allocate ID for the user - domain full?\n"
 msgstr "Det gick inte att allokera ID för användaren - full domän?\n"
 
-#: tools/sss_useradd.c:263
+#: src/tools/sss_useradd.c:262
 msgid "A user or group with the same name or ID already exists\n"
 msgstr "En användare eller grupp med samma namn eller ID finns redan\n"
 
-#: tools/sss_useradd.c:269
+#: src/tools/sss_useradd.c:268
 msgid "Transaction error. Could not add user.\n"
 msgstr "Transaktionsfel.  Det gick inte att lägga till användaren.\n"
 
-#: tools/sss_groupadd.c:43 tools/sss_groupmod.c:48
+#: src/tools/sss_groupadd.c:43 src/tools/sss_groupmod.c:48
 msgid "The GID of the group"
 msgstr "GID:t för gruppen"
 
-#: tools/sss_groupadd.c:75
+#: src/tools/sss_groupadd.c:73
 msgid "Specify group to add\n"
 msgstr "Ange en grupp att lägga till\n"
 
-#: tools/sss_groupadd.c:106 tools/sss_groupmod.c:194
+#: src/tools/sss_groupadd.c:102 src/tools/sss_groupmod.c:192
 msgid "The selected GID is outside the allowed range\n"
 msgstr "Den valda GID:n är utanför det tillåtna intervallet\n"
 
-#: tools/sss_groupadd.c:131
+#: src/tools/sss_groupadd.c:127
 msgid "Could not allocate ID for the group - domain full?\n"
 msgstr "Det gick inte att allokera ID för gruppen - full domän?\n"
 
-#: tools/sss_groupadd.c:135
+#: src/tools/sss_groupadd.c:131
 msgid "A group with the same name or GID already exists\n"
 msgstr "En grupp med samma namn eller GID finns redan\n"
 
-#: tools/sss_groupadd.c:140
+#: src/tools/sss_groupadd.c:136
 msgid "Transaction error. Could not add group.\n"
 msgstr "Transaktionsfel.  Det gick inte att lägga till gruppen.\n"
 
-#: tools/sss_groupdel.c:70
+#: src/tools/sss_groupdel.c:68
 msgid "Specify group to delete\n"
 msgstr "Ange grupp att ta bort\n"
 
-#: tools/sss_groupdel.c:107
+#: src/tools/sss_groupdel.c:103
 #, c-format
 msgid "Group %s is outside the defined ID range for domain\n"
 msgstr "Grupp %s är utanför det definierade ID-intervallet för domänen\n"
 
-#: tools/sss_groupdel.c:121
+#: src/tools/sss_groupdel.c:117
 msgid ""
 "No such group in local domain. Removing groups only allowed in local "
 "domain.\n"
@@ -719,23 +732,28 @@ msgstr ""
 "Ingen sådan grupp i den lokala domänen.  Att ta bort grupper är endast "
 "tillåtet i den lokala domänen.\n"
 
-#: tools/sss_groupdel.c:126
+#: src/tools/sss_groupdel.c:122
 msgid "Internal error. Could not remove group.\n"
 msgstr "Internt fel.  Det gick inte att ta bort gruppen.\n"
 
-#: tools/sss_groupmod.c:44
+#: src/tools/sss_groupmod.c:44
 msgid "Groups to add this group to"
 msgstr "Grupper att lägga till denna grupp till"
 
-#: tools/sss_groupmod.c:46
+#: src/tools/sss_groupmod.c:46
 msgid "Groups to remove this group from"
 msgstr "Grupper att ta bort denna grupp från"
 
-#: tools/sss_groupmod.c:98
+#: src/tools/sss_groupmod.c:84 src/tools/sss_usermod.c:93
+#, fuzzy
+msgid "Specify group to remove from\n"
+msgstr "Ange grupp att ändra\n"
+
+#: src/tools/sss_groupmod.c:98
 msgid "Specify group to modify\n"
 msgstr "Ange grupp att ändra\n"
 
-#: tools/sss_groupmod.c:130
+#: src/tools/sss_groupmod.c:128
 msgid ""
 "Cannot find group in local domain, modifying groups is allowed only in local "
 "domain\n"
@@ -743,12 +761,12 @@ msgstr ""
 "Ken inte hitta gruppen i den lokala domänen, att ändra grupper är endast "
 "tillåtet i den lokala domänen\n"
 
-#: tools/sss_groupmod.c:151 tools/sss_groupmod.c:178
+#: src/tools/sss_groupmod.c:149 src/tools/sss_groupmod.c:176
 msgid "Member groups must be in the same domain as parent group\n"
 msgstr "Medlemsgrupper måster ligga i samma domän som föräldragrupper\n"
 
-#: tools/sss_groupmod.c:159 tools/sss_groupmod.c:186 tools/sss_usermod.c:180
-#: tools/sss_usermod.c:207
+#: src/tools/sss_groupmod.c:157 src/tools/sss_groupmod.c:184
+#: src/tools/sss_usermod.c:178 src/tools/sss_usermod.c:205
 #, c-format
 msgid ""
 "Cannot find group %s in local domain, only groups in local domain are "
@@ -757,64 +775,64 @@ msgstr ""
 "Kan inte hitta grupp %s i den lokala domänen, endast grupper i den lokala "
 "domänen är tillåtna\n"
 
-#: tools/sss_groupmod.c:220
+#: src/tools/sss_groupmod.c:218
 msgid "Could not modify group - check if member group names are correct\n"
 msgstr ""
 "Det gick inte att ändra gruppen - kontrollera om medlemsgruppsnamnen är "
 "riktiga\n"
 
-#: tools/sss_groupmod.c:224
+#: src/tools/sss_groupmod.c:222
 msgid "Could not modify group - check if groupname is correct\n"
 msgstr ""
 "Det gick inte att ändra gruppen - kontrollera om gruppnamnet är riktigt\n"
 
-#: tools/sss_groupmod.c:228
+#: src/tools/sss_groupmod.c:226
 msgid "Transaction error. Could not modify group.\n"
 msgstr "Transaktionsfel.  Det gick inte att ändra gruppen.\n"
 
-#: tools/sss_groupshow.c:567
+#: src/tools/sss_groupshow.c:567
 #, fuzzy, c-format
 msgid "%s%sGroup: %s\n"
 msgstr "Grupper"
 
-#: tools/sss_groupshow.c:568
+#: src/tools/sss_groupshow.c:568
 msgid "Magic Private "
 msgstr ""
 
-#: tools/sss_groupshow.c:570
+#: src/tools/sss_groupshow.c:570
 #, c-format
 msgid "%sGID number: %d\n"
 msgstr ""
 
-#: tools/sss_groupshow.c:572
+#: src/tools/sss_groupshow.c:572
 #, c-format
 msgid "%sMember users: "
 msgstr ""
 
-#: tools/sss_groupshow.c:579
+#: src/tools/sss_groupshow.c:579
 #, c-format
 msgid ""
 "\n"
 "%sIs a member of: "
 msgstr ""
 
-#: tools/sss_groupshow.c:586
+#: src/tools/sss_groupshow.c:586
 #, c-format
 msgid ""
 "\n"
 "%sMember groups: "
 msgstr ""
 
-#: tools/sss_groupshow.c:622
+#: src/tools/sss_groupshow.c:622
 msgid "Print indirect group members recursively"
 msgstr ""
 
-#: tools/sss_groupshow.c:657
+#: src/tools/sss_groupshow.c:655
 #, fuzzy
 msgid "Specify group to show\n"
 msgstr "Ange en grupp att lägga till\n"
 
-#: tools/sss_groupshow.c:698
+#: src/tools/sss_groupshow.c:694
 #, fuzzy
 msgid ""
 "No such group in local domain. Printing groups only allowed in local "
@@ -823,103 +841,103 @@ msgstr ""
 "Ingen sådan grupp i den lokala domänen.  Att ta bort grupper är endast "
 "tillåtet i den lokala domänen.\n"
 
-#: tools/sss_groupshow.c:703
+#: src/tools/sss_groupshow.c:699
 #, fuzzy
 msgid "Internal error. Could not print group.\n"
 msgstr "Internt fel.  Det gick inte att ta bort gruppen.\n"
 
-#: tools/sss_userdel.c:133
+#: src/tools/sss_userdel.c:133
 msgid "Remove home directory and mail spool"
 msgstr "Ta bort hemkatalog och brevlåda"
 
-#: tools/sss_userdel.c:135
+#: src/tools/sss_userdel.c:135
 msgid "Do not remove home directory and mail spool"
 msgstr "Ta inte bort hemkatalog och brevlåda"
 
-#: tools/sss_userdel.c:137
+#: src/tools/sss_userdel.c:137
 msgid "Force removal of files not owned by the user"
 msgstr "Framtvinga borttagning av filer som inte ägs av användaren"
 
-#: tools/sss_userdel.c:139
+#: src/tools/sss_userdel.c:139
 msgid "Kill users' processes before removing him"
 msgstr ""
 
-#: tools/sss_userdel.c:186
+#: src/tools/sss_userdel.c:184
 msgid "Specify user to delete\n"
 msgstr "Ange användare att ta bort\n"
 
-#: tools/sss_userdel.c:235
+#: src/tools/sss_userdel.c:231
 #, c-format
 msgid "User %s is outside the defined ID range for domain\n"
 msgstr "Användare %s är utanför det definierade ID-intervallet för domänen\n"
 
-#: tools/sss_userdel.c:260
+#: src/tools/sss_userdel.c:256
 msgid "Cannot reset SELinux login context\n"
 msgstr ""
 
-#: tools/sss_userdel.c:272
+#: src/tools/sss_userdel.c:268
 #, c-format
 msgid "WARNING: The user (uid %lu) was still logged in when deleted.\n"
 msgstr ""
 
-#: tools/sss_userdel.c:277
+#: src/tools/sss_userdel.c:273
 msgid "Cannot determine if the user was logged in on this platform"
 msgstr ""
 
-#: tools/sss_userdel.c:282
+#: src/tools/sss_userdel.c:278
 msgid "Error while checking if the user was logged in\n"
 msgstr ""
 
-#: tools/sss_userdel.c:289
+#: src/tools/sss_userdel.c:285
 #, c-format
 msgid "The post-delete command failed: %s\n"
 msgstr ""
 
-#: tools/sss_userdel.c:301
+#: src/tools/sss_userdel.c:297
 msgid "Not removing home dir - not owned by user\n"
 msgstr "Tar inte bort hemkatalogen - ägs inte av användaren\n"
 
-#: tools/sss_userdel.c:303
+#: src/tools/sss_userdel.c:299
 #, c-format
 msgid "Cannot remove homedir: %s\n"
 msgstr "Kan inte ta bort hemkatalogen: %s\n"
 
-#: tools/sss_userdel.c:314
+#: src/tools/sss_userdel.c:310
 msgid ""
 "No such user in local domain. Removing users only allowed in local domain.\n"
 msgstr ""
 "Ingen sådan användare i den lokala domänen.  Det går endast att ta bort "
 "användare i den lokala domänen.\n"
 
-#: tools/sss_userdel.c:319
+#: src/tools/sss_userdel.c:315
 msgid "Internal error. Could not remove user.\n"
 msgstr "Internt fel.  Det gick inte att ta bort användaren.\n"
 
-#: tools/sss_usermod.c:49
+#: src/tools/sss_usermod.c:49
 msgid "The GID of the user"
 msgstr "Användarens GID"
 
-#: tools/sss_usermod.c:53
+#: src/tools/sss_usermod.c:53
 msgid "Groups to add this user to"
 msgstr "Grupper att lägga till denna användare till"
 
-#: tools/sss_usermod.c:54
+#: src/tools/sss_usermod.c:54
 msgid "Groups to remove this user from"
 msgstr "Grupper att ta bort denna användare ifrån"
 
-#: tools/sss_usermod.c:55
+#: src/tools/sss_usermod.c:55
 msgid "Lock the account"
 msgstr "Lås kontot"
 
-#: tools/sss_usermod.c:56
+#: src/tools/sss_usermod.c:56
 msgid "Unlock the account"
 msgstr "Lås upp kontot"
 
-#: tools/sss_usermod.c:117
+#: src/tools/sss_usermod.c:117
 msgid "Specify user to modify\n"
 msgstr "Ange användare att ändra\n"
 
-#: tools/sss_usermod.c:148
+#: src/tools/sss_usermod.c:146
 msgid ""
 "Cannot find user in local domain, modifying users is allowed only in local "
 "domain\n"
@@ -927,30 +945,30 @@ msgstr ""
 "Det gick inte att hitta användaren i den lokala domänen, det går bara att "
 "ändra användare i den lokala domänen\n"
 
-#: tools/sss_usermod.c:250
+#: src/tools/sss_usermod.c:248
 msgid "Could not modify user - check if group names are correct\n"
 msgstr ""
 "Det gick inte att ändra användaren - kontrollera att gruppnamnen är riktiga\n"
 
-#: tools/sss_usermod.c:254
+#: src/tools/sss_usermod.c:252
 msgid "Could not modify user - user already member of groups?\n"
 msgstr ""
 "Det gick inte att ändra användaren - är användaren redan medlem i grupper?\n"
 
-#: tools/sss_usermod.c:258
+#: src/tools/sss_usermod.c:256
 msgid "Transaction error. Could not modify user.\n"
 msgstr "Transaktionsfel.  Det gick inte att ändra användaren.\n"
 
-#: tools/tools_util.c:285
+#: src/tools/tools_util.c:290
 msgid "Out of memory\n"
 msgstr "Slut på minne\n"
 
-#: tools/tools_util.h:34
+#: src/tools/tools_util.h:40
 #, c-format
 msgid "%s must be run as root\n"
 msgstr "%s måste köras som root\n"
 
-#: util/util.h:63
+#: src/util/util.h:65
 msgid "Send the debug output to files instead of stderr"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index 78a58adc..693304ee 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2010-08-03 18:24-0400\n"
+"POT-Creation-Date: 2010-10-18 13:14-0400\n"
 "PO-Revision-Date: 2010-07-18 10:13+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -18,89 +18,89 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: config/SSSDConfig.py:39
+#: src/config/SSSDConfig.py:39
 msgid "Set the verbosity of the debug logging"
 msgstr "Встановити рівень докладності діагностичних записів журналу"
 
-#: config/SSSDConfig.py:40
+#: src/config/SSSDConfig.py:40
 msgid "Include timestamps in debug logs"
 msgstr "Додати до діагностичних журналів позначки часу"
 
-#: config/SSSDConfig.py:41
+#: src/config/SSSDConfig.py:41
 msgid "Write debug messages to logfiles"
 msgstr "Записувати діагностичні повідомлення до файлів журналу"
 
-#: config/SSSDConfig.py:42
+#: src/config/SSSDConfig.py:42
 msgid "Ping timeout before restarting service"
 msgstr "Час очікування відповіді на пінг перед перезапуском служби"
 
-#: config/SSSDConfig.py:43
+#: src/config/SSSDConfig.py:43
 msgid "Command to start service"
 msgstr "Команда запуску служби"
 
-#: config/SSSDConfig.py:44
+#: src/config/SSSDConfig.py:44
 msgid "Number of times to attempt connection to Data Providers"
 msgstr "Кількість повторних спроб встановлення з’єднання з надавачами даних"
 
-#: config/SSSDConfig.py:47
+#: src/config/SSSDConfig.py:47
 msgid "SSSD Services to start"
 msgstr "Служби SSSD, які слід запустити"
 
-#: config/SSSDConfig.py:48
+#: src/config/SSSDConfig.py:48
 msgid "SSSD Domains to start"
 msgstr "Домени SSSD, які слід запустити"
 
-#: config/SSSDConfig.py:49
+#: src/config/SSSDConfig.py:49
 msgid "Timeout for messages sent over the SBUS"
 msgstr "Час очікування для повідомлень, надісланих за допомогою SBUS"
 
-#: config/SSSDConfig.py:50
+#: src/config/SSSDConfig.py:50
 msgid "Regex to parse username and domain"
 msgstr "Формальний вираз для обробки імені користувача і домену"
 
-#: config/SSSDConfig.py:51
+#: src/config/SSSDConfig.py:51
 msgid "Printf-compatible format for displaying fully-qualified names"
 msgstr "Сумісний з printf формат показу повних назв"
 
-#: config/SSSDConfig.py:54
+#: src/config/SSSDConfig.py:54
 msgid "Enumeration cache timeout length (seconds)"
 msgstr "Тривалість часу очікування на дані кешу нумерування (у секундах)"
 
-#: config/SSSDConfig.py:55
+#: src/config/SSSDConfig.py:55
 msgid "Entry cache background update timeout length (seconds)"
 msgstr "Час очікування на фонове оновлення кешу записів (у секундах)"
 
-#: config/SSSDConfig.py:56
+#: src/config/SSSDConfig.py:56
 msgid "Negative cache timeout length (seconds)"
 msgstr "Від’ємний час очікування на дані з кешу (у секундах)"
 
-#: config/SSSDConfig.py:57
+#: src/config/SSSDConfig.py:57
 msgid "Users that SSSD should explicitly ignore"
 msgstr "Користувачі, яких SSSD має явно ігнорувати"
 
-#: config/SSSDConfig.py:58
+#: src/config/SSSDConfig.py:58
 msgid "Groups that SSSD should explicitly ignore"
 msgstr "Групи користувачів, які SSSD має явно ігнорувати"
 
-#: config/SSSDConfig.py:59
+#: src/config/SSSDConfig.py:59
 msgid "Should filtered users appear in groups"
 msgstr "Чи слід показувати відфільтрованих користувачів у групах"
 
-#: config/SSSDConfig.py:60
+#: src/config/SSSDConfig.py:60
 msgid "The value of the password field the NSS provider should return"
 msgstr "Значення поля пароля, яке має повертати постачальник даних NSS"
 
-#: config/SSSDConfig.py:63
+#: src/config/SSSDConfig.py:63
 msgid "How long to allow cached logins between online logins (days)"
 msgstr ""
 "Тривалість зберігання кешованих реєстраційних даних між входами до системи "
 "(у днях)"
 
-#: config/SSSDConfig.py:64
+#: src/config/SSSDConfig.py:64
 msgid "How many failed logins attempts are allowed when offline"
 msgstr "Макс. дозволена кількість помилкових спроб входу у автономному режимі"
 
-#: config/SSSDConfig.py:65
+#: src/config/SSSDConfig.py:65
 msgid ""
 "How long (minutes) to deny login after offline_failed_login_attempts has "
 "been reached"
@@ -108,333 +108,333 @@ msgstr ""
 "Тривалість (у хвилинах) заборони входу після досягнення значення "
 "offline_failed_login_attempts"
 
-#: config/SSSDConfig.py:68
+#: src/config/SSSDConfig.py:68
 msgid "Identity provider"
 msgstr "Служба профілів"
 
-#: config/SSSDConfig.py:69
+#: src/config/SSSDConfig.py:69
 msgid "Authentication provider"
 msgstr "Служба розпізнавання"
 
-#: config/SSSDConfig.py:70
+#: src/config/SSSDConfig.py:70
 msgid "Access control provider"
 msgstr "Служба керування доступом"
 
-#: config/SSSDConfig.py:71
+#: src/config/SSSDConfig.py:71
 msgid "Password change provider"
 msgstr "Служба зміни паролів"
 
-#: config/SSSDConfig.py:74
+#: src/config/SSSDConfig.py:74
 msgid "Minimum user ID"
 msgstr "Мін. ідентифікатор користувача"
 
-#: config/SSSDConfig.py:75
+#: src/config/SSSDConfig.py:75
 msgid "Maximum user ID"
 msgstr "Макс. ідентифікатор користувача"
 
-#: config/SSSDConfig.py:76
+#: src/config/SSSDConfig.py:76
 msgid "Ping timeout before restarting domain"
 msgstr "Час очікування відповіді на пінг перед перезапуском домену"
 
-#: config/SSSDConfig.py:77
+#: src/config/SSSDConfig.py:77
 msgid "Enable enumerating all users/groups"
 msgstr "Увімкнути нумерацію всіх користувачів/груп"
 
-#: config/SSSDConfig.py:78
+#: src/config/SSSDConfig.py:78
 msgid "Cache credentials for offline login"
 msgstr "Кешувати реєстраційні дані для автономного входу"
 
-#: config/SSSDConfig.py:79
+#: src/config/SSSDConfig.py:79
 msgid "Store password hashes"
 msgstr "Зберігати хеші паролів"
 
-#: config/SSSDConfig.py:80
+#: src/config/SSSDConfig.py:80
 msgid "Display users/groups in fully-qualified form"
 msgstr "Показувати записи користувачів/груп повністю"
 
-#: config/SSSDConfig.py:81
+#: src/config/SSSDConfig.py:81
 msgid "Entry cache timeout length (seconds)"
 msgstr "Тривалість кешування записів (у секундах)"
 
-#: config/SSSDConfig.py:82
+#: src/config/SSSDConfig.py:82
 msgid ""
 "Restrict or prefer a specific address family when performing DNS lookups"
 msgstr ""
 "Обмежити або надавати перевагу певному сімейству адрес під час виконання "
 "пошуків DNS"
 
-#: config/SSSDConfig.py:83
+#: src/config/SSSDConfig.py:83
 msgid "How long to keep cached entries after last successful login (days)"
 msgstr ""
 "Тривалість зберігання кешованих записів після останнього успішного входу (у "
 "днях)"
 
-#: config/SSSDConfig.py:84
+#: src/config/SSSDConfig.py:84
 msgid "How long to wait for replies from DNS when resolving servers (seconds)"
 msgstr ""
 "Тривалість очікування на відповідь від DNS під час визначення адрес серверів "
 "(у секундах)"
 
-#: config/SSSDConfig.py:85
+#: src/config/SSSDConfig.py:85
 msgid "The domain part of service discovery DNS query"
 msgstr "Частина запиту щодо виявлення служби DNS, пов’язана з доменом"
 
-#: config/SSSDConfig.py:88
+#: src/config/SSSDConfig.py:88
 msgid "IPA domain"
 msgstr "Домен IPA"
 
-#: config/SSSDConfig.py:89
+#: src/config/SSSDConfig.py:89
 msgid "IPA server address"
 msgstr "Адреса сервера IPA"
 
-#: config/SSSDConfig.py:90
+#: src/config/SSSDConfig.py:90
 msgid "IPA client hostname"
 msgstr "Назва вузла клієнта IPA"
 
-#: config/SSSDConfig.py:91
+#: src/config/SSSDConfig.py:91
 msgid "Whether to automatically update the client's DNS entry in FreeIPA"
 msgstr ""
 "Визначає, чи слід автоматично оновлювати запис DNS клієнтського вузла у "
 "FreeIPA"
 
-#: config/SSSDConfig.py:92
+#: src/config/SSSDConfig.py:92
 msgid "The interface whose IP should be used for dynamic DNS updates"
 msgstr ""
 "Інтерфейс, чию адресу IP має бути використано для динамічних оновлень DNS"
 
-#: config/SSSDConfig.py:95 config/SSSDConfig.py:124
+#: src/config/SSSDConfig.py:95 src/config/SSSDConfig.py:124
 msgid "Kerberos server address"
 msgstr "Адреса сервера Kerberos"
 
-#: config/SSSDConfig.py:96 config/SSSDConfig.py:125
+#: src/config/SSSDConfig.py:96 src/config/SSSDConfig.py:125
 msgid "Kerberos realm"
 msgstr "Область Kerberos"
 
-#: config/SSSDConfig.py:97
+#: src/config/SSSDConfig.py:97
 msgid "Authentication timeout"
 msgstr "Час очікування на розпізнавання"
 
-#: config/SSSDConfig.py:100
+#: src/config/SSSDConfig.py:100
 msgid "Directory to store credential caches"
 msgstr "Каталог, де зберігатиметься кеш реєстраційних даних"
 
-#: config/SSSDConfig.py:101
+#: src/config/SSSDConfig.py:101
 msgid "Location of the user's credential cache"
 msgstr "Адреса кешу реєстраційних даних користувача"
 
-#: config/SSSDConfig.py:102
+#: src/config/SSSDConfig.py:102
 msgid "Location of the keytab to validate credentials"
 msgstr "Адреса таблиці ключів для перевірки реєстраційних даних"
 
-#: config/SSSDConfig.py:103
+#: src/config/SSSDConfig.py:103
 msgid "Enable credential validation"
 msgstr "Увімкнути перевірку реєстраційних даних"
 
-#: config/SSSDConfig.py:104
+#: src/config/SSSDConfig.py:104
 msgid "Store password if offline for later online authentication"
 msgstr "Зберігати пароль у автономному режимі для розпізнавання у мережі"
 
-#: config/SSSDConfig.py:107
+#: src/config/SSSDConfig.py:107
 msgid "Server where the change password service is running if not on the KDC"
 msgstr ""
 "Сервер, на якому запущено службу зміни паролів, якщо такий не вдасться "
 "виявити у KDC"
 
-#: config/SSSDConfig.py:110
+#: src/config/SSSDConfig.py:110
 msgid "ldap_uri, The URI of the LDAP server"
 msgstr "ldap_uri, адреса URI сервера LDAP"
 
-#: config/SSSDConfig.py:111
+#: src/config/SSSDConfig.py:111
 msgid "The default base DN"
 msgstr "Типова базова назва домену"
 
-#: config/SSSDConfig.py:112
+#: src/config/SSSDConfig.py:112
 msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr "Тип схеми, використаний на сервері LDAP, rfc2307"
 
-#: config/SSSDConfig.py:113
+#: src/config/SSSDConfig.py:113
 msgid "The default bind DN"
 msgstr "Типова назва домену прив’язки"
 
-#: config/SSSDConfig.py:114
+#: src/config/SSSDConfig.py:114
 msgid "The type of the authentication token of the default bind DN"
 msgstr "Тип розпізнавання для типової назви сервера прив’язки"
 
-#: config/SSSDConfig.py:115
+#: src/config/SSSDConfig.py:115
 msgid "The authentication token of the default bind DN"
 msgstr "Лексема розпізнавання типової назви сервера прив’язки"
 
-#: config/SSSDConfig.py:116
+#: src/config/SSSDConfig.py:116
 msgid "Length of time to attempt connection"
 msgstr "Проміжок часу між спробами встановлення з’єднання"
 
-#: config/SSSDConfig.py:117
+#: src/config/SSSDConfig.py:117
 msgid "Length of time to attempt synchronous LDAP operations"
 msgstr "Проміжок часу між спробами виконання синхронних операцій LDAP"
 
-#: config/SSSDConfig.py:118
+#: src/config/SSSDConfig.py:118
 msgid "Length of time between attempts to reconnect while offline"
 msgstr ""
 "Проміжок часу між повторними спробами встановлення з’єднання у автономному "
 "режимі"
 
-#: config/SSSDConfig.py:119
+#: src/config/SSSDConfig.py:119
 msgid "File that contains CA certificates"
 msgstr "Файл, що містить сертифікати CA"
 
-#: config/SSSDConfig.py:120
+#: src/config/SSSDConfig.py:120
 msgid "Path to CA certificate directory"
 msgstr "Шлях до каталогу сертифікатів CA"
 
-#: config/SSSDConfig.py:121
+#: src/config/SSSDConfig.py:121
 msgid "Require TLS certificate verification"
 msgstr "Потрібна перевірка сертифіката TLS"
 
-#: config/SSSDConfig.py:122
+#: src/config/SSSDConfig.py:122
 msgid "Specify the sasl mechanism to use"
 msgstr "Вкажіть механізм SASL, який слід використовувати"
 
-#: config/SSSDConfig.py:123
+#: src/config/SSSDConfig.py:123
 msgid "Specify the sasl authorization id to use"
 msgstr "Вкажіть ідентифікатор уповноваження SASL, який слід використовувати"
 
-#: config/SSSDConfig.py:126
+#: src/config/SSSDConfig.py:126
 msgid "Kerberos service keytab"
 msgstr "Таблиця ключів служби Kerberos"
 
-#: config/SSSDConfig.py:127
+#: src/config/SSSDConfig.py:127
 msgid "Use Kerberos auth for LDAP connection"
 msgstr "Розпізнавання Kerberos для з’єднання LDAP"
 
-#: config/SSSDConfig.py:128
+#: src/config/SSSDConfig.py:128
 msgid "Follow LDAP referrals"
 msgstr "Переходити за посиланнями LDAP"
 
-#: config/SSSDConfig.py:129
+#: src/config/SSSDConfig.py:129
 msgid "Lifetime of TGT for LDAP connection"
 msgstr "Строк дії TGT для з’єднання LDAP"
 
-#: config/SSSDConfig.py:132
+#: src/config/SSSDConfig.py:132
 msgid "Length of time to wait for a search request"
 msgstr "Тривалість очікування на дані запиту пошуку"
 
-#: config/SSSDConfig.py:133
+#: src/config/SSSDConfig.py:133
 msgid "Length of time between enumeration updates"
 msgstr "Проміжок часу між оновленнями нумерації"
 
-#: config/SSSDConfig.py:134
+#: src/config/SSSDConfig.py:134
 msgid "Require TLS for ID lookups"
 msgstr "Вимагати TLS для пошуків ідентифікаторів"
 
-#: config/SSSDConfig.py:135
+#: src/config/SSSDConfig.py:135
 msgid "Base DN for user lookups"
 msgstr "Базова назва домену для пошуків користувачів"
 
-#: config/SSSDConfig.py:136
+#: src/config/SSSDConfig.py:136
 msgid "Scope of user lookups"
 msgstr "Діапазон пошуків користувачів"
 
-#: config/SSSDConfig.py:137
+#: src/config/SSSDConfig.py:137
 msgid "Filter for user lookups"
 msgstr "Фільтр пошуку користувачів"
 
-#: config/SSSDConfig.py:138
+#: src/config/SSSDConfig.py:138
 msgid "Objectclass for users"
 msgstr "Клас об’єктів для користувачів"
 
-#: config/SSSDConfig.py:139
+#: src/config/SSSDConfig.py:139
 msgid "Username attribute"
 msgstr "Атрибут імені користувача"
 
-#: config/SSSDConfig.py:140
+#: src/config/SSSDConfig.py:140
 msgid "UID attribute"
 msgstr "Атрибут UID"
 
-#: config/SSSDConfig.py:141
+#: src/config/SSSDConfig.py:141
 msgid "Primary GID attribute"
 msgstr "Головний атрибут GID"
 
-#: config/SSSDConfig.py:142
+#: src/config/SSSDConfig.py:142
 msgid "GECOS attribute"
 msgstr "Атрибут GECOS"
 
-#: config/SSSDConfig.py:143
+#: src/config/SSSDConfig.py:143
 msgid "Home directory attribute"
 msgstr "Атрибут домашнього каталогу"
 
-#: config/SSSDConfig.py:144
+#: src/config/SSSDConfig.py:144
 msgid "Shell attribute"
 msgstr "Атрибут оболонки"
 
-#: config/SSSDConfig.py:145
+#: src/config/SSSDConfig.py:145
 msgid "UUID attribute"
 msgstr "Атрибут UUID"
 
-#: config/SSSDConfig.py:146
+#: src/config/SSSDConfig.py:146
 msgid "User principal attribute (for Kerberos)"
 msgstr "Атрибут реєстраційного запису користувача (для Kerberos)"
 
-#: config/SSSDConfig.py:147
+#: src/config/SSSDConfig.py:147
 msgid "Full Name"
 msgstr "Повне ім'я"
 
-#: config/SSSDConfig.py:148
+#: src/config/SSSDConfig.py:148
 msgid "memberOf attribute"
 msgstr "Атрибут memberOf"
 
-#: config/SSSDConfig.py:149
+#: src/config/SSSDConfig.py:149
 msgid "Modification time attribute"
 msgstr "Атрибут часу зміни"
 
-#: config/SSSDConfig.py:152
+#: src/config/SSSDConfig.py:152
 msgid "Policy to evaluate the password expiration"
 msgstr "Правила оцінки завершення строку дії пароля"
 
-#: config/SSSDConfig.py:155
+#: src/config/SSSDConfig.py:155
 msgid "LDAP filter to determine access privileges"
 msgstr "Фільтр LDAP для визначення прав доступу"
 
-#: config/SSSDConfig.py:158
+#: src/config/SSSDConfig.py:158
 msgid "Comma separated list of allowed users"
 msgstr "Відокремлений комами список дозволених користувачів"
 
-#: config/SSSDConfig.py:159
+#: src/config/SSSDConfig.py:159
 msgid "Comma separated list of prohibited users"
 msgstr "Відокремлений комами список заборонених користувачів"
 
-#: config/SSSDConfig.py:162
+#: src/config/SSSDConfig.py:162
 msgid "Default shell, /bin/bash"
 msgstr "Типова оболонка, /bin/bash"
 
-#: config/SSSDConfig.py:163
+#: src/config/SSSDConfig.py:163
 msgid "Base for home directories"
 msgstr "Базова адреса домашніх каталогів"
 
-#: config/SSSDConfig.py:166
+#: src/config/SSSDConfig.py:166
 msgid "The name of the NSS library to use"
 msgstr "Назва бібліотеки NSS, яку слід використовувати"
 
-#: config/SSSDConfig.py:169
+#: src/config/SSSDConfig.py:169
 msgid "PAM stack to use"
 msgstr "Стек PAM, який слід використовувати"
 
-#: monitor/monitor.c:2137
+#: src/monitor/monitor.c:2140
 msgid "Become a daemon (default)"
 msgstr "Запуститися фонову службу (типова поведінка)"
 
-#: monitor/monitor.c:2139
+#: src/monitor/monitor.c:2142
 msgid "Run interactive (not a daemon)"
 msgstr "Запустити у інтерактивному режимі (без фонової служби)"
 
-#: monitor/monitor.c:2141
+#: src/monitor/monitor.c:2144
 msgid "Specify a non-default config file"
 msgstr "Вказати нетиповий файл налаштувань"
 
-#: monitor/monitor.c:2167
+#: src/monitor/monitor.c:2170
 msgid "sssd must be run as root\n"
 msgstr "sssd слід запускати від імені користувача root\n"
 
-#: monitor/monitor.c:2202
+#: src/monitor/monitor.c:2205
 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"
@@ -442,7 +442,7 @@ msgstr ""
 "Було виявлено сокет nscd. Можливості з кешування nscd можуть конфліктувати з "
 "SSSD. Не рекомендуємо вам користуватися nscd паралельно з SSSD\n"
 
-#: monitor/monitor.c:2212
+#: src/monitor/monitor.c:2215
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
@@ -452,280 +452,293 @@ msgstr ""
 "встановлено для цього файла права доступу 0600 і чи є парою власник-група "
 "файла root.root\n"
 
-#: monitor/monitor.c:2217
+#: src/monitor/monitor.c:2220
 msgid "Cannot load configuration database\n"
 msgstr "Не вдалося завантажити базу даних налаштувань\n"
 
-#: providers/krb5/krb5_child.c:993 providers/ldap/ldap_child.c:361
-#: util/util.h:61
+#: src/providers/krb5/krb5_child.c:1043 src/providers/ldap/ldap_child.c:359
+#: src/util/util.h:63
 msgid "Debug level"
 msgstr "Рівень зневаджування"
 
-#: providers/krb5/krb5_child.c:995 providers/ldap/ldap_child.c:363
-#: util/util.h:65
+#: src/providers/krb5/krb5_child.c:1045 src/providers/ldap/ldap_child.c:361
+#: src/util/util.h:67
 msgid "Add debug timestamps"
 msgstr "Додавати діагностичні часові позначки"
 
-#: providers/krb5/krb5_child.c:997 providers/ldap/ldap_child.c:365
+#: src/providers/krb5/krb5_child.c:1047 src/providers/ldap/ldap_child.c:363
 msgid "An open file descriptor for the debug logs"
 msgstr "Дескриптор відкритого файла для запису журналів діагностики"
 
-#: providers/data_provider_be.c:1165
+#: src/providers/data_provider_be.c:1165
 msgid "Domain of the information provider (mandatory)"
 msgstr "Домен надання відомостей (обов’язковий)"
 
-#: sss_client/common.c:742
+#: src/sss_client/common.c:742
 msgid "Privileged socket has wrong ownership or permissions."
 msgstr "У привілейованого сокета помилковий власник або права доступу."
 
-#: sss_client/common.c:745
+#: src/sss_client/common.c:745
 msgid "Public socket has wrong ownership or permissions."
 msgstr "У відкритого сокета помилковий власник або права доступу."
 
-#: sss_client/common.c:748
+#: src/sss_client/common.c:748
 msgid "Unexpected format of the server credential message."
 msgstr "Некоректний формат повідомлення щодо реєстраційних даних сервера."
 
-#: sss_client/common.c:751
+#: src/sss_client/common.c:751
 msgid "SSSD is not run by root."
 msgstr "SSSD запущено не від імені користувача root."
 
-#: sss_client/common.c:756
+#: src/sss_client/common.c:756
 msgid "An error occurred, but no description can be found."
 msgstr "Сталася помилка, але не вдалося знайти її опису."
 
-#: sss_client/common.c:762
+#: src/sss_client/common.c:762
 msgid "Unexpected error while looking for an error description"
 msgstr "Неочікувана помилка під час пошуку опису помилки"
 
-#: sss_client/pam_sss.c:372
+#: src/sss_client/pam_sss.c:372
 msgid "Passwords do not match"
 msgstr "Паролі не збігаються"
 
-#: sss_client/pam_sss.c:556
+#: src/sss_client/pam_sss.c:556
 msgid "Password reset by root is not supported."
 msgstr "Підтримки скидання пароля користувачем root не передбачено."
 
-#: sss_client/pam_sss.c:597
+#: src/sss_client/pam_sss.c:597
 msgid "Authenticated with cached credentials"
 msgstr "Розпізнано за реєстраційними даними з кешу"
 
-#: sss_client/pam_sss.c:598
+#: src/sss_client/pam_sss.c:598
 msgid ", your cached password will expire at: "
 msgstr ", строк дії вашого кешованого пароля завершиться: "
 
-#: sss_client/pam_sss.c:628
+#: src/sss_client/pam_sss.c:628
 #, c-format
 msgid "Your password has expired. You have %d grace login(s) remaining."
 msgstr "Строк дії вашого пароля вичерпано. Залишилося %d резервних входи."
 
-#: sss_client/pam_sss.c:674
+#: src/sss_client/pam_sss.c:674
 #, c-format
 msgid "Your password will expire in %d %s."
 msgstr "Строк дії вашого пароля завершиться за %d %s."
 
-#: sss_client/pam_sss.c:723
+#: src/sss_client/pam_sss.c:723
 msgid "Authentication is denied until: "
 msgstr "Розпізнавання заборонено до: "
 
-#: sss_client/pam_sss.c:750
+#: src/sss_client/pam_sss.c:750
 msgid "System is offline, password change not possible"
 msgstr "Система працює у автономному режимі, зміна пароля неможлива"
 
-#: sss_client/pam_sss.c:780 sss_client/pam_sss.c:793
+#: src/sss_client/pam_sss.c:780 src/sss_client/pam_sss.c:793
 msgid "Password change failed. "
 msgstr "Спроба зміни пароля зазнала невдачі. "
 
-#: sss_client/pam_sss.c:783 sss_client/pam_sss.c:794
+#: src/sss_client/pam_sss.c:783 src/sss_client/pam_sss.c:794
 msgid "Server message: "
 msgstr "Повідомлення сервера: "
 
-#: sss_client/pam_sss.c:1197
+#: src/sss_client/pam_sss.c:1197
 msgid "New Password: "
 msgstr "Новий пароль: "
 
-#: sss_client/pam_sss.c:1198
+#: src/sss_client/pam_sss.c:1198
 msgid "Reenter new Password: "
 msgstr "Ще раз введіть новий пароль: "
 
-#: sss_client/pam_sss.c:1280
+#: src/sss_client/pam_sss.c:1280
 msgid "Password: "
 msgstr "Пароль: "
 
-#: sss_client/pam_sss.c:1312
+#: src/sss_client/pam_sss.c:1312
 msgid "Current Password: "
 msgstr "Поточний пароль: "
 
-#: sss_client/pam_sss.c:1458
+#: src/sss_client/pam_sss.c:1458
 msgid "Password expired. Change your password now."
 msgstr "Строк дії пароля вичерпано. Змініть ваш пароль."
 
-#: tools/sss_useradd.c:48 tools/sss_groupadd.c:41 tools/sss_groupdel.c:43
-#: tools/sss_groupmod.c:42 tools/sss_groupshow.c:620 tools/sss_userdel.c:131
-#: tools/sss_usermod.c:47
+#: src/tools/sss_useradd.c:48 src/tools/sss_groupadd.c:41
+#: src/tools/sss_groupdel.c:43 src/tools/sss_groupmod.c:42
+#: src/tools/sss_groupshow.c:620 src/tools/sss_userdel.c:131
+#: src/tools/sss_usermod.c:47
 msgid "The debug level to run with"
 msgstr "Рівень діагностики під час запуску"
 
-#: tools/sss_useradd.c:49 tools/sss_usermod.c:48
+#: src/tools/sss_useradd.c:49 src/tools/sss_usermod.c:48
 msgid "The UID of the user"
 msgstr "Ідентифікатор користувача"
 
-#: tools/sss_useradd.c:50 tools/sss_usermod.c:50
+#: src/tools/sss_useradd.c:50 src/tools/sss_usermod.c:50
 msgid "The comment string"
 msgstr "Рядок коментаря"
 
-#: tools/sss_useradd.c:51 tools/sss_usermod.c:51
+#: src/tools/sss_useradd.c:51 src/tools/sss_usermod.c:51
 msgid "Home directory"
 msgstr "Домашній каталог"
 
-#: tools/sss_useradd.c:52 tools/sss_usermod.c:52
+#: src/tools/sss_useradd.c:52 src/tools/sss_usermod.c:52
 msgid "Login shell"
 msgstr "Оболонка входу"
 
-#: tools/sss_useradd.c:53
+#: src/tools/sss_useradd.c:53
 msgid "Groups"
 msgstr "Групи"
 
-#: tools/sss_useradd.c:54
+#: src/tools/sss_useradd.c:54
 msgid "Create user's directory if it does not exist"
 msgstr "Створити каталог користувача, якщо його ще не існує"
 
-#: tools/sss_useradd.c:55
+#: src/tools/sss_useradd.c:55
 msgid "Never create user's directory, overrides config"
 msgstr "Ніколи не створювати каталог користувача, перевизначає налаштування"
 
-#: tools/sss_useradd.c:56
+#: src/tools/sss_useradd.c:56
 msgid "Specify an alternative skeleton directory"
 msgstr "Вказати альтернативний основний каталог"
 
-#: tools/sss_useradd.c:57 tools/sss_usermod.c:57
+#: src/tools/sss_useradd.c:57 src/tools/sss_usermod.c:57
 msgid "The SELinux user for user's login"
 msgstr "Ім’я користувача SELinux для входу до системи"
 
-#: tools/sss_useradd.c:71 tools/sss_groupadd.c:56 tools/sss_groupdel.c:52
-#: tools/sss_groupmod.c:63 tools/sss_groupshow.c:631 tools/sss_userdel.c:148
-#: tools/sss_usermod.c:72
+#: src/tools/sss_useradd.c:71 src/tools/sss_groupadd.c:56
+#: src/tools/sss_groupdel.c:52 src/tools/sss_groupmod.c:63
+#: src/tools/sss_groupshow.c:631 src/tools/sss_userdel.c:148
+#: src/tools/sss_usermod.c:72
 msgid "Error setting the locale\n"
 msgstr "Помилка під час спроби встановити локаль\n"
 
-#: tools/sss_useradd.c:107
+#: src/tools/sss_useradd.c:84 src/tools/sss_groupmod.c:76
+#: src/tools/sss_usermod.c:85
+#, fuzzy
+msgid "Specify group to add to\n"
+msgstr "Вкажіть групу, яку слід додати\n"
+
+#: src/tools/sss_useradd.c:108
 msgid "Specify user to add\n"
 msgstr "Вкажіть користувача, запис якого слід додати\n"
 
-#: tools/sss_useradd.c:118 tools/sss_groupadd.c:86 tools/sss_groupdel.c:81
-#: tools/sss_groupmod.c:111 tools/sss_groupshow.c:668 tools/sss_userdel.c:197
-#: tools/sss_usermod.c:128
+#: src/tools/sss_useradd.c:117 src/tools/sss_groupadd.c:82
+#: src/tools/sss_groupdel.c:77 src/tools/sss_groupmod.c:109
+#: src/tools/sss_groupshow.c:664 src/tools/sss_userdel.c:193
+#: src/tools/sss_usermod.c:126
 msgid "Error initializing the tools - no local domain\n"
 msgstr "Помилка ініціалізації інструментів: немає локального домену\n"
 
-#: tools/sss_useradd.c:120 tools/sss_groupadd.c:88 tools/sss_groupdel.c:83
-#: tools/sss_groupmod.c:113 tools/sss_groupshow.c:670 tools/sss_userdel.c:199
-#: tools/sss_usermod.c:130
+#: src/tools/sss_useradd.c:119 src/tools/sss_groupadd.c:84
+#: src/tools/sss_groupdel.c:79 src/tools/sss_groupmod.c:111
+#: src/tools/sss_groupshow.c:666 src/tools/sss_userdel.c:195
+#: src/tools/sss_usermod.c:128
 msgid "Error initializing the tools\n"
 msgstr "Помилка ініціалізації інструментів\n"
 
-#: tools/sss_useradd.c:129 tools/sss_groupadd.c:97 tools/sss_groupdel.c:92
-#: tools/sss_groupmod.c:121 tools/sss_groupshow.c:679 tools/sss_userdel.c:208
-#: tools/sss_usermod.c:139
+#: src/tools/sss_useradd.c:128 src/tools/sss_groupadd.c:93
+#: src/tools/sss_groupdel.c:88 src/tools/sss_groupmod.c:119
+#: src/tools/sss_groupshow.c:675 src/tools/sss_userdel.c:204
+#: src/tools/sss_usermod.c:137
 msgid "Invalid domain specified in FQDN\n"
 msgstr "У FQDN вказано некоректний домен\n"
 
-#: tools/sss_useradd.c:138 tools/sss_groupmod.c:143 tools/sss_groupmod.c:170
-#: tools/sss_usermod.c:164 tools/sss_usermod.c:191
+#: src/tools/sss_useradd.c:137 src/tools/sss_groupmod.c:141
+#: src/tools/sss_groupmod.c:168 src/tools/sss_usermod.c:162
+#: src/tools/sss_usermod.c:189
 msgid "Internal error while parsing parameters\n"
 msgstr "Внутрішня помилка під час обробки параметрів\n"
 
-#: tools/sss_useradd.c:146 tools/sss_usermod.c:172 tools/sss_usermod.c:199
+#: src/tools/sss_useradd.c:145 src/tools/sss_usermod.c:170
+#: src/tools/sss_usermod.c:197
 msgid "Groups must be in the same domain as user\n"
 msgstr "Групи мають належати до того самого домену, що і користувач\n"
 
-#: tools/sss_useradd.c:154
+#: src/tools/sss_useradd.c:153
 #, c-format
 msgid "Cannot find group %s in local domain\n"
 msgstr "Не вдалося знайти групу %s у локальному домені\n"
 
-#: tools/sss_useradd.c:169 tools/sss_userdel.c:218
+#: src/tools/sss_useradd.c:168 src/tools/sss_userdel.c:214
 msgid "Cannot set default values\n"
 msgstr "Не вдалося встановити типові значення\n"
 
-#: tools/sss_useradd.c:176 tools/sss_usermod.c:155
+#: src/tools/sss_useradd.c:175 src/tools/sss_usermod.c:153
 msgid "The selected UID is outside the allowed range\n"
 msgstr ""
 "Вибраний ідентифікатор користувача не належить до діапазону дозволених\n"
 
-#: tools/sss_useradd.c:203 tools/sss_usermod.c:240
+#: src/tools/sss_useradd.c:202 src/tools/sss_usermod.c:238
 msgid "Cannot set SELinux login context\n"
 msgstr "Не вдалося встановити контекст входу SELinux\n"
 
-#: tools/sss_useradd.c:219
+#: src/tools/sss_useradd.c:218
 msgid "Cannot get info about the user\n"
 msgstr "Не вдалося отримати відомості щодо користувача\n"
 
-#: tools/sss_useradd.c:233
+#: src/tools/sss_useradd.c:232
 msgid "User's home directory already exists, not copying data from skeldir\n"
 msgstr ""
 "Домашній каталог користувача вже існує, копіювання даних з каталогу skel не "
 "виконуватиметься\n"
 
-#: tools/sss_useradd.c:236
+#: src/tools/sss_useradd.c:235
 #, c-format
 msgid "Cannot create user's home directory: %s\n"
 msgstr "Не вдалося створити домашній каталог користувача: %s\n"
 
-#: tools/sss_useradd.c:247
+#: src/tools/sss_useradd.c:246
 #, c-format
 msgid "Cannot create user's mail spool: %s\n"
 msgstr "Не вдалося створити поштовий буфер користувача: %s\n"
 
-#: tools/sss_useradd.c:259
+#: src/tools/sss_useradd.c:258
 msgid "Could not allocate ID for the user - domain full?\n"
 msgstr ""
 "Не вдалося отримати ідентифікатор для користувача. Домен переповнено?\n"
 
-#: tools/sss_useradd.c:263
+#: src/tools/sss_useradd.c:262
 msgid "A user or group with the same name or ID already exists\n"
 msgstr ""
 "Вже існує користувач або група з таким самим іменем, назвою або "
 "ідентифікатором\n"
 
-#: tools/sss_useradd.c:269
+#: src/tools/sss_useradd.c:268
 msgid "Transaction error. Could not add user.\n"
 msgstr "Помилка під час виконання операції. Не вдалося додати користувача.\n"
 
-#: tools/sss_groupadd.c:43 tools/sss_groupmod.c:48
+#: src/tools/sss_groupadd.c:43 src/tools/sss_groupmod.c:48
 msgid "The GID of the group"
 msgstr "Ідентифікатор групи"
 
-#: tools/sss_groupadd.c:75
+#: src/tools/sss_groupadd.c:73
 msgid "Specify group to add\n"
 msgstr "Вкажіть групу, яку слід додати\n"
 
-#: tools/sss_groupadd.c:106 tools/sss_groupmod.c:194
+#: src/tools/sss_groupadd.c:102 src/tools/sss_groupmod.c:192
 msgid "The selected GID is outside the allowed range\n"
 msgstr "Вибраний ідентифікатор групи не належить до діапазону дозволених\n"
 
-#: tools/sss_groupadd.c:131
+#: src/tools/sss_groupadd.c:127
 msgid "Could not allocate ID for the group - domain full?\n"
 msgstr "Не вдалося отримати ідентифікатор для групи. Домен переповнено?\n"
 
-#: tools/sss_groupadd.c:135
+#: src/tools/sss_groupadd.c:131
 msgid "A group with the same name or GID already exists\n"
 msgstr "Вже існує група з такою самою назвою або ідентифікатором\n"
 
-#: tools/sss_groupadd.c:140
+#: src/tools/sss_groupadd.c:136
 msgid "Transaction error. Could not add group.\n"
 msgstr "Помилка під час виконання операції Не вдалося додати групу.\n"
 
-#: tools/sss_groupdel.c:70
+#: src/tools/sss_groupdel.c:68
 msgid "Specify group to delete\n"
 msgstr "Вкажіть групу, яку слід вилучити\n"
 
-#: tools/sss_groupdel.c:107
+#: src/tools/sss_groupdel.c:103
 #, c-format
 msgid "Group %s is outside the defined ID range for domain\n"
 msgstr "Група %s не належить визначеному діапазону ідентифікаторів домену\n"
 
-#: tools/sss_groupdel.c:121
+#: src/tools/sss_groupdel.c:117
 msgid ""
 "No such group in local domain. Removing groups only allowed in local "
 "domain.\n"
@@ -733,23 +746,28 @@ msgstr ""
 "У локальному домені немає такої групи. Вилучення груп можливе лише у межах "
 "локального домену.\n"
 
-#: tools/sss_groupdel.c:126
+#: src/tools/sss_groupdel.c:122
 msgid "Internal error. Could not remove group.\n"
 msgstr "Внутрішня помилка. Не вдалося вилучити запис групи.\n"
 
-#: tools/sss_groupmod.c:44
+#: src/tools/sss_groupmod.c:44
 msgid "Groups to add this group to"
 msgstr "Групи, до яких слід додати цю групу"
 
-#: tools/sss_groupmod.c:46
+#: src/tools/sss_groupmod.c:46
 msgid "Groups to remove this group from"
 msgstr "Групи, з яких слід вилучити цю групу"
 
-#: tools/sss_groupmod.c:98
+#: src/tools/sss_groupmod.c:84 src/tools/sss_usermod.c:93
+#, fuzzy
+msgid "Specify group to remove from\n"
+msgstr "Вкажіть групу, запис якої слід змінити\n"
+
+#: src/tools/sss_groupmod.c:98
 msgid "Specify group to modify\n"
 msgstr "Вкажіть групу, запис якої слід змінити\n"
 
-#: tools/sss_groupmod.c:130
+#: src/tools/sss_groupmod.c:128
 msgid ""
 "Cannot find group in local domain, modifying groups is allowed only in local "
 "domain\n"
@@ -757,13 +775,13 @@ msgstr ""
 "Не вдалося знайти групу у локальному домені. Зміну записів груп можна "
 "виконувати лише у межах локального домену\n"
 
-#: tools/sss_groupmod.c:151 tools/sss_groupmod.c:178
+#: src/tools/sss_groupmod.c:149 src/tools/sss_groupmod.c:176
 msgid "Member groups must be in the same domain as parent group\n"
 msgstr ""
 "Групи-учасники мають належати до того самого домену, що і основна група\n"
 
-#: tools/sss_groupmod.c:159 tools/sss_groupmod.c:186 tools/sss_usermod.c:180
-#: tools/sss_usermod.c:207
+#: src/tools/sss_groupmod.c:157 src/tools/sss_groupmod.c:184
+#: src/tools/sss_usermod.c:178 src/tools/sss_usermod.c:205
 #, c-format
 msgid ""
 "Cannot find group %s in local domain, only groups in local domain are "
@@ -772,41 +790,41 @@ msgstr ""
 "Не вдалося знайти групу %s у локальному домені, можна використовувати лише "
 "групи з локального домену\n"
 
-#: tools/sss_groupmod.c:220
+#: src/tools/sss_groupmod.c:218
 msgid "Could not modify group - check if member group names are correct\n"
 msgstr ""
 "Не вдалося змінити запис групи. Перевірте, чи правильно вказано назви груп-"
 "учасників\n"
 
-#: tools/sss_groupmod.c:224
+#: src/tools/sss_groupmod.c:222
 msgid "Could not modify group - check if groupname is correct\n"
 msgstr ""
 "Не вдалося змінити запис групи. Перевірте, чи правильно вказано назву групи\n"
 
-#: tools/sss_groupmod.c:228
+#: src/tools/sss_groupmod.c:226
 msgid "Transaction error. Could not modify group.\n"
 msgstr "Помилка під час виконання операції Не вдалося змінити групу.\n"
 
-#: tools/sss_groupshow.c:567
+#: src/tools/sss_groupshow.c:567
 #, c-format
 msgid "%s%sGroup: %s\n"
 msgstr "%s%sГрупа: %s\n"
 
-#: tools/sss_groupshow.c:568
+#: src/tools/sss_groupshow.c:568
 msgid "Magic Private "
 msgstr "Магічна приватна "
 
-#: tools/sss_groupshow.c:570
+#: src/tools/sss_groupshow.c:570
 #, c-format
 msgid "%sGID number: %d\n"
 msgstr "%sНомер GID: %d\n"
 
-#: tools/sss_groupshow.c:572
+#: src/tools/sss_groupshow.c:572
 #, c-format
 msgid "%sMember users: "
 msgstr "%sКористувачі-учасники: "
 
-#: tools/sss_groupshow.c:579
+#: src/tools/sss_groupshow.c:579
 #, c-format
 msgid ""
 "\n"
@@ -815,7 +833,7 @@ msgstr ""
 "\n"
 "%sє учасником: "
 
-#: tools/sss_groupshow.c:586
+#: src/tools/sss_groupshow.c:586
 #, c-format
 msgid ""
 "\n"
@@ -824,15 +842,15 @@ msgstr ""
 "\n"
 "%sГрупи-учасники: "
 
-#: tools/sss_groupshow.c:622
+#: src/tools/sss_groupshow.c:622
 msgid "Print indirect group members recursively"
 msgstr "Виводити дані щодо непрямих учасників групи рекурсивно"
 
-#: tools/sss_groupshow.c:657
+#: src/tools/sss_groupshow.c:655
 msgid "Specify group to show\n"
 msgstr "Вкажіть групу, дані якої слід показати\n"
 
-#: tools/sss_groupshow.c:698
+#: src/tools/sss_groupshow.c:694
 msgid ""
 "No such group in local domain. Printing groups only allowed in local "
 "domain.\n"
@@ -840,106 +858,106 @@ msgstr ""
 "У локальному домені немає такої групи. Вивід даних груп можливий лише у "
 "межах локального домену.\n"
 
-#: tools/sss_groupshow.c:703
+#: src/tools/sss_groupshow.c:699
 msgid "Internal error. Could not print group.\n"
 msgstr "Внутрішня помилка. Не вдалося вивести дані групи.\n"
 
-#: tools/sss_userdel.c:133
+#: src/tools/sss_userdel.c:133
 msgid "Remove home directory and mail spool"
 msgstr "Вилучити домашній каталог і поштовий буфер"
 
-#: tools/sss_userdel.c:135
+#: src/tools/sss_userdel.c:135
 msgid "Do not remove home directory and mail spool"
 msgstr "Не вилучати домашній каталог і поштовий буфер"
 
-#: tools/sss_userdel.c:137
+#: src/tools/sss_userdel.c:137
 msgid "Force removal of files not owned by the user"
 msgstr "Примусово вилучити файли, які не належать користувачеві"
 
-#: tools/sss_userdel.c:139
+#: src/tools/sss_userdel.c:139
 msgid "Kill users' processes before removing him"
 msgstr "Припинити роботу процесів користувача перед вилученням його запису"
 
-#: tools/sss_userdel.c:186
+#: src/tools/sss_userdel.c:184
 msgid "Specify user to delete\n"
 msgstr "Вкажіть користувача, запис якого слід вилучити\n"
 
-#: tools/sss_userdel.c:235
+#: src/tools/sss_userdel.c:231
 #, c-format
 msgid "User %s is outside the defined ID range for domain\n"
 msgstr ""
 "Користувач %s не належить визначеному діапазону ідентифікаторів домену\n"
 
-#: tools/sss_userdel.c:260
+#: src/tools/sss_userdel.c:256
 msgid "Cannot reset SELinux login context\n"
 msgstr "Не вдалося відновити початковий контекст входу SELinux\n"
 
-#: tools/sss_userdel.c:272
+#: src/tools/sss_userdel.c:268
 #, c-format
 msgid "WARNING: The user (uid %lu) was still logged in when deleted.\n"
 msgstr ""
 "ПОПЕРЕДЖЕННЯ: користувач (uid %lu) все ще працював у системі на час "
 "вилучення його запису.\n"
 
-#: tools/sss_userdel.c:277
+#: src/tools/sss_userdel.c:273
 msgid "Cannot determine if the user was logged in on this platform"
 msgstr ""
 "Не вдалося визначити, чи увійшов користувач до системи на цій платформі"
 
-#: tools/sss_userdel.c:282
+#: src/tools/sss_userdel.c:278
 msgid "Error while checking if the user was logged in\n"
 msgstr "Помилка під час перевірки входу користувача до системи\n"
 
-#: tools/sss_userdel.c:289
+#: src/tools/sss_userdel.c:285
 #, c-format
 msgid "The post-delete command failed: %s\n"
 msgstr "Помилка команди, яку слід було виконати після вилучення запису: %s\n"
 
-#: tools/sss_userdel.c:301
+#: src/tools/sss_userdel.c:297
 msgid "Not removing home dir - not owned by user\n"
 msgstr "Домашній каталог не буде вилучено. Він не належить користувачеві.\n"
 
-#: tools/sss_userdel.c:303
+#: src/tools/sss_userdel.c:299
 #, c-format
 msgid "Cannot remove homedir: %s\n"
 msgstr "Не вдалося вилучити домашній каталог: %s\n"
 
-#: tools/sss_userdel.c:314
+#: src/tools/sss_userdel.c:310
 msgid ""
 "No such user in local domain. Removing users only allowed in local domain.\n"
 msgstr ""
 "У локальному домені немає такого користувача. Вилучення користувачів можливе "
 "лише у межах локального домену.\n"
 
-#: tools/sss_userdel.c:319
+#: src/tools/sss_userdel.c:315
 msgid "Internal error. Could not remove user.\n"
 msgstr "Внутрішня помилка Не вдалося вилучити запис користувача.\n"
 
-#: tools/sss_usermod.c:49
+#: src/tools/sss_usermod.c:49
 msgid "The GID of the user"
 msgstr "Ідентифікатор групи користувача"
 
-#: tools/sss_usermod.c:53
+#: src/tools/sss_usermod.c:53
 msgid "Groups to add this user to"
 msgstr "Групи, до яких слід додати цього користувача"
 
-#: tools/sss_usermod.c:54
+#: src/tools/sss_usermod.c:54
 msgid "Groups to remove this user from"
 msgstr "Групи, з яких слід вилучити цього користувача"
 
-#: tools/sss_usermod.c:55
+#: src/tools/sss_usermod.c:55
 msgid "Lock the account"
 msgstr "Заблокувати обліковий запис"
 
-#: tools/sss_usermod.c:56
+#: src/tools/sss_usermod.c:56
 msgid "Unlock the account"
 msgstr "Розблокувати обліковий запис"
 
-#: tools/sss_usermod.c:117
+#: src/tools/sss_usermod.c:117
 msgid "Specify user to modify\n"
 msgstr "Вкажіть користувача, запис якого слід змінити\n"
 
-#: tools/sss_usermod.c:148
+#: src/tools/sss_usermod.c:146
 msgid ""
 "Cannot find user in local domain, modifying users is allowed only in local "
 "domain\n"
@@ -947,32 +965,32 @@ msgstr ""
 "Не вдалося знайти користувача у локальному домені. Зміну записів "
 "користувачів можна виконувати лише у межах локального домену\n"
 
-#: tools/sss_usermod.c:250
+#: src/tools/sss_usermod.c:248
 msgid "Could not modify user - check if group names are correct\n"
 msgstr ""
 "Не вдалося змінити запис користувача. Перевірте, чи правильно вказано назви "
 "груп\n"
 
-#: tools/sss_usermod.c:254
+#: src/tools/sss_usermod.c:252
 msgid "Could not modify user - user already member of groups?\n"
 msgstr ""
 "Не вдалося змінити запис користувача. Користувач вже є учасником груп?\n"
 
-#: tools/sss_usermod.c:258
+#: src/tools/sss_usermod.c:256
 msgid "Transaction error. Could not modify user.\n"
 msgstr ""
 "Помилка під час виконання операції. Не вдалося змінити запис користувача.\n"
 
-#: tools/tools_util.c:285
+#: src/tools/tools_util.c:290
 msgid "Out of memory\n"
 msgstr "Не вистачає пам'яті\n"
 
-#: tools/tools_util.h:34
+#: src/tools/tools_util.h:40
 #, c-format
 msgid "%s must be run as root\n"
 msgstr "%s слід виконувати від імені користувача root\n"
 
-#: util/util.h:63
+#: src/util/util.h:65
 msgid "Send the debug output to files instead of stderr"
 msgstr "Надіслати діагностичні дані до файлів, а не до stderr"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 825accb0..dc5891ea 100644
--- a/po/zh_TW.po
+++ b/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-08-03 18:24-0400\n"
+"POT-Creation-Date: 2010-10-18 13:14-0400\n"
 "PO-Revision-Date: 2010-03-22 22:00+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Fedora-trans-zh_tw <trans-zh_tw@lists.fedoraproject.org>\n"
@@ -20,431 +20,431 @@ msgstr ""
 "X-Poedit-Country: TAIWAN\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: config/SSSDConfig.py:39
+#: src/config/SSSDConfig.py:39
 #, fuzzy
 msgid "Set the verbosity of the debug logging"
 msgstr "設定除錯日誌功能的冗長度"
 
-#: config/SSSDConfig.py:40
+#: src/config/SSSDConfig.py:40
 msgid "Include timestamps in debug logs"
 msgstr "在除錯日誌內加入時間戳記"
 
-#: config/SSSDConfig.py:41
+#: src/config/SSSDConfig.py:41
 msgid "Write debug messages to logfiles"
 msgstr "將除錯訊息寫入日誌檔"
 
-#: config/SSSDConfig.py:42
+#: src/config/SSSDConfig.py:42
 #, fuzzy
 msgid "Ping timeout before restarting service"
 msgstr "在重新啟動服務之前 ping 逾時"
 
-#: config/SSSDConfig.py:43
+#: src/config/SSSDConfig.py:43
 msgid "Command to start service"
 msgstr "啟動服務的指令"
 
-#: config/SSSDConfig.py:44
+#: src/config/SSSDConfig.py:44
 #, fuzzy
 msgid "Number of times to attempt connection to Data Providers"
 msgstr "試圖連線到資料提供者的次數"
 
-#: config/SSSDConfig.py:47
+#: src/config/SSSDConfig.py:47
 msgid "SSSD Services to start"
 msgstr "要啟動的 SSSD 服務"
 
-#: config/SSSDConfig.py:48
+#: src/config/SSSDConfig.py:48
 msgid "SSSD Domains to start"
 msgstr "要啟動的 SSSD 網域"
 
-#: config/SSSDConfig.py:49
+#: src/config/SSSDConfig.py:49
 #, fuzzy
 msgid "Timeout for messages sent over the SBUS"
 msgstr "透過 SBUS 送出的訊息逾時"
 
-#: config/SSSDConfig.py:50
+#: src/config/SSSDConfig.py:50
 msgid "Regex to parse username and domain"
 msgstr "用來解析使用者名稱與網域的正規表示式"
 
-#: config/SSSDConfig.py:51
+#: src/config/SSSDConfig.py:51
 msgid "Printf-compatible format for displaying fully-qualified names"
 msgstr ""
 
-#: config/SSSDConfig.py:54
+#: src/config/SSSDConfig.py:54
 #, fuzzy
 msgid "Enumeration cache timeout length (seconds)"
 msgstr "列表快取的逾時長度（秒）"
 
-#: config/SSSDConfig.py:55
+#: src/config/SSSDConfig.py:55
 msgid "Entry cache background update timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:56
+#: src/config/SSSDConfig.py:56
 msgid "Negative cache timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:57
+#: src/config/SSSDConfig.py:57
 msgid "Users that SSSD should explicitly ignore"
 msgstr "SSSD 應該明確忽略的使用者"
 
-#: config/SSSDConfig.py:58
+#: src/config/SSSDConfig.py:58
 msgid "Groups that SSSD should explicitly ignore"
 msgstr "SSSD 應該明確忽略的群組"
 
-#: config/SSSDConfig.py:59
+#: src/config/SSSDConfig.py:59
 msgid "Should filtered users appear in groups"
 msgstr "過濾的使用者是否應該顯現在群組內"
 
-#: config/SSSDConfig.py:60
+#: src/config/SSSDConfig.py:60
 #, fuzzy
 msgid "The value of the password field the NSS provider should return"
 msgstr "NSS 提供者應該回傳的密碼的值"
 
-#: config/SSSDConfig.py:63
+#: src/config/SSSDConfig.py:63
 msgid "How long to allow cached logins between online logins (days)"
 msgstr ""
 
-#: config/SSSDConfig.py:64
+#: src/config/SSSDConfig.py:64
 #, fuzzy
 msgid "How many failed logins attempts are allowed when offline"
 msgstr "當離線時所許可的試圖登入失敗次數"
 
-#: config/SSSDConfig.py:65
+#: src/config/SSSDConfig.py:65
 msgid ""
 "How long (minutes) to deny login after offline_failed_login_attempts has "
 "been reached"
 msgstr ""
 
-#: config/SSSDConfig.py:68
+#: src/config/SSSDConfig.py:68
 msgid "Identity provider"
 msgstr "身分提供者"
 
-#: config/SSSDConfig.py:69
+#: src/config/SSSDConfig.py:69
 msgid "Authentication provider"
 msgstr "認證提供者"
 
-#: config/SSSDConfig.py:70
+#: src/config/SSSDConfig.py:70
 msgid "Access control provider"
 msgstr "存取控制提供者"
 
-#: config/SSSDConfig.py:71
+#: src/config/SSSDConfig.py:71
 msgid "Password change provider"
 msgstr "密碼變更提供者"
 
-#: config/SSSDConfig.py:74
+#: src/config/SSSDConfig.py:74
 msgid "Minimum user ID"
 msgstr "最小的使用者 ID"
 
-#: config/SSSDConfig.py:75
+#: src/config/SSSDConfig.py:75
 msgid "Maximum user ID"
 msgstr "最大的使用者 ID"
 
-#: config/SSSDConfig.py:76
+#: src/config/SSSDConfig.py:76
 msgid "Ping timeout before restarting domain"
 msgstr ""
 
-#: config/SSSDConfig.py:77
+#: src/config/SSSDConfig.py:77
 msgid "Enable enumerating all users/groups"
 msgstr "啟用所有使用者或群組的列舉"
 
-#: config/SSSDConfig.py:78
+#: src/config/SSSDConfig.py:78
 msgid "Cache credentials for offline login"
 msgstr "供離線登入使用的快取憑證"
 
-#: config/SSSDConfig.py:79
+#: src/config/SSSDConfig.py:79
 #, fuzzy
 msgid "Store password hashes"
 msgstr "儲存密碼雜湊"
 
-#: config/SSSDConfig.py:80
+#: src/config/SSSDConfig.py:80
 msgid "Display users/groups in fully-qualified form"
 msgstr ""
 
-#: config/SSSDConfig.py:81
+#: src/config/SSSDConfig.py:81
 msgid "Entry cache timeout length (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:82
+#: src/config/SSSDConfig.py:82
 msgid ""
 "Restrict or prefer a specific address family when performing DNS lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:83
+#: src/config/SSSDConfig.py:83
 msgid "How long to keep cached entries after last successful login (days)"
 msgstr ""
 
-#: config/SSSDConfig.py:84
+#: src/config/SSSDConfig.py:84
 msgid "How long to wait for replies from DNS when resolving servers (seconds)"
 msgstr ""
 
-#: config/SSSDConfig.py:85
+#: src/config/SSSDConfig.py:85
 msgid "The domain part of service discovery DNS query"
 msgstr ""
 
-#: config/SSSDConfig.py:88
+#: src/config/SSSDConfig.py:88
 msgid "IPA domain"
 msgstr "IPA 網域"
 
-#: config/SSSDConfig.py:89
+#: src/config/SSSDConfig.py:89
 msgid "IPA server address"
 msgstr "IPA 伺服器位址"
 
-#: config/SSSDConfig.py:90
+#: src/config/SSSDConfig.py:90
 msgid "IPA client hostname"
 msgstr "IPA 客戶端主機名稱"
 
-#: config/SSSDConfig.py:91
+#: src/config/SSSDConfig.py:91
 msgid "Whether to automatically update the client's DNS entry in FreeIPA"
 msgstr ""
 
-#: config/SSSDConfig.py:92
+#: src/config/SSSDConfig.py:92
 msgid "The interface whose IP should be used for dynamic DNS updates"
 msgstr ""
 
-#: config/SSSDConfig.py:95 config/SSSDConfig.py:124
+#: src/config/SSSDConfig.py:95 src/config/SSSDConfig.py:124
 msgid "Kerberos server address"
 msgstr "Kerberos 伺服器位址"
 
-#: config/SSSDConfig.py:96 config/SSSDConfig.py:125
+#: src/config/SSSDConfig.py:96 src/config/SSSDConfig.py:125
 msgid "Kerberos realm"
 msgstr ""
 
-#: config/SSSDConfig.py:97
+#: src/config/SSSDConfig.py:97
 msgid "Authentication timeout"
 msgstr "認證逾時"
 
-#: config/SSSDConfig.py:100
+#: src/config/SSSDConfig.py:100
 msgid "Directory to store credential caches"
 msgstr "儲存憑證快取的目錄"
 
-#: config/SSSDConfig.py:101
+#: src/config/SSSDConfig.py:101
 msgid "Location of the user's credential cache"
 msgstr "使用者憑證快取的位置"
 
-#: config/SSSDConfig.py:102
+#: src/config/SSSDConfig.py:102
 msgid "Location of the keytab to validate credentials"
 msgstr "驗證憑證用的金鑰表格位置"
 
-#: config/SSSDConfig.py:103
+#: src/config/SSSDConfig.py:103
 msgid "Enable credential validation"
 msgstr "啟用憑證驗證"
 
-#: config/SSSDConfig.py:104
+#: src/config/SSSDConfig.py:104
 msgid "Store password if offline for later online authentication"
 msgstr ""
 
-#: config/SSSDConfig.py:107
+#: src/config/SSSDConfig.py:107
 msgid "Server where the change password service is running if not on the KDC"
 msgstr ""
 
-#: config/SSSDConfig.py:110
+#: src/config/SSSDConfig.py:110
 msgid "ldap_uri, The URI of the LDAP server"
 msgstr ""
 
-#: config/SSSDConfig.py:111
+#: src/config/SSSDConfig.py:111
 msgid "The default base DN"
 msgstr ""
 
-#: config/SSSDConfig.py:112
+#: src/config/SSSDConfig.py:112
 msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr ""
 
-#: config/SSSDConfig.py:113
+#: src/config/SSSDConfig.py:113
 msgid "The default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:114
+#: src/config/SSSDConfig.py:114
 msgid "The type of the authentication token of the default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:115
+#: src/config/SSSDConfig.py:115
 msgid "The authentication token of the default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:116
+#: src/config/SSSDConfig.py:116
 msgid "Length of time to attempt connection"
 msgstr ""
 
-#: config/SSSDConfig.py:117
+#: src/config/SSSDConfig.py:117
 msgid "Length of time to attempt synchronous LDAP operations"
 msgstr ""
 
-#: config/SSSDConfig.py:118
+#: src/config/SSSDConfig.py:118
 msgid "Length of time between attempts to reconnect while offline"
 msgstr ""
 
-#: config/SSSDConfig.py:119
+#: src/config/SSSDConfig.py:119
 #, fuzzy
 msgid "File that contains CA certificates"
 msgstr "含有 CA 憑證的檔案"
 
-#: config/SSSDConfig.py:120
+#: src/config/SSSDConfig.py:120
 msgid "Path to CA certificate directory"
 msgstr ""
 
-#: config/SSSDConfig.py:121
+#: src/config/SSSDConfig.py:121
 msgid "Require TLS certificate verification"
 msgstr "需要 TLS 憑證驗證"
 
-#: config/SSSDConfig.py:122
+#: src/config/SSSDConfig.py:122
 msgid "Specify the sasl mechanism to use"
 msgstr "指定要使用的 sasl 機制"
 
-#: config/SSSDConfig.py:123
+#: src/config/SSSDConfig.py:123
 msgid "Specify the sasl authorization id to use"
 msgstr "指定要使用的 sasl 認證 id"
 
-#: config/SSSDConfig.py:126
+#: src/config/SSSDConfig.py:126
 msgid "Kerberos service keytab"
 msgstr ""
 
-#: config/SSSDConfig.py:127
+#: src/config/SSSDConfig.py:127
 msgid "Use Kerberos auth for LDAP connection"
 msgstr ""
 
-#: config/SSSDConfig.py:128
+#: src/config/SSSDConfig.py:128
 msgid "Follow LDAP referrals"
 msgstr ""
 
-#: config/SSSDConfig.py:129
+#: src/config/SSSDConfig.py:129
 msgid "Lifetime of TGT for LDAP connection"
 msgstr ""
 
-#: config/SSSDConfig.py:132
+#: src/config/SSSDConfig.py:132
 msgid "Length of time to wait for a search request"
 msgstr "搜尋請求的等候時間長度"
 
-#: config/SSSDConfig.py:133
+#: src/config/SSSDConfig.py:133
 #, fuzzy
 msgid "Length of time between enumeration updates"
 msgstr "在列舉更新之間的長度"
 
-#: config/SSSDConfig.py:134
+#: src/config/SSSDConfig.py:134
 msgid "Require TLS for ID lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:135
+#: src/config/SSSDConfig.py:135
 msgid "Base DN for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:136
+#: src/config/SSSDConfig.py:136
 msgid "Scope of user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:137
+#: src/config/SSSDConfig.py:137
 msgid "Filter for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:138
+#: src/config/SSSDConfig.py:138
 msgid "Objectclass for users"
 msgstr ""
 
-#: config/SSSDConfig.py:139
+#: src/config/SSSDConfig.py:139
 msgid "Username attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:140
+#: src/config/SSSDConfig.py:140
 #, fuzzy
 msgid "UID attribute"
 msgstr "UID 屬性"
 
-#: config/SSSDConfig.py:141
+#: src/config/SSSDConfig.py:141
 #, fuzzy
 msgid "Primary GID attribute"
 msgstr "主要 GID 屬性"
 
-#: config/SSSDConfig.py:142
+#: src/config/SSSDConfig.py:142
 #, fuzzy
 msgid "GECOS attribute"
 msgstr "GEOS 屬性"
 
-#: config/SSSDConfig.py:143
+#: src/config/SSSDConfig.py:143
 #, fuzzy
 msgid "Home directory attribute"
 msgstr "家目錄屬性"
 
-#: config/SSSDConfig.py:144
+#: src/config/SSSDConfig.py:144
 #, fuzzy
 msgid "Shell attribute"
 msgstr "Shell 屬性"
 
-#: config/SSSDConfig.py:145
+#: src/config/SSSDConfig.py:145
 #, fuzzy
 msgid "UUID attribute"
 msgstr "UUID 屬性"
 
-#: config/SSSDConfig.py:146
+#: src/config/SSSDConfig.py:146
 #, fuzzy
 msgid "User principal attribute (for Kerberos)"
 msgstr "使用者原則屬性（供 Kerberos 使用）"
 
-#: config/SSSDConfig.py:147
+#: src/config/SSSDConfig.py:147
 msgid "Full Name"
 msgstr "全名"
 
-#: config/SSSDConfig.py:148
+#: src/config/SSSDConfig.py:148
 msgid "memberOf attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:149
+#: src/config/SSSDConfig.py:149
 #, fuzzy
 msgid "Modification time attribute"
 msgstr "修改時間屬性"
 
-#: config/SSSDConfig.py:152
+#: src/config/SSSDConfig.py:152
 msgid "Policy to evaluate the password expiration"
 msgstr "評估密碼過期時效的策略"
 
-#: config/SSSDConfig.py:155
+#: src/config/SSSDConfig.py:155
 msgid "LDAP filter to determine access privileges"
 msgstr ""
 
-#: config/SSSDConfig.py:158
+#: src/config/SSSDConfig.py:158
 msgid "Comma separated list of allowed users"
 msgstr "許可的使用者清單，請使用半形逗號作為分隔"
 
-#: config/SSSDConfig.py:159
+#: src/config/SSSDConfig.py:159
 msgid "Comma separated list of prohibited users"
 msgstr "被禁止的使用者清單，請使用半形逗號作為分隔"
 
-#: config/SSSDConfig.py:162
+#: src/config/SSSDConfig.py:162
 msgid "Default shell, /bin/bash"
 msgstr "預設 shell，/bin/bash"
 
-#: config/SSSDConfig.py:163
+#: src/config/SSSDConfig.py:163
 #, fuzzy
 msgid "Base for home directories"
 msgstr "家目錄的基礎"
 
-#: config/SSSDConfig.py:166
+#: src/config/SSSDConfig.py:166
 msgid "The name of the NSS library to use"
 msgstr "要使用的 NSS 函式庫名稱"
 
-#: config/SSSDConfig.py:169
+#: src/config/SSSDConfig.py:169
 msgid "PAM stack to use"
 msgstr "要使用的 PAM 堆疊"
 
-#: monitor/monitor.c:2137
+#: src/monitor/monitor.c:2140
 msgid "Become a daemon (default)"
 msgstr "作為幕後程式 (預設)"
 
-#: monitor/monitor.c:2139
+#: src/monitor/monitor.c:2142
 msgid "Run interactive (not a daemon)"
 msgstr "以互動方式執行 (非幕後程式)"
 
-#: monitor/monitor.c:2141
+#: src/monitor/monitor.c:2144
 msgid "Specify a non-default config file"
 msgstr "指定非預設的配置檔"
 
-#: monitor/monitor.c:2167
+#: src/monitor/monitor.c:2170
 msgid "sssd must be run as root\n"
 msgstr "sssd 必須以 root 身分執行\n"
 
-#: monitor/monitor.c:2202
+#: src/monitor/monitor.c:2205
 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:2212
+#: src/monitor/monitor.c:2215
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
@@ -452,353 +452,371 @@ msgid ""
 msgstr ""
 "無法讀取配置檔 %s，請確認權限是否為 0600 並且檔案是由 root.root 所擁有\n"
 
-#: monitor/monitor.c:2217
+#: src/monitor/monitor.c:2220
 msgid "Cannot load configuration database\n"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:993 providers/ldap/ldap_child.c:361
-#: util/util.h:61
+#: src/providers/krb5/krb5_child.c:1043 src/providers/ldap/ldap_child.c:359
+#: src/util/util.h:63
 msgid "Debug level"
 msgstr "除錯層級"
 
-#: providers/krb5/krb5_child.c:995 providers/ldap/ldap_child.c:363
-#: util/util.h:65
+#: src/providers/krb5/krb5_child.c:1045 src/providers/ldap/ldap_child.c:361
+#: src/util/util.h:67
 msgid "Add debug timestamps"
 msgstr "加入除錯時間戳記"
 
-#: providers/krb5/krb5_child.c:997 providers/ldap/ldap_child.c:365
+#: src/providers/krb5/krb5_child.c:1047 src/providers/ldap/ldap_child.c:363
 #, fuzzy
 msgid "An open file descriptor for the debug logs"
 msgstr "供除錯日誌使用的開啟檔案描述符"
 
-#: providers/data_provider_be.c:1165
+#: src/providers/data_provider_be.c:1165
 #, fuzzy
 msgid "Domain of the information provider (mandatory)"
 msgstr "資訊提供者的網域（委任）"
 
-#: sss_client/common.c:742
+#: src/sss_client/common.c:742
 msgid "Privileged socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:745
+#: src/sss_client/common.c:745
 msgid "Public socket has wrong ownership or permissions."
 msgstr ""
 
-#: sss_client/common.c:748
+#: src/sss_client/common.c:748
 #, fuzzy
 msgid "Unexpected format of the server credential message."
 msgstr "使用者憑證快取的位置"
 
-#: sss_client/common.c:751
+#: src/sss_client/common.c:751
 msgid "SSSD is not run by root."
 msgstr ""
 
-#: sss_client/common.c:756
+#: src/sss_client/common.c:756
 msgid "An error occurred, but no description can be found."
 msgstr ""
 
-#: sss_client/common.c:762
+#: src/sss_client/common.c:762
 msgid "Unexpected error while looking for an error description"
 msgstr ""
 
-#: sss_client/pam_sss.c:372
+#: src/sss_client/pam_sss.c:372
 msgid "Passwords do not match"
 msgstr "密碼不相符"
 
-#: sss_client/pam_sss.c:556
+#: src/sss_client/pam_sss.c:556
 msgid "Password reset by root is not supported."
 msgstr ""
 
-#: sss_client/pam_sss.c:597
+#: src/sss_client/pam_sss.c:597
 msgid "Authenticated with cached credentials"
 msgstr ""
 
-#: sss_client/pam_sss.c:598
+#: src/sss_client/pam_sss.c:598
 msgid ", your cached password will expire at: "
 msgstr "，您快取的密碼將在此刻過期："
 
-#: sss_client/pam_sss.c:628
+#: src/sss_client/pam_sss.c:628
 #, c-format
 msgid "Your password has expired. You have %d grace login(s) remaining."
 msgstr ""
 
-#: sss_client/pam_sss.c:674
+#: src/sss_client/pam_sss.c:674
 #, fuzzy, c-format
 msgid "Your password will expire in %d %s."
 msgstr "，您快取的密碼將在此刻過期："
 
-#: sss_client/pam_sss.c:723
+#: src/sss_client/pam_sss.c:723
 #, fuzzy
 msgid "Authentication is denied until: "
 msgstr "離線認證，認證被定義到："
 
-#: sss_client/pam_sss.c:750
+#: src/sss_client/pam_sss.c:750
 msgid "System is offline, password change not possible"
 msgstr "系統已離線，不可能作密碼變更"
 
-#: sss_client/pam_sss.c:780 sss_client/pam_sss.c:793
+#: src/sss_client/pam_sss.c:780 src/sss_client/pam_sss.c:793
 msgid "Password change failed. "
 msgstr "密碼變更失敗。"
 
-#: sss_client/pam_sss.c:783 sss_client/pam_sss.c:794
+#: src/sss_client/pam_sss.c:783 src/sss_client/pam_sss.c:794
 msgid "Server message: "
 msgstr "伺服器訊息："
 
-#: sss_client/pam_sss.c:1197
+#: src/sss_client/pam_sss.c:1197
 msgid "New Password: "
 msgstr "新密碼："
 
-#: sss_client/pam_sss.c:1198
+#: src/sss_client/pam_sss.c:1198
 msgid "Reenter new Password: "
 msgstr "再次輸入新密碼："
 
-#: sss_client/pam_sss.c:1280
+#: src/sss_client/pam_sss.c:1280
 msgid "Password: "
 msgstr "密碼："
 
-#: sss_client/pam_sss.c:1312
+#: src/sss_client/pam_sss.c:1312
 msgid "Current Password: "
 msgstr "目前的密碼："
 
-#: sss_client/pam_sss.c:1458
+#: src/sss_client/pam_sss.c:1458
 msgid "Password expired. Change your password now."
 msgstr "密碼已過期。請立刻變更您的密碼。"
 
-#: tools/sss_useradd.c:48 tools/sss_groupadd.c:41 tools/sss_groupdel.c:43
-#: tools/sss_groupmod.c:42 tools/sss_groupshow.c:620 tools/sss_userdel.c:131
-#: tools/sss_usermod.c:47
+#: src/tools/sss_useradd.c:48 src/tools/sss_groupadd.c:41
+#: src/tools/sss_groupdel.c:43 src/tools/sss_groupmod.c:42
+#: src/tools/sss_groupshow.c:620 src/tools/sss_userdel.c:131
+#: src/tools/sss_usermod.c:47
 #, fuzzy
 msgid "The debug level to run with"
 msgstr "要依那種除錯層級執行"
 
-#: tools/sss_useradd.c:49 tools/sss_usermod.c:48
+#: src/tools/sss_useradd.c:49 src/tools/sss_usermod.c:48
 msgid "The UID of the user"
 msgstr "使用者的 UID"
 
-#: tools/sss_useradd.c:50 tools/sss_usermod.c:50
+#: src/tools/sss_useradd.c:50 src/tools/sss_usermod.c:50
 msgid "The comment string"
 msgstr "註解字串"
 
-#: tools/sss_useradd.c:51 tools/sss_usermod.c:51
+#: src/tools/sss_useradd.c:51 src/tools/sss_usermod.c:51
 msgid "Home directory"
 msgstr "家目錄"
 
-#: tools/sss_useradd.c:52 tools/sss_usermod.c:52
+#: src/tools/sss_useradd.c:52 src/tools/sss_usermod.c:52
 msgid "Login shell"
 msgstr "登入用 shell"
 
-#: tools/sss_useradd.c:53
+#: src/tools/sss_useradd.c:53
 msgid "Groups"
 msgstr "群組"
 
-#: tools/sss_useradd.c:54
+#: src/tools/sss_useradd.c:54
 msgid "Create user's directory if it does not exist"
 msgstr "如果使用者的目錄不存在便將它建立"
 
-#: tools/sss_useradd.c:55
+#: src/tools/sss_useradd.c:55
 msgid "Never create user's directory, overrides config"
 msgstr "永遠不建立使用者的目錄，凌駕配置"
 
-#: tools/sss_useradd.c:56
+#: src/tools/sss_useradd.c:56
 msgid "Specify an alternative skeleton directory"
 msgstr "指定替代的骨幹目錄"
 
-#: tools/sss_useradd.c:57 tools/sss_usermod.c:57
+#: src/tools/sss_useradd.c:57 src/tools/sss_usermod.c:57
 msgid "The SELinux user for user's login"
 msgstr ""
 
-#: tools/sss_useradd.c:71 tools/sss_groupadd.c:56 tools/sss_groupdel.c:52
-#: tools/sss_groupmod.c:63 tools/sss_groupshow.c:631 tools/sss_userdel.c:148
-#: tools/sss_usermod.c:72
+#: src/tools/sss_useradd.c:71 src/tools/sss_groupadd.c:56
+#: src/tools/sss_groupdel.c:52 src/tools/sss_groupmod.c:63
+#: src/tools/sss_groupshow.c:631 src/tools/sss_userdel.c:148
+#: src/tools/sss_usermod.c:72
 msgid "Error setting the locale\n"
 msgstr "設定區域設置時發生錯誤\n"
 
-#: tools/sss_useradd.c:107
+#: src/tools/sss_useradd.c:84 src/tools/sss_groupmod.c:76
+#: src/tools/sss_usermod.c:85
+#, fuzzy
+msgid "Specify group to add to\n"
+msgstr "指定要加入的群組\n"
+
+#: src/tools/sss_useradd.c:108
 msgid "Specify user to add\n"
 msgstr "指定要加入的使用者\n"
 
-#: tools/sss_useradd.c:118 tools/sss_groupadd.c:86 tools/sss_groupdel.c:81
-#: tools/sss_groupmod.c:111 tools/sss_groupshow.c:668 tools/sss_userdel.c:197
-#: tools/sss_usermod.c:128
+#: src/tools/sss_useradd.c:117 src/tools/sss_groupadd.c:82
+#: src/tools/sss_groupdel.c:77 src/tools/sss_groupmod.c:109
+#: src/tools/sss_groupshow.c:664 src/tools/sss_userdel.c:193
+#: src/tools/sss_usermod.c:126
 msgid "Error initializing the tools - no local domain\n"
 msgstr "初始化工具時發生錯誤 - 沒有本機網域\n"
 
-#: tools/sss_useradd.c:120 tools/sss_groupadd.c:88 tools/sss_groupdel.c:83
-#: tools/sss_groupmod.c:113 tools/sss_groupshow.c:670 tools/sss_userdel.c:199
-#: tools/sss_usermod.c:130
+#: src/tools/sss_useradd.c:119 src/tools/sss_groupadd.c:84
+#: src/tools/sss_groupdel.c:79 src/tools/sss_groupmod.c:111
+#: src/tools/sss_groupshow.c:666 src/tools/sss_userdel.c:195
+#: src/tools/sss_usermod.c:128
 msgid "Error initializing the tools\n"
 msgstr "初始化工具時發生錯誤\n"
 
-#: tools/sss_useradd.c:129 tools/sss_groupadd.c:97 tools/sss_groupdel.c:92
-#: tools/sss_groupmod.c:121 tools/sss_groupshow.c:679 tools/sss_userdel.c:208
-#: tools/sss_usermod.c:139
+#: src/tools/sss_useradd.c:128 src/tools/sss_groupadd.c:93
+#: src/tools/sss_groupdel.c:88 src/tools/sss_groupmod.c:119
+#: src/tools/sss_groupshow.c:675 src/tools/sss_userdel.c:204
+#: src/tools/sss_usermod.c:137
 msgid "Invalid domain specified in FQDN\n"
 msgstr "在 FQDN 內指定了無效的網域\n"
 
-#: tools/sss_useradd.c:138 tools/sss_groupmod.c:143 tools/sss_groupmod.c:170
-#: tools/sss_usermod.c:164 tools/sss_usermod.c:191
+#: src/tools/sss_useradd.c:137 src/tools/sss_groupmod.c:141
+#: src/tools/sss_groupmod.c:168 src/tools/sss_usermod.c:162
+#: src/tools/sss_usermod.c:189
 msgid "Internal error while parsing parameters\n"
 msgstr "當解析參數時發生內部錯誤\n"
 
-#: tools/sss_useradd.c:146 tools/sss_usermod.c:172 tools/sss_usermod.c:199
+#: src/tools/sss_useradd.c:145 src/tools/sss_usermod.c:170
+#: src/tools/sss_usermod.c:197
 msgid "Groups must be in the same domain as user\n"
 msgstr "群組必須位於與使用者相同的網域內\n"
 
-#: tools/sss_useradd.c:154
+#: src/tools/sss_useradd.c:153
 #, c-format
 msgid "Cannot find group %s in local domain\n"
 msgstr "在本機網域內找不到 %s 群組\n"
 
-#: tools/sss_useradd.c:169 tools/sss_userdel.c:218
+#: src/tools/sss_useradd.c:168 src/tools/sss_userdel.c:214
 msgid "Cannot set default values\n"
 msgstr "無法設定預設值\n"
 
-#: tools/sss_useradd.c:176 tools/sss_usermod.c:155
+#: src/tools/sss_useradd.c:175 src/tools/sss_usermod.c:153
 msgid "The selected UID is outside the allowed range\n"
 msgstr "所選的 UID 位於許可的範圍外\n"
 
-#: tools/sss_useradd.c:203 tools/sss_usermod.c:240
+#: src/tools/sss_useradd.c:202 src/tools/sss_usermod.c:238
 msgid "Cannot set SELinux login context\n"
 msgstr ""
 
-#: tools/sss_useradd.c:219
+#: src/tools/sss_useradd.c:218
 msgid "Cannot get info about the user\n"
 msgstr "無法取得關於這位使用者的資訊\n"
 
-#: tools/sss_useradd.c:233
+#: src/tools/sss_useradd.c:232
 msgid "User's home directory already exists, not copying data from skeldir\n"
 msgstr "使用者的家目錄已經存在，不會從骨幹目錄複製資料\n"
 
-#: tools/sss_useradd.c:236
+#: src/tools/sss_useradd.c:235
 #, c-format
 msgid "Cannot create user's home directory: %s\n"
 msgstr "無法建立使用者的家目錄：%s\n"
 
-#: tools/sss_useradd.c:247
+#: src/tools/sss_useradd.c:246
 #, c-format
 msgid "Cannot create user's mail spool: %s\n"
 msgstr "無法建立使用者的郵件 spool：%s\n"
 
-#: tools/sss_useradd.c:259
+#: src/tools/sss_useradd.c:258
 msgid "Could not allocate ID for the user - domain full?\n"
 msgstr "無法為使用者分配 ID - 網域已滿？\n"
 
-#: tools/sss_useradd.c:263
+#: src/tools/sss_useradd.c:262
 msgid "A user or group with the same name or ID already exists\n"
 msgstr "已經存在相同名稱的使用者或群組\n"
 
-#: tools/sss_useradd.c:269
+#: src/tools/sss_useradd.c:268
 msgid "Transaction error. Could not add user.\n"
 msgstr "處理事項發生錯誤。無法加入使用者。\n"
 
-#: tools/sss_groupadd.c:43 tools/sss_groupmod.c:48
+#: src/tools/sss_groupadd.c:43 src/tools/sss_groupmod.c:48
 msgid "The GID of the group"
 msgstr "群組的 GID"
 
-#: tools/sss_groupadd.c:75
+#: src/tools/sss_groupadd.c:73
 msgid "Specify group to add\n"
 msgstr "指定要加入的群組\n"
 
-#: tools/sss_groupadd.c:106 tools/sss_groupmod.c:194
+#: src/tools/sss_groupadd.c:102 src/tools/sss_groupmod.c:192
 msgid "The selected GID is outside the allowed range\n"
 msgstr "所選的 GID 位於許可的範圍外\n"
 
-#: tools/sss_groupadd.c:131
+#: src/tools/sss_groupadd.c:127
 msgid "Could not allocate ID for the group - domain full?\n"
 msgstr "無法為群組分配 ID - 網域已滿？\n"
 
-#: tools/sss_groupadd.c:135
+#: src/tools/sss_groupadd.c:131
 msgid "A group with the same name or GID already exists\n"
 msgstr "已經存在相同名稱的群組或 GID\n"
 
-#: tools/sss_groupadd.c:140
+#: src/tools/sss_groupadd.c:136
 msgid "Transaction error. Could not add group.\n"
 msgstr "處理事項發生錯誤。無法加入群組。\n"
 
-#: tools/sss_groupdel.c:70
+#: src/tools/sss_groupdel.c:68
 msgid "Specify group to delete\n"
 msgstr "指定要刪除的群組\n"
 
-#: tools/sss_groupdel.c:107
+#: src/tools/sss_groupdel.c:103
 #, fuzzy, c-format
 msgid "Group %s is outside the defined ID range for domain\n"
 msgstr "群組 %s 位於為網域所定義的 ID 範圍外\n"
 
-#: tools/sss_groupdel.c:121
+#: src/tools/sss_groupdel.c:117
 msgid ""
 "No such group in local domain. Removing groups only allowed in local "
 "domain.\n"
 msgstr "在本機網域內沒有這樣的群組。只許可在本機網域內移除群組。\n"
 
-#: tools/sss_groupdel.c:126
+#: src/tools/sss_groupdel.c:122
 msgid "Internal error. Could not remove group.\n"
 msgstr "內部錯誤。無法移除群組。\n"
 
-#: tools/sss_groupmod.c:44
+#: src/tools/sss_groupmod.c:44
 #, fuzzy
 msgid "Groups to add this group to"
 msgstr "要加入此群組的群組"
 
-#: tools/sss_groupmod.c:46
+#: src/tools/sss_groupmod.c:46
 #, fuzzy
 msgid "Groups to remove this group from"
 msgstr "要從哪些群組移除此群組"
 
-#: tools/sss_groupmod.c:98
+#: src/tools/sss_groupmod.c:84 src/tools/sss_usermod.c:93
+#, fuzzy
+msgid "Specify group to remove from\n"
+msgstr "指定要修改的群組\n"
+
+#: src/tools/sss_groupmod.c:98
 msgid "Specify group to modify\n"
 msgstr "指定要修改的群組\n"
 
-#: tools/sss_groupmod.c:130
+#: src/tools/sss_groupmod.c:128
 msgid ""
 "Cannot find group in local domain, modifying groups is allowed only in local "
 "domain\n"
 msgstr "在本機網域內找不到群組，只許可在本機網域內修改群組\n"
 
-#: tools/sss_groupmod.c:151 tools/sss_groupmod.c:178
+#: src/tools/sss_groupmod.c:149 src/tools/sss_groupmod.c:176
 msgid "Member groups must be in the same domain as parent group\n"
 msgstr "成員群組必須位於與親代群組相同的網域內\n"
 
-#: tools/sss_groupmod.c:159 tools/sss_groupmod.c:186 tools/sss_usermod.c:180
-#: tools/sss_usermod.c:207
+#: src/tools/sss_groupmod.c:157 src/tools/sss_groupmod.c:184
+#: src/tools/sss_usermod.c:178 src/tools/sss_usermod.c:205
 #, c-format
 msgid ""
 "Cannot find group %s in local domain, only groups in local domain are "
 "allowed\n"
 msgstr "在本機網域內找不到 %s 群組，只許可本機網域內的群組\n"
 
-#: tools/sss_groupmod.c:220
+#: src/tools/sss_groupmod.c:218
 #, fuzzy
 msgid "Could not modify group - check if member group names are correct\n"
 msgstr "無法修改群組 - 請檢查成員群組名稱是否正確\n"
 
-#: tools/sss_groupmod.c:224
+#: src/tools/sss_groupmod.c:222
 msgid "Could not modify group - check if groupname is correct\n"
 msgstr "無法修改群組 - 請檢查群組名稱是否正確\n"
 
-#: tools/sss_groupmod.c:228
+#: src/tools/sss_groupmod.c:226
 msgid "Transaction error. Could not modify group.\n"
 msgstr "處理事項發生錯誤。無法修改群組。\n"
 
-#: tools/sss_groupshow.c:567
+#: src/tools/sss_groupshow.c:567
 #, c-format
 msgid "%s%sGroup: %s\n"
 msgstr "%s%s群組：%s\n"
 
-#: tools/sss_groupshow.c:568
+#: src/tools/sss_groupshow.c:568
 msgid "Magic Private "
 msgstr "魔法隱私"
 
-#: tools/sss_groupshow.c:570
+#: src/tools/sss_groupshow.c:570
 #, c-format
 msgid "%sGID number: %d\n"
 msgstr "%sGID 編號：%d\n"
 
-#: tools/sss_groupshow.c:572
+#: src/tools/sss_groupshow.c:572
 #, fuzzy, c-format
 msgid "%sMember users: "
 msgstr "%s成員使用者："
 
-#: tools/sss_groupshow.c:579
+#: src/tools/sss_groupshow.c:579
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -807,7 +825,7 @@ msgstr ""
 "\n"
 "%s是該群組的成員："
 
-#: tools/sss_groupshow.c:586
+#: src/tools/sss_groupshow.c:586
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -816,145 +834,145 @@ msgstr ""
 "\n"
 "%s成員群組： "
 
-#: tools/sss_groupshow.c:622
+#: src/tools/sss_groupshow.c:622
 msgid "Print indirect group members recursively"
 msgstr "遞迴地列出間接的群組成員"
 
-#: tools/sss_groupshow.c:657
+#: src/tools/sss_groupshow.c:655
 msgid "Specify group to show\n"
 msgstr "指定要顯示的群組\n"
 
-#: tools/sss_groupshow.c:698
+#: src/tools/sss_groupshow.c:694
 msgid ""
 "No such group in local domain. Printing groups only allowed in local "
 "domain.\n"
 msgstr "本機網域內沒有這樣的群組。只許可在本機網域內列出群組。\n"
 
-#: tools/sss_groupshow.c:703
+#: src/tools/sss_groupshow.c:699
 msgid "Internal error. Could not print group.\n"
 msgstr "內部錯誤。無法列出群組。\n"
 
-#: tools/sss_userdel.c:133
+#: src/tools/sss_userdel.c:133
 #, fuzzy
 msgid "Remove home directory and mail spool"
 msgstr "移除家目錄與郵件 spool"
 
-#: tools/sss_userdel.c:135
+#: src/tools/sss_userdel.c:135
 #, fuzzy
 msgid "Do not remove home directory and mail spool"
 msgstr "不要移除家目錄與郵件 spool"
 
-#: tools/sss_userdel.c:137
+#: src/tools/sss_userdel.c:137
 msgid "Force removal of files not owned by the user"
 msgstr "強制檔案的移除並非由使用者所擁有"
 
-#: tools/sss_userdel.c:139
+#: src/tools/sss_userdel.c:139
 msgid "Kill users' processes before removing him"
 msgstr ""
 
-#: tools/sss_userdel.c:186
+#: src/tools/sss_userdel.c:184
 msgid "Specify user to delete\n"
 msgstr "指定要刪除的使用者\n"
 
-#: tools/sss_userdel.c:235
+#: src/tools/sss_userdel.c:231
 #, c-format
 msgid "User %s is outside the defined ID range for domain\n"
 msgstr "使用者 %s 位於為網域所定義的 ID 範圍外\n"
 
-#: tools/sss_userdel.c:260
+#: src/tools/sss_userdel.c:256
 msgid "Cannot reset SELinux login context\n"
 msgstr ""
 
-#: tools/sss_userdel.c:272
+#: src/tools/sss_userdel.c:268
 #, c-format
 msgid "WARNING: The user (uid %lu) was still logged in when deleted.\n"
 msgstr ""
 
-#: tools/sss_userdel.c:277
+#: src/tools/sss_userdel.c:273
 msgid "Cannot determine if the user was logged in on this platform"
 msgstr ""
 
-#: tools/sss_userdel.c:282
+#: src/tools/sss_userdel.c:278
 msgid "Error while checking if the user was logged in\n"
 msgstr ""
 
-#: tools/sss_userdel.c:289
+#: src/tools/sss_userdel.c:285
 #, c-format
 msgid "The post-delete command failed: %s\n"
 msgstr ""
 
-#: tools/sss_userdel.c:301
+#: src/tools/sss_userdel.c:297
 msgid "Not removing home dir - not owned by user\n"
 msgstr "不會移除家目錄 - 並非由使用者所擁有\n"
 
-#: tools/sss_userdel.c:303
+#: src/tools/sss_userdel.c:299
 #, c-format
 msgid "Cannot remove homedir: %s\n"
 msgstr "無法移除家目錄：%s\n"
 
-#: tools/sss_userdel.c:314
+#: src/tools/sss_userdel.c:310
 msgid ""
 "No such user in local domain. Removing users only allowed in local domain.\n"
 msgstr "在本機網域內沒有這樣的使用者。只許可在本機網域內移除使用者。\n"
 
-#: tools/sss_userdel.c:319
+#: src/tools/sss_userdel.c:315
 msgid "Internal error. Could not remove user.\n"
 msgstr "內部錯誤。無法移除使用者。\n"
 
-#: tools/sss_usermod.c:49
+#: src/tools/sss_usermod.c:49
 msgid "The GID of the user"
 msgstr "使用者的 GID"
 
-#: tools/sss_usermod.c:53
+#: src/tools/sss_usermod.c:53
 #, fuzzy
 msgid "Groups to add this user to"
 msgstr "將此使用者加入何群組"
 
-#: tools/sss_usermod.c:54
+#: src/tools/sss_usermod.c:54
 #, fuzzy
 msgid "Groups to remove this user from"
 msgstr "將此使用者從何群組移除"
 
-#: tools/sss_usermod.c:55
+#: src/tools/sss_usermod.c:55
 msgid "Lock the account"
 msgstr "鎖住這個帳號"
 
-#: tools/sss_usermod.c:56
+#: src/tools/sss_usermod.c:56
 msgid "Unlock the account"
 msgstr "解除這個帳號的鎖"
 
-#: tools/sss_usermod.c:117
+#: src/tools/sss_usermod.c:117
 msgid "Specify user to modify\n"
 msgstr "指定要修改的使用者\n"
 
-#: tools/sss_usermod.c:148
+#: src/tools/sss_usermod.c:146
 msgid ""
 "Cannot find user in local domain, modifying users is allowed only in local "
 "domain\n"
 msgstr "在本機網域內找不到使用者，只許可在本機網域內修改使用者\n"
 
-#: tools/sss_usermod.c:250
+#: src/tools/sss_usermod.c:248
 msgid "Could not modify user - check if group names are correct\n"
 msgstr "無法修改使用者 - 請檢查群組名稱是否正確\n"
 
-#: tools/sss_usermod.c:254
+#: src/tools/sss_usermod.c:252
 msgid "Could not modify user - user already member of groups?\n"
 msgstr "無法修改使用者 - 使用者是否已經是群組的成員？\n"
 
-#: tools/sss_usermod.c:258
+#: src/tools/sss_usermod.c:256
 msgid "Transaction error. Could not modify user.\n"
 msgstr "處理事項發生錯誤。無法修改使用者。\n"
 
-#: tools/tools_util.c:285
+#: src/tools/tools_util.c:290
 msgid "Out of memory\n"
 msgstr "記憶體耗盡\n"
 
-#: tools/tools_util.h:34
+#: src/tools/tools_util.h:40
 #, c-format
 msgid "%s must be run as root\n"
 msgstr "%s 必須以 root 身分執行\n"
 
-#: util/util.h:63
+#: src/util/util.h:65
 msgid "Send the debug output to files instead of stderr"
 msgstr "傳送除錯輸出到檔案而不是標準輸出"