diff --git a/app/views/management/budgets/investments/print.html.erb b/app/views/management/budgets/investments/print.html.erb index 6bdd84713..9dec03cc8 100644 --- a/app/views/management/budgets/investments/print.html.erb +++ b/app/views/management/budgets/investments/print.html.erb @@ -32,8 +32,7 @@ <% end %>
-

<%= t("management.print.budget_investments_info") %>
- <%= t("management.print.budget_investments_note") %>

+

<%= t("management.print.budget_investments_info") %>

diff --git a/app/views/management/proposals/print.html.erb b/app/views/management/proposals/print.html.erb index b4dfa9281..1948f0125 100644 --- a/app/views/management/proposals/print.html.erb +++ b/app/views/management/proposals/print.html.erb @@ -20,8 +20,7 @@ <%= render @proposals %>
-

<%= t("management.print.proposals_info") %>
- <%= t("management.print.proposals_note") %>

+

<%= t("management.print.proposals_info") %>

diff --git a/app/views/management/spending_proposals/print.html.erb b/app/views/management/spending_proposals/print.html.erb index 46a012149..72dba37d5 100644 --- a/app/views/management/spending_proposals/print.html.erb +++ b/app/views/management/spending_proposals/print.html.erb @@ -26,8 +26,7 @@ <%= render @spending_proposals %>
-

<%= t("management.print.spending_proposals_info") %>
- <%= t("management.print.spending_proposals_note") %>

+

<%= t("management.print.spending_proposals_info") %>

diff --git a/config/locales/en/devise.yml b/config/locales/en/devise.yml index 7be2fefba..712e47ff4 100644 --- a/config/locales/en/devise.yml +++ b/config/locales/en/devise.yml @@ -38,11 +38,7 @@ en: updated: "Your password has been changed successfully. Authentication successful." updated_not_active: "Your password has been changed successfully." registrations: - destroyed: - "Goodbye! Your account has been cancelled. We hope to see you again soon. In accordance with your request, personal data registered as - a user of the site and form part of the file 'File' under the responsibility of the - 'Responsible', they have been canceled under the terms of the provisions of Article 16 of the - Ley Orgánica 15/1999 de Protección de Datos de Carácter Personal and Article 31 of its Reglamento de desarrollo (RD 1720/2007)." + destroyed: "Goodbye! Your account has been cancelled. We hope to see you again soon." signed_up: "Welcome! You have been authenticated." signed_up_but_inactive: "Your registration was successful, but you could not be signed in because your account has not been activated." signed_up_but_locked: "Your registration was successful, but you could not be signed in because your account is locked." diff --git a/config/locales/en/devise_views.yml b/config/locales/en/devise_views.yml index b3b2681eb..8cb60b23d 100644 --- a/config/locales/en/devise_views.yml +++ b/config/locales/en/devise_views.yml @@ -16,7 +16,7 @@ en: confirmation_instructions: confirm_link: Confirm my account text: 'You can confirm your email account at the following link:' - title: Welcome to the Open Government Portal + title: Welcome welcome: Welcome reset_password_instructions: change_link: Change my password diff --git a/config/locales/en/management.yml b/config/locales/en/management.yml index 9d1b1046e..86ddba64b 100644 --- a/config/locales/en/management.yml +++ b/config/locales/en/management.yml @@ -78,12 +78,9 @@ en: vote_proposals: Vote proposals print: proposals_info: Create yor proposal on http://url.consul - proposals_note: The proposals more supported will be voted. If are accepted by a majority, the city Council shall be carried out. proposals_title: 'Proposals:' spending_proposals_info: Participate at http://url.consul - spending_proposals_note: Participatory budget will be assigned to the most voted budget investment. budget_investments_info: Participate at http://url.consul - budget_investments_note: Participatory budget will be assigned to the most voted budget investment. print_info: Print this info proposals: alert: @@ -106,7 +103,7 @@ en: unverified_user: User is not verified create: Create a budget investment filters: - heading: Concepto + heading: Concept unfeasible: Unfeasible investment print: print_button: Print diff --git a/config/locales/es/devise.yml b/config/locales/es/devise.yml index 4b6983051..9cd10c0a0 100644 --- a/config/locales/es/devise.yml +++ b/config/locales/es/devise.yml @@ -37,7 +37,7 @@ es: updated: "Tu contraseña ha cambiado correctamente. Has sido identificado correctamente." updated_not_active: "Tu contraseña se ha cambiado correctamente." registrations: - destroyed: "¡Adiós! Tu cuenta ha sido cancelada. Esperamos volver a verte pronto. Le informamos que de conformidad con su petición, sus datos personales registrados como usuario de la Web y que forman parte del fichero 'Fichero' cuyo responsable es 'Responsable', han sido cancelados en los términos de lo previsto en el artículo 16 de la Ley Orgánica 15/1999 de Protección de Datos de Carácter Personal y del artículo 31 de su Reglamento de desarrollo (RD 1720/2007)." + destroyed: "¡Adiós! Tu cuenta ha sido cancelada. Esperamos volver a verte pronto." signed_up: "¡Bienvenido! Has sido identificado." signed_up_but_inactive: "Te has registrado correctamente, pero no has podido iniciar sesión porque tu cuenta no ha sido activada." signed_up_but_locked: "Te has registrado correctamente, pero no has podido iniciar sesión porque tu cuenta está bloqueada." diff --git a/config/locales/es/devise_views.yml b/config/locales/es/devise_views.yml index aee940d5f..3f45671e5 100644 --- a/config/locales/es/devise_views.yml +++ b/config/locales/es/devise_views.yml @@ -16,7 +16,7 @@ es: confirmation_instructions: confirm_link: Confirmar mi cuenta text: 'Puedes confirmar tu cuenta de correo electrónico en el siguiente enlace:' - title: Te damos la bienvenida al Portal de Gobierno Abierto + title: Bienvenido/a welcome: Bienvenido/a reset_password_instructions: change_link: Cambiar mi contraseña diff --git a/config/locales/es/management.yml b/config/locales/es/management.yml index dbea2a38b..368be738f 100644 --- a/config/locales/es/management.yml +++ b/config/locales/es/management.yml @@ -78,12 +78,9 @@ es: vote_proposals: Participar en las votaciones finales print: proposals_info: Haz tu propuesta en http://url.consul - proposals_note: Las propuestas más apoyadas serán llevadas a votación. Y si las acepta una mayoría, el Ayuntamiento las llevará a cabo. proposals_title: 'Propuestas:' spending_proposals_info: Participa en http://url.consul - spending_proposals_note: Los presupuestos participativos se invertirán en las propuestas de inversión más apoyadas. budget_investments_info: 'Participa en http://url.consul' - budget_investments_note: Los presupuestos participativos se invertirán en los proyectos de gasto más apoyados. print_info: Imprimir esta información proposals: alert: