diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb index d49e00dc6..5a32ffc2a 100644 --- a/app/models/auth_source_ldap.rb +++ b/app/models/auth_source_ldap.rb @@ -31,14 +31,6 @@ class AuthSourceLdap < AuthSource before_validation :strip_ldap_attributes - def self.human_attribute_name(attribute_key_name, *args) - attr_name = attribute_key_name.to_s - if attr_name == "filter" - attr_name = "ldap_filter" - end - super(attr_name, *args) - end - def initialize(attributes=nil, *args) super self.port = 389 if self.port == 0 diff --git a/app/views/auth_sources/_form_auth_source_ldap.html.erb b/app/views/auth_sources/_form_auth_source_ldap.html.erb index 9a6afb36b..2f6d0b0ce 100644 --- a/app/views/auth_sources/_form_auth_source_ldap.html.erb +++ b/app/views/auth_sources/_form_auth_source_ldap.html.erb @@ -23,7 +23,7 @@

<%= text_field 'auth_source', 'base_dn', :size => 60 %>

-

+

<%= text_field 'auth_source', 'filter', :size => 60 %>

diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 01248d78c..cd9419a30 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -1026,7 +1026,7 @@ ar: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 610f73b98..917085d0d 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -328,7 +328,7 @@ bg: field_cvs_module: Модул field_repository_is_default: Главно хранилище field_multiple: Избор на повече от една стойност - field_ldap_filter: LDAP филтър + field_auth_source_ldap_filter: LDAP филтър field_core_fields: Стандартни полета field_timeout: Таймаут (в секунди) diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 7d3f9877d..ca7ee5db3 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -1040,7 +1040,7 @@ bs: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 603bdb95c..7604edfff 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -1028,7 +1028,7 @@ ca: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 2c71b0a5d..e289adf00 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -1029,7 +1029,7 @@ cs: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/da.yml b/config/locales/da.yml index 02fa85986..f404d5fdf 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -1043,7 +1043,7 @@ da: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/de.yml b/config/locales/de.yml index 2f79e77d2..fb2ebae0d 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1046,7 +1046,7 @@ de: notice_issue_update_conflict: Das Ticket wurde von einem anderen Nutzer überarbeitet während Ihrer Bearbeitung. text_issue_conflict_resolution_cancel: Meine Änderungen verwerfen und %{link} neu anzeigen permission_manage_related_issues: Zugehörige Tickets verwalten - field_ldap_filter: LDAP Filter + field_auth_source_ldap_filter: LDAP Filter label_search_for_watchers: Nach hinzufügbaren Beobachtern suchen notice_account_deleted: Ihr Benutzerkonto wurde unwiderruflich gelöscht. setting_unsubscribe: Erlaubt Benutzern das eigene Benutzerkonto zu löschen diff --git a/config/locales/el.yml b/config/locales/el.yml index 35550e71b..00c1066bf 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -1026,7 +1026,7 @@ el: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index baa395849..a586bc437 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -1028,7 +1028,7 @@ en-GB: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/en.yml b/config/locales/en.yml index f35ba5745..1c6ed7e4d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -327,7 +327,7 @@ en: field_cvs_module: Module field_repository_is_default: Main repository field_multiple: Multiple values - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter field_core_fields: Standard fields field_timeout: "Timeout (in seconds)" field_board_parent: Parent forum diff --git a/config/locales/es.yml b/config/locales/es.yml index bb442e671..6b26f0be3 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1063,7 +1063,7 @@ es: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/et.yml b/config/locales/et.yml index 87624a98c..1f91aeb36 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -342,7 +342,7 @@ et: field_cvs_module: "Moodul" field_repository_is_default: "Peamine hoidla" field_multiple: "Korraga mitu väärtust" - field_ldap_filter: "LDAP filter" + field_auth_source_ldap_filter: "LDAP filter" setting_app_title: "Veebilehe pealkiri" setting_app_subtitle: "Veebilehe alampealkiri" diff --git a/config/locales/eu.yml b/config/locales/eu.yml index dba7de468..a19fbf145 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -1029,7 +1029,7 @@ eu: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 3d0c7c0b0..4dfe020cf 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -1028,7 +1028,7 @@ fa: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 713923322..d3e2bfbd0 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -1047,7 +1047,7 @@ fi: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 9afb86ed3..ecaf44707 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -326,7 +326,7 @@ fr: field_commit_logs_encoding: Encodage des messages de commit field_repository_is_default: Dépôt principal field_multiple: Valeurs multiples - field_ldap_filter: Filtre LDAP + field_auth_source_ldap_filter: Filtre LDAP field_core_fields: Champs standards field_timeout: "Timeout (en secondes)" field_board_parent: Forum parent diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 63a3aad8b..7e6fb1e02 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -1037,7 +1037,7 @@ gl: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/he.yml b/config/locales/he.yml index db50ac5d2..b93ca0fad 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -1031,7 +1031,7 @@ he: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 2436ba97d..6d7f47392 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -1029,7 +1029,7 @@ hr: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 47af094cd..850f5716b 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -1045,7 +1045,7 @@ notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/id.yml b/config/locales/id.yml index cce0c0c30..e3d36b6d0 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -1032,7 +1032,7 @@ id: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/it.yml b/config/locales/it.yml index 84a956465..b0278b730 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -1027,7 +1027,7 @@ it: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 152e618a8..7b2ee46d2 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1056,7 +1056,7 @@ ja: notice_issue_update_conflict: このチケットを編集中に他のユーザーが更新しました。 text_issue_conflict_resolution_cancel: 自分の編集内容を破棄し %{link} を再表示 permission_manage_related_issues: 関連するチケットの管理 - field_ldap_filter: LDAPフィルタ + field_auth_source_ldap_filter: LDAPフィルタ label_search_for_watchers: ウォッチャーを検索して追加 notice_account_deleted: アカウントが削除されました。 setting_unsubscribe: ユーザーによるアカウント削除を許可 diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 489905a48..000d2560f 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -1076,7 +1076,7 @@ ko: notice_issue_update_conflict: 일감이 수정되는 동안 다른 사용자에 의해서 변경되었습니다. text_issue_conflict_resolution_cancel: "변경내용을 되돌리고 다시 표시 %{link}" permission_manage_related_issues: 연계된 일감 관리 - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: 추가할 일감관계자 검색 notice_account_deleted: 당신의 계정이 완전히 삭제되었습니다. setting_unsubscribe: 사용자들이 자신의 계정을 삭제토록 허용 diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 32555e10d..a22f282ed 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -1086,7 +1086,7 @@ lt: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/lv.yml b/config/locales/lv.yml index eff8efdd7..253ce93da 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -1020,7 +1020,7 @@ lv: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 63c795bdb..ff92a8248 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -1026,7 +1026,7 @@ mk: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/mn.yml b/config/locales/mn.yml index c2fde0db8..f2ac89557 100644 --- a/config/locales/mn.yml +++ b/config/locales/mn.yml @@ -1028,7 +1028,7 @@ mn: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 7547103bf..ec329fd48 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -1008,7 +1008,7 @@ nl: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/no.yml b/config/locales/no.yml index 6fc9b9933..864d37280 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -1016,7 +1016,7 @@ notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 54562df43..071a121d4 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -1043,7 +1043,7 @@ pl: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 063dfb6aa..89b0f0375 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -1048,7 +1048,7 @@ pt-BR: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 69a595942..28ee66816 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -1031,7 +1031,7 @@ pt: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/ro.yml b/config/locales/ro.yml index cdc25485a..313b73f06 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -1023,7 +1023,7 @@ ro: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 44cd0fc6e..858e85738 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1141,7 +1141,7 @@ ru: notice_issue_update_conflict: Кто-то изменил задачу, пока вы ее редактировали. text_issue_conflict_resolution_cancel: Отменить мои изменения и показать задачу заново %{link} permission_manage_related_issues: Управление связанными задачами - field_ldap_filter: Фильтр LDAP + field_auth_source_ldap_filter: Фильтр LDAP label_search_for_watchers: Найти наблюдателей notice_account_deleted: "Ваша учетная запись полностью удалена" setting_unsubscribe: "Разрешить пользователям удалять свои учетные записи" diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 9244efc76..10f53a1eb 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -1026,7 +1026,7 @@ sk: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/sl.yml b/config/locales/sl.yml index f7caef4a3..cde46acac 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -1026,7 +1026,7 @@ sl: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 678ceef78..5ac721445 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -325,7 +325,7 @@ sq: field_cvs_module: Module field_repository_is_default: Main repository field_multiple: Multiple values - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter setting_app_title: Application title setting_app_subtitle: Application subtitle diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml index 0ff63a9ca..1c8a697d3 100644 --- a/config/locales/sr-YU.yml +++ b/config/locales/sr-YU.yml @@ -1028,7 +1028,7 @@ sr-YU: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 838fb5c59..b338db461 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -1027,7 +1027,7 @@ sr: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/sv.yml b/config/locales/sv.yml index af1aef8eb..b84594305 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -367,7 +367,7 @@ sv: field_cvs_module: Modul field_repository_is_default: Huvudarkiv field_multiple: Flera värden - field_ldap_filter: LDAP-filter + field_auth_source_ldap_filter: LDAP-filter setting_app_title: Applikationsrubrik setting_app_subtitle: Applikationsunderrubrik diff --git a/config/locales/th.yml b/config/locales/th.yml index 33cb0a6cf..ec4145736 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -1023,7 +1023,7 @@ th: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 2eeefe0df..2b5ba35a2 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -1045,7 +1045,7 @@ tr: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 42845c60e..53f188b9d 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -1023,7 +1023,7 @@ uk: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: "Ваш обліковій запис повністю видалений" setting_unsubscribe: "Дозволити користувачам видаляти свої облікові записи" diff --git a/config/locales/vi.yml b/config/locales/vi.yml index bd7516d12..a9b130edd 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -1077,7 +1077,7 @@ vi: notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} permission_manage_related_issues: Manage related issues - field_ldap_filter: LDAP filter + field_auth_source_ldap_filter: LDAP filter label_search_for_watchers: Search for watchers to add notice_account_deleted: Your account has been permanently deleted. setting_unsubscribe: Allow users to delete their own account diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 9035eea6a..10204ebbd 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -409,7 +409,7 @@ field_cvs_module: 模組 field_repository_is_default: 主要儲存機制 field_multiple: 多重值 - field_ldap_filter: LDAP 篩選器 + field_auth_source_ldap_filter: LDAP 篩選器 field_core_fields: 標準欄位 field_timeout: "逾時 (單位: 秒)" diff --git a/config/locales/zh.yml b/config/locales/zh.yml index ede7a2335..a3d4634ea 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1030,7 +1030,7 @@ zh: notice_issue_update_conflict: 当您正在编辑这个问题的时候,它已经被其他人抢先一步更新过了。 text_issue_conflict_resolution_cancel: 取消我所有的变更并重新刷新显示 %{link} 。 permission_manage_related_issues: 相关问题管理 - field_ldap_filter: LDAP 过滤器 + field_auth_source_ldap_filter: LDAP 过滤器 label_search_for_watchers: 通过查找方式添加跟踪者 notice_account_deleted: 您的账号已被永久删除(账号已无法恢复)。 setting_unsubscribe: 允许用户退订