[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-www] branch stable updated (ede1c3a -> 190bada)
From: |
gnunet |
Subject: |
[taler-www] branch stable updated (ede1c3a -> 190bada) |
Date: |
Thu, 01 Oct 2020 21:50:37 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch stable
in repository www.
from ede1c3a merge
add 91d63e0 add jp
add dbc18df Added translation using Weblate (Japanese)
add 80295b7 Translated using Weblate (Japanese)
add 27e7b48 jp -> ja
add af627f3 jp -> ja
add 2dfb695 Back to JP
add e71341c move PO file under /jp/
add b01e533 Translated using Weblate (Japanese)
add 9307d11 Translated using Weblate (Japanese)
add b2b0980 Translated using Weblate (Japanese)
add 674c7ac Translated using Weblate (Japanese)
add 503ef22 new logo under version
add f4ded66 new logo in index page
add 3794481 new logo at news pages
add ea40009 resize logo to 20%
add 69348e9 adjust logo
add f3d061d navigation logo
add 232f14f adjust navigation logo
add 64c0d2d remove not needed styles
add 5f806a3 adjust navigation logo
add 55c7673 adjust navigation logo
add 190bada taler talk
No new revisions were added by this update.
Summary of changes:
Makefile | 2 +-
common/navigation.j2.inc | 4 +-
images/logo-2020.jpg | Bin 0 -> 39336 bytes
.../{messages.pot => jp/LC_MESSAGES/messages.po} | 49 ++++++++++++---------
news/2015-11.html.j2 | 2 +-
news/2016-12.html.j2 | 2 +-
news/2017-02.html.j2 | 2 +-
news/2017-03.html.j2 | 2 +-
news/2017-04.html.j2 | 2 +-
news/2017-08.html.j2 | 2 +-
news/2020-10.html.j2 | 13 ++++++
static/styles.css | 29 ++++--------
template/index.html.j2 | 2 +-
www.yml | 6 +++
14 files changed, 65 insertions(+), 52 deletions(-)
create mode 100644 images/logo-2020.jpg
copy locale/{messages.pot => jp/LC_MESSAGES/messages.po} (98%)
create mode 100644 news/2020-10.html.j2
diff --git a/Makefile b/Makefile
index a613cff..353170e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
include build-system/config.mk
# List of all supported languages, add new languages here!
-LANGUAGES="en de fr es it ru pt"
+LANGUAGES="en de fr es it ru pt jp"
# All: build HTML pages in all languages and compile the
# TypeScript logic in web-common.
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index fb44bb1..1e712c2 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -6,7 +6,9 @@
{%- endmacro %}
<nav class="navbar navbar-expand-lg navbar-light">
- <a class="navbar-brand taler_home" href="{{ url_localized('index.html')
}}">Taler</a>
+ <a class="navbar-brand" href="{{ url_localized('index.html') }}">
+ <img class="taler_home" src="{{ url_static('images/logo-2020.jpg') }}">
+ </a>
<button class="navbar-toggler"
type="button"
data-toggle="collapse"
diff --git a/images/logo-2020.jpg b/images/logo-2020.jpg
new file mode 100644
index 0000000..489832f
Binary files /dev/null and b/images/logo-2020.jpg differ
diff --git a/locale/messages.pot b/locale/jp/LC_MESSAGES/messages.po
similarity index 98%
copy from locale/messages.pot
copy to locale/jp/LC_MESSAGES/messages.po
index 7ca20c7..bdd8611 100644
--- a/locale/messages.pot
+++ b/locale/jp/LC_MESSAGES/messages.po
@@ -3,75 +3,81 @@
# This file is distributed under the same license as the PROJECT project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2020-07-04 22:21+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-09-25 22:16+0000\n"
+"Last-Translator: Maki Konno <maki.7719@gmail.com>\n"
+"Language-Team: Japanese <http://weblate.taler.net/projects/gnu-taler/"
+"main-web-site/jp/>\n"
+"Language: jp\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.2.2\n"
"Generated-By: Babel 2.6.0\n"
#: common/base.j2:5 common/news.j2:5
msgid "GNU Taler"
-msgstr ""
+msgstr "GNU 通貨"
#: common/base.j2:6 common/news.j2:6
msgid "Taxable Anonymous Libre Electronic Reserves"
msgstr ""
#: common/footer.j2.inc:11
+#, fuzzy
msgid "Contact"
-msgstr ""
+msgstr "問合せ窓口"
#: common/footer.j2.inc:16
+#, fuzzy
msgid "FAQ"
-msgstr ""
+msgstr "よくある質問"
#: common/footer.j2.inc:21
msgid "Bibliography"
-msgstr ""
+msgstr "参考文献"
#: common/footer.j2.inc:28 template/bibliography.html.j2:34
msgid "and"
-msgstr ""
+msgstr "と"
#: 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 ""
+msgstr "私達は、このサイトによるサポートと貢献にとても感謝しています <a href='http://www.bfh.ch/'>BFH</a>"
#: common/footer.j2.inc:33
msgid ""
"This page was created using <a href='https://www.gnu.org/'>Free "
"Software</a> only."
msgstr ""
+"このページは、使用して作成されています<a href='https://www.gnu.org/'>Free Software</a> only."
#: common/navigation.j2.inc:21
msgid "Features"
-msgstr ""
+msgstr "特徴"
#: common/navigation.j2.inc:22
msgid "Principles"
-msgstr ""
+msgstr "原則"
#: common/navigation.j2.inc:23
msgid "Docs"
-msgstr ""
+msgstr "資料"
#: common/navigation.j2.inc:24 news/index.html.j2:8
msgid "News"
-msgstr ""
+msgstr "ニュース"
#: news/index.html.j2:11
msgid "News posts about changes related to GNU Taler such as releases and
events"
-msgstr ""
+msgstr "封切と出来事など、GNU通貨に関連する変更に関する新たな投稿"
#: news/index.html.j2:16
msgid "subscribe to our RSS feed"
@@ -79,11 +85,11 @@ msgstr ""
#: news/index.html.j2:33
msgid "read more"
-msgstr ""
+msgstr "続きを読む"
#: template/architecture.html.j2:6
msgid "Taler System Architecture"
-msgstr ""
+msgstr "通貨方式の建築"
#: template/bibliography.html.j2:5
msgid "GNU Taler Bibliography"
@@ -101,19 +107,19 @@ msgstr ""
msgid ""
"The Taler Cashier is an Android app that enables you to take cash and "
"give out electronic cash."
-msgstr ""
+msgstr "通貨の出納は、現金を受け取って電子現金を分配できるアンドロイドアプリです。"
#: template/cashier.html.j2:21 template/investors.html.j2:90
msgid "Download"
-msgstr ""
+msgstr "取得"
#: template/contact.html.j2:6
msgid "Contact information"
-msgstr ""
+msgstr "連絡先"
#: template/contact.html.j2:13
msgid "The mailing list"
-msgstr ""
+msgstr "送り先"
#: template/contact.html.j2:15
msgid "An archived, public mailing list for GNU Taler is hosted at"
@@ -1704,4 +1710,3 @@ msgstr ""
#: template/wallet.html.j2:263
msgid "Wallets for other browsers will be provided in the near future."
msgstr ""
-
diff --git a/news/2015-11.html.j2 b/news/2015-11.html.j2
index acca59d..92cb94a 100644
--- a/news/2015-11.html.j2
+++ b/news/2015-11.html.j2
@@ -2,7 +2,7 @@
{% block body_content %}
<h1>2015-11: Christian Grothoff explains the goals behind Taler</h1>
<p>
- <video id="video" poster="https://taler.net/images/logo-2018-dold.svg"
autobuffer="" height="360" width="640" controls="controls">
+ <video id="video" poster="https://taler.net/images/logo-2020.jpg"
autobuffer="" height="360" width="640" controls="controls">
<source src="https://taler.net/videos/inria2015interview.webm"
type="video/webm" />
<source src="https://taler.net/videos/inria2015interview.ogv"
type="video/ogv" />
</video>
diff --git a/news/2016-12.html.j2 b/news/2016-12.html.j2
index 8480d50..43533ae 100644
--- a/news/2016-12.html.j2
+++ b/news/2016-12.html.j2
@@ -2,7 +2,7 @@
{% block body_content %}
<h1>2016-12: Christian Grothoff explains Taler at hasgeek in Bangalore</h1>
<p>
- <video id="video" poster="https://taler.net/images/logo-2018-dold.svg"
autobuffer="" height="360" width="720" controls="controls">
+ <video id="video" poster="https://taler.net/images/logo-2020.jpg"
autobuffer="" height="360" width="720" controls="controls">
<source src="/videos/grothoff2016bangalore.webm" type="video/webm" \>
<source src="/videos/grothoff2016bangalore.ogv" type="video/ogv" \>
</video>
diff --git a/news/2017-02.html.j2 b/news/2017-02.html.j2
index ffe9076..41d5355 100644
--- a/news/2017-02.html.j2
+++ b/news/2017-02.html.j2
@@ -2,7 +2,7 @@
{% block body_content %}
<h1>2017-02: Florian Dold explains Taler at 50p in Bangalore</h1>
<p>
- <video id="video" poster="https://taler.net/images/logo-2018-dold.svg"
autobuffer="" height="360" width="640" controls="controls">
+ <video id="video" poster="https://taler.net/images/logo-2020.jpg"
autobuffer="" height="360" width="640" controls="controls">
<source src="/videos/dold50p.webm" type="video/webm" \>
<source src="/videos/dold50p.ogv" type="video/ogv" \>
</video>
diff --git a/news/2017-03.html.j2 b/news/2017-03.html.j2
index 6b4f792..198eba3 100644
--- a/news/2017-03.html.j2
+++ b/news/2017-03.html.j2
@@ -2,7 +2,7 @@
{% block body_content %}
<h1>2017-03: Sva explains GNU Taler at FOSSASIA in Singapore</h1>
<p>
- <video id="video" poster="https://taler.net/images/logo-2018-dold.svg"
autobuffer="" height="360" width="640" controls="controls">
+ <video id="video" poster="https://taler.net/images/logo-2020.jpg"
autobuffer="" height="360" width="640" controls="controls">
<source src="/videos/taler2017fossasia.webm" type="video/webm" \>
<source src="/videos/taler2017fossasia.ogv" type="video/ogv" \>
</video>
diff --git a/news/2017-04.html.j2 b/news/2017-04.html.j2
index 02ac38b..9162807 100644
--- a/news/2017-04.html.j2
+++ b/news/2017-04.html.j2
@@ -2,7 +2,7 @@
{% block body_content %}
<h1>2017-04: Sva explains GNU Taler at EasterHegg and Torsten demonstrates it
is child's play</h1>
<p>
- <video id="video" poster="https://taler.net/images/logo-2018-dold.svg"
autobuffer="" height="360" width="640" controls="controls">
+ <video id="video" poster="https://taler.net/images/logo-2020.jpg"
autobuffer="" height="360" width="640" controls="controls">
<source src="/videos/taler2017eh.webm" type="video/webm" \>
<source src="/videos/taler2017eh.ogv" type="video/ogv" \>
<source src="/videos/taler2017eh.mp4" type="video/mp4" \>
diff --git a/news/2017-08.html.j2 b/news/2017-08.html.j2
index 7a98a4f..d505daa 100644
--- a/news/2017-08.html.j2
+++ b/news/2017-08.html.j2
@@ -2,7 +2,7 @@
{% block body_content %}
<h1>2017-08: We explain GNU Taler at SHA 2017</h1>
<p>
- <video id="video" poster="https://taler.net/images/logo-2018-dold.svg"
autobuffer="" height="360" width="640" controls="controls">
+ <video id="video" poster="https://taler.net/images/logo-2020.jpg"
autobuffer="" height="360" width="640" controls="controls">
<source src="https://taler.net//videos/sha2017taler.webm"
type="video/webm" />
<source src="https://taler.net/videos/sha2017taler.ogv" type="video/ogv" />
<source src="https://taler.net/videos/sha2017taler.mp4" type="video/mp4" />
diff --git a/news/2020-10.html.j2 b/news/2020-10.html.j2
new file mode 100644
index 0000000..35ab839
--- /dev/null
+++ b/news/2020-10.html.j2
@@ -0,0 +1,13 @@
+{% extends "common/news.j2" %}
+{% block body_content %}
+<h1>2020-10: GNU Taler presentation by Javier Sepúlveda in Valencia</h1>
+<p>
+ <a href="https://www.gnu.org/people/speakers.html#Sepulveda">Javier
Sepúlveda</a>
+ will give a
+ <a
href="https://www.valenciatech.com/conferencias/gnu-taler-sistema-de-pago-socialmente-responsable/">talk</a>
+ in Spanish about GNU Taler at <a
href="https://www.lasnaves.com/som/">Valencia</a>
+ at an event organized by the <a
href="https://gnulinuxvalencia.org/">GNU/Linux group
+ from Valencia</a>, which is a public organization supported by the Valencia
City Hall
+ to promote urban innovation and entrepreneurship.
+</p>
+{% endblock body_content %}
diff --git a/static/styles.css b/static/styles.css
index 2307a5f..21286b2 100644
--- a/static/styles.css
+++ b/static/styles.css
@@ -104,27 +104,6 @@ footer {
min-height: 80vh;
}
-.adorn_h3_bracket h3::before {
- content: "❬";
- color: #aa3939;
-}
-
-.adorn_h3_bracket h3::after {
- content: "❭";
- color: #aa3939;
-}
-.taler_home::before {
- content: "❬";
- color: #aa3939;
-}
-.taler_home::after {
- content: "❭";
- color: #aa3939;
-}
-.taler_home {
- font-family: 'Lucida Console', Monaco, monospace;
-}
-
.footer-list {
list-style: none;
}
@@ -142,6 +121,14 @@ footer {
filter: invert(100%);
}
+/* overrides bootstrap defaults. */
+.navbar-brand {
+ display: contents;
+}
+
+.taler_home {
+ width: 8%;
+}
.checkmark {
height: 1em;
diff --git a/template/index.html.j2 b/template/index.html.j2
index 5720ce2..d0feda9 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -4,7 +4,7 @@
<div class="row justify-content-center">
<div class="col-8">
- <img src="{{ url_static('images/logo-2018-dold.svg') }}">
+ <img src="{{ url_static('images/logo-2020.jpg') }}">
</div>
</div>
diff --git a/www.yml b/www.yml
index 361cd3a..1b76225 100644
--- a/www.yml
+++ b/www.yml
@@ -16,6 +16,7 @@ langs_full: &langs
de: Deutsch
ru: Ру́сский язы́к
pt: Português
+ jp: 日本語
symlinks:
staticfiles:
- file: favicon.ico
@@ -26,6 +27,11 @@ staticfiles:
- robots.txt
meetingnotes:
newsposts:
+ - page: 2020-10.html
+ date: 2020-10-01
+ title: Talk about GNU Taler in Valencia
+ abstract:
+ content:
- page: 2020-09.html
date: 2020-09-16
title: GNU Taler launched at BFH
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-www] branch stable updated (ede1c3a -> 190bada),
gnunet <=