Merge branch 'master' into 1856-legislation_processes_proposals_phase

config/locales/en/admin.yml

@@ -213,6 +213,7 @@ en:
         hidden_debate: Hidden debate
         hidden_proposal: Hidden proposal
         title: Hidden comments
+        no_hidden_comments: There is no hidden comments.
     dashboard:
       index:
         back: Go back to %{org}
@@ -226,6 +227,7 @@ en:
           with_confirmed_hide: Confirmed
           without_confirmed_hide: Pending
         title: Hidden debates
+        no_hidden_debates: There is no hidden debates.
     hidden_users:
       index:
         filter: Filter
@@ -234,6 +236,8 @@ en:
           with_confirmed_hide: Confirmed
           without_confirmed_hide: Pending
         title: Hidden users
+        user: User
+        no_hidden_users: There is no hidden users.
       show:
         email: 'Email:'
         hidden_at: 'Hidden at:'
@@ -417,6 +421,7 @@ en:
       poll_officers: Poll officers
       polls: Polls
       poll_booths: Booths location
+      poll_booth_assignments: Booths Assignments
       poll_shifts: Manage shifts
       officials: Officials
       organizations: Organisations
@@ -522,6 +527,7 @@ en:
         search_officer_placeholder: Search officer
         search_officer_text: Search for an officer to assign a new shift
         select_date: "Select day"
+        no_voting_days: "Los dias de votación terminaron"
         select_task: "Select task"
         table_shift: "Shift"
         table_email: "Email"
@@ -532,6 +538,17 @@ en:
         date_missing: "A date must be selected"
       vote_collection: Collect Votes
       recount_scrutiny: Recount & Scrutiny
+    booth_assignments:
+      manage_assignments: Manage assignments
+      manage:
+        assignments_list: "Assignments for poll '%{poll}'"
+        status:
+          assign_status: Assignment
+          assigned: Assigned
+          unassigned: Unassigned
+        actions:
+          assign: Assign booth
+          unassign: Unassign booth
     poll_booth_assignments:
       flash:
         destroy: "Booth not assigned anymore"
@@ -545,6 +562,7 @@ en:
         no_officers: "There are no officers for this booth"
         recounts: "Recounts"
         recounts_list: "Recount list for this booth"
+        results: "Results"
         date: "Date"
         count_final: "Final recount (by officer)"
         count_by_system:  "Votes (automatic)"
@@ -554,9 +572,6 @@ en:
         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"
@@ -564,8 +579,13 @@ en:
         create: "Create poll"
         name: "Name"
         dates: "Dates"
+        geozone_restricted: "Restricted to districts"
       new:
         title: "New poll"
+        show_results_and_stats: "Show results and stats"
+        show_results: "Show results"
+        show_stats: "Show stats"
+        results_and_stats_reminder: "Marking these checkboxes the results and/or stats of this poll will be publicly available and every user will see them."
         submit_button: "Create poll"
       edit:
         title: "Edit poll"
@@ -606,7 +626,8 @@ en:
       show:
         proposal: Original proposal
         author: Author
-        title: Title
+        question: Question
+        edit_question: Edit question
         valid_answers: Valid answers
         add_answer: Add answer
         video_url: External video
@@ -629,6 +650,7 @@ en:
         description: Description
         images: Images
         images_list: Images list
+        edit: Edit answer
       edit:
         title: Edit answer
       videos:
@@ -652,11 +674,17 @@ en:
       index:
         title: "Results"
         no_results: "There are no results"
+      result:
         table_whites: "Totally blank ballots"
         table_nulls: "Invalid ballots"
         table_total: "Total ballots"
         table_answer: Answer
         table_votes: Votes
+      results_by_booth:
+        booth: Booth
+        results: Results
+        see_results: See results
+        title: "Results by booth"
     booths:
       index:
         title: "List of booths"
@@ -664,6 +692,7 @@ en:
         add_booth: "Add booth"
         name: "Name"
         location: "Location"
+        no_location: "No Location"
       new:
         title: "New booth"
         name: "Name"
@@ -676,6 +705,7 @@ en:
         location: "Location"
       booth:
         shifts: "Manage shifts"
+        edit: "Edit booth"
     officials:
       edit:
         destroy: Remove 'Official' status
@@ -723,6 +753,7 @@ en:
           with_confirmed_hide: Confirmed
           without_confirmed_hide: Pending
         title: Hidden proposals
+        no_hidden_proposals: There is no hidden proposals.
     settings:
       flash:
         updated: Value updated
@@ -765,6 +796,9 @@ en:
         placeholder: Search user by name or email
       search_results: "Search results"
       no_search_results: "No results found."
+      actions: Actions
+      title: Title
+      description: Description
     spending_proposals:
       index:
         geozone_filter_all: All zones
@@ -909,11 +943,12 @@ en:
         total: Total
         proposals_with_notifications: Proposals with notifications
     tags:
-      create: Create Topic
-      destroy: Destroy Topic
+      create: Create topic
+      destroy: Destroy topic
       index:
         add_tag: Add a new proposal topic
         title: Proposal topics
+        topic: Topic
       name:
         placeholder: Type the name of the topic
     users: