GitLab steht wegen Wartungsarbeiten am Montag, den 10. Mai, zwischen 17:00 und 19:00 Uhr nicht zur Verfügung.

Commit a536ecae authored by jplang's avatar jplang

Harmonize setting labels (#21421).

For every setting, there should always is be a "setting_%{label}
Patch by Jan Schulz-Hofen.

git-svn-id: e93f8b46-1217-0410-a6f0-8f06a7374b81
parent f3a482ed
......@@ -18,7 +18,7 @@
<%= 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]} %>
<p><%= setting_check_box :lost_password, :label => :label_password_lost %></p>
<p><%= setting_check_box :lost_password %></p>
<p><%= setting_text_field :max_additional_emails, :size => 6 %></p>
......@@ -46,8 +46,7 @@
<p><%= setting_text_field :sys_api_key,
:size => 30,
:id => 'settings_sys_api_key',
:disabled => !Setting.sys_api_enabled?,
:label => :setting_mail_handler_api_key %>
:disabled => !Setting.sys_api_enabled? %>
<%= link_to_function l(:label_generate_key),
"if (!$('#settings_sys_api_key').attr('disabled')) { $('#settings_sys_api_key').val(randomKey(20)) }" %>
......@@ -1020,7 +1020,8 @@ de:
setting_login_required: Authentifizierung erforderlich
setting_mail_from: E-Mail-Absender
setting_mail_handler_api_enabled: Abruf eingehender E-Mails aktivieren
setting_mail_handler_api_key: API-Schlüssel
setting_mail_handler_api_key: API-Schlüssel für eingehende E-Mails
setting_sys_api_key: API-Schlüssel für Webservice zur Projektarchiv-Verwaltung
setting_mail_handler_body_delimiters: "Schneide E-Mails nach einer dieser Zeilen ab"
setting_mail_handler_excluded_filenames: Anhänge nach Namen ausschließen
setting_new_project_user_role_id: Rolle, die einem Nicht-Administrator zugeordnet wird, der ein Projekt erstellt
......@@ -1028,6 +1029,7 @@ de:
setting_openid: Erlaube OpenID-Anmeldung und -Registrierung
setting_password_min_length: Mindestlänge des Kennworts
setting_password_max_age: Erzwinge Passwortwechsel nach
setting_lost_password: Erlaube Passwort-Zurücksetzen per E-Mail
setting_per_page_options: Objekte pro Seite
setting_plain_text_mail: Nur reinen Text (kein HTML) senden
setting_protocol: Protokoll
......@@ -398,7 +398,8 @@ en:
setting_enabled_scm: Enabled SCM
setting_mail_handler_body_delimiters: "Truncate emails after one of these lines"
setting_mail_handler_api_enabled: Enable WS for incoming emails
setting_mail_handler_api_key: API key
setting_mail_handler_api_key: Incoming email WS API key
setting_sys_api_key: Repository management WS API key
setting_sequential_project_identifiers: Generate sequential project identifiers
setting_gravatar_enabled: Use Gravatar user icons
setting_gravatar_default: Default Gravatar image
......@@ -408,6 +409,7 @@ en:
setting_openid: Allow OpenID login and registration
setting_password_max_age: Require password change after
setting_password_min_length: Minimum password length
setting_lost_password: Allow password reset via email
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
setting_default_projects_modules: Default enabled modules for new projects
setting_issue_done_ratio: Calculate the issue done ratio with
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment