diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-02-05 07:48:22 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-02-05 07:48:22 +0000 |
| commit | f34ef6e83977abe83909cdb4318e741a55e32e64 (patch) | |
| tree | 12cdc4dec3852aa610e814f87f48a821366f0039 /config | |
| parent | 5d70fce6ce4c481f058fc1b89d567c1389cb7e54 (diff) | |
| download | redmine-f34ef6e83977abe83909cdb4318e741a55e32e64.tar.gz redmine-f34ef6e83977abe83909cdb4318e741a55e32e64.zip | |
Harmonize setting labels (#21421).
For every setting, there should always is be a "setting_%{label}
Patch by Jan Schulz-Hofen.
git-svn-id: http://svn.redmine.org/redmine/trunk@15146 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/de.yml | 4 | ||||
| -rw-r--r-- | config/locales/en.yml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/config/locales/de.yml b/config/locales/de.yml index 808a61681..0d6199830 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -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 diff --git a/config/locales/en.yml b/config/locales/en.yml index a9973786a..8a314511a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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 |