Merge branch 'master' into polling-views-plus

This commit is contained in:
Juanjo Bazán
2016-10-19 13:50:08 +02:00
68 changed files with 1063 additions and 136 deletions

View File

@@ -210,6 +210,7 @@ en:
open_data: Open data
open_gov: Open government
proposals: Proposals
proposal_ballot: Voting
see_all: See proposals
spending_proposals: Spending proposals
legislation:
@@ -302,6 +303,7 @@ en:
hot_score: most active
most_commented: most commented
relevance: relevance
archival_date: Archived
retired_proposals: Retired proposals
retired_proposals_link: "Proposals retired by the author"
retired_links:
@@ -351,6 +353,7 @@ en:
zero: No supports
supports_necessary: "%{number} supports needed"
total_percent: 100%
archived: "This proposal has been archived and can't collect supports."
show:
author_deleted: User deleted
code: 'Proposal code:'
@@ -372,6 +375,17 @@ en:
update:
form:
submit_button: Save changes
proposal_ballots:
title: "Votings"
description_html: "The following citizen proposals that have reached the <strong>required supports</strong> and will be voted."
date_title: "Dates of participation"
date: "Soon we'll announce the date of vote these proposals."
successfull: "This proposal has reached the required supports and will be voted in the %{voting}."
voting: "next voting"
featured_title: "#NextVoting"
nothing_to_vote: "There is nothing to vote at the moment."
info: "New proposals that have reached the voting phase."
button: "I want to decide"
proposal_notifications:
new:
title: "Send message"