kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed AuthSourceLdap.human_attribute_name. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10146 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-07-31 17:30:01 +00:00
parent a53894dd22
commit 77d94818a4
49 changed files with 48 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/auth_source_ldap.rb
View File

@ -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

2
app/views/auth_sources/_form_auth_source_ldap.html.erb
View File

@ -23,7 +23,7 @@
<p><label for="auth_source_base_dn"><%=l(:field_base_dn)%> <span class="required">*</span></label>
<%= text_field 'auth_source', 'base_dn', :size => 60 %></p>
<p><label for="auth_source_custom_filter"><%=l(:field_ldap_filter)%></label>
<p><label for="auth_source_custom_filter"><%=l(:field_auth_source_ldap_filter)%></label>
<%= text_field 'auth_source', 'filter', :size => 60 %></p>
<p><label for="auth_source_timeout"><%=l(:field_timeout)%></label>

2
config/locales/ar.yml
View File

@ -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

2
config/locales/bg.yml
View File

@ -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: Таймаут (в секунди)

2
config/locales/bs.yml
View File

@ -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

2
config/locales/ca.yml
View File

@ -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

2
config/locales/cs.yml
View File

@ -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

2
config/locales/da.yml
View File

@ -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

2
config/locales/de.yml
View File

@ -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

2
config/locales/el.yml
View File

@ -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

2
config/locales/en-GB.yml
View File

@ -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

2
config/locales/en.yml
View File

@ -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

2
config/locales/es.yml
View File

@ -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

2
config/locales/et.yml
View File

@ -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"

2
config/locales/eu.yml
View File

@ -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

2
config/locales/fa.yml
View File

@ -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

2
config/locales/fi.yml
View File

@ -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

2
config/locales/fr.yml
View File

@ -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

2
config/locales/gl.yml
View File

@ -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

2
config/locales/he.yml
View File

@ -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

2
config/locales/hr.yml
View File

@ -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

2
config/locales/hu.yml
View File

@ -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

2
config/locales/id.yml
View File

@ -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

2
config/locales/it.yml
View File

@ -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

2
config/locales/ja.yml
View File

@ -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: ユーザーによるアカウント削除を許可

2
config/locales/ko.yml
View File

@ -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: 사용자들이 자신의 계정을 삭제토록 허용

2
config/locales/lt.yml
View File

@ -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

2
config/locales/lv.yml
View File

@ -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

2
config/locales/mk.yml
View File

@ -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

2
config/locales/mn.yml
View File

@ -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

2
config/locales/nl.yml
View File

@ -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

2
config/locales/no.yml
View File

@ -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

2
config/locales/pl.yml
View File

@ -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

2
config/locales/pt-BR.yml
View File

@ -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

2
config/locales/pt.yml
View File

@ -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

2
config/locales/ro.yml
View File

@ -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

2
config/locales/ru.yml
View File

@ -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: "Разрешить пользователям удалять свои учетные записи"

2
config/locales/sk.yml
View File

@ -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

2
config/locales/sl.yml
View File

@ -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

2
config/locales/sq.yml
View File

@ -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

2
config/locales/sr-YU.yml
View File

@ -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

2
config/locales/sr.yml
View File

@ -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

2
config/locales/sv.yml
View File

@ -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

2
config/locales/th.yml
View File

@ -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

2
config/locales/tr.yml
View File

@ -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

2
config/locales/uk.yml
View File

@ -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: "Дозволити користувачам видаляти свої облікові записи"

2
config/locales/vi.yml
View File

@ -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

2
config/locales/zh-TW.yml
View File

@ -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: "逾時 (單位: 秒)"

2
config/locales/zh.yml
View File

@ -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: 允许用户退订