Merge branch 'release/4.3' into dev'

pull/6827/head
Continuous Integration 9 years ago
commit 83a9a5056e
  1. 6
      config/locales/en.yml

@ -48,12 +48,12 @@ en:
work_package: work_package:
attributes: attributes:
blocks_ids: blocks_ids:
can_only_contain_work_packages_of_current_sprint: "can only contain the IDs of current sprint's tickets" can_only_contain_work_packages_of_current_sprint: "can only contain the IDs of work packages in the current sprint"
must_block_at_least_one_work_package: "must contain the ID of at least one ticket" must_block_at_least_one_work_package: "must contain the ID of at least one ticket"
fixed_version_id: fixed_version_id:
task_version_must_be_the_same_as_story_version: "must be the same as the story's version" task_version_must_be_the_same_as_story_version: "must be the same as the story's version"
parent_id: parent_id:
parent_child_relationship_across_projects: "is invalid because the work_package '%{work_package_name}' is a backlogs task and as such can not have the backlogs story '%{parent_name}' as it's parent as long as the story is in a different project" parent_child_relationship_across_projects: "is invalid because the work package '%{work_package_name}' is a backlog task and as such can not have the backlog story '%{parent_name}' as its parent as long as the story is in a different project"
type_must_be_one_of_the_following: "Type must be one of the following: %{type_names}" type_must_be_one_of_the_following: "Type must be one of the following: %{type_names}"
sprint: sprint:
cannot_end_before_it_starts: "Sprint cannot end before it starts" cannot_end_before_it_starts: "Sprint cannot end before it starts"
@ -77,7 +77,7 @@ en:
label_is_done_status: "Status %{status_name} means done" label_is_done_status: "Status %{status_name} means done"
no_burndown_data: "No burndown data available. It is necessary to have the sprint start- and end dates set." no_burndown_data: "No burndown data available. It is necessary to have the sprint start- and end dates set."
points: "Points" points: "Points"
positions_could_not_be_rebuilt: "Positions could not be rebuild." positions_could_not_be_rebuilt: "Positions could not be rebuilt."
positions_rebuilt_successfully: "Positions rebuilt successfully." positions_rebuilt_successfully: "Positions rebuilt successfully."
properties: "Properties" properties: "Properties"
rebuild: "Rebuild" rebuild: "Rebuild"

Loading…
Cancel
Save