Merge branch 'master' of github.com:AyuntamientoMadrid/participacion
This commit is contained in:
Jose Manuel
@@ -55,4 +55,4 @@ es:
|
||||
not_locked: "no estaba bloqueado."
|
||||
not_saved:
|
||||
one: "1 error impidió que este %{resource} fuera guardado:"
|
||||
other: "%{count} errores impidieron que este %{resource} fuera guardado:"
|
||||
other: "%{count} errores impidieron que este %{resource} fuera guardado:"
|
||||
|
||||
@@ -6,17 +6,20 @@ en:
|
||||
submit: "Resend confirmation instructions"
|
||||
mailer:
|
||||
confirmation_instructions:
|
||||
title: "Welcome to open government"
|
||||
welcome: "Welcome"
|
||||
text: "You can confirm your account email through the link below:"
|
||||
confirm_link: "Confirm my account"
|
||||
reset_password_instructions:
|
||||
hello: "Hello"
|
||||
text: "Someone has requested a link to change your password. You can do this through the link below."
|
||||
title: Change your password
|
||||
text: "Someone has requested to change your password. You can do this through the link below:"
|
||||
change_link: "Change my password"
|
||||
ignore_text: "If you didn't request this, please ignore this email."
|
||||
info_text: "Your password won't change until you access the link above and create a new one."
|
||||
unlock_instructions:
|
||||
hello: "Hello"
|
||||
title: Your account has been locked
|
||||
info_text: "Your account has been locked due to an excessive number of unsuccessful sign in attempts."
|
||||
instructions_text: "Click the link below to unlock your account:"
|
||||
unlock_link: "Unlock my account"
|
||||
@@ -66,6 +69,13 @@ en:
|
||||
phone_number_label: "Phone number"
|
||||
password_confirmation_label: "Confirm password"
|
||||
submit: "Sign up"
|
||||
success:
|
||||
title: "Registration of organization / collective"
|
||||
thank_you: "Thank you for registering your organization or collective in the website. Now is <b>pending verification</b>."
|
||||
instructions_1_html: "We will <b>contact you soon</b> in order to verify that you represent your collective."
|
||||
instructions_2_html: "Meanwhile, <b>review your email</b>. We have sent you a <b>confirmation link to activate your account</b>."
|
||||
instructions_3_html: "When you confirm your account will then be able to participate as a non-verified organization."
|
||||
back_to_index: "Ok, go back to index"
|
||||
sessions:
|
||||
new:
|
||||
title: "Log in"
|
||||
|
||||
@@ -6,17 +6,20 @@ es:
|
||||
submit: "Reenviar instrucciones de confirmación"
|
||||
mailer:
|
||||
confirmation_instructions:
|
||||
welcome: "Bienvenido"
|
||||
title: "Bienvenido/a a gobierno abierto"
|
||||
welcome: "Bienvenido/a"
|
||||
text: "Puedes confirmar tu cuenta de correo electrónico en el siguiente enlace:"
|
||||
confirm_link: "Confirmar mi cuenta"
|
||||
reset_password_instructions:
|
||||
hello: "Hola"
|
||||
text: "Se ha solicitado un enlace para cambiar tu contraseña, puedes hacerlo en el siguiente enlace:"
|
||||
change_link: "cambiar mi contraseña"
|
||||
ignore_text: "Si tu no lo has solicitado, puedes ignorar este email"
|
||||
title: "Cambiar tu contraseña"
|
||||
text: "Se ha solicitado cambiar tu contraseña, puedes hacerlo en el siguiente enlace:"
|
||||
change_link: "Cambiar mi contraseña"
|
||||
ignore_text: "Si tu no lo has solicitado, puedes ignorar este email."
|
||||
info_text: "Tu contraseña no cambiará hasta que no accedas al enlace y la modifiques."
|
||||
unlock_instructions:
|
||||
hello: "Hola"
|
||||
title: Tu cuenta ha sido bloqueada
|
||||
info_text: "Tu cuenta ha sido bloqueada debido a un excesivo número de intentos fallidos de alta."
|
||||
instructions_text: "Sigue el siguiente enlace para desbloquear tu cuenta:"
|
||||
unlock_link: "Desbloquear mi cuenta"
|
||||
@@ -66,6 +69,13 @@ es:
|
||||
phone_number_label: "Teléfono"
|
||||
password_confirmation_label: "Confirmar contraseña"
|
||||
submit: "Registrarse"
|
||||
success:
|
||||
title: "Registro de organización / colectivo"
|
||||
thank_you: "Gracias por registrar tu colectivo en la web. Ahora está <b>pendiente de verificación</b>."
|
||||
instructions_1_html: "En breve <b>nos pondremos en contacto contigo</b> para verificar que realmente representas a este colectivo."
|
||||
instructions_2_html: "Mientras <b>revisa tu correo electrónico</b>, te hemos enviado un <b>enlace para confirmar tu cuenta</b>."
|
||||
instructions_3_html: "Una vez confirmado, podrás empezar a participar como colectivo no verificado."
|
||||
back_to_index: "Entendido, volver a la página principal"
|
||||
sessions:
|
||||
new:
|
||||
title: "Entrar"
|
||||
|
||||
@@ -61,7 +61,6 @@ en:
|
||||
zero: No votes
|
||||
one: 1 vote
|
||||
other: "%{count} votes"
|
||||
votes_weighted_score: "Total: %{score}"
|
||||
form:
|
||||
debate_title: Debate title
|
||||
title_instructions: "SBe clear and precise with the title, but make it informative"
|
||||
@@ -134,8 +133,8 @@ en:
|
||||
shared:
|
||||
tags_cloud:
|
||||
tags: Topics
|
||||
flag_as_inappropiate: Flag as inappropiate
|
||||
undo_flag_as_inappropiate: Undo flag as inappropiate
|
||||
flag_as_inappropiate: Flag as inappropriate
|
||||
undo_flag_as_inappropiate: Undo flag
|
||||
collective: Collective
|
||||
mailer:
|
||||
comment:
|
||||
@@ -148,3 +147,12 @@ en:
|
||||
all: "You are not authorized to %{action} %{subject}."
|
||||
welcome:
|
||||
last_debates: Last debates
|
||||
omniauth:
|
||||
finish_signup:
|
||||
title: Add Email
|
||||
twitter:
|
||||
sign_in: Sign in with Twitter
|
||||
facebook:
|
||||
sign_in: Sign in with Facebook
|
||||
google_oauth2:
|
||||
sign_in: Sign in with Google
|
||||
|
||||
@@ -61,7 +61,6 @@ es:
|
||||
zero: Sin votos
|
||||
one: 1 voto
|
||||
other: "%{count} votos"
|
||||
votes_weighted_score: "Total: %{score}"
|
||||
form:
|
||||
debate_title: Título del debate
|
||||
title_instructions: "Sé claro y conciso a la hora de poner un título, pero recuerda que debe explicar bien tu idea, ¡es tu carta de entrada!"
|
||||
@@ -135,7 +134,7 @@ es:
|
||||
tags_cloud:
|
||||
tags: Temas
|
||||
flag_as_inappropiate: Denunciar como inapropiado
|
||||
undo_flag_as_inappropiate: Deshacer denunciar como inapropiado
|
||||
undo_flag_as_inappropiate: Deshacer denuncia
|
||||
collective: Colectivo
|
||||
mailer:
|
||||
comment:
|
||||
@@ -148,3 +147,12 @@ es:
|
||||
all: "No tienes permiso para realizar la acción '%{action}' sobre %{subject}."
|
||||
welcome:
|
||||
last_debates: Últimos debates
|
||||
omniauth:
|
||||
finish_signup:
|
||||
title: Añade tu email
|
||||
twitter:
|
||||
sign_in: Entra con Twitter
|
||||
facebook:
|
||||
sign_in: Entra con Facebook
|
||||
google_oauth2:
|
||||
sign_in: Entra con Google
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
en:
|
||||
mailers:
|
||||
comment:
|
||||
hi: "Hello, %{recipient}"
|
||||
new_comment_by: "There'is a new comment by %{commenter}"
|
||||
hi: Hello
|
||||
title: New comment on your debate
|
||||
new_comment_by_html: "There'is a new comment by <b<%{commenter}</b> on"
|
||||
reply:
|
||||
hi: "Hello, %{recipient}"
|
||||
new_reply_by: "There'is a new reply by %{commenter} to your comment"
|
||||
hi: Hello
|
||||
title: New reply on your comment
|
||||
new_reply_by_html: "There'is a new reply by <b>%{commenter}</b> to your comment on"
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
es:
|
||||
mailers:
|
||||
comment:
|
||||
hi: "Hola, %{recipient}"
|
||||
new_comment_by: "Hay un nuevo comentario de %{commenter}"
|
||||
hi: Hola
|
||||
title: Nuevo comentario en tu debate
|
||||
new_comment_by_html: "Hay un nuevo comentario de <b>%{commenter}</b> en"
|
||||
reply:
|
||||
hi: "Hola, %{recipient}"
|
||||
new_reply_by: "Hay una nueva respuesta de %{commenter} a tu comentario"
|
||||
hi: Hola
|
||||
title: Nueva respuesta a tu comentario
|
||||
new_reply_by_html: "Hay una nueva respuesta de <b>%{commenter}</b> a tu comentario en"
|
||||
|
||||
@@ -8,7 +8,7 @@ en:
|
||||
title: Moderation
|
||||
comments:
|
||||
index:
|
||||
title: Comments flagged as inappropiate
|
||||
title: Comments flagged as inappropriate
|
||||
headers:
|
||||
flags: Flags
|
||||
updated_at: Date
|
||||
@@ -16,27 +16,27 @@ en:
|
||||
commentable: Root
|
||||
comment: Comment
|
||||
hide: Hide
|
||||
mark_as_reviewed: Mark as reviewed
|
||||
reviewed: Reviewed
|
||||
archive: Archive
|
||||
archived: Archived
|
||||
filter: Filter
|
||||
filters:
|
||||
all: All
|
||||
pending_review: Pending
|
||||
reviewed: Reviewed
|
||||
pending: Pending
|
||||
archived: Archived
|
||||
debates:
|
||||
index:
|
||||
title: Debates flagged as inappropiate
|
||||
title: Debates flagged as inappropriate
|
||||
headers:
|
||||
flags: Flags
|
||||
updated_at: Date
|
||||
title: Title
|
||||
description: Description
|
||||
actions: Actions
|
||||
hide: Hide
|
||||
mark_as_reviewed: Mark as reviewed
|
||||
reviewed: Reviewed
|
||||
archive: Archive
|
||||
archived: Archived
|
||||
filter: Filter
|
||||
filters:
|
||||
all: All
|
||||
pending_review: Pending
|
||||
reviewed: Reviewed
|
||||
|
||||
pending: Pending
|
||||
archived: Archived
|
||||
|
||||
@@ -8,7 +8,7 @@ es:
|
||||
title: Moderación
|
||||
comments:
|
||||
index:
|
||||
title: Comentarios Denunciados como Inapropiados
|
||||
title: Comentarios denunciados como inapropiados
|
||||
headers:
|
||||
flags: Denuncias
|
||||
updated_at: Fecha
|
||||
@@ -16,28 +16,27 @@ es:
|
||||
commentable: Raíz
|
||||
comment: Comentario
|
||||
hide: Ocultar
|
||||
mark_as_reviewed: Marcar como revisado
|
||||
reviewed: Revisado
|
||||
archive: Archivar
|
||||
archived: Archivado
|
||||
filter: Filtrar
|
||||
filters:
|
||||
all: Todos
|
||||
pending_review: Pendientes
|
||||
reviewed: Revisados
|
||||
pending: Pendientes
|
||||
archived: Archivados
|
||||
debates:
|
||||
index:
|
||||
title: Debates Denunciados como Inapropiados
|
||||
title: Debates denunciados como inapropiados
|
||||
headers:
|
||||
flags: Denuncias
|
||||
updated_at: Fecha
|
||||
title: Título
|
||||
description: Descripción
|
||||
actions: Acciones
|
||||
hide: Ocultar
|
||||
mark_as_reviewed: Marcar como revisado
|
||||
reviewed: Revisado
|
||||
archive: Archivar
|
||||
archived: Archivado
|
||||
filter: Filtrar
|
||||
filters:
|
||||
all: Todos
|
||||
pending_review: Pendientes
|
||||
reviewed: Revisados
|
||||
|
||||
|
||||
pending: Pendientes
|
||||
archived: Archivados
|
||||
|
||||
Reference in New Issue
Block a user