release: merge back stable branch into default

.hgtags

@@ -46,3 +46,4
 7dc62c090881fb5d03268141e71e0940d7c3295d v4.13.3
 9151328c1c46b72ba6f00d7640d9141e75aa1ca2 v4.14.0
 a47eeac5dfa41fa6779d90452affba4091c3ade8 v4.14.1
+4b34ce0d2c3c10510626b3b65044939bb7a2cddf v4.15.0

docs/release-notes/release-notes-4.15.0.rst

@@ -78,4 +78,5
 Upgrade notes
 ^^^^^^^^^^^^^
 
-- LDAP cert dirs
  No newline at end of file
+- In this release we introduced new options for cert directory and file for LDAP plugins.
+  In case of problems with LDAPS please verify the settings in the LDAP plugin configuration.

rhodecode/i18n/rhodecode.pot

@@ -6,9 +6,9
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rhodecode-enterprise-ce 4.14.0\n"
+"Project-Id-Version: rhodecode-enterprise-ce 4.15.0\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2018-11-03 10:41+0100\n"
+"POT-Creation-Date: 2018-12-10 18:11+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,98 +17,6
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: rhodecode/apps/admin/navigation.py:72 rhodecode/authentication/routes.py:60
-#: rhodecode/integrations/views.py:154
-#: rhodecode/templates/admin/permissions/permissions.mako:36
-msgid "Global"
-msgstr ""
-
-#: rhodecode/apps/admin/navigation.py:74
-#: rhodecode/templates/admin/repos/repo_edit.mako:58
-msgid "VCS"
-msgstr ""
-
-#: rhodecode/apps/admin/navigation.py:76
-msgid "Visual"
-msgstr ""
-
-#: rhodecode/apps/admin/navigation.py:78
-msgid "Remap and Rescan"
-msgstr ""
-
-#: rhodecode/apps/admin/navigation.py:80
-#: rhodecode/templates/admin/repos/repo_edit.mako:64
-msgid "Issue Tracker"
-msgstr ""
-
-#: rhodecode/apps/admin/navigation.py:82
-#: rhodecode/integrations/types/email.py:174
-#: rhodecode/templates/register.mako:91
-#: rhodecode/templates/admin/my_account/my_account_profile.mako:48
-#: rhodecode/templates/admin/users/user_add.mako:86
-#: rhodecode/templates/admin/users/user_edit_profile.mako:65
-#: rhodecode/templates/admin/users/users.mako:73
-#: rhodecode/templates/email_templates/user_registration.mako:25
-#: rhodecode/templates/users/user_profile.mako:51
-msgid "Email"
-msgstr ""
-
-#: rhodecode/apps/admin/navigation.py:84
-msgid "Hooks"
-msgstr ""
-
-#: rhodecode/apps/admin/navigation.py:86
-msgid "Full Text Search"
-msgstr ""
-
-#: rhodecode/apps/admin/navigation.py:88
-#: rhodecode/templates/admin/integrations/base.mako:23
-#: rhodecode/templates/admin/integrations/form.mako:8
-#: rhodecode/templates/admin/integrations/form.mako:21
-#: rhodecode/templates/admin/integrations/form.mako:32
-#: rhodecode/templates/admin/integrations/list.mako:21
-#: rhodecode/templates/admin/integrations/list.mako:25
-#: rhodecode/templates/admin/integrations/list.mako:29
-#: rhodecode/templates/admin/integrations/list.mako:36
-#: rhodecode/templates/admin/integrations/new.mako:9
-#: rhodecode/templates/admin/integrations/new.mako:17
-#: rhodecode/templates/admin/integrations/new.mako:23
-#: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:51
-#: rhodecode/templates/admin/repos/repo_edit.mako:78
-#: rhodecode/templates/base/base.mako:84
-msgid "Integrations"
-msgstr ""
-
-#: rhodecode/apps/admin/navigation.py:90
-#: rhodecode/templates/admin/settings/settings_system.mako:9
-msgid "System Info"
-msgstr ""
-
-#: rhodecode/apps/admin/navigation.py:92
-msgid "Exceptions Tracker"
-msgstr ""
-
-#: rhodecode/apps/admin/navigation.py:95
-msgid "Processes"
-msgstr ""
-
-#: rhodecode/apps/admin/navigation.py:97
-msgid "User Sessions"
-msgstr ""
-
-#: rhodecode/apps/admin/navigation.py:99
-msgid "Open Source Licenses"
-msgstr ""
-
-#: rhodecode/apps/admin/navigation.py:101
-#: rhodecode/templates/admin/repos/repo_edit.mako:86
-msgid "Automation"
-msgstr ""
-
-#: rhodecode/apps/admin/navigation.py:105
-msgid "Labs"
-msgstr ""
-
 #: rhodecode/apps/admin/views/defaults.py:90
 msgid "Default settings updated successfully"
 msgstr ""
@@ -192,80 +100,80
 msgstr ""
 
 #: rhodecode/apps/admin/views/settings.py:162
-#: rhodecode/apps/admin/views/settings.py:318
-#: rhodecode/apps/admin/views/settings.py:393
-#: rhodecode/apps/admin/views/settings.py:725
+#: rhodecode/apps/admin/views/settings.py:317
+#: rhodecode/apps/admin/views/settings.py:392
+#: rhodecode/apps/admin/views/settings.py:724
 #: rhodecode/apps/repository/views/repo_settings_vcs.py:124
 msgid "Some form inputs contain invalid data."
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:190
-#: rhodecode/apps/admin/views/settings.py:354
+#: rhodecode/apps/admin/views/settings.py:189
+#: rhodecode/apps/admin/views/settings.py:353
 msgid "Error occurred during updating application settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:194
+#: rhodecode/apps/admin/views/settings.py:193
 #: rhodecode/apps/repository/views/repo_settings_vcs.py:143
 msgid "Updated VCS settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:268
+#: rhodecode/apps/admin/views/settings.py:267
 #, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:350
+#: rhodecode/apps/admin/views/settings.py:349
 msgid "Updated application settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:432
+#: rhodecode/apps/admin/views/settings.py:431
 msgid "Updated visualisation settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:435
+#: rhodecode/apps/admin/views/settings.py:434
 msgid "Error occurred during updating visualisation settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:497
+#: rhodecode/apps/admin/views/settings.py:496
 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:125
 msgid "Invalid issue tracker pattern: {}"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:514
+#: rhodecode/apps/admin/views/settings.py:513
 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:134
 msgid "Updated issue tracker entries"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:532
+#: rhodecode/apps/admin/views/settings.py:531
 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:89
 msgid "Removed issue tracker entry"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:569
+#: rhodecode/apps/admin/views/settings.py:568
 msgid "Please enter email address"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:587
+#: rhodecode/apps/admin/views/settings.py:586
 msgid "Send email task created"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:637
+#: rhodecode/apps/admin/views/settings.py:636
 msgid "Added new hook"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:652
+#: rhodecode/apps/admin/views/settings.py:651
 msgid "Updated hooks"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:656
+#: rhodecode/apps/admin/views/settings.py:655
 msgid "Error occurred during hook creation"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:749
+#: rhodecode/apps/admin/views/settings.py:748
 msgid "Error occurred during updating labs settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:754
+#: rhodecode/apps/admin/views/settings.py:753
 msgid "Updated Labs settings"
 msgstr ""
 
@@ -298,138 +206,142
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:99
-msgid "RhodeCode Server IP"
+msgid "RhodeCode Base URL"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:100
-msgid "RhodeCode Server ID"
+msgid "RhodeCode Server IP"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:101
-msgid "RhodeCode Configuration"
+msgid "RhodeCode Server ID"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:102
-msgid "RhodeCode Certificate"
+msgid "RhodeCode Configuration"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:103
-msgid "Workers"
+msgid "RhodeCode Certificate"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:104
+msgid "Workers"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:105
 msgid "Worker Type"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:108
-msgid "Database"
-msgstr ""
-
 #: rhodecode/apps/admin/views/system_info.py:109
+msgid "Database"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:110
 msgid "Database version"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:113
-msgid "Platform"
-msgstr ""
-
 #: rhodecode/apps/admin/views/system_info.py:114
-msgid "Platform UUID"
+msgid "Platform"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:115
-msgid "Lang"
+msgid "Platform UUID"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:116
-msgid "Python version"
+msgid "Lang"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:117
+msgid "Python version"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:118
 msgid "Python path"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:121
-msgid "CPU"
-msgstr ""
-
 #: rhodecode/apps/admin/views/system_info.py:122
-msgid "Load"
+msgid "CPU"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:123
-msgid "Memory"
+msgid "Load"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:124
+msgid "Memory"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:125
 msgid "Uptime"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:128
+#: rhodecode/apps/admin/views/system_info.py:129
 msgid "Ulimit"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:131
-msgid "Storage location"
-msgstr ""
-
 #: rhodecode/apps/admin/views/system_info.py:132
-msgid "Storage info"
+msgid "Storage location"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:133
+msgid "Storage info"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:134
 msgid "Storage inodes"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:135
-msgid "Gist storage location"
-msgstr ""
-
 #: rhodecode/apps/admin/views/system_info.py:136
