release: merge back stable branch into default
marcink -
r3300:9214ba94 merge default
Not Reviewed
Show More
Add another comment
TODOs: 0 unresolved 0 Resolved
COMMENTS: 0 General 0 Inline
@@ -46,3 +46,4
46 7dc62c090881fb5d03268141e71e0940d7c3295d v4.13.3
46 7dc62c090881fb5d03268141e71e0940d7c3295d v4.13.3
47 9151328c1c46b72ba6f00d7640d9141e75aa1ca2 v4.14.0
47 9151328c1c46b72ba6f00d7640d9141e75aa1ca2 v4.14.0
48 a47eeac5dfa41fa6779d90452affba4091c3ade8 v4.14.1
48 a47eeac5dfa41fa6779d90452affba4091c3ade8 v4.14.1
49 4b34ce0d2c3c10510626b3b65044939bb7a2cddf v4.15.0
@@ -78,4 +78,5
78 Upgrade notes
78 Upgrade notes
79 ^^^^^^^^^^^^^
79 ^^^^^^^^^^^^^
80
80
81 - LDAP cert dirs No newline at end of file
81 - In this release we introduced new options for cert directory and file for LDAP plugins.
82 In case of problems with LDAPS please verify the settings in the LDAP plugin configuration.
This diff has been collapsed as it changes many lines, (1166 lines changed) Show them Hide them
@@ -6,9 +6,9
6 #, fuzzy
6 #, fuzzy
7 msgid ""
7 msgid ""
8 msgstr ""
8 msgstr ""
9 "Project-Id-Version: rhodecode-enterprise-ce 4.14.0\n"
9 "Project-Id-Version: rhodecode-enterprise-ce 4.15.0\n"
10 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
10 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
11 "POT-Creation-Date: 2018-11-03 10:41+0100\n"
11 "POT-Creation-Date: 2018-12-10 18:11+0100\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,98 +17,6
17 "Content-Transfer-Encoding: 8bit\n"
17 "Content-Transfer-Encoding: 8bit\n"
18 "Generated-By: Babel 1.3\n"
18 "Generated-By: Babel 1.3\n"
19
19
20 #: rhodecode/apps/admin/navigation.py:72 rhodecode/authentication/routes.py:60
21 #: rhodecode/integrations/views.py:154
22 #: rhodecode/templates/admin/permissions/permissions.mako:36
23 msgid "Global"
24 msgstr ""
25
26 #: rhodecode/apps/admin/navigation.py:74
27 #: rhodecode/templates/admin/repos/repo_edit.mako:58
28 msgid "VCS"
29 msgstr ""
30
31 #: rhodecode/apps/admin/navigation.py:76
32 msgid "Visual"
33 msgstr ""
34
35 #: rhodecode/apps/admin/navigation.py:78
36 msgid "Remap and Rescan"
37 msgstr ""
38
39 #: rhodecode/apps/admin/navigation.py:80
40 #: rhodecode/templates/admin/repos/repo_edit.mako:64
41 msgid "Issue Tracker"
42 msgstr ""
43
44 #: rhodecode/apps/admin/navigation.py:82
45 #: rhodecode/integrations/types/email.py:174
46 #: rhodecode/templates/register.mako:91
47 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48
48 #: rhodecode/templates/admin/users/user_add.mako:86
49 #: rhodecode/templates/admin/users/user_edit_profile.mako:65
50 #: rhodecode/templates/admin/users/users.mako:73
51 #: rhodecode/templates/email_templates/user_registration.mako:25
52 #: rhodecode/templates/users/user_profile.mako:51
53 msgid "Email"
54 msgstr ""
55
56 #: rhodecode/apps/admin/navigation.py:84
57 msgid "Hooks"
58 msgstr ""
59
60 #: rhodecode/apps/admin/navigation.py:86
61 msgid "Full Text Search"
62 msgstr ""
63
64 #: rhodecode/apps/admin/navigation.py:88
65 #: rhodecode/templates/admin/integrations/base.mako:23
66 #: rhodecode/templates/admin/integrations/form.mako:8
67 #: rhodecode/templates/admin/integrations/form.mako:21
68 #: rhodecode/templates/admin/integrations/form.mako:32
69 #: rhodecode/templates/admin/integrations/list.mako:21
70 #: rhodecode/templates/admin/integrations/list.mako:25
71 #: rhodecode/templates/admin/integrations/list.mako:29
72 #: rhodecode/templates/admin/integrations/list.mako:36
73 #: rhodecode/templates/admin/integrations/new.mako:9
74 #: rhodecode/templates/admin/integrations/new.mako:17
75 #: rhodecode/templates/admin/integrations/new.mako:23
76 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:51
77 #: rhodecode/templates/admin/repos/repo_edit.mako:78
78 #: rhodecode/templates/base/base.mako:84
79 msgid "Integrations"
80 msgstr ""
81
82 #: rhodecode/apps/admin/navigation.py:90
83 #: rhodecode/templates/admin/settings/settings_system.mako:9
84 msgid "System Info"
85 msgstr ""
86
87 #: rhodecode/apps/admin/navigation.py:92
88 msgid "Exceptions Tracker"
89 msgstr ""
90
91 #: rhodecode/apps/admin/navigation.py:95
92 msgid "Processes"
93 msgstr ""
94
95 #: rhodecode/apps/admin/navigation.py:97
96 msgid "User Sessions"
97 msgstr ""
98
99 #: rhodecode/apps/admin/navigation.py:99
100 msgid "Open Source Licenses"
101 msgstr ""
102
103 #: rhodecode/apps/admin/navigation.py:101
104 #: rhodecode/templates/admin/repos/repo_edit.mako:86
105 msgid "Automation"
106 msgstr ""
107
108 #: rhodecode/apps/admin/navigation.py:105
109 msgid "Labs"
110 msgstr ""
111
112 #: rhodecode/apps/admin/views/defaults.py:90
20 #: rhodecode/apps/admin/views/defaults.py:90
113 msgid "Default settings updated successfully"
21 msgid "Default settings updated successfully"
114 msgstr ""
22 msgstr ""
@@ -192,80 +100,80
192 msgstr ""
100 msgstr ""
193
101
194 #: rhodecode/apps/admin/views/settings.py:162
102 #: rhodecode/apps/admin/views/settings.py:162
195 #: rhodecode/apps/admin/views/settings.py:318
103 #: rhodecode/apps/admin/views/settings.py:317
196 #: rhodecode/apps/admin/views/settings.py:393
104 #: rhodecode/apps/admin/views/settings.py:392
197 #: rhodecode/apps/admin/views/settings.py:725
105 #: rhodecode/apps/admin/views/settings.py:724
198 #: rhodecode/apps/repository/views/repo_settings_vcs.py:124
106 #: rhodecode/apps/repository/views/repo_settings_vcs.py:124
199 msgid "Some form inputs contain invalid data."
107 msgid "Some form inputs contain invalid data."
200 msgstr ""
108 msgstr ""
201
109
202 #: rhodecode/apps/admin/views/settings.py:190
110 #: rhodecode/apps/admin/views/settings.py:189
203 #: rhodecode/apps/admin/views/settings.py:354
111 #: rhodecode/apps/admin/views/settings.py:353
204 msgid "Error occurred during updating application settings"
112 msgid "Error occurred during updating application settings"
205 msgstr ""
113 msgstr ""
206
114
207 #: rhodecode/apps/admin/views/settings.py:194
115 #: rhodecode/apps/admin/views/settings.py:193
208 #: rhodecode/apps/repository/views/repo_settings_vcs.py:143
116 #: rhodecode/apps/repository/views/repo_settings_vcs.py:143
209 msgid "Updated VCS settings"
117 msgid "Updated VCS settings"
210 msgstr ""
118 msgstr ""
211
119
212 #: rhodecode/apps/admin/views/settings.py:268
120 #: rhodecode/apps/admin/views/settings.py:267
213 #, python-format
121 #, python-format
214 msgid "Repositories successfully rescanned added: %s ; removed: %s"
122 msgid "Repositories successfully rescanned added: %s ; removed: %s"
215 msgstr ""
123 msgstr ""
216
124
217 #: rhodecode/apps/admin/views/settings.py:350
125 #: rhodecode/apps/admin/views/settings.py:349
218 msgid "Updated application settings"
126 msgid "Updated application settings"
219 msgstr ""
127 msgstr ""
220
128
221 #: rhodecode/apps/admin/views/settings.py:432
129 #: rhodecode/apps/admin/views/settings.py:431
222 msgid "Updated visualisation settings"
130 msgid "Updated visualisation settings"
223 msgstr ""
131 msgstr ""
224
132
225 #: rhodecode/apps/admin/views/settings.py:435
133 #: rhodecode/apps/admin/views/settings.py:434
226 msgid "Error occurred during updating visualisation settings"
134 msgid "Error occurred during updating visualisation settings"
227 msgstr ""
135 msgstr ""
228
136
229 #: rhodecode/apps/admin/views/settings.py:497
137 #: rhodecode/apps/admin/views/settings.py:496
230 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:125
138 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:125
231 msgid "Invalid issue tracker pattern: {}"
139 msgid "Invalid issue tracker pattern: {}"
232 msgstr ""
140 msgstr ""
233
141
234 #: rhodecode/apps/admin/views/settings.py:514
142 #: rhodecode/apps/admin/views/settings.py:513
235 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:134
143 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:134
236 msgid "Updated issue tracker entries"
144 msgid "Updated issue tracker entries"
237 msgstr ""
145 msgstr ""
238
146
239 #: rhodecode/apps/admin/views/settings.py:532
147 #: rhodecode/apps/admin/views/settings.py:531
240 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:89
148 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:89
241 msgid "Removed issue tracker entry"
149 msgid "Removed issue tracker entry"
242 msgstr ""
150 msgstr ""
243
151
244 #: rhodecode/apps/admin/views/settings.py:569
152 #: rhodecode/apps/admin/views/settings.py:568
245 msgid "Please enter email address"
153 msgid "Please enter email address"
246 msgstr ""
154 msgstr ""
247
155
248 #: rhodecode/apps/admin/views/settings.py:587
156 #: rhodecode/apps/admin/views/settings.py:586
249 msgid "Send email task created"
157 msgid "Send email task created"
250 msgstr ""
158 msgstr ""
251
159
252 #: rhodecode/apps/admin/views/settings.py:637
160 #: rhodecode/apps/admin/views/settings.py:636
253 msgid "Added new hook"
161 msgid "Added new hook"
254 msgstr ""
162 msgstr ""
255
163
256 #: rhodecode/apps/admin/views/settings.py:652
164 #: rhodecode/apps/admin/views/settings.py:651
257 msgid "Updated hooks"
165 msgid "Updated hooks"
258 msgstr ""
166 msgstr ""
259
167
260 #: rhodecode/apps/admin/views/settings.py:656
168 #: rhodecode/apps/admin/views/settings.py:655
261 msgid "Error occurred during hook creation"
169 msgid "Error occurred during hook creation"
262 msgstr ""
170 msgstr ""
263
171
264 #: rhodecode/apps/admin/views/settings.py:749
172 #: rhodecode/apps/admin/views/settings.py:748
265 msgid "Error occurred during updating labs settings"
173 msgid "Error occurred during updating labs settings"
266 msgstr ""
174 msgstr ""
267
175
268 #: rhodecode/apps/admin/views/settings.py:754
176 #: rhodecode/apps/admin/views/settings.py:753
269 msgid "Updated Labs settings"
177 msgid "Updated Labs settings"
270 msgstr ""
178 msgstr ""
271
179
@@ -298,138 +206,142
298 msgstr ""
206 msgstr ""
299
207
300 #: rhodecode/apps/admin/views/system_info.py:99
208 #: rhodecode/apps/admin/views/system_info.py:99
301 msgid "RhodeCode Server IP"
209 msgid "RhodeCode Base URL"
302 msgstr ""
210 msgstr ""
303
211
304 #: rhodecode/apps/admin/views/system_info.py:100
212 #: rhodecode/apps/admin/views/system_info.py:100
305 msgid "RhodeCode Server ID"
213 msgid "RhodeCode Server IP"
306 msgstr ""
214 msgstr ""
307
215
308 #: rhodecode/apps/admin/views/system_info.py:101
216 #: rhodecode/apps/admin/views/system_info.py:101
309 msgid "RhodeCode Configuration"
217 msgid "RhodeCode Server ID"
310 msgstr ""
218 msgstr ""
311
219
312 #: rhodecode/apps/admin/views/system_info.py:102
220 #: rhodecode/apps/admin/views/system_info.py:102
313 msgid "RhodeCode Certificate"
221 msgid "RhodeCode Configuration"
314 msgstr ""
222 msgstr ""
315
223
316 #: rhodecode/apps/admin/views/system_info.py:103
224 #: rhodecode/apps/admin/views/system_info.py:103
317 msgid "Workers"
225 msgid "RhodeCode Certificate"
318 msgstr ""
226 msgstr ""
319
227
320 #: rhodecode/apps/admin/views/system_info.py:104
228 #: rhodecode/apps/admin/views/system_info.py:104
229 msgid "Workers"
230 msgstr ""
231
232 #: rhodecode/apps/admin/views/system_info.py:105
321 msgid "Worker Type"
233 msgid "Worker Type"
322 msgstr ""
234 msgstr ""
323
235
324 #: rhodecode/apps/admin/views/system_info.py:108
325 msgid "Database"
326 msgstr ""
327
328 #: rhodecode/apps/admin/views/system_info.py:109
236 #: rhodecode/apps/admin/views/system_info.py:109
237 msgid "Database"
238 msgstr ""
239
240 #: rhodecode/apps/admin/views/system_info.py:110
329 msgid "Database version"
241 msgid "Database version"
330 msgstr ""
242 msgstr ""
331
243
332 #: rhodecode/apps/admin/views/system_info.py:113
333 msgid "Platform"
334 msgstr ""
335
336 #: rhodecode/apps/admin/views/system_info.py:114
244 #: rhodecode/apps/admin/views/system_info.py:114
337 msgid "Platform UUID"
245 msgid "Platform"
338 msgstr ""
246 msgstr ""
339
247
340 #: rhodecode/apps/admin/views/system_info.py:115
248 #: rhodecode/apps/admin/views/system_info.py:115
341 msgid "Lang"
249 msgid "Platform UUID"
342 msgstr ""
250 msgstr ""
343
251
344 #: rhodecode/apps/admin/views/system_info.py:116
252 #: rhodecode/apps/admin/views/system_info.py:116
345 msgid "Python version"
253 msgid "Lang"
346 msgstr ""
254 msgstr ""
347
255
348 #: rhodecode/apps/admin/views/system_info.py:117
256 #: rhodecode/apps/admin/views/system_info.py:117
257 msgid "Python version"
258 msgstr ""
259
260 #: rhodecode/apps/admin/views/system_info.py:118
349 msgid "Python path"
261 msgid "Python path"
350 msgstr ""
262 msgstr ""
351
263
352 #: rhodecode/apps/admin/views/system_info.py:121
353 msgid "CPU"
354 msgstr ""
355
356 #: rhodecode/apps/admin/views/system_info.py:122
264 #: rhodecode/apps/admin/views/system_info.py:122
357 msgid "Load"
265 msgid "CPU"
358 msgstr ""
266 msgstr ""
359
267
360 #: rhodecode/apps/admin/views/system_info.py:123
268 #: rhodecode/apps/admin/views/system_info.py:123
361 msgid "Memory"
269 msgid "Load"
362 msgstr ""
270 msgstr ""
363
271
364 #: rhodecode/apps/admin/views/system_info.py:124
272 #: rhodecode/apps/admin/views/system_info.py:124
273 msgid "Memory"
274 msgstr ""
275
276 #: rhodecode/apps/admin/views/system_info.py:125
365 msgid "Uptime"
277 msgid "Uptime"
366 msgstr ""
278 msgstr ""
367
279
368 #: rhodecode/apps/admin/views/system_info.py:128
280 #: rhodecode/apps/admin/views/system_info.py:129
369 msgid "Ulimit"
281 msgid "Ulimit"
370 msgstr ""
282 msgstr ""
371
283
372 #: rhodecode/apps/admin/views/system_info.py:131
373 msgid "Storage location"
374 msgstr ""
375
376 #: rhodecode/apps/admin/views/system_info.py:132
284 #: rhodecode/apps/admin/views/system_info.py:132
377 msgid "Storage info"
285 msgid "Storage location"
378 msgstr ""
286 msgstr ""
379
287
380 #: rhodecode/apps/admin/views/system_info.py:133
288 #: rhodecode/apps/admin/views/system_info.py:133
289 msgid "Storage info"
290 msgstr ""
291
292 #: rhodecode/apps/admin/views/system_info.py:134
381 msgid "Storage inodes"
293 msgid "Storage inodes"
382 msgstr ""
294 msgstr ""
383
295
384 #: rhodecode/apps/admin/views/system_info.py:135
385 msgid "Gist storage location"
386 msgstr ""
387
388 #: rhodecode/apps/admin/views/system_info.py:136
296 #: rhodecode/apps/admin/views/system_info.py:136
297 msgid "Gist storage location"
298 msgstr ""
299
300 #: rhodecode/apps/admin/views/system_info.py:137
389 msgid "Gist storage info"
301 msgid "Gist storage info"
390 msgstr ""
302 msgstr ""
391
303
392 #: rhodecode/apps/admin/views/system_info.py:138
393 msgid "Archive cache storage location"
394 msgstr ""
395
396 #: rhodecode/apps/admin/views/system_info.py:139
304 #: rhodecode/apps/admin/views/system_info.py:139
305 msgid "Archive cache storage location"
306 msgstr ""
307
308 #: rhodecode/apps/admin/views/system_info.py:140
397 msgid "Archive cache info"
309 msgid "Archive cache info"
398 msgstr ""
310 msgstr ""
399
311
400 #: rhodecode/apps/admin/views/system_info.py:141
401 msgid "Temp storage location"
402 msgstr ""
403
404 #: rhodecode/apps/admin/views/system_info.py:142
312 #: rhodecode/apps/admin/views/system_info.py:142
313 msgid "Temp storage location"
314 msgstr ""
315
316 #: rhodecode/apps/admin/views/system_info.py:143
405 msgid "Temp storage info"
317 msgid "Temp storage info"
406 msgstr ""
318 msgstr ""
407
319
408 #: rhodecode/apps/admin/views/system_info.py:144
409 msgid "Search info"
410 msgstr ""
411
412 #: rhodecode/apps/admin/views/system_info.py:145
320 #: rhodecode/apps/admin/views/system_info.py:145
321 msgid "Search info"
322 msgstr ""
323
324 #: rhodecode/apps/admin/views/system_info.py:146
413 msgid "Search location"
325 msgid "Search location"
414 msgstr ""
326 msgstr ""
415
327
416 #: rhodecode/apps/admin/views/system_info.py:149
417 msgid "VCS Backends"
418 msgstr ""
419
420 #: rhodecode/apps/admin/views/system_info.py:150
328 #: rhodecode/apps/admin/views/system_info.py:150
421 msgid "VCS Server"
329 msgid "VCS Backends"
422 msgstr ""
330 msgstr ""
423
331
424 #: rhodecode/apps/admin/views/system_info.py:151
332 #: rhodecode/apps/admin/views/system_info.py:151
425 msgid "GIT"
333 msgid "VCS Server"
426 msgstr ""
334 msgstr ""
427
335
428 #: rhodecode/apps/admin/views/system_info.py:152
336 #: rhodecode/apps/admin/views/system_info.py:152
429 msgid "HG"
337 msgid "GIT"
430 msgstr ""
338 msgstr ""
431
339
432 #: rhodecode/apps/admin/views/system_info.py:153
340 #: rhodecode/apps/admin/views/system_info.py:153
341 msgid "HG"
342 msgstr ""
343
344 #: rhodecode/apps/admin/views/system_info.py:154
433 msgid "SVN"
345 msgid "SVN"
434 msgstr ""
346 msgstr ""
435
347
@@ -650,7 +562,7
650 msgstr ""
562 msgstr ""
651
563
652 #: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:41413
564 #: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:41413
653 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:21
565 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:25
654 #: rhodecode/public/js/src/rhodecode.js:508
566 #: rhodecode/public/js/src/rhodecode.js:508
655 msgid "Lifetime"
567 msgid "Lifetime"
656 msgstr ""
568 msgstr ""
@@ -722,27 +634,27
722 msgid "journal"
634 msgid "journal"
723 msgstr ""
635 msgstr ""
724
636
725 #: rhodecode/apps/login/views.py:293 rhodecode/apps/login/views.py:374
637 #: rhodecode/apps/login/views.py:304 rhodecode/apps/login/views.py:400
726 msgid "Bad captcha"
638 msgid "Bad captcha"
727 msgstr ""
639 msgstr ""
728
640
729 #: rhodecode/apps/login/views.py:315
641 #: rhodecode/apps/login/views.py:332
730 msgid "You have successfully registered with RhodeCode"
642 msgid "You have successfully registered with RhodeCode"
731 msgstr ""
643 msgstr ""
732
644
733 #: rhodecode/apps/login/views.py:352
645 #: rhodecode/apps/login/views.py:369
734 msgid "If such email exists, a password reset link was sent to it."
646 msgid "If such email exists, a password reset link was sent to it."
735 msgstr ""
647 msgstr ""
736
648
737 #: rhodecode/apps/login/views.py:358
649 #: rhodecode/apps/login/views.py:382
738 msgid "Password reset has been disabled."
650 msgid "Password reset has been disabled."
739 msgstr ""
651 msgstr ""
740
652
741 #: rhodecode/apps/login/views.py:446
653 #: rhodecode/apps/login/views.py:471
742 msgid "Given reset token is invalid"
654 msgid "Given reset token is invalid"
743 msgstr ""
655 msgstr ""
744
656
745 #: rhodecode/apps/login/views.py:454
657 #: rhodecode/apps/login/views.py:479
746 msgid "Your password reset was successful, a new password has been sent to your email"
658 msgid "Your password reset was successful, a new password has been sent to your email"
747 msgstr ""
659 msgstr ""
748
660
@@ -1257,6 +1169,12
1257 msgid "An error occurred during synchronization update"
1169 msgid "An error occurred during synchronization update"
1258 msgstr ""
1170 msgstr ""
1259
1171
1172 #: rhodecode/authentication/routes.py:61
1173 #: rhodecode/templates/admin/auth/auth_settings.mako:14
1174 #: rhodecode/templates/admin/auth/plugin_settings.mako:14
1175 msgid "Authentication Plugins"
1176 msgstr ""
1177
1260 #: rhodecode/authentication/schema.py:36
1178 #: rhodecode/authentication/schema.py:36
1261 msgid "Enable or disable this authentication plugin."
1179 msgid "Enable or disable this authentication plugin."
1262 msgstr ""
1180 msgstr ""
@@ -1266,6 +1184,7
1266 #: rhodecode/model/permission.py:118 rhodecode/model/permission.py:122
1184 #: rhodecode/model/permission.py:118 rhodecode/model/permission.py:122
1267 #: rhodecode/model/permission.py:126 rhodecode/model/permission.py:130
1185 #: rhodecode/model/permission.py:126 rhodecode/model/permission.py:130
1268 #: rhodecode/model/validation_schema/schemas/integration_schema.py:195
1186 #: rhodecode/model/validation_schema/schemas/integration_schema.py:195
1187 #: rhodecode/templates/admin/auth/auth_settings.mako:67
1269 #: rhodecode/templates/admin/integrations/list.mako:71
1188 #: rhodecode/templates/admin/integrations/list.mako:71
1270 msgid "Enabled"
1189 msgid "Enabled"
1271 msgstr ""
1190 msgstr ""
@@ -1309,7 +1228,7
1309 msgstr ""
1228 msgstr ""
1310
1229
1311 #: rhodecode/authentication/plugins/auth_crowd.py:69
1230 #: rhodecode/authentication/plugins/auth_crowd.py:69
1312 #: rhodecode/authentication/plugins/auth_ldap.py:89
1231 #: rhodecode/authentication/plugins/auth_ldap.py:254
1313 msgid "Port"
1232 msgid "Port"
1314 msgstr ""
1233 msgstr ""
1315
1234
@@ -1337,7 +1256,7
1337 msgid "Admin Groups"
1256 msgid "Admin Groups"
1338 msgstr ""
1257 msgstr ""
1339
1258
1340 #: rhodecode/authentication/plugins/auth_crowd.py:216
1259 #: rhodecode/authentication/plugins/auth_crowd.py:217
1341 msgid "CROWD"
1260 msgid "CROWD"
1342 msgstr ""
1261 msgstr ""
1343
1262
@@ -1377,50 +1296,50
1377 msgid "URL"
1296 msgid "URL"
1378 msgstr ""
1297 msgstr ""
1379
1298
1380 #: rhodecode/authentication/plugins/auth_jasig_cas.py:92
1299 #: rhodecode/authentication/plugins/auth_jasig_cas.py:93
1381 msgid "Jasig-CAS"
1300 msgid "Jasig-CAS"
1382 msgstr ""
1301 msgstr ""
1383
1302
1384 #: rhodecode/authentication/plugins/auth_ldap.py:77
1303 #: rhodecode/authentication/plugins/auth_ldap.py:242
1385 msgid ""
1304 msgid ""
1386 "Host[s] of the LDAP Server \n"
1305 "Host[s] of the LDAP Server \n"
1387 "(e.g., 192.168.2.154, or ldap-server.domain.com.\n"
1306 "(e.g., 192.168.2.154, or ldap-server.domain.com.\n"
1388 " Multiple servers can be specified using commas"
1307 " Multiple servers can be specified using commas"
1389 msgstr ""
1308 msgstr ""
1390
1309
1391 #: rhodecode/authentication/plugins/auth_ldap.py:81
1310 #: rhodecode/authentication/plugins/auth_ldap.py:246
1392 msgid "LDAP Host"
1311 msgid "LDAP Host"
1393 msgstr ""
1312 msgstr ""
1394
1313
1395 #: rhodecode/authentication/plugins/auth_ldap.py:86
1314 #: rhodecode/authentication/plugins/auth_ldap.py:251
1396 msgid "Custom port that the LDAP server is listening on. Default value is: 389"
1315 msgid "Custom port that the LDAP server is listening on. Default value is: 389, use 689 for LDAPS(SSL)"
1397 msgstr ""
1316 msgstr ""
1398
1317
1399 #: rhodecode/authentication/plugins/auth_ldap.py:96
1318 #: rhodecode/authentication/plugins/auth_ldap.py:261
1400 msgid "Timeout for LDAP connection"
1319 msgid "Timeout for LDAP connection"
1401 msgstr ""
1320 msgstr ""
1402
1321
1403 #: rhodecode/authentication/plugins/auth_ldap.py:98
1322 #: rhodecode/authentication/plugins/auth_ldap.py:263
1404 msgid "Connection timeout"
1323 msgid "Connection timeout"
1405 msgstr ""
1324 msgstr ""
1406
1325
1407 #: rhodecode/authentication/plugins/auth_ldap.py:105
1326 #: rhodecode/authentication/plugins/auth_ldap.py:270
1408 msgid ""
1327 msgid ""
1409 "Optional user DN/account to connect to LDAP if authentication is required. \n"
1328 "Optional user DN/account to connect to LDAP if authentication is required. \n"
1410 "e.g., cn=admin,dc=mydomain,dc=com, or uid=root,cn=users,dc=mydomain,dc=com, or admin@mydomain.com"
1329 "e.g., cn=admin,dc=mydomain,dc=com, or uid=root,cn=users,dc=mydomain,dc=com, or admin@mydomain.com"
1411 msgstr ""
1330 msgstr ""
1412
1331
1413 #: rhodecode/authentication/plugins/auth_ldap.py:110
1332 #: rhodecode/authentication/plugins/auth_ldap.py:275
1414 msgid "Account"
1333 msgid "Account"
1415 msgstr ""
1334 msgstr ""
1416
1335
1417 #: rhodecode/authentication/plugins/auth_ldap.py:115
1336 #: rhodecode/authentication/plugins/auth_ldap.py:280
1418 msgid "Password to authenticate for given user DN."
1337 msgid "Password to authenticate for given user DN."
1419 msgstr ""
1338 msgstr ""
1420
1339
1421 #: rhodecode/authentication/plugins/auth_ldap.py:118
1340 #: rhodecode/authentication/plugins/auth_ldap.py:283
1422 #: rhodecode/integrations/types/webhook.py:89 rhodecode/templates/login.mako:50
1341 #: rhodecode/integrations/types/webhook.py:89 rhodecode/templates/login.mako:50
1423 #: rhodecode/templates/register.mako:58
1342 #: rhodecode/templates/register.mako:60
1424 #: rhodecode/templates/admin/my_account/my_account.mako:30
1343 #: rhodecode/templates/admin/my_account/my_account.mako:30
1425 #: rhodecode/templates/admin/users/user_add.mako:44
1344 #: rhodecode/templates/admin/users/user_add.mako:44
1426 #: rhodecode/templates/base/base.mako:331
1345 #: rhodecode/templates/base/base.mako:331
@@ -1428,93 +1347,111
1428 msgid "Password"
1347 msgid "Password"
1429 msgstr ""
1348 msgstr ""
1430
1349
1431 #: rhodecode/authentication/plugins/auth_ldap.py:123
1350 #: rhodecode/authentication/plugins/auth_ldap.py:288
1432 msgid "TLS Type"
1351 msgid "TLS Type"
1433 msgstr ""
1352 msgstr ""
1434
1353
1435 #: rhodecode/authentication/plugins/auth_ldap.py:124
1354 #: rhodecode/authentication/plugins/auth_ldap.py:289
1436 msgid "Connection Security"
1355 msgid "Connection Security"
1437 msgstr ""
1356 msgstr ""
1438
1357
1439 #: rhodecode/authentication/plugins/auth_ldap.py:130
1358 #: rhodecode/authentication/plugins/auth_ldap.py:295
1440 msgid ""
1359 msgid ""
1441 "Require Cert over TLS?. Self-signed and custom certificates can be used when\n"
1360 "Require Cert over TLS?. Self-signed and custom certificates can be used when\n"
1442 " `RhodeCode Certificate` found in admin > settings > system info page is extended."
1361 " `RhodeCode Certificate` found in admin > settings > system info page is extended."
1443 msgstr ""
1362 msgstr ""
1444
1363
1445 #: rhodecode/authentication/plugins/auth_ldap.py:133
1364 #: rhodecode/authentication/plugins/auth_ldap.py:298
1446 msgid "Certificate Checks"
1365 msgid "Certificate Checks"
1447 msgstr ""
1366 msgstr ""
1448
1367
1449 #: rhodecode/authentication/plugins/auth_ldap.py:139
1368 #: rhodecode/authentication/plugins/auth_ldap.py:304
1369 msgid ""
1370 "This specifies the PEM-format file path containing certificates for use in TLS connection.\n"
1371 "If not specified `TLS Cert dir` will be used"
1372 msgstr ""
1373
1374 #: rhodecode/authentication/plugins/auth_ldap.py:307
1375 msgid "TLS Cert file"
1376 msgstr ""
1377
1378 #: rhodecode/authentication/plugins/auth_ldap.py:313
1379 msgid "This specifies the path of a directory that contains individual CA certificates in separate files."
1380 msgstr ""
1381
1382 #: rhodecode/authentication/plugins/auth_ldap.py:315
1383 msgid "TLS Cert dir"
1384 msgstr ""
1385
1386 #: rhodecode/authentication/plugins/auth_ldap.py:320
1450 msgid ""
1387 msgid ""
1451 "Base DN to search. Dynamic bind is supported. Add `$login` marker in it to be replaced with current user credentials \n"
1388 "Base DN to search. Dynamic bind is supported. Add `$login` marker in it to be replaced with current user credentials \n"
1452 "(e.g., dc=mydomain,dc=com, or ou=Users,dc=mydomain,dc=com)"
1389 "(e.g., dc=mydomain,dc=com, or ou=Users,dc=mydomain,dc=com)"
1453 msgstr ""
1390 msgstr ""
1454
1391
1455 #: rhodecode/authentication/plugins/auth_ldap.py:144
1392 #: rhodecode/authentication/plugins/auth_ldap.py:325
1456 msgid "Base DN"
1393 msgid "Base DN"
1457 msgstr ""
1394 msgstr ""
1458
1395
1459 #: rhodecode/authentication/plugins/auth_ldap.py:149
1396 #: rhodecode/authentication/plugins/auth_ldap.py:330
1460 msgid ""
1397 msgid ""
1461 "Filter to narrow results \n"
1398 "Filter to narrow results \n"
1462 "(e.g., (&(objectCategory=Person)(objectClass=user)), or \n"
1399 "(e.g., (&(objectCategory=Person)(objectClass=user)), or \n"
1463 "(memberof=cn=rc-login,ou=groups,ou=company,dc=mydomain,dc=com)))"
1400 "(memberof=cn=rc-login,ou=groups,ou=company,dc=mydomain,dc=com)))"
1464 msgstr ""
1401 msgstr ""
1465
1402
1466 #: rhodecode/authentication/plugins/auth_ldap.py:154
1403 #: rhodecode/authentication/plugins/auth_ldap.py:335
1467 msgid "LDAP Search Filter"
1404 msgid "LDAP Search Filter"
1468 msgstr ""
1405 msgstr ""
1469
1406
1470 #: rhodecode/authentication/plugins/auth_ldap.py:160
1407 #: rhodecode/authentication/plugins/auth_ldap.py:341
1471 msgid "How deep to search LDAP. If unsure set to SUBTREE"
1408 msgid "How deep to search LDAP. If unsure set to SUBTREE"
1472 msgstr ""
1409 msgstr ""
1473
1410
1474 #: rhodecode/authentication/plugins/auth_ldap.py:161
1411 #: rhodecode/authentication/plugins/auth_ldap.py:342
1475 msgid "LDAP Search Scope"
1412 msgid "LDAP Search Scope"
1476 msgstr ""
1413 msgstr ""
1477
1414
1478 #: rhodecode/authentication/plugins/auth_ldap.py:167
1415 #: rhodecode/authentication/plugins/auth_ldap.py:348
1479 msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)"
1416 msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)"
1480 msgstr ""
1417 msgstr ""
1481
1418
1482 #: rhodecode/authentication/plugins/auth_ldap.py:169
1419 #: rhodecode/authentication/plugins/auth_ldap.py:350
1483 msgid "Login Attribute"
1420 msgid "Login Attribute"
1484 msgstr ""
1421 msgstr ""
1485
1422
1486 #: rhodecode/authentication/plugins/auth_ldap.py:170
1423 #: rhodecode/authentication/plugins/auth_ldap.py:351
1487 msgid "The LDAP Login attribute of the CN must be specified"
1424 msgid "The LDAP Login attribute of the CN must be specified"
1488 msgstr ""
1425 msgstr ""
1489
1426
1490 #: rhodecode/authentication/plugins/auth_ldap.py:175
1427 #: rhodecode/authentication/plugins/auth_ldap.py:356
1491 msgid "LDAP Attribute to map to first name (e.g., givenName)"
1492 msgstr ""
1493
1494 #: rhodecode/authentication/plugins/auth_ldap.py:178
1495 msgid "First Name Attribute"
1496 msgstr ""
1497
1498 #: rhodecode/authentication/plugins/auth_ldap.py:183
1499 msgid "LDAP Attribute to map to last name (e.g., sn)"
1500 msgstr ""
1501
1502 #: rhodecode/authentication/plugins/auth_ldap.py:186
1503 msgid "Last Name Attribute"
1504 msgstr ""
1505
1506 #: rhodecode/authentication/plugins/auth_ldap.py:191
1507 msgid ""
1428 msgid ""
1508 "LDAP Attribute to map to email address (e.g., mail).\n"
1429 "LDAP Attribute to map to email address (e.g., mail).\n"
1509 "Emails are a crucial part of RhodeCode. \n"
1430 "Emails are a crucial part of RhodeCode. \n"
1510 "If possible add a valid email attribute to ldap users."
1431 "If possible add a valid email attribute to ldap users." </