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

merges master and fixes conflicts

Browse Source
This commit is contained in:
kikito
2015-08-18 09:35:13 +02:00
parent cf4495e17c 1f5f6d2589
commit b28f63b016
80 changed files with 18565 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/locales/activerecord.en.yml
View File

@@ -23,5 +23,7 @@ en:
nickname: Nickname
password: Password
phone_number: Phone number
official_position: Official position
official_level: Official level
organization:
name: Organization name

2
config/locales/activerecord.es.yml
View File

@@ -23,5 +23,7 @@ es:
nickname: Pseudónimo
password: Contraseña
phone_number: Teléfono
official_position: Cargo público
official_level: Nivel del cargo
organization:
name: Nombre de organización

33
config/locales/admin.en.yml
View File

@@ -1,13 +1,21 @@
en:
admin:
settings:
index:
title: Global settings
flash:
updated: 'Setting updated!'
dashboard:
index:
title: Administration
menu:
settings: Global settings
debate_topics: Debate topics
hidden_debates: Hidden debates
hidden_comments: Hidden comments
organizations: Organizations
officials: Officials
stats: Statistics
organizations:
index:
title: Organizations
@@ -41,5 +49,30 @@ en:
debates:
index:
title: Hidden debates
show:
back: Back
restore:
success: The debate has been restored
officials:
level_0: Level 0
level_1: Level 1
level_2: Level 2
level_3: Level 3
level_4: Level 4
level_5: Level 5
index:
title: Officials
search_email_placeholder: 'Search user by email'
search: Search
search:
title: 'Officials: Search users'
edit_official: Edit official
make_official: Make this user an official
search: Search
edit:
title: 'Officials: edit user'
destroy: "Remove 'Official' condition"
cancel: "Cancel"
flash:
official_updated: 'Official position saved!'
official_destroyed: 'User is not an official anymore'

33
config/locales/admin.es.yml
View File

@@ -1,13 +1,21 @@
es:
admin:
settings:
index:
title: Configuración global
flash:
updated: 'Valor actualizado'
dashboard:
index:
title: Administración
menu:
settings: Configuración global
debate_topics: Temas de debate
hidden_debates: Debates ocultos
hidden_comments: Comentarios ocultos
organizations: Organizaciones
officials: Cargos públicos
stats: Estadísticas
organizations:
index:
title: Organizaciones
@@ -41,5 +49,30 @@ es:
debates:
index:
title: Debates ocultos
show:
back: Volver
restore:
success: El debate ha sido permitido
officials:
level_0: Nivel 0
level_1: Nivel 1
level_2: Nivel 2
level_3: Nivel 3
level_4: Nivel 4
level_5: Nivel 5
index:
title: Cargos Públicos
search_email_placeholder: 'Buscar usuario por email'
search: Buscar
search:
title: 'Cargos Públicos: Búsqueda de usuarios'
edit_official: Editar cargo público
make_official: Convertir en cargo público
search: Buscar
edit:
title: 'Cargos Públicos: Editar usuario'
destroy: "Eliminar condición de 'Cargo Público'"
cancel: "Cancelar"
flash:
official_updated: 'Datos del cargo público guardados'
official_destroyed: 'Datos guardados: el usuario ya no es cargo público'

10
config/locales/en.yml
View File

@@ -31,6 +31,14 @@ en:
debates:
index:
create_debate: Create a debate
showing: You are seeing
tag: with the topic
filter_debates: debates
filter_initiatives: initiatives
filter_debates_and_initiatives: debates and initiatives
filter_news: the newest
filter_votes: the most voted
filter_rated: the best rated
debate:
debate: Debate
comments:
@@ -131,3 +139,5 @@ en:
default: "You are not authorized to access this page."
manage:
all: "You are not authorized to %{action} %{subject}."
welcome:
featured_debates: Features debates

22
config/locales/es.yml
View File

@@ -31,6 +31,14 @@ es:
debates:
index:
create_debate: Crea un debate
showing: "Estás viendo"
tag: "con el tema"
filter_debates: debates
filter_initiatives: iniciativas
filter_debates_and_initiatives: debates e iniciativas
filter_news: "más nuevos"
filter_votes: "más votados"
filter_rated: mejor valorados
debate:
debate: Debate
comments:
@@ -129,17 +137,7 @@ es:
subject: Alguien ha respondido a tu comentario
unauthorized:
default: "No tienes permiso para acceder a esta página."
index:
all: "No tienes permiso para listar %{subject}"
show:
all: "No tienes permiso para ver %{subject}"
edit:
all: "No tienes permiso para editar %{subject}"
update:
all: "No tienes permiso para modificar %{subject}"
create:
all: "No tienes permiso para crear %{subject}"
delete:
all: "No tienes permiso para borrar %{subject}"
manage:
all: "No tienes permiso para realizar la acción '%{action}' sobre %{subject}."
welcome:
featured_debates: Debates destacados

17
config/locales/kaminari.en.yml Normal file
View File

@@ -0,0 +1,17 @@
en:
views:
pagination:
first: "« First"
last: "Last »"
previous: "‹ Prev"
next: "Next ›"
truncate: "…"
helpers:
page_entries_info:
one_page:
display_entries:
zero: "No %{entry_name} found"
one: "Displaying <b>1</b> %{entry_name}"
other: "Displaying <b>all %{count}</b> %{entry_name}"
more_pages:
display_entries: "Displaying %{entry_name} <b>%{first}&nbsp;-&nbsp;%{last}</b> of <b>%{total}</b> in total"

17
config/locales/kaminari.es.yml Normal file
View File

@@ -0,0 +1,17 @@
es:
views:
pagination:
first: "&laquo; Primera"
last: "Última &raquo;"
previous: "&lsaquo; Anterior"
next: "Siguiente &rsaquo;"
truncate: "&hellip;"
helpers:
page_entries_info:
one_page:
display_entries:
zero: "No se han encontrado %{entry_name}"
one: "Encontrado <b>1</b> %{entry_name}"
other: "Encontrados <b> %{count}</b> %{entry_name}"
more_pages:
display_entries: "Se muestran <b> del %{first}&nbsp;al&nbsp;%{last}</b> de un total de <b>%{total}</b> %{entry_name}"