summaryrefslogtreecommitdiffstats
path: root/config/locales/fi.yml
diff options
context:
space:
mode:
Diffstat (limited to 'config/locales/fi.yml')
-rw-r--r--config/locales/fi.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 2ad1e9884..2f8c01249 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1039,3 +1039,7 @@ fi:
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}