jro_apps/redmine Commit - r14764:f34ef6e83977

Harmonize setting labels (#21421)....

Jean-Philippe Lang -

r14764:f34ef6e83977

parent child

Context file:

r14764:f34ef6e83977

app/views/settings/_authentication.html.erb +1 -1

               <%= 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>
-            <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>

app/views/settings/_repositories.html.erb +1 -2

             <p><%= setting_text_field :sys_api_key,
                                       :size     => 30,
                                       :id       => 'settings_sys_api_key',
-                                      :disabled => !Setting.sys_api_enabled?,
+                                      :disabled => !Setting.sys_api_enabled? %>
-                                      :label    => :setting_mail_handler_api_key %>
               <%= link_to_function l(:label_generate_key),
                                    "if (!$('#settings_sys_api_key').attr('disabled')) { $('#settings_sys_api_key').val(randomKey(20)) }" %>
             </p>

config/locales/de.yml +3 -1

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

config/locales/en.yml +3 -1

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

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages