consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into polls

Browse Source
This commit is contained in:
Juanjo Bazán
2017-01-19 16:51:19 +01:00
parent 0e9cec2ca6 c918c9e081
commit 113f9b32d7
254 changed files with 10658 additions and 871 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
config/locales/en.yml
View File

@@ -8,8 +8,8 @@ en:
erase_account_link: Erase my account
finish_verification: Complete verification
notifications: Notifications
organization_name_label: Name of organisation
organization_responsible_name_placeholder: Representative of the organisation/collective
organization_name_label: Name of organization
organization_responsible_name_placeholder: Representative of the organization/collective
personal: Personal details
phone_number_label: Phone number
public_activity_label: Keep my list of activities public
@@ -153,6 +153,7 @@ en:
proposal: Proposal
proposal_notification: "Notification"
spending_proposal: Spending proposal
budget/investment: Investment
user: Account
verification/sms: phone
signature_sheet: Signature sheet
@@ -207,7 +208,7 @@ en:
new_notifications:
one: You have a new notification
other: You have %{count} new notifications
no_notifications: You don't have new notifications
no_notifications: "You don't have new notifications"
open: open
open_city_slogan_html: There are cities that are governed directly by their inhabitants, who <b>discuss</b> the topics they are concerned about, <b>propose</b> ideas to improve their lives and <b>decide</b> among themselves which ones will be carried out.
open_city_title: Love the city, and it will become a city you love.
@@ -215,7 +216,8 @@ en:
proposals: Proposals
poll_questions: Voting
see_all: See proposals
spending_proposals: Spending proposals
budgets: Participatory budgeting
spending_proposals: Spending Proposals
legislation:
help:
alt: Select the text you want to comment and press the button with the pencil.
@@ -247,14 +249,23 @@ en:
facebook:
sign_in: Sign in with Facebook
sign_up: Sign up with Facebook
name: Facebook
finish_signup:
title: Add your email address
google_oauth2:
sign_in: Sign in with Google
sign_up: Sign up with Google
name: Google
twitter:
sign_in: Sign in with Twitter
sign_up: Sign up with Twitter
name: Twitter
info_sign_in: "Sign in with:"
info_sign_up: "Sign up with:"
or_fill: "Or fill the following form:"
finish_signup:
title: "Additional details"
username_warning: "Due to a change in the way we interact with social networks, it is possible that your username now appears as 'already in use'. If that is your case, please choose a different username."
proposals:
create:
form:
@@ -441,14 +452,11 @@ en:
comments:
title: 'Comments'
login_to_comment: 'You must %{signin} or %{signup} to leave a comment.'
"yes": "Yes"
"no": "No"
advanced_search:
author_type: 'By author category'
author_type_blank: 'Select a category'
author_type_1: 'Public employee'
author_type_2: 'Municipal Organization'
author_type_3: 'General director'
author_type_4: 'City councillor'
author_type_5: 'Mayoress'
date: 'By date'
date_placeholder: 'DD/MM/YYYY'
date_range_blank: 'Choose a date'
@@ -474,6 +482,7 @@ en:
hide: Hide
print:
print_button: Print this info
search: Search
show: Show
suggest:
debate:
@@ -589,8 +598,7 @@ en:
deleted: Deleted
deleted_debate: This debate has been deleted
deleted_proposal: This proposal has been deleted
delete_spending_proposal: Delete
confirm_deletion_spending_proposal: Are you sure? This action can not be undone
deleted_budget_investment: This investment has been deleted
filters:
comments:
one: 1 Comment
@@ -601,9 +609,9 @@ en:
proposals:
one: 1 Proposal
other: "%{count} Proposals"
spending_proposals:
one: 1 Spending proposal
other: "%{count} Spending proposals"
budget_investments:
one: 1 Investment
other: "%{count} Investments"
no_activity: User has no public activity
no_private_messages: "This user doesn't accept private messages."
private_activity: This user decided to keep the activity list private
@@ -617,7 +625,7 @@ en:
anonymous: Too many anonymous votes to admit vote %{verify_account}.
comment_unauthenticated: You must %{signin} or %{signup} to vote.
disagree: I disagree
organizations: Organisations are not permitted to vote
organizations: Organizations are not permitted to vote
signin: Sign in
signup: Sign up
supports: Supports
@@ -627,9 +635,16 @@ en:
spending_proposals:
not_logged_in: You must %{signin} or %{signup} to continue.
not_verified: Only verified users can vote on proposals; %{verify_account}.
organization: Organisations are not permitted to vote
organization: Organizations are not permitted to vote
unfeasible: Unfeasible investment projects can not be supported
not_voting_allowed: Voting phase is closed
budget_investments:
not_logged_in: You must %{signin} or %{signup} to continue.
not_verified: Only verified users can vote on proposals; %{verify_account}.
organization: Organizations are not permitted to vote
unfeasible: Unfeasible investment projects can not be supported
not_voting_allowed: Voting phase is closed
different_heading_assigned: You can only support proposals in one district
welcome:
debates:
description: For meeting, discussing and sharing the things that matter to us in our city.
@@ -659,19 +674,6 @@ en:
user_permission_verify_info: "* Only for users on Census."
user_permission_verify_my_account: Verify my account
user_permission_votes: Participate on final voting
omniauth:
finish_signup:
title: "Additional details"
username_warning: "Due to a change in the way we interact with social networks, it is possible that your username now appears as 'already in use'. If that is your case, please choose a different username."
twitter:
sign_in: "Sign in with Twitter"
sign_up: "Sign up with Twitter"
facebook:
sign_in: "Sign in with Facebook"
sign_up: "Sign up with Facebook"
google_oauth2:
sign_in: "Sign in with Google"
sign_up: "Sign up with Google"
legislation:
help:
title: "How I can comment this document?"