Merge branch 'master' into budget

This commit is contained in:
kikito
2016-11-28 11:41:49 +01:00
219 changed files with 3311 additions and 1189 deletions

View File

@@ -11,10 +11,22 @@ en:
max_votes_for_debate_edit: "Number of votes from which a Debate can no longer be edited"
proposal_code_prefix: "Prefix for Proposal codes"
votes_for_proposal_success: "Number of votes necessary for approval of a Proposal"
months_to_archive_proposals: "Months to archive Proposals"
email_domain_for_officials: "Email domain for public officials"
per_page_code: "Code to be included on every page"
twitter_handle: "Twitter handle"
twitter_hashtag: "Twitter hashtag"
facebook_handle: "Facebook handle"
youtube_handle: "Youtube handle"
blog_url: "Blog URL"
url: "Main URL"
org_name: "Organization"
place_name: "Place"
feature:
budgets: Participatory budgeting
twitter_login: Twitter login
facebook_login: Facebook login
google_login: Google login
debates: Debates
spending_proposals: Investment projects
spending_proposal_features: