Merge branch 'master' into site-customization

This commit is contained in:
Amaia Castro
2017-04-07 17:29:33 +02:00
279 changed files with 9351 additions and 464 deletions

View File

@@ -1,7 +1,10 @@
---
en:
admin:
header:
title: Administration
actions:
actions: Actions
confirm: Are you sure?
confirm_hide: Confirm
hide: Hide
@@ -9,6 +12,8 @@ en:
restore: Restore
mark_featured: Featured
unmark_featured: Unmark featured
edit: Edit
configure: Configure
banners:
index:
title: Banners
@@ -190,17 +195,20 @@ en:
activity: Moderator activity
admin: Admin menu
banner: Manage banners
poll_questions: Poll questions
proposals_topics: Proposals topics
budgets: Participatory budgets
debate_topics: Debate topics
geozones: Manage geozones
hidden_comments: Hidden comments
hidden_debates: Hidden debates
hidden_proposals: Hidden proposals
hidden_users: Hidden users
incomplete_verifications: Incomplete verifications
managers: Managers
moderators: Moderators
valuators: Valuators
poll_officers: Poll officers
polls: Polls
poll_booths: Booths location
officials: Officials
organizations: Organisations
settings: Configuration settings
@@ -211,6 +219,13 @@ en:
pages: Custom Pages
images: Custom Images
content_blocks: Custom content blocks
title_categories: Categories
title_moderated_content: Moderated content
title_budgets: Budgets
title_polls: Polls
title_profiles: Profiles
title_banners: Banners
title_site_customization: Site customization
moderators:
index:
title: Moderators
@@ -241,6 +256,162 @@ en:
in_evaluation_count: In evaluation
total_count: Total
cost: Cost
poll_officers:
index:
title: Poll officers
officer:
add: Add
delete: Delete position
name: Name
email: Email
entry_name: officer
search:
email_placeholder: Search user by email
search: Search
user_not_found: User not found
poll_officer_assignments:
flash:
destroy: "Officing shift removed"
create: "Officing shift added"
error_destroy: "An error ocurred when removing officer assignment"
error_create: "An error ocurred when adding officer assignment"
index:
officers_title: "List of officers"
no_officers: "There are no officers assigned to this poll."
table_name: "Name"
table_email: "Email"
add_officer_assignments: "Add shifts as officer"
edit_officer_assignments: "Edit officing shifts"
by_officer:
new_assignment: "New shift"
date: "Date"
booth: "Booth"
assignment: "Assignment"
select_date: "Select day"
select_booth: "Select booth"
add_assignment: "Add shift"
remove_assignment: "Remove"
assignments: "Officing shifts in this poll"
no_assignments: "This user has no officing shifts in this poll."
recounts: "Daily recounts"
recount: "Daily recount (by officer)"
final_recounts: "Final recounts"
final_recount: "Final recount (by officer)"
poll_booth_assignments:
flash:
destroy: "Booth not assigned anymore"
create: "Booth assigned"
error_destroy: "An error ocurred when removing booth assignment"
error_create: "An error ocurred when assigning booth to the poll"
show:
location: "Location"
officers: "Officers"
officers_list: "Officer list for this booth"
no_officers: "There are no officers for this booth"
recounts: "Recounts"
recounts_list: "Recount list for this booth"
no_recounts: "There are not daily recounts of this booth yet"
date: "Date"
count_by_officer: "Daily recount (by officer)"
count_final: "Final recount (by officer)"
count_by_system: "Votes (automatic)"
index:
booths_title: "List of booths"
no_booths: "There are no booths assigned to this poll."
table_name: "Name"
table_location: "Location"
table_assignment: "Assignment"
remove_booth: "Remove booth from poll"
add_booth: "Assign booth"
polls:
index:
title: "List of polls"
no_polls: "There are no polls."
create: "Create poll"
name: "Name"
dates: "Dates"
new:
title: "New poll"
submit_button: "Create poll"
edit:
title: "Edit poll"
submit_button: "Update poll"
show:
questions_tab: Questions
booths_tab: Booths
officers_tab: Officers
recounts_tab: Recounting
results_tab: Results
no_questions: "There are no questions assigned to this poll."
questions_title: "List of questions"
remove_question: "Remove question from poll"
add_question: "Include question"
table_title: "Title"
table_assignment: "Assignment"
table_name: "Name"
flash:
question_added: "Question added to this poll"
error_on_question_added: "Question could not be assigned to this poll"
question_removed: "Question removed from this poll"
error_on_question_removed: "Question could not be removed from this poll"
questions:
index:
title: "Questions"
create: "Create question"
no_questions: "There are no questions."
filter_poll: Filter by Poll
select_poll: Select Poll
questions_tab: "Questions"
successful_proposals_tab: "Successful proposals"
create_question: "Create question"
table_proposal: "Proposal"
table_question: "Question"
edit:
title: "Edit Question"
new:
title: "Create Question"
poll_label: "Poll"
valid_answers_note: "Enter the answers separated by commas (,)"
show:
proposal: Original proposal
author: Author
title: Title
valid_answers: Valid answers
description: Description
preview: View on website
recounts:
index:
title: "Recounts"
no_recounts: "There is nothing to be recounted"
table_booth_name: "Booth"
table_recounts: "Accumulated daily recounts (by officer)"
table_final_recount: "Final recount (by officer)"
table_system_count: "Votes (automatic)"
results:
index:
title: "Results"
no_results: "There are no results"
table_whites: "Blank ballots"
table_nulls: "Invalid ballots"
table_answer: Answer
table_votes: Votes
booths:
index:
title: "List of booths"
no_booths: "There are no booths."
add_booth: "Add booth"
name: "Name"
location: "Location"
new:
title: "New booth"
name: "Name"
location: "Location"
submit_button: "Create booth"
edit:
title: "Edit booth"
submit_button: "Update booth"
show:
location: "Location"
officials:
edit:
destroy: Remove 'Official' status
@@ -303,6 +474,15 @@ en:
enable: "Enable"
disable: "Disable"
shared:
booths_search:
button: Search
placeholder: Search booth by name
poll_officers_search:
button: Search
placeholder: Search poll officers
poll_questions_search:
button: Search
placeholder: Search poll questions
proposal_search:
button: Search
placeholder: Search proposals by title, code, description or question
@@ -312,6 +492,8 @@ en:
user_search:
button: Search
placeholder: Search user by name or email'
search_results: "Search results"
no_search_results: "No results found."
spending_proposals:
index:
geozone_filter_all: All zones
@@ -443,6 +625,7 @@ en:
visits_title: Visits
direct_messages: Direct messages
proposal_notifications: Proposal notifications
incomplete_verifications: Incomplete verifications
direct_messages:
title: Direct messages
total: Total
@@ -455,9 +638,9 @@ en:
create: Create Topic
destroy: Destroy Topic
index:
add_tag: Add a new debate topic
title: Debate topics
mark_as_featured: Propose topic upon creating debate
add_tag: Add a new proposal topic
title: Proposal topics
mark_as_featured: Propose topic upon creating proposal
name:
placeholder: Type the name of the topic
update: Update Topic