fixes conflicts with master

config/locales/admin.en.yml

@@ -340,8 +340,10 @@ en:
       hidden_debates: Hidden debates
       hidden_proposals: Hidden proposals
       hidden_users: Hidden users
+      administrators: Administrators
       managers: Managers
       moderators: Moderators
+      newsletter: Newsletters
       valuators: Valuators
       poll_officers: Poll officers
       polls: Polls
@@ -364,6 +366,17 @@ en:
       title_banners: Banners
       title_site_customization: Site customization
       legislation: Collaborative Legislation
+    administrators:
+      index:
+        title: Administrators
+      administrator:
+        add: Add
+        delete: Delete
+        restricted_removal: "Sorry, you can't remove yourself from the administrators"
+      search:
+        email_placeholder: Search user by email
+        search: Search
+        user_not_found: User not found
     moderators:
       index:
         title: Moderators
@@ -374,6 +387,10 @@ en:
         email_placeholder: Search user by email
         search: Search
         user_not_found: User not found
+    newsletters:
+      index:
+        title: Newsletters
+        button: Download zip with users list
     valuators:
       index:
         title: Valuators
@@ -629,7 +646,7 @@ en:
         placeholder: Search spending proposals by title or description
       user_search:
         button: Search
-        placeholder: Search user by name or email'
+        placeholder: Search user by name or email
       search_results: "Search results"
       no_search_results: "No results found."
     spending_proposals: