From fb3b904b8ffbe65ba11ed68252cdb441421b9a2b Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 4 Feb 2012 17:36:15 +0000 Subject: Better handling of issue update conflicts (#8691). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8774 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/th.yml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'config/locales/th.yml') diff --git a/config/locales/th.yml b/config/locales/th.yml index 0c52f74c0..81137e8f1 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -1015,3 +1015,7 @@ th: text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.
Once saved, the identifier cannot be changed. field_multiple: Multiple values setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed + text_issue_conflict_resolution_add_notes: Add my notes and discard my other changes + text_issue_conflict_resolution_overwrite: Apply my changes anyway (previous notes will be kept but some changes may be overwritten) + notice_issue_update_conflict: The issue has been updated by an other user while you were editing it. + text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link} -- cgit v1.2.3