diff --git a/_i18n/en.yml b/_i18n/en.yml index 3da6fcf1..d5bddc7c 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -18,44 +18,38 @@ global: privacy: Privacy copyright: Copyright edit: Edit This Page -menu: - forum: Forum - blog: Blog - knowledge_base: Knowledge Base - community: Community - bitcointalk: Bitcointalk Thread - reddit: Reddit - allblog: All Blog Posts - devdiaries: Dev Diaries - missives: Monero Missives - uncategorised: Uncategorized - choose: How to Choose a Monero Client - running: How to Run a Monero Node - donations: Donating and Sponsorships - contribute: Contributing to Monero - downloads: All Monero Downloads - github: GitHub - merchants: Merchants and Services Directory - accepting: Accepting Monero Payments +titles: + index: Home + whatismonero: What is Monero (XMR)? + using: Using Monero + accepting: Accepting Monero + contributing: Improing Monero + mining: Mining Monero + faq: FAQ + downloads: Downloads + allposts: All Blog Posts + team: Monero Team + hangouts: Hangouts + events: Events + sponsorships: Sponsorships + merchants: Merchants & Services about: About Monero - people: The People Behind Monero + roadmap: Roadmap + researchlab: Monero Research Lab + moneropedia: Moneropedia userguides: User Guides developerguides: Developer Guides - vrp: Vulnerability Response Process - goals: Design & Development Goals - openalias: The OpenAlias Project - lab: Monero Research Lab - alternative: Alternative Clients - projects: External Projects - stackexchange: StackExchange Q&A - slack: Slack Chat - telegram: Telegram Chat - irc: IRC on Freenode - irc-general: "#monero (General)" - irc-development: "#monero-dev (Development)" - irc-trading: "#monero-otc (OTC Trading)" - irc-markets: "#monero-markets (Markets)" - irc-mining: "#monero-pools (Mining)" + technicalspecs: Technical Specs + themoneroproject: The Monero Project + presskit: Monero Press Kit + legal: Legal + ffs: Forum Funding System + ffs-cp: Completed Proposals + ffs-fr: Funding Required + ffs-ideas: Ideas + ffs-ot: Open Tasks + ffs-wip: Work in Progress + blogbytag: Blog by Tag index: page_title: "Monero - secure, private, untraceable" what_is_1: What is diff --git a/_i18n/en/get-started/contributing.md b/_i18n/en/get-started/contributing.md index 72a02ab1..c2785c78 100644 --- a/_i18n/en/get-started/contributing.md +++ b/_i18n/en/get-started/contributing.md @@ -49,7 +49,7 @@ Mining ensures the Monero network remains decentralized and secure. In the Moner
-

Ongoing development is supported by donations and sponsorships.

+

Ongoing development is supported by donations and sponsorships.

diff --git a/_i18n/en/get-started/mining.md b/_i18n/en/get-started/mining.md index 321332b3..ce648307 100644 --- a/_i18n/en/get-started/mining.md +++ b/_i18n/en/get-started/mining.md @@ -16,7 +16,7 @@
-

See Hangouts, /r/moneromining and #monero-pools.

+

See Hangouts, /r/moneromining and #monero-pools.

diff --git a/_i18n/en/index.md b/_i18n/en/index.md index 964b48f7..266200cc 100644 --- a/_i18n/en/index.md +++ b/_i18n/en/index.md @@ -16,7 +16,7 @@

Monero

Private Digital Currency

Monero is a secure, private, and untraceable cryptocurrency. It is open-source and accessible to all. With Monero, you are your own bank. Only you control and are responsible for your funds. Your accounts and transactions are kept private from prying eyes.

-

Get Started

+

Get Started

@@ -64,7 +64,7 @@

Monero is fungible

-

Monero is fungible because it is private by default. Units of Monero cannot be blacklisted by vendors or exchanges due to their association in previous transactions.

+

Monero is fungible because it is private by default. Units of Monero cannot be blacklisted by vendors or exchanges due to their association in previous transactions.

@@ -86,22 +86,22 @@
-

Monero for Windows

+

Monero for Windows

-

Monero for Mac

+

Monero for Mac

-

Monero for Linux

+

Monero for Linux

-

Latest Blockchain

+

Latest Blockchain

-

Need it for a different operating system? View all available downloads here.

+

Need it for a different operating system? View all available downloads here.

@@ -118,7 +118,7 @@ {% for post in site.posts limit:2 %}
-

{{ post.title }}

+

{{ post.title }}

{% endfor %} @@ -126,7 +126,7 @@
-

More news

+

More news

@@ -149,7 +149,7 @@

Moneropedia

Would you like to look up the meanings of the terms and concepts used in Monero? Here you will find an alphabetical guide to terms and their meanings from both the Monero and Kovri projects.

-

Read Moneropedia

+

Read Moneropedia

@@ -163,7 +163,7 @@

User Guides

Step-by-step guides to all things Monero are separated by category and cover everything from creating a wallet to supporting the network, and even how to edit this website.

-

Read user guides

+

Read user guides

@@ -177,7 +177,7 @@

FAQ

We've heard a lot of questions over the years and have compiled, for your convenience, a thorough and varied FAQ. Don't worry, if your questions are not on here, you can always ask the community.

-

Read answers

+

Read answers

diff --git a/_i18n/en/resources/roadmap.md b/_i18n/en/resources/roadmap.md index b06b7d60..f60d69b1 100644 --- a/_i18n/en/resources/roadmap.md +++ b/_i18n/en/resources/roadmap.md @@ -23,7 +23,7 @@

2014

- {% for toplevel in site.data.roadmap %} + {% for toplevel in site.data.lang[site.lang].roadmap %} {% if toplevel.year == 2014 %} {% for roadlist in toplevel.accomplishments %}
diff --git a/_i18n/es.yml b/_i18n/es.yml index 3da6fcf1..1e0beccb 100644 --- a/_i18n/es.yml +++ b/_i18n/es.yml @@ -18,44 +18,38 @@ global: privacy: Privacy copyright: Copyright edit: Edit This Page -menu: - forum: Forum - blog: Blog - knowledge_base: Knowledge Base - community: Community - bitcointalk: Bitcointalk Thread - reddit: Reddit - allblog: All Blog Posts - devdiaries: Dev Diaries - missives: Monero Missives - uncategorised: Uncategorized - choose: How to Choose a Monero Client - running: How to Run a Monero Node - donations: Donating and Sponsorships - contribute: Contributing to Monero - downloads: All Monero Downloads - github: GitHub - merchants: Merchants and Services Directory - accepting: Accepting Monero Payments - about: About Monero - people: The People Behind Monero - userguides: User Guides - developerguides: Developer Guides - vrp: Vulnerability Response Process - goals: Design & Development Goals - openalias: The OpenAlias Project - lab: Monero Research Lab - alternative: Alternative Clients - projects: External Projects - stackexchange: StackExchange Q&A - slack: Slack Chat - telegram: Telegram Chat - irc: IRC on Freenode - irc-general: "#monero (General)" - irc-development: "#monero-dev (Development)" - irc-trading: "#monero-otc (OTC Trading)" - irc-markets: "#monero-markets (Markets)" - irc-mining: "#monero-pools (Mining)" +titles: + index: Inicio + whatismonero: ¿Qué es Monero (XMR)? + using: Usar Monero + accepting: Aceptar Monero + contributing: Mejorar Monero + mining: Minar Monero + faq: FAQ + downloads: Descargas + allposts: All Blog Posts + team: Equipo + hangouts: Canales de comunicación + events: Eventos + sponsorships: Patrocinios + merchants: Comerciantes y Servicios + about: Sobre Monero + roadmap: Hoja de ruta + researchlab: Laboratorio de investigación de Monero (MRL) + moneropedia: Moneropedia + userguides: Guías de usuario + developerguides: Guías de desarrolladores + technicalspecs: Especificaciones técnicas + themoneroproject: The Monero Project + presskit: Monero Press Kit + legal: Legal + ffs: Forum Funding System + ffs-cp: Completed Proposals + ffs-fr: Funding Required + ffs-ideas: Ideas + ffs-ot: Open Tasks + ffs-wip: Work in Progress + blogbytag: Blog by Tag index: page_title: "Monero - secure, private, untraceable" what_is_1: What is diff --git a/_i18n/es/index.md b/_i18n/es/index.md index 4a62989b..03f6998a 100644 --- a/_i18n/es/index.md +++ b/_i18n/es/index.md @@ -5,7 +5,7 @@
-
@@ -15,7 +15,7 @@

Monero

Moneda Digital Privada

Monero es una moneda privada, segura y no rastreable. Tiene el código abierto y está disponible para todos. Con Monero, usted es su propio banco. Sólo usted controla sus finanzas. Sus cuentas y transacciones están cubiertas de ojos curiosos.

-

Empezar

+

Empezar

@@ -47,8 +47,8 @@
-

Monero is untraceable.

-

Sending and receiving addresses as well as transacted amounts are obfuscated by default. Transactions on the Monero blockchain cannot be linked to a particular user or real-world identity.

+

Monero es no rastreable.

+

El enviar y el recibir Monero se ofuscan por defecto. Las transacciones en la cadena de bloques no pueden identificar a un usuario particular o una persona real.

Untraceable Monero paths @@ -77,22 +77,22 @@
-

¿Usa otro sistema operativo?Véase todas descargas disponibles aquí.

+

¿Usa otro sistema operativo? Véase todas descargas disponibles aquí.

@@ -108,13 +108,13 @@ {% for post in site.posts limit:2 %}
{% endfor %}
@@ -134,7 +134,7 @@

Moneropedia

¿Quisiera ver las definiciones de términos y conceptos usados en Monero? Aquí encontrará la lista alfabética de términos de los proyectos Monero y Kovri y sus significados.

-

Leer Moneropedia

+

Leer Moneropedia

@@ -147,7 +147,7 @@

Guías de usuarios

Los guías, que describen varios procesos paso a paso, se separan por categoría. Cubren todos los asuntos, de cómo crear una billetera a cómo apoyar la red y aun cómo editar el sitio web.

-

Ver guías de usuarios

+

Ver guías de usuarios

@@ -159,8 +159,8 @@

FAQ

-

Hemos escuchado muchas preguntas a lo largo de los años y hemos compilado un FAQ variado y profundo para su conveniencia. No se preocupe, si sus preguntas no están aquí, puede hacerlas en los canales de comunicación de la comunidad.

-

Ver respuestas

+

Hemos compilado un FAQ variado y profundo para su conveniencia. No se preocupe, si sus preguntas no están aquí, puede hacerlas en los canales de comunicación de la comunidad.

+

Ver respuestas

diff --git a/_i18n/es/resources/roadmap.md b/_i18n/es/resources/roadmap.md index b06b7d60..f60d69b1 100644 --- a/_i18n/es/resources/roadmap.md +++ b/_i18n/es/resources/roadmap.md @@ -23,7 +23,7 @@

2014

- {% for toplevel in site.data.roadmap %} + {% for toplevel in site.data.lang[site.lang].roadmap %} {% if toplevel.year == 2014 %} {% for roadlist in toplevel.accomplishments %}
diff --git a/_includes/footer.html b/_includes/footer.html index d15590f6..48099ee4 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,60 +1,40 @@
- + diff --git a/_includes/head.html b/_includes/head.html index 5e3b12e0..a4217b0f 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -3,7 +3,12 @@ - {% if page.entry %}{{ page.entry }} | {% t global.wiki %} | {% t index.page_title %}{% elsif tag %}{% t global.tags %}: {{ tag.name }} | {% t index.page_title %}{% elsif page.title %}{{ page.title }} | {% t index.page_title %}{% else %}{% t index.page_title %}{% endif %} + + {% if page.entry %}{{ page.entry }} | {% t global.wiki %} | {% t index.page_title %} + {% elsif tag %}{% t global.tags %}: {{ tag.name }} | {% t index.page_title %} + {% elsif page.title contains "titles." %}{% t page.title %} | {% t index.page_title %} + {% elsif page.title %} {{page.title}} | {% t index.page_title %} + {% else %}{% t index.page_title %}{% endif %} diff --git a/_includes/header.html b/_includes/header.html index 5db86848..984f1587 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -4,9 +4,7 @@
- {% case site.lang %} - {% when 'en' %} - {% for item in site.data.navigation.en %} + {% for item in site.data.lang[site.lang].navigation %}
{% endfor %} - - {% when 'es' %} - {% for item in site.data.navigation.es %} -
- -
- {% endfor %} - - {% endcase %} -
-
+
- Forum Funding System - Vulnerability Response - The Monero Project + Forum Funding System + Vulnerability Response + The Monero Project +
@@ -102,10 +100,7 @@
-
+
- +