merge new website generation.

1 files changed, 57 insertions, 50 deletions

diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index e20c1fe..0e6b067 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -2,14 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-01 21:29+0100\n"
+"POT-Creation-Date: 2019-12-10 00:42+0000\n"
 "PO-Revision-Date: 2017-08-10 06:24+0200\n"
 "Last-Translator: \n"
 "Language-Team: es <LL@li.org>\n"
-"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "Generated-By: Babel 2.3.4\n"
 "X-Generator: Poedit 2.0.2\n"
@@ -18,7 +18,7 @@ msgstr ""
 msgid "GNU Taler"
 msgstr "GNU Taler"
 
-#: common/base.j2:6
+#: common/base.j2:6 common/news.j2:6
 msgid "Taxable Anonymous Libre Electronic Reserves"
 msgstr "Reservas Electrónicas Gravales, Anónimas y Libres"
 
@@ -34,19 +34,18 @@ msgstr "Preguntas frecuentes"
 msgid "Bibliography"
 msgstr "Bibliografía"
 
-#: common/footer.j2.inc:27 template/bibliography.html.j2:23
-#: template/bibliography.html.j2:30 template/bibliography.html.j2:37
-#: template/bibliography.html.j2:43 template/developers.html.j2:66
+#: common/footer.j2.inc:28 template/bibliography.html.j2:33
+#: template/developers.html.j2:66
 msgid "and"
 msgstr "y"
 
-#: common/footer.j2.inc:30
+#: common/footer.j2.inc:31
 msgid ""
 "We are grateful for support and free hosting of this site by <a href='http://"
 "www.bfh.ch/'>BFH</a>"
 msgstr ""
 
-#: common/footer.j2.inc:32
+#: common/footer.j2.inc:33
 msgid ""
 "This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
 "only."
@@ -66,24 +65,30 @@ msgstr ""
 msgid "Docs"
 msgstr ""
 
+#: common/navigation.j2.inc:24 news/index.html.j2:9
+msgid "News"
+msgstr ""
+
+#: common/news.j2:5
+msgid "GNUnet"
+msgstr ""
+
+#: inc/news.macro.j2:22
+msgid "read more"
+msgstr ""
+
 #: template/architecture.html.j2:6
 msgid "Taler System Architecture"
 msgstr "Arquitectura del Sistema Taler"
 
-#: template/bibliography.html.j2:4
+#: template/bibliography.html.j2:5
 msgid "GNU Taler Bibliography"
 msgstr "Bibliografía de GNU Taler"
 
-#: template/bibliography.html.j2:9 template/bibliography.html.j2:16
-#: template/bibliography.html.j2:23 template/bibliography.html.j2:30
-#: template/bibliography.html.j2:37 template/bibliography.html.j2:43
+#: template/bibliography.html.j2:27
 msgid "by"
 msgstr "por"
 
-#: template/bibliography.html.j2:44
-msgid "available upon request"
-msgstr "disponible bajo petición"
-
 #: template/contact.html.j2:6
 msgid "Contact information"
 msgstr "Contacto"
@@ -619,7 +624,7 @@ msgid "Exchange"
 msgstr "Plataforma de intercambio"
 
 #: template/docs.html.j2:64
-msgid "Operator's manual for the GNU Taler exchange. Also available as"
+msgid "Operator&#39;s manual for the GNU Taler exchange. Also available as"
 msgstr ""
 
 #: template/docs.html.j2:74
@@ -1027,7 +1032,7 @@ msgstr ""
 msgid ""
 "When making a payment, customers only need a charged wallet. A merchant can "
 "accept payments <span class=\"tlr\">without making their customers register</"
-"span> on the merchant's Website."
+"span> on the merchant&#39;s Website."
 msgstr ""
 
 #: template/features.html.j2:50
@@ -1053,8 +1058,8 @@ msgstr "Pagando con Taler"
 #| "or identity theft.</p>"
 msgid ""
 "To pay with Taler, customers install an electronic wallet on their device. "
-"Before the first payment, the desired currency must be added to the wallet's "
-"balance by some other means of payment."
+"Before the first payment, the desired currency must be added to the "
+"wallet&#39;s balance by some other means of payment."
 msgstr ""
 "<p>Para pagar con Taler, los clientes instalan una billetera electrónica en "
 "su dispositivo. Antes del primer pago, el saldo de la billetera debe ser "
@@ -1103,8 +1108,9 @@ msgstr "Recibiendo pagos con Taler"
 msgid ""
 "To receive Taler payments, a merchant needs a bank account in the desired "
 "currency. We provide supporting software in various programming languages to "
-"make the integration painless. The merchant's backend for Taler transaction "
-"processing can run on the merchant's premises or be hosted by a third party."
+"make the integration painless. The merchant&#39;s backend for Taler "
+"transaction processing can run on the merchant&#39;s premises or be hosted "
+"by a third party."
 msgstr ""
 "<p>Para recibir pagos con Taler, un comerciante necesita una cuenta bancaria "
 "en la moneda deseada. Nosotros proporcionamos el software de apoyo en varios "
@@ -1142,10 +1148,16 @@ msgid "Stable"
 msgstr "Estable"
 
 #: template/features.html.j2:143
+#, fuzzy
+#| msgid ""
+#| "Taler does not introduce a new currency. Taler uses a digital wallet "
+#| "storing coins and payment service providers with escrow accounts in "
+#| "existing currencies. Thus, Taler's cryptographic coins correspond to "
+#| "existing currencies, such as US Dollars, Euros or even Bitcoins."
 msgid ""
 "Taler does not introduce a new currency. Taler uses a digital wallet storing "
 "coins and payment service providers with escrow accounts in existing "
-"currencies. Thus, Taler's cryptographic coins correspond to existing "
+"currencies. Thus, Taler&#39;s cryptographic coins correspond to existing "
 "currencies, such as US Dollars, Euros or even Bitcoins."
 msgstr ""
 "Taler no introduce una nueva moneda. Taler utiliza una billetera electrónica "
@@ -1175,8 +1187,13 @@ msgid "Taxable"
 msgstr "Imponible"
 
 #: template/features.html.j2:172
+#, fuzzy
+#| msgid ""
+#| "When using Taler, merchant's revenue is transparent for tax collection "
+#| "authorities. Unlike cash and most digital currencies, Taler helps prevent "
+#| "black markets. Taler is not suitable for illegal activities."
 msgid ""
-"When using Taler, merchant's revenue is transparent for tax collection "
+"When using Taler, merchant&#39;s revenue is transparent for tax collection "
 "authorities. Unlike cash and most digital currencies, Taler helps prevent "
 "black markets. Taler is not suitable for illegal activities."
 msgstr ""
@@ -2040,37 +2057,37 @@ msgstr ""
 msgid "Shipment Tracking"
 msgstr ""
 
-#: template/index.html.j2:23
+#: template/index.html.j2:25
 msgid ""
 "We provide a payment system that makes <span class='tlr'>privacy-friendly</"
 "span> online transactions <span class='tlr'>fast and easy</span>."
 msgstr ""
 
-#: template/index.html.j2:27
+#: template/index.html.j2:29
 msgid "Payments without registration"
 msgstr ""
 
-#: template/index.html.j2:31
+#: template/index.html.j2:33
 msgid "Data protection by default"
 msgstr ""
 
-#: template/index.html.j2:35
+#: template/index.html.j2:37
 msgid "Fraud eliminated by design"
 msgstr ""
 
-#: template/index.html.j2:39
+#: template/index.html.j2:41
 msgid "Not a new currency!"
 msgstr ""
 
-#: template/index.html.j2:43
+#: template/index.html.j2:45
 msgid "Empowers communities to run their own payment infrastructure"
 msgstr ""
 
-#: template/index.html.j2:46
+#: template/index.html.j2:48
 msgid "Try Demo!"
 msgstr ""
 
-#: template/index.html.j2:47
+#: template/index.html.j2:49
 msgid "Read Docs"
 msgstr ""
 
@@ -2413,24 +2430,6 @@ msgstr ""
 msgid "customer perspective"
 msgstr "Perspectiva del consumidor"
 
-#: template/news.html.j2:6
-msgid "News"
-msgstr ""
-
-#: template/news.html.j2:16
-msgid "More news"
-msgstr ""
-
-#: template/old-news.html.j2:6
-#, fuzzy
-#| msgid "Taler News"
-msgid "Older News"
-msgstr "Noticias de Taler"
-
-#: template/old-news.html.j2:9
-msgid "This page documents the GNU Taler history."
-msgstr ""
-
 #: template/press.html.j2:4
 msgid "GNU Taler in the Press"
 msgstr "GNU Taler en la Prensa"
@@ -2713,6 +2712,14 @@ msgstr ""
 msgid "Wallets for other browsers will be provided in the near future."
 msgstr ""
 
+#~ msgid "available upon request"
+#~ msgstr "disponible bajo petición"
+
+#, fuzzy
+#~| msgid "Taler News"
+#~ msgid "Older News"
+#~ msgstr "Noticias de Taler"
+
 #, fuzzy
 #~| msgid "The Team"
 #~ msgid "Team"