+msgid "Gist storage location"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:137
 msgid "Gist storage info"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:138
-msgid "Archive cache storage location"
-msgstr ""
-
 #: rhodecode/apps/admin/views/system_info.py:139
+msgid "Archive cache storage location"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:140
 msgid "Archive cache info"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:141
-msgid "Temp storage location"
-msgstr ""
-
 #: rhodecode/apps/admin/views/system_info.py:142
+msgid "Temp storage location"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:143
 msgid "Temp storage info"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:144
-msgid "Search info"
-msgstr ""
-
 #: rhodecode/apps/admin/views/system_info.py:145
+msgid "Search info"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:146
 msgid "Search location"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:149
-msgid "VCS Backends"
-msgstr ""
-
 #: rhodecode/apps/admin/views/system_info.py:150
-msgid "VCS Server"
+msgid "VCS Backends"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:151
-msgid "GIT"
+msgid "VCS Server"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:152
-msgid "HG"
+msgid "GIT"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:153
+msgid "HG"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:154
 msgid "SVN"
 msgstr ""
 
@@ -650,7 +562,7
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:41413
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25
 #: rhodecode/public/js/src/rhodecode.js:508
 msgid "Lifetime"
 msgstr ""
@@ -722,27 +634,27
 msgid "journal"
 msgstr ""
 
-#: rhodecode/apps/login/views.py:293 rhodecode/apps/login/views.py:374
+#: rhodecode/apps/login/views.py:304 rhodecode/apps/login/views.py:400
 msgid "Bad captcha"
 msgstr ""
 
-#: rhodecode/apps/login/views.py:315
+#: rhodecode/apps/login/views.py:332
 msgid "You have successfully registered with RhodeCode"
 msgstr ""
 
-#: rhodecode/apps/login/views.py:352
+#: rhodecode/apps/login/views.py:369
 msgid "If such email exists, a password reset link was sent to it."
 msgstr ""
 
-#: rhodecode/apps/login/views.py:358
+#: rhodecode/apps/login/views.py:382
 msgid "Password reset has been disabled."
 msgstr ""
 
-#: rhodecode/apps/login/views.py:446
+#: rhodecode/apps/login/views.py:471
 msgid "Given reset token is invalid"
 msgstr ""
 
-#: rhodecode/apps/login/views.py:454
+#: rhodecode/apps/login/views.py:479
 msgid "Your password reset was successful, a new password has been sent to your email"
 msgstr ""
 
@@ -1257,6 +1169,12
 msgid "An error occurred during synchronization update"
 msgstr ""
 
+#: rhodecode/authentication/routes.py:61
+#: rhodecode/templates/admin/auth/auth_settings.mako:14
+#: rhodecode/templates/admin/auth/plugin_settings.mako:14
+msgid "Authentication Plugins"
+msgstr ""
+
 #: rhodecode/authentication/schema.py:36
 msgid "Enable or disable this authentication plugin."
 msgstr ""
@@ -1266,6 +1184,7
 #: rhodecode/model/permission.py:118 rhodecode/model/permission.py:122
 #: rhodecode/model/permission.py:126 rhodecode/model/permission.py:130
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:195
+#: rhodecode/templates/admin/auth/auth_settings.mako:67
 #: rhodecode/templates/admin/integrations/list.mako:71
 msgid "Enabled"
 msgstr ""
@@ -1309,7 +1228,7
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:69
-#: rhodecode/authentication/plugins/auth_ldap.py:89
+#: rhodecode/authentication/plugins/auth_ldap.py:254
 msgid "Port"
 msgstr ""
 
@@ -1337,7 +1256,7
 msgid "Admin Groups"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_crowd.py:216
+#: rhodecode/authentication/plugins/auth_crowd.py:217
 msgid "CROWD"
 msgstr ""
 
@@ -1377,50 +1296,50
 msgid "URL"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_jasig_cas.py:92
+#: rhodecode/authentication/plugins/auth_jasig_cas.py:93
 msgid "Jasig-CAS"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:77
+#: rhodecode/authentication/plugins/auth_ldap.py:242
 msgid ""
 "Host[s] of the LDAP Server \n"
 "(e.g., 192.168.2.154, or ldap-server.domain.com.\n"
 " Multiple servers can be specified using commas"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:81
+#: rhodecode/authentication/plugins/auth_ldap.py:246
 msgid "LDAP Host"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:86
-msgid "Custom port that the LDAP server is listening on. Default value is: 389"
-msgstr ""
-
-#: rhodecode/authentication/plugins/auth_ldap.py:96
+#: rhodecode/authentication/plugins/auth_ldap.py:251
+msgid "Custom port that the LDAP server is listening on. Default value is: 389, use 689 for LDAPS(SSL)"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:261
 msgid "Timeout for LDAP connection"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:98
