Merge branch 'release/4.2' into dev

pull/6827/head
Jens Ulferts 10 years ago
commit 5096e8459c
  1. 18
      config/locales/en.yml

@ -19,36 +19,36 @@
--- ---
en: en:
button_save_as: "Save Report As..." button_save_as: "Save report as..."
comments: "Comment" comments: "Comment"
cost_reports_title: "Cost Reports" cost_reports_title: "Cost reports"
label_cost_report: "Cost Report" label_cost_report: "Cost report"
description_drill_down: "Show details" description_drill_down: "Show details"
description_filter_selection: "Selection" description_filter_selection: "Selection"
description_multi_select: "Show multiselect" description_multi_select: "Show multiselect"
description_remove_filter: "Remove Filter" description_remove_filter: "Remove filter"
information_restricted_depending_on_permission: "Depending on your permissions this page might contain restricted information." information_restricted_depending_on_permission: "Depending on your permissions this page might contain restricted information."
label_click_to_edit: "Click to edit." label_click_to_edit: "Click to edit."
label_closed: "closed" label_closed: "closed"
label_columns: "Columns" label_columns: "Columns"
label_cost_entry_attributes: "Cost Entry Attributes" label_cost_entry_attributes: "Cost entry attributes"
label_days_ago: "during the last days" label_days_ago: "during the last days"
label_entry: "Cost Entry" label_entry: "Cost entry"
label_filter_text: "Filter text" label_filter_text: "Filter text"
label_filter_value: "Value" label_filter_value: "Value"
label_filters: "Filter" label_filters: "Filter"
label_greater: ">" label_greater: ">"
label_is_not_project_with_subprojects: "is not (includes subprojects)" label_is_not_project_with_subprojects: "is not (includes subprojects)"
label_is_project_with_subprojects: "is (includes subprojects)" label_is_project_with_subprojects: "is (includes subprojects)"
label_work_package_attributes: "Work Package Attributes" label_work_package_attributes: "Work package attributes"
label_less: "<" label_less: "<"
label_money: "Cash value" label_money: "Cash value"
label_month_reporting: "Month (Spent)" label_month_reporting: "Month (Spent)"
label_new_report: "New Cost Report" label_new_report: "New cost report"
label_open: "open" label_open: "open"
label_operator: "Operator" label_operator: "Operator"
label_private_report_plural: "Private cost reports" label_private_report_plural: "Private cost reports"
@ -66,7 +66,7 @@ en:
permission_save_cost_reports: "Save public cost reports" permission_save_cost_reports: "Save public cost reports"
permission_save_private_cost_reports: "Save private cost reports" permission_save_private_cost_reports: "Save private cost reports"
project_module_reporting_module: "Cost Reports" project_module_reporting_module: "Cost reports"
text_costs_are_rounded_note: "Displayed values are rounded. All calculations are based on the non-rounded values." text_costs_are_rounded_note: "Displayed values are rounded. All calculations are based on the non-rounded values."
toggle_multiselect: "activate/deactivate multiselect" toggle_multiselect: "activate/deactivate multiselect"

Loading…
Cancel
Save