Feature #21421 » 0005-Harmonize-setting-labels.patch
app/views/settings/_authentication.html.erb | ||
---|---|---|
18 | 18 |
<%= setting_select :password_max_age, [[l(:label_disabled), 0]] + [7, 30, 60, 90, 180, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]} %> |
19 | 19 |
</p> |
20 | 20 | |
21 |
<p><%= setting_check_box :lost_password, :label => :label_password_lost %></p>
|
|
21 |
<p><%= setting_check_box :lost_password %></p> |
|
22 | 22 | |
23 | 23 |
<p><%= setting_text_field :max_additional_emails, :size => 6 %></p> |
24 | 24 |
app/views/settings/_repositories.html.erb | ||
---|---|---|
51 | 51 |
<p><%= setting_text_field :sys_api_key, |
52 | 52 |
:size => 30, |
53 | 53 |
:id => 'settings_sys_api_key', |
54 |
:disabled => !Setting.sys_api_enabled?, |
|
55 |
:label => :setting_mail_handler_api_key %> |
|
54 |
:disabled => !Setting.sys_api_enabled? %> |
|
56 | 55 |
<%= link_to_function l(:label_generate_key), |
57 | 56 |
"if (!$('#settings_sys_api_key').attr('disabled')) { $('#settings_sys_api_key').val(randomKey(20)) }" %> |
58 | 57 |
</p> |
config/locales/de.yml | ||
---|---|---|
1020 | 1020 |
setting_login_required: Authentifizierung erforderlich |
1021 | 1021 |
setting_mail_from: E-Mail-Absender |
1022 | 1022 |
setting_mail_handler_api_enabled: Abruf eingehender E-Mails aktivieren |
1023 |
setting_mail_handler_api_key: API-Schlüssel |
|
1023 |
setting_mail_handler_api_key: API-Schlüssel für eingehende E-Mails |
|
1024 |
setting_sys_api_key: API-Schlüssel für Webservice zur Projektarchiv-Verwaltung |
|
1024 | 1025 |
setting_mail_handler_body_delimiters: "Schneide E-Mails nach einer dieser Zeilen ab" |
1025 | 1026 |
setting_mail_handler_excluded_filenames: Anhänge nach Namen ausschließen |
1026 | 1027 |
setting_new_project_user_role_id: Rolle, die einem Nicht-Administrator zugeordnet wird, der ein Projekt erstellt |
... | ... | |
1028 | 1029 |
setting_openid: Erlaube OpenID-Anmeldung und -Registrierung |
1029 | 1030 |
setting_password_min_length: Mindestlänge des Kennworts |
1030 | 1031 |
setting_password_max_age: Erzwinge Passwortwechsel nach |
1032 |
setting_lost_password: Erlaube Passwort-Zurücksetzen per E-Mail |
|
1031 | 1033 |
setting_per_page_options: Objekte pro Seite |
1032 | 1034 |
setting_plain_text_mail: Nur reinen Text (kein HTML) senden |
1033 | 1035 |
setting_protocol: Protokoll |
config/locales/en.yml | ||
---|---|---|
397 | 397 |
setting_enabled_scm: Enabled SCM |
398 | 398 |
setting_mail_handler_body_delimiters: "Truncate emails after one of these lines" |
399 | 399 |
setting_mail_handler_api_enabled: Enable WS for incoming emails |
400 |
setting_mail_handler_api_key: API key |
|
400 |
setting_mail_handler_api_key: Incoming email WS API key |
|
401 |
setting_sys_api_key: Repository management WS API key |
|
401 | 402 |
setting_sequential_project_identifiers: Generate sequential project identifiers |
402 | 403 |
setting_gravatar_enabled: Use Gravatar user icons |
403 | 404 |
setting_gravatar_default: Default Gravatar image |
... | ... | |
407 | 408 |
setting_openid: Allow OpenID login and registration |
408 | 409 |
setting_password_max_age: Require password change after |
409 | 410 |
setting_password_min_length: Minimum password length |
411 |
setting_lost_password: Allow password reset via email |
|
410 | 412 |
setting_new_project_user_role_id: Role given to a non-admin user who creates a project |
411 | 413 |
setting_default_projects_modules: Default enabled modules for new projects |
412 | 414 |
setting_issue_done_ratio: Calculate the issue done ratio with |