+#: rhodecode/authentication/plugins/auth_ldap.py:263
 msgid "Connection timeout"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:105
+#: rhodecode/authentication/plugins/auth_ldap.py:270
 msgid ""
 "Optional user DN/account to connect to LDAP if authentication is required. \n"
 "e.g., cn=admin,dc=mydomain,dc=com, or uid=root,cn=users,dc=mydomain,dc=com, or [e-mail]"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:110
+#: rhodecode/authentication/plugins/auth_ldap.py:275
 msgid "Account"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:115
+#: rhodecode/authentication/plugins/auth_ldap.py:280
 msgid "Password to authenticate for given user DN."
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:118
+#: rhodecode/authentication/plugins/auth_ldap.py:283
 #: rhodecode/integrations/types/webhook.py:89 rhodecode/templates/login.mako:50
-#: rhodecode/templates/register.mako:58
+#: rhodecode/templates/register.mako:60
 #: rhodecode/templates/admin/my_account/my_account.mako:30
 #: rhodecode/templates/admin/users/user_add.mako:44
 #: rhodecode/templates/base/base.mako:331
@@ -1428,93 +1347,111
 msgid "Password"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:123
+#: rhodecode/authentication/plugins/auth_ldap.py:288
 msgid "TLS Type"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:124
+#: rhodecode/authentication/plugins/auth_ldap.py:289
 msgid "Connection Security"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:130
+#: rhodecode/authentication/plugins/auth_ldap.py:295
 msgid ""
 "Require Cert over TLS?. Self-signed and custom certificates can be used when\n"
 " `RhodeCode Certificate` found in admin > settings > system info page is extended."
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:133
+#: rhodecode/authentication/plugins/auth_ldap.py:298
 msgid "Certificate Checks"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:139
+#: rhodecode/authentication/plugins/auth_ldap.py:304
+msgid ""
+"This specifies the PEM-format file path containing certificates for use in TLS connection.\n"
+"If not specified `TLS Cert dir` will be used"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:307
+msgid "TLS Cert file"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:313
+msgid "This specifies the path of a directory that contains individual CA certificates in separate files."
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:315
+msgid "TLS Cert dir"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:320
 msgid ""
 "Base DN to search. Dynamic bind is supported. Add `$login` marker in it to be replaced with current user credentials \n"
 "(e.g., dc=mydomain,dc=com, or ou=Users,dc=mydomain,dc=com)"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:144
+#: rhodecode/authentication/plugins/auth_ldap.py:325
 msgid "Base DN"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:149
+#: rhodecode/authentication/plugins/auth_ldap.py:330
 msgid ""
 "Filter to narrow results \n"
 "(e.g., (&(objectCategory=Person)(objectClass=user)), or \n"
 "(memberof=cn=rc-login,ou=groups,ou=company,dc=mydomain,dc=com)))"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:154
+#: rhodecode/authentication/plugins/auth_ldap.py:335
 msgid "LDAP Search Filter"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:160
+#: rhodecode/authentication/plugins/auth_ldap.py:341
 msgid "How deep to search LDAP. If unsure set to SUBTREE"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:161
+#: rhodecode/authentication/plugins/auth_ldap.py:342
 msgid "LDAP Search Scope"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:167
+#: rhodecode/authentication/plugins/auth_ldap.py:348
 msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:169
+#: rhodecode/authentication/plugins/auth_ldap.py:350
 msgid "Login Attribute"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:170
+#: rhodecode/authentication/plugins/auth_ldap.py:351
 msgid "The LDAP Login attribute of the CN must be specified"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:175
-msgid "LDAP Attribute to map to first name (e.g., givenName)"
-msgstr ""
-
-#: rhodecode/authentication/plugins/auth_ldap.py:178
-msgid "First Name Attribute"
-msgstr ""
-
-#: rhodecode/authentication/plugins/auth_ldap.py:183
-msgid "LDAP Attribute to map to last name (e.g., sn)"
-msgstr ""
-
-#: rhodecode/authentication/plugins/auth_ldap.py:186
-msgid "Last Name Attribute"
-msgstr ""
-
-#: rhodecode/authentication/plugins/auth_ldap.py:191
+#: rhodecode/authentication/plugins/auth_ldap.py:356
 msgid ""
 "LDAP Attribute to map to email address (e.g., mail).\n"
 "Emails are a crucial part of RhodeCode. \n"
 "If possible add a valid email attribute to ldap users."