Merge branch 'master' into legislation-module-stable

This commit is contained in:
Amaia Castro
2017-01-11 22:54:41 +01:00
235 changed files with 9717 additions and 656 deletions

View File

@@ -4,6 +4,12 @@ en:
activity:
one: "activity"
other: "activities"
budget:
one: "Participatory budget"
other: "Participatory budgets"
budget/investment:
one: "Investment"
other: "Investments"
comment:
one: "Comment"
other: "Comments"
@@ -50,6 +56,30 @@ en:
one: "Answer"
other: "Answers"
attributes:
budget:
name: "Name"
description_accepting: "Description during Accepting phase"
description_reviewing: "Description during Reviewing phase"
description_selecting: "Description during Selecting phase"
description_valuating: "Description during Valuating phase"
description_balloting: "Description during Balloting phase"
description_reviewing_ballots: "Description during Reviewing Ballots phase"
description_finished: "Description when the budget is finished"
phase: "Phase"
currency_symbol: "Currency"
budget/investment:
heading_id: "Sección de presupuesto"
title: "Title"
description: "Description"
external_url: "External url"
location: "Location"
administrator_id: "Administrator"
description: "Description"
external_url: "Link to additional documentation"
heading_id: "Heading"
title: "Title"
location: "Location"
organization_name: "If you are proposing in the name of a collective/organization, write its name"
comment:
body: "Comment"
user: "User"
@@ -139,6 +169,10 @@ en:
attributes:
tag_list:
less_than_or_equal_to: "tags must be less than or equal to %{count}"
budget/investment:
attributes:
tag_list:
less_than_or_equal_to: "tags must be less than or equal to %{count}"
proposal_notification:
attributes:
minimum_interval: