merges master and fix conflicts
This commit is contained in:
kikito
@@ -36,7 +36,7 @@ en:
|
||||
hide_author: Ban author
|
||||
restore: Restore
|
||||
confirm: 'Are you sure?'
|
||||
archive: Archive
|
||||
confirm_hide: Confirm
|
||||
tags:
|
||||
index:
|
||||
title: 'Debate topics'
|
||||
@@ -48,39 +48,30 @@ en:
|
||||
comments:
|
||||
index:
|
||||
title: Hidden comments
|
||||
show_debate: Show debate
|
||||
filter: Filter
|
||||
restore:
|
||||
success: The comment has been restored
|
||||
filters:
|
||||
all: All
|
||||
pending: Pending
|
||||
archived: Archived
|
||||
filters:
|
||||
all: All
|
||||
with_confirmed_hide: Confirmed
|
||||
debates:
|
||||
index:
|
||||
title: Hidden debates
|
||||
filter: Filter
|
||||
show:
|
||||
back: Back
|
||||
restore:
|
||||
success: The debate has been restored
|
||||
filters:
|
||||
all: All
|
||||
pending: Pending
|
||||
archived: Archived
|
||||
filters:
|
||||
all: All
|
||||
with_confirmed_hide: Confirmed
|
||||
users:
|
||||
index:
|
||||
title: Banned users
|
||||
restore: Restore user
|
||||
filter: Filter
|
||||
filters:
|
||||
all: All
|
||||
with_confirmed_hide: Confirmed
|
||||
show:
|
||||
title: "User activity from %{user}"
|
||||
restore: Restore user
|
||||
back: Back
|
||||
email: "Email:"
|
||||
registered_at: "Registered at:"
|
||||
hidden_at: "Hidden at:"
|
||||
restore:
|
||||
success: The user has been restored
|
||||
officials:
|
||||
level_0: Level 0
|
||||
level_1: Level 1
|
||||
|
||||
@@ -36,7 +36,7 @@ es:
|
||||
hide_author: Bloquear al autor
|
||||
restore: Volver a mostrar
|
||||
confirm: '¿Estás seguro?'
|
||||
archive: Archivar
|
||||
confirm_hide: Confirmar
|
||||
tags:
|
||||
index:
|
||||
title: 'Temas de debate'
|
||||
@@ -48,39 +48,30 @@ es:
|
||||
comments:
|
||||
index:
|
||||
title: Comentarios ocultos
|
||||
show_debate: Ver debate
|
||||
filter: Filtro
|
||||
restore:
|
||||
success: El comentario ha sido permitido
|
||||
filters:
|
||||
all: Todos
|
||||
pending: Pendientes
|
||||
archived: Archivados
|
||||
filter: Firar
|
||||
filters:
|
||||
all: Todos
|
||||
with_confirmed_hide: Confirmados
|
||||
debates:
|
||||
index:
|
||||
title: Debates ocultos
|
||||
filter: Filtro
|
||||
show:
|
||||
back: Volver
|
||||
restore:
|
||||
success: El debate ha sido permitido
|
||||
filters:
|
||||
all: Todos
|
||||
pending: Pendientes
|
||||
archived: Archivados
|
||||
filters:
|
||||
all: Todos
|
||||
with_confirmed_hide: Confirmados
|
||||
users:
|
||||
index:
|
||||
title: Usuarios bloqueados
|
||||
restore: Restaurar usuario
|
||||
filter: Filro
|
||||
filters:
|
||||
all: Todos
|
||||
with_confirmed_hide: Confirmados
|
||||
show:
|
||||
title: "Actividad del usuario %{user}"
|
||||
restore: Restaurar usuario
|
||||
back: Volver
|
||||
email: "Email:"
|
||||
registered_at: "Fecha de alta:"
|
||||
hidden_at: "Bloqueado:"
|
||||
restore:
|
||||
success: El usuario y sus contenidos han sido restaurados
|
||||
officials:
|
||||
level_0: Nivel 0
|
||||
level_1: Nivel 1
|
||||
|
||||
@@ -3,14 +3,24 @@ en:
|
||||
layouts:
|
||||
header:
|
||||
external_link_transparency: Transparency
|
||||
external_link_transparency_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Transparencia?vgnextfmt=default&vgnextchannel=20fd850769797310VgnVCM2000000c205a0aRCRD"
|
||||
external_link_opendata: Open data
|
||||
external_link_opendata_url: "http://datos.madrid.es"
|
||||
external_link_blog: Blog
|
||||
open_gov: "%{open} government"
|
||||
open: "Open"
|
||||
participation: Participation
|
||||
menu: Menu
|
||||
open_city: We are opening Madrid
|
||||
open_city_slogan: So the citizens can decide what kind of city they want.
|
||||
open_city_title: "The city you want, it will be the city you want."
|
||||
open_city_slogan:
|
||||
"Start listening to Madrid.
|
||||
For that we open this digital Puerta del Sol, where all the locals can meet to discuss and share everything we want.
|
||||
Also a place where you can talk directly with all the employees of the City of Madrid, from the Mayor to any officer."
|
||||
open_city_text:
|
||||
"Here every voice has its place, and are citizens, and no one in their name, they decide to vote debates what issues are
|
||||
most important of every time. Officials have individual users with whom you may participate in the debates, and evaluated,
|
||||
the same level as everyone else. Because the Madrid City Council works for its citizens, and must respond to them."
|
||||
open_city_soon: "And soon... we opened the section of citizen proposals."
|
||||
see_all_debates: See all debates
|
||||
my_account_link: My account
|
||||
locale: "Site language:"
|
||||
@@ -21,7 +31,20 @@ en:
|
||||
debates: Debates
|
||||
initiatives: Initiatives
|
||||
footer:
|
||||
description:
|
||||
"The city you want, it will be the city you want. Get more information here on this page.
|
||||
This Open Government Portal is %{open_source}, and code is in %{github_url}.
|
||||
Madrid, for the whole world."
|
||||
open_source: "software libre AGPLv3"
|
||||
open_source_url: "http://www.gnu.org/licenses/agpl-3.0.html"
|
||||
github_url: "https://github.com/ayuntamientomadrid"
|
||||
copyright: "Ayuntamiento de Madrid, 2015. All rights reserved"
|
||||
participation_title: "Participation"
|
||||
participation_text: Decide what should be the city of Madrid you want.
|
||||
transparency_title: Transparency
|
||||
transparency_text: Get any information on the City of Madrid.
|
||||
open_data_title: Open Data
|
||||
open_data_text: All City Council data are yours
|
||||
form:
|
||||
error: error
|
||||
errors: errors
|
||||
@@ -92,9 +115,11 @@ en:
|
||||
publish_new: Publish new debate
|
||||
back_link: Back
|
||||
recommendations_title: Tips for creating a debate
|
||||
recommendation_one: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore"
|
||||
recommendation_two: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore"
|
||||
recommendation_three: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore"
|
||||
recommendation_one: "On the Internet it is easy to say things you would not dare to say face to face. The tone of what you say you will be matched by a similar tone in the answers."
|
||||
recommendation_two: "Do not write the title of the debate or whole sentences in capital. On the Internet this is considered shouting. And nobody likes to scream."
|
||||
recommendation_three: "Any discussion or comment that involves an illegal act will be eliminated, also intending to sabotage the debate spaces, everything else is permitted."
|
||||
recommendation_four: "The harsh criticism are very welcome. This is a space of thought but we recommend preserving the elegance and intelligence. The world is better with them present."
|
||||
recommendation_five: "Enjoy this space, voices that fill it, it is yours too."
|
||||
comments:
|
||||
form:
|
||||
leave_comment: Write a comment
|
||||
@@ -137,8 +162,8 @@ en:
|
||||
shared:
|
||||
tags_cloud:
|
||||
tags: Topics
|
||||
flag_as_inappropiate: Flag as inappropriate
|
||||
undo_flag_as_inappropiate: Undo flag
|
||||
flag: Flag as inappropriate
|
||||
unflag: Undo flag
|
||||
collective: Collective
|
||||
mailer:
|
||||
comment:
|
||||
|
||||
@@ -3,14 +3,24 @@ es:
|
||||
layouts:
|
||||
header:
|
||||
external_link_transparency: Transparencia
|
||||
external_link_transparency_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Transparencia?vgnextfmt=default&vgnextchannel=20fd850769797310VgnVCM2000000c205a0aRCRD"
|
||||
external_link_opendata: Datos abiertos
|
||||
external_link_opendata_url: "http://datos.madrid.es"
|
||||
external_link_blog: Blog
|
||||
open_gov: "Gobierno %{open}"
|
||||
open: "abierto"
|
||||
participation: Participación
|
||||
menu: Menú
|
||||
open_city: Estamos abriendo Madrid
|
||||
open_city_slogan: Para que todos los madrileños decidamos que ciudad queremos tener.
|
||||
open_city_title: "La ciudad que quieres, será la ciudad que quieras."
|
||||
open_city_slogan:
|
||||
"Empecemos escuchando qué tiene que decir Madrid.
|
||||
Para ello abrimos esta Puerta del Sol digital, donde todos los madrileños podemos encontrarnos para debatir y compartir todo lo que queramos.
|
||||
También un espacio donde poder hablar directamente con todos los trabajadores del Ayuntamiento de Madrid, desde la Alcaldesa hasta cualquier funcionario."
|
||||
open_city_text:
|
||||
"Aquí cualquier voz tiene su espacio, y son los ciudadanos, y nadie en su nombre, los que deciden votando los debates cuáles son los temas
|
||||
más importantes de cada momento. Los funcionarios tienen usuarios propios con los que podrán participar en los debates, y ser evaluados,
|
||||
al mismo nivel que todos los demás. Porque el Ayuntamiento de Madrid trabaja para sus ciudadanos, y ante ellos debe responder."
|
||||
open_city_soon: "Y muy pronto... abrimos la sección de propuestas ciudadanas."
|
||||
see_all_debates: Ver todos los debates
|
||||
my_account_link: Mi cuenta
|
||||
locale: "Idioma de la página:"
|
||||
@@ -21,7 +31,20 @@ es:
|
||||
debates: Debates
|
||||
initiatives: Iniciativas
|
||||
footer:
|
||||
description:
|
||||
"La ciudad que quieres, será la ciudad que quieras. Obtén aquí más información sobre esta página.
|
||||
Este Portal de Gobierno Abierto es %{open_source}, y su código se encuentra en %{github_url}.
|
||||
De Madrid, para el mundo entero."
|
||||
open_source: "software libre AGPLv3"
|
||||
open_source_url: "http://www.gnu.org/licenses/agpl-3.0.html"
|
||||
github_url: "https://github.com/ayuntamientomadrid"
|
||||
copyright: "Ayuntamiento de Madrid, %{year}. Todos los derechos reservados"
|
||||
participation_title: "Participación"
|
||||
participation_text: "Decide cómo debe ser la ciudad de Madrid que quieres."
|
||||
transparency_title: Transparencia
|
||||
transparency_text: "Obtén cualquier información sobre el Ayuntamiento de Madrid."
|
||||
open_data_title: Datos Abiertos
|
||||
open_data_text: Todos los datos del Ayuntamiento son tuyos
|
||||
form:
|
||||
error: error
|
||||
errors: errores
|
||||
@@ -92,9 +115,11 @@ es:
|
||||
publish_new: Publicar debate nuevo
|
||||
back_link: Volver
|
||||
recommendations_title: Recomendaciones para crear un debate
|
||||
recommendation_one: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore"
|
||||
recommendation_two: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore"
|
||||
recommendation_three: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore"
|
||||
recommendation_one: "En internet es fácil decir cosas que uno no se atrevería a decir cara a cara. El tono de lo que digas será correspondido con un tono similar en las respuestas."
|
||||
recommendation_two: "No escribas el título del debate o frases enteras en mayúsculas. En internet eso se considera gritar. Y a nadie le gusta que le griten."
|
||||
recommendation_three: "Cualquier debate o comentario que implique una acción ilegal será eliminado, también los que tengan la intención de sabotear los espacios de debate, todo lo demás está permitido."
|
||||
recommendation_four: "Las críticas despiadadas son muy bienvenidas. Este es un espacio de pensamiento. Pero te recomendamos conservar la elegancia y la inteligencia. El mundo es mejor con ellas presentes."
|
||||
recommendation_five: "Disfruta de este espacio, de las voces que lo llenan, también es tuyo."
|
||||
comments:
|
||||
form:
|
||||
leave_comment: Deja tu comentario
|
||||
@@ -137,8 +162,8 @@ es:
|
||||
shared:
|
||||
tags_cloud:
|
||||
tags: Temas
|
||||
flag_as_inappropiate: Denunciar como inapropiado
|
||||
undo_flag_as_inappropiate: Deshacer denuncia
|
||||
flag: Denunciar como inapropiado
|
||||
unflag: Deshacer denuncia
|
||||
collective: Colectivo
|
||||
mailer:
|
||||
comment:
|
||||
|
||||
@@ -16,13 +16,13 @@ en:
|
||||
commentable: Root
|
||||
comment: Comment
|
||||
hide: Hide
|
||||
archive: Archive
|
||||
archived: Archived
|
||||
ignore_flag: Ignore
|
||||
ignored_flag: Ignored
|
||||
filter: Filter
|
||||
filters:
|
||||
all: All
|
||||
pending: Pending
|
||||
archived: Archived
|
||||
pending_flag_review: Pending
|
||||
with_ignored_flag: Ignored
|
||||
debates:
|
||||
index:
|
||||
title: Debates flagged as inappropriate
|
||||
@@ -33,10 +33,10 @@ en:
|
||||
description: Description
|
||||
actions: Actions
|
||||
hide: Hide
|
||||
archive: Archive
|
||||
archived: Archived
|
||||
ignore_flag: Ignore
|
||||
ignored_flag: Ignored
|
||||
filter: Filter
|
||||
filters:
|
||||
all: All
|
||||
pending: Pending
|
||||
archived: Archived
|
||||
pending_flag_review: Pending
|
||||
with_ignored_flag: Ignored
|
||||
|
||||
@@ -16,13 +16,13 @@ es:
|
||||
commentable: Raíz
|
||||
comment: Comentario
|
||||
hide: Ocultar
|
||||
archive: Archivar
|
||||
archived: Archivado
|
||||
ignore_flag: Ignorar
|
||||
ignored_flag: Ignorado
|
||||
filter: Filtrar
|
||||
filters:
|
||||
all: Todos
|
||||
pending: Pendientes
|
||||
archived: Archivados
|
||||
pending_flag_review: Pendientes
|
||||
with_ignored_flag: Ignorados
|
||||
debates:
|
||||
index:
|
||||
title: Debates denunciados como inapropiados
|
||||
@@ -33,10 +33,10 @@ es:
|
||||
description: Descripción
|
||||
actions: Acciones
|
||||
hide: Ocultar
|
||||
archive: Archivar
|
||||
archived: Archivado
|
||||
ignore_flag: Ignorar
|
||||
ignored_flag: Ignorado
|
||||
filter: Filtrar
|
||||
filters:
|
||||
all: Todos
|
||||
pending: Pendientes
|
||||
archived: Archivados
|
||||
pending_flag_review: Pendientes
|
||||
with_ignored_flag: Ignorados
|
||||
|
||||
Reference in New Issue
Block a user