diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-06-10 13:16:56 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-06-10 13:16:56 +0000 |
commit | 74645eb017f2f8a0f9e7ce669c50c3827488b801 (patch) | |
tree | a551422f1783886028107abd2874b4c9cdc35ee9 /config/locales/en.yml | |
parent | 26ff9e1c260b6cbb02371f72047e3108a93aee75 (diff) | |
download | redmine-74645eb017f2f8a0f9e7ce669c50c3827488b801.tar.gz redmine-74645eb017f2f8a0f9e7ce669c50c3827488b801.zip |
Configurable session lifetime and timeout (#6597).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9797 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config/locales/en.yml')
-rw-r--r-- | config/locales/en.yml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index d1718a77b..05ef97b0e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -49,6 +49,9 @@ en: about_x_hours: one: "about 1 hour" other: "about %{count} hours" + x_hours: + one: "1 hour" + other: "%{count} hours" x_days: one: "1 day" other: "%{count} days" @@ -194,6 +197,7 @@ en: error_unable_delete_issue_status: 'Unable to delete issue status' error_unable_to_connect: "Unable to connect (%{value})" error_attachment_too_big: "This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})" + error_session_expired: "Your session has expired. Please login again." warning_attachments_not_saved: "%{count} file(s) could not be saved." mail_subject_lost_password: "Your %{value} password" @@ -385,6 +389,8 @@ en: setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed setting_unsubscribe: Allow users to delete their own account + setting_session_lifetime: Session maximum lifetime + setting_session_timeout: Session inactivity timeout permission_add_project: Create project permission_add_subprojects: Create subprojects @@ -847,6 +853,7 @@ en: label_item_position: "%{position} of %{count}" label_completed_versions: Completed versions label_search_for_watchers: Search for watchers to add + label_session_expiration: Session expiration button_login: Login button_submit: Submit @@ -982,6 +989,7 @@ en: text_issue_conflict_resolution_add_notes: "Add my notes and discard my other changes" text_issue_conflict_resolution_cancel: "Discard all my changes and redisplay %{link}" text_account_destroy_confirmation: "Are you sure you want to proceed?\nYour account will be permanently deleted, with no way to reactivate it." + text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours." default_role_manager: Manager default_role_developer: Developer |