Fix rebase with master.

2017-08-28 14:09:44 +02:00
parent 188d492f7a
commit 54cf210b07
8 changed files with 22 additions and 21 deletions
--- a/config/locales/en/community.yml
+++ b/config/locales/en/community.yml
@@ -1,8 +1,8 @@
 en:
  community:
    sidebar:
-      title: Comunidad
-      description: Partecipa a la comunidad de usuarios, da tu opinión.
+      title: Community
+      description: Join the community of users, give your opinion.
      button_to_access: Access the community
    show:
      title:
@@ -39,7 +39,6 @@ en:
        update:
          submit_button: Update topic
      show:
-        community_of_the_proposal: Community of the proposal
        tab:
          comments_tab: Comments
      sidebar:
--- a/config/locales/es/community.yml
+++ b/config/locales/es/community.yml
@@ -39,7 +39,6 @@ es:
        update:
          submit_button: Actualizar tema
      show:
-        community_of_the_proposal: Comunidad de la propuesta
        tab:
          comments_tab: Comentarios
      sidebar: