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

Merge branch 'master' into notifications

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2016-01-08 12:46:28 +01:00
parent 40ffeeaeb0 017bfe9146
commit de51bb0f79
19 changed files with 119 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config/locales/en.yml
View File

@@ -84,13 +84,11 @@ en:
featured_debates_html: "Featured<br>debates"
start_debate: "Start a debate"
select_order: "Order by"
select_order_long: "You are viewing debates according to:"
orders:
confidence_score: "highest rated"
hot_score: "most active"
created_at: "newest"
most_commented: "most commented"
random: "random"
relevance: "relevance"
filter_topic:
one: " with topic '%{topic}'"
@@ -160,14 +158,13 @@ en:
title: "Proposals"
featured_proposals_html: "Featured<br>proposals"
start_proposal: "Create a proposal"
select_order: "Order by"
select_order_long: "You are viewing proposals according to:"
select_order: "Order by"
orders:
confidence_score: "highest rated"
hot_score: "most active"
created_at: "newest"
most_commented: "most commented"
random: "random"
relevance: "relevance"
filter_topic:
one: " with topic '%{topic}'"
@@ -175,7 +172,7 @@ en:
search_form:
title: "Search"
button: "Search"
placeholder: "Search citizen proposals..."
placeholder: "Search proposals..."
search_results:
one: " containing the term '%{search_term}'"
other: " containing the term '%{search_term}'"

27
config/locales/es.yml
View File

@@ -84,14 +84,12 @@ es:
featured_debates_html: "Debates<br>destacados"
start_debate: "Empieza un debate"
select_order: "Ordenar por"
select_order_long: "Estás viendo los debates"
orders:
confidence_score: "mejor valorados"
hot_score: "más activos"
created_at: "más nuevos"
most_commented: "más comentados"
random: "aleatorio"
relevance: "relevancia"
confidence_score: "Mejor valorados"
hot_score: "Más activos hoy"
created_at: "Nuevos"
most_commented: "Más comentados"
relevance: "Más relevantes"
filter_topic:
one: " con el tema '%{topic}'"
other: " con el tema '%{topic}'"
@@ -160,22 +158,21 @@ es:
title: "Propuestas ciudadanas"
featured_proposals_html: "Propuestas<br>destacadas"
start_proposal: "Crea una propuesta"
select_order_long: "Estas viendo las propuestas"
select_order: "Ordenar por"
select_order_long: "Estás viendo las propuestas"
orders:
confidence_score: "más apoyadas"
hot_score: "más activas hoy"
created_at: "más nuevas"
most_commented: "más comentadas"
random: "aleatorias"
relevance: "relevancia"
confidence_score: "Más apoyadas"
hot_score: "Más activas hoy"
created_at: "Nuevas"
most_commented: "Más comentadas"
relevance: "Más relevantes"
filter_topic:
one: " con el tema '%{topic}'"
other: " con el tema '%{topic}'"
search_form:
title: "Buscar"
button: "Buscar"
placeholder: "Buscar propuestas ciudadanas..."
placeholder: "Buscar propuestas..."
search_results:
one: " que contiene '%{search_term}'"
other: " que contienen '%{search_term}'"