diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-02-04 17:36:15 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-02-04 17:36:15 +0000 |
| commit | fb3b904b8ffbe65ba11ed68252cdb441421b9a2b (patch) | |
| tree | 59a297f8cd97d158dd57d552bc00df1387173ace /config/locales/hu.yml | |
| parent | b9c26d6ddcd3b2afa91637d0f81738e7d2e6c17a (diff) | |
| download | redmine-fb3b904b8ffbe65ba11ed68252cdb441421b9a2b.tar.gz redmine-fb3b904b8ffbe65ba11ed68252cdb441421b9a2b.zip | |
Better handling of issue update conflicts (#8691).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8774 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config/locales/hu.yml')
| -rw-r--r-- | config/locales/hu.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/hu.yml b/config/locales/hu.yml index ddff9f764..96ea2bbc1 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -1037,3 +1037,7 @@ text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />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} |