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

fixes conflicts with fork

Browse Source
This commit is contained in:
rgarcia
2016-06-17 19:40:30 +02:00
parent 9f195350a3
commit 98040e191e
8 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/locales/en.yml
View File

@@ -17,6 +17,7 @@ en:
subscription_to_website_newsletter_label: Receive by email website relevant information
email_on_direct_message_label: Receive emails about direct messages
email_digest_label: Receive a summary of proposal notifications
official_position_badge_label: Show official position badge
title: My account
user_permission_debates: Participate on debates
user_permission_info: With your account you can...

1
config/locales/es.yml
View File

@@ -17,6 +17,7 @@ es:
subscription_to_website_newsletter_label: Recibir emails con información interesante sobre la web
email_on_direct_message_label: Recibir emails con mensajes privados
email_digest_label: Recibir resumen de notificaciones sobre propuestas
official_position_badge_label: Mostrar etiqueta de tipo de usuario
title: Mi cuenta
user_permission_debates: Participar en debates
user_permission_info: Con tu cuenta ya puedes...