[git] gnupg-doc - branch, master, updated. cbd448822077402651094bbfd158a53d7b822349
by Werner Koch
cvs at cvs.gnupg.org
Tue Sep 5 18:52:40 CEST 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GnuPG website and other docs".
The branch, master has been updated
via cbd448822077402651094bbfd158a53d7b822349 (commit)
from 0df7691b59f6a3be2fc58945ce5442fb9ec62822 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cbd448822077402651094bbfd158a53d7b822349
Author: Werner Koch <wk at gnupg.org>
Date: Tue Sep 5 18:48:57 2017 +0200
campaign: Also rename the translations of the main page
diff --git a/web/donate/index.de.org b/web/donate/camp2017.de.org
similarity index 94%
rename from web/donate/index.de.org
rename to web/donate/camp2017.de.org
index 5504753..3f2f41a 100644
--- a/web/donate/index.de.org
+++ b/web/donate/camp2017.de.org
@@ -40,17 +40,17 @@
<ul class="nav navbar-header pull-right visible-xs-inline-block lang-chooser lang-chooser-xs">
<li class="dropdown">
<!-- noscript: Link to the next language. -->
- <a href="/donate/index.fr.html"
+ <a href="/donate/camp2017.fr.html"
class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
<span class="flag-icon flag-icon-de"></span> <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
- <li><a href="/donate/index.html">
+ <li><a href="/donate/camp2017.html">
<span class="flag-icon flag-icon-usuk"></span> English</a></li>
- <li><a href="/donate/index.de.html">
+ <li><a href="/donate/camp2017.de.html">
<span class="flag-icon flag-icon-de "></span> German</a></li>
- <li><a href="/donate/index.fr.html">
+ <li><a href="/donate/camp2017.fr.html">
<span class="flag-icon flag-icon-fr "></span> French</a></li>
- <li><a href="/donate/index.ja.html">
+ <li><a href="/donate/camp2017.ja.html">
<span class="flag-icon flag-icon-jp "></span> Japanese</a></li>
</ul>
</li>
@@ -71,17 +71,17 @@
<ul class="nav navbar-nav navbar-right hidden-xs lang-chooser">
<li class="dropdown">
<!-- noscript: Link to the next language. -->
- <a href="/donate/index.fr.html"
+ <a href="/donate/camp2017.fr.html"
class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
<span class="flag-icon flag-icon-de"></span> <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
- <li><a href="/donate/index.html">
+ <li><a href="/donate/camp2017.html">
<span class="flag-icon flag-icon-usuk"></span> English</a></li>
- <li><a href="/donate/index.de.html">
+ <li><a href="/donate/camp2017.de.html">
<span class="flag-icon flag-icon-de "></span> German</a></li>
- <li><a href="/donate/index.fr.html">
+ <li><a href="/donate/camp2017.fr.html">
<span class="flag-icon flag-icon-fr "></span> French</a></li>
- <li><a href="/donate/index.ja.html">
+ <li><a href="/donate/camp2017.ja.html">
<span class="flag-icon flag-icon-jp "></span> Japanese</a></li>
</ul>
</li>
@@ -96,11 +96,27 @@
<div class="col-lg-12 visible-lg-block">
<h1>GnuPG Spendenkampagne</h1>
</div>
+ <div class="col-xs-12 col-lg-8">
+ <div class="embed-responsive embed-responsive-16by9 camp-video" data-embed="main">
+ <img src="/share/campaign/img/thumbs/main.jpg">
+ <div class="play-button"></div>
+ <div class="video-text">Klicken um das Video zu starten
+ <noscript><br />
+ <span style="font-size: 60%"
+ >(erfordert JavaScript von YouTube).
+ </span>
+ </noscript>
+ </div>
+ </div>
+ </div>
<div class="col-xs-12 hidden-lg">
<h1>GnuPG Spendenkampagne</h1>
</div>
+ <p>[<strong>This is a snaphot of the page at the end of the
+ campaign on 2017-09-05.</strong>]</p>
+
<div class="col-xs-12 col-lg-4">
<div class="row">
<div class="col-xs-12">
@@ -1703,6 +1719,103 @@ src="https://www.gnupg.org/ftp/media/openpgp.conf/2016/gnupg-team-smaller.jpg"
</div>
</div>
+ <div id="team" class="camp-gutter container">
+ <div class="row">
+ <div class="col-xs-12">
+ <h2>Wer wir sind</h2>
+ </div>
+ </div>
+
+ <div class="row">
+ <!-- Werner -->
+ <div class="camp-who col-md-6">
+ <div class="media">
+ <div class="media-left">
+ <img class="media-object" src="/share/campaign/img/team/werner.jpg" alt="Bild von Werner">
+ </div>
+ <div class="media-body">
+ <strong>Werner</strong> gründete GnuPG im Jahr 1997. Werner
+ ist seit langem ein Unterstützer von Freier Software und
+ ein Mitbegründer der FSFE.
+ </div>
+ </div>
+ </div>
+
+ <!-- Neal -->
+ <div class="camp-who col-md-6">
+ <div class="media">
+ <div class="media-left">
+ <img class="media-object" src="/share/campaign/img/team/neal.jpg" alt="Bild von Neal">
+ </div>
+ <div class="media-body">
+ <strong>Neal</strong> begann im Jahr 2015 an GnuPG zu
+ arbeiten und unterstützt Wartung und Entwicklung in
+ allen Gebieten.
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <!-- Justus -->
+ <div class="camp-who col-md-6">
+ <div class="media">
+ <div class="media-left">
+ <img class="media-object" src="/share/campaign/img/team/justus.jpg" alt="Bild von Justus">
+ </div>
+ <div class="media-body">
+ <strong>Justus</strong> begann im Jahr 2015 an GnuPG zu
+ arbeiten und unterstützt Wartung und Entwicklung in
+ allen Gebieten.
+ </div>
+ </div>
+ </div>
+
+ <!-- Marcus -->
+ <div class="camp-who col-md-6">
+ <div class="media">
+ <div class="media-left">
+ <img class="media-object" src="/share/campaign/img/team/marcus.jpg" alt="Bild von Marcus">
+ </div>
+ <div class="media-body">
+ <strong>Marcus</strong> hat im Zeitraum von 2001 bis
+ 2012 an GnuPG gearbeitet und ist seit 2017 wieder
+ eingestiegen um GnuPG auf allen Gebieten zu
+ unterstützen.
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <!-- Kai -->
+ <div class="camp-who col-md-6">
+ <div class="media">
+ <div class="media-left">
+ <img class="media-object" src="/share/campaign/img/team/kai.jpg" alt="Bild von Kai">
+ </div>
+ <div class="media-body">
+ <strong>Kai</strong> arbeitet seit dem Jahr 2015 an dem Enigmail Projekt.
+ </div>
+ </div>
+ </div>
+
+ <!-- Gniibe -->
+ <div class="camp-who col-md-6">
+ <div class="media">
+ <div class="media-left">
+ <img class="media-object" src="/share/campaign/img/team/gniibe.jpg" alt="Bild von Niibe">
+ </div>
+ <div class="media-body">
+ <strong>Niibe</strong> ist seit langem ein Hacker von
+ Freier Software und kam im Jahr 2011 zu dem GnuPG
+ Projekt um an Smart Cards und dem Gnuk Sicherheitstoken
+ zu arbeiten.
+ </div>
+ </div>
+ </div>
+ </div>
+
</div>
</div>
diff --git a/web/donate/index.fr.org b/web/donate/camp2017.fr.org
similarity index 94%
rename from web/donate/index.fr.org
rename to web/donate/camp2017.fr.org
index 4e190b1..c51e97d 100644
--- a/web/donate/index.fr.org
+++ b/web/donate/camp2017.fr.org
@@ -40,17 +40,17 @@
<ul class="nav navbar-header pull-right visible-xs-inline-block lang-chooser lang-chooser-xs">
<li class="dropdown">
<!-- noscript: Link to the next language. -->
- <a href="/donate/index.ja.html"
+ <a href="/donate/camp2017.ja.html"
class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
<span class="flag-icon flag-icon-fr"></span> <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
- <li><a href="/donate/index.html">
+ <li><a href="/donate/camp2017.html">
<span class="flag-icon flag-icon-usuk"></span> English</a></li>
- <li><a href="/donate/index.de.html">
+ <li><a href="/donate/camp2017.de.html">
<span class="flag-icon flag-icon-de "></span> German</a></li>
- <li><a href="/donate/index.fr.html">
+ <li><a href="/donate/camp2017.fr.html">
<span class="flag-icon flag-icon-fr "></span> French</a></li>
- <li><a href="/donate/index.ja.html">
+ <li><a href="/donate/camp2017.ja.html">
<span class="flag-icon flag-icon-jp "></span> Japanese</a></li>
</ul>
</li>
@@ -68,17 +68,17 @@
<ul class="nav navbar-nav navbar-right hidden-xs lang-chooser">
<li class="dropdown">
<!-- noscript: Link to the next language. -->
- <a href="/donate/index.ja.html"
+ <a href="/donate/camp2017.ja.html"
class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
<span class="flag-icon flag-icon-fr"></span> <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
- <li><a href="/donate/index.html">
+ <li><a href="/donate/camp2017.html">
<span class="flag-icon flag-icon-usuk"></span> English</a></li>
- <li><a href="/donate/index.de.html">
+ <li><a href="/donate/camp2017.de.html">
<span class="flag-icon flag-icon-de "></span> German</a></li>
- <li><a href="/donate/index.fr.html">
+ <li><a href="/donate/camp2017.fr.html">
<span class="flag-icon flag-icon-fr "></span> French</a></li>
- <li><a href="/donate/index.ja.html">
+ <li><a href="/donate/camp2017.ja.html">
<span class="flag-icon flag-icon-jp "></span> Japanese</a></li>
</ul>
</li>
@@ -93,11 +93,27 @@
<div class="col-lg-12 visible-lg-block">
<h1>Campagne de financement pour GnuPG</h1>
</div>
+ <div class="col-xs-12 col-lg-8">
+ <div class="embed-responsive embed-responsive-16by9 camp-video" data-embed="main">
+ <img src="/share/campaign/img/thumbs/main.jpg">
+ <div class="play-button"></div>
+ <div class="video-text">Cliquez pour lancer la vidéo
+ <noscript><br />
+ <span style="font-size: 60%"
+ >(nécessite JavaScript depuis YouTube.)
+ </span>
+ </noscript>
+ </div>
+ </div>
+ </div>
<div class="col-xs-12 hidden-lg">
<h1>Campagne de financement pour GnuPG</h1>
</div>
+ <p>[<strong>This is a snaphot of the page at the end of the
+ campaign on 2017-09-05.</strong>]</p>
+
<div class="col-xs-12 col-lg-4">
<div class="row">
<div class="col-xs-12">
@@ -1617,6 +1633,102 @@ src="https://www.gnupg.org/ftp/media/openpgp.conf/2016/gnupg-team-smaller.jpg"
</div>
</div>
+<div id="team" class="camp-gutter container">
+<div class="row">
+ <div class="col-xs-12">
+ <h2>Qui nous sommes</h2>
+ </div>
+</div>
+
+<div class="row">
+ <!-- Werner -->
+ <div class="camp-who col-md-6">
+ <div class="media">
+ <div class="media-left">
+ <img class="media-object" src="/share/campaign/img/team/werner.jpg" alt="Photo de Werner">
+ </div>
+ <div class="media-body">
+ <strong>Werner</strong> a fondé GnuPG en 1997. Werner
+ milite pour le logiciel libre depuis longtemps, et est en
+ particulier co-fondateur de la FSFE.
+ </div>
+ </div>
+ </div>
+
+ <!-- Neal -->
+ <div class="camp-who col-md-6">
+ <div class="media">
+ <div class="media-left">
+ <img class="media-object" src="/share/campaign/img/team/neal.jpg" alt="Photo de Neal">
+ </div>
+ <div class="media-body">
+ <strong>Neal</strong> travaille sur GnuPG depuis 2015,
+ contribuant à la maintenance et au développement de toutes les
+ composantes du projet.
+ </div>
+ </div>
+ </div>
+</div>
+
+<div class="row">
+ <!-- Justus -->
+ <div class="camp-who col-md-6">
+ <div class="media">
+ <div class="media-left">
+ <img class="media-object" src="/share/campaign/img/team/justus.jpg" alt="Photo de Justus">
+ </div>
+ <div class="media-body">
+ <strong>Justus</strong> travaille sur GnuPG depuis 2015,
+ contribuant à la maintenance et au développement de toutes les
+ composantes du projet.
+ </div>
+ </div>
+ </div>
+
+ <!-- Marcus -->
+ <div class="camp-who col-md-6">
+ <div class="media">
+ <div class="media-left">
+ <img class="media-object" src="/share/campaign/img/team/marcus.jpg" alt="Photo de Marcus">
+ </div>
+ <div class="media-body">
+ <strong>Marcus</strong> a travaillé sur GnuPG entre 2001 et
+ 2012, puis de nouveau depuis 2017 pour contribuer à
+ la maintenance et au développement de toutes les
+ composantes du projet.
+ </div>
+ </div>
+ </div>
+</div>
+
+<div class="row">
+ <!-- Kai -->
+ <div class="camp-who col-md-6">
+ <div class="media">
+ <div class="media-left">
+ <img class="media-object" src="/share/campaign/img/team/kai.jpg" alt="Photo de Kai">
+ </div>
+ <div class="media-body">
+ <strong>Kai</strong> travaille sur le projet Enigmail depuis 2015.
+ </div>
+ </div>
+ </div>
+
+ <!-- Gniibe -->
+ <div class="camp-who col-md-6">
+ <div class="media">
+ <div class="media-left">
+ <img class="media-object" src="/share/campaign/img/team/gniibe.jpg" alt="Photo de Niibe">
+ </div>
+ <div class="media-body">
+ <strong>Niibe</strong> est un militant du logiciel libre
+ qui a rejoint le projet GnuPG en 2011 pour travailler sur les
+ cartes à puce et le jeton de sécurité Gnuk.
+ </div>
+ </div>
+ </div>
+</div>
+
</div>
</div>
diff --git a/web/donate/index.ja.org b/web/donate/camp2017.ja.org
similarity index 94%
rename from web/donate/index.ja.org
rename to web/donate/camp2017.ja.org
index 1193529..39b979e 100644
--- a/web/donate/index.ja.org
+++ b/web/donate/camp2017.ja.org
@@ -40,17 +40,17 @@
<ul class="nav navbar-header pull-right visible-xs-inline-block lang-chooser lang-chooser-xs">
<li class="dropdown">
<!-- noscript: Link to the next language. -->
- <a href="/donate/index.html"
+ <a href="/donate/camp2017.html"
class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
<span class="flag-icon flag-icon-jp"></span> <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
- <li><a href="/donate/index.html">
+ <li><a href="/donate/camp2017.html">
<span class="flag-icon flag-icon-usuk"></span>英語</a></li>
- <li><a href="/donate/index.de.html">
+ <li><a href="/donate/camp2017.de.html">
<span class="flag-icon flag-icon-de "></span>ドイツ語</a></li>
- <li><a href="/donate/index.fr.html">
+ <li><a href="/donate/camp2017.fr.html">
<span class="flag-icon flag-icon-fr "></span>フランス語</a></li>
- <li><a href="/donate/index.ja.html">
+ <li><a href="/donate/camp2017.ja.html">
<span class="flag-icon flag-icon-jp "></span>日本語</a></li>
</ul>
</li>
@@ -68,17 +68,17 @@
<ul class="nav navbar-nav navbar-right hidden-xs lang-chooser">
<li class="dropdown">
<!-- noscript: Link to the next language. -->
- <a href="/donate/index.html"
+ <a href="/donate/camp2017.html"
class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
<span class="flag-icon flag-icon-jp"></span> <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
- <li><a href="/donate/index.html">
+ <li><a href="/donate/camp2017.html">
<span class="flag-icon flag-icon-usuk"></span>英語</a></li>
- <li><a href="/donate/index.de.html">
+ <li><a href="/donate/camp2017.de.html">
<span class="flag-icon flag-icon-de "></span>ドイツ語</a></li>
- <li><a href="/donate/index.fr.html">
+ <li><a href="/donate/camp2017.fr.html">
<span class="flag-icon flag-icon-fr "></span>フランス語</a></li>
- <li><a href="/donate/index.ja.html">
+ <li><a href="/donate/camp2017.ja.html">
<span class="flag-icon flag-icon-jp "></span>日本語</a></li>
</ul>
</li>
@@ -93,11 +93,27 @@
<div class="col-lg-12 visible-lg-block">
<h1>GnuPG 資金調達の呼びかけ</h1>
</div>
+ <div class="col-xs-12 col-lg-8">
+ <div class="embed-responsive embed-responsive-16by9 camp-video" data-embed="main">
+ <img src="/share/campaign/img/thumbs/main.jpg">
+ <div class="play-button"></div>
+ <div class="video-text">クリックして動画をスタート
+ <noscript><br />
+ <span style="font-size: 60%"
+ >(YouTubeからのJavaScriptが必要となります。)
+ </span>
+ </noscript>
+ </div>
+ </div>
+ </div>
<div class="col-xs-12 hidden-lg">
<h1>GnuPG 資金調達の呼びかけ</h1>
</div>
+ <p>[<strong>This is a snaphot of the page at the end of the
+ campaign on 2017-09-05.</strong>]</p>
+
<div class="col-xs-12 col-lg-4">
<div class="row">
<div class="col-xs-12">
@@ -1390,6 +1406,93 @@ src="https://www.gnupg.org/ftp/media/openpgp.conf/2016/gnupg-team-smaller.jpg"
</div>
</div>
+<div id="team" class="camp-gutter container">
+<div class="row">
+ <div class="col-xs-12">
+ <h2>わたしたちは?</h2>
+ </div>
+</div>
+
+<div class="row">
+ <!-- Werner -->
+ <div class="camp-who col-md-6">
+ <div class="media">
+ <div class="media-left">
+ <img class="media-object" src="/share/campaign/img/team/werner.jpg" alt="Picture of Werner">
+ </div>
+ <div class="media-body">
+ <strong>Werner</strong>は1997年にGnuPGを始めました。
+ Wernerは長らく自由ソフトウェアの支持者で、FSFEの発起人の一人です。
+ </div>
+ </div>
+ </div>
+
+ <!-- Neal -->
+ <div class="camp-who col-md-6">
+ <div class="media">
+ <div class="media-left">
+ <img class="media-object" src="/share/campaign/img/team/neal.jpg" alt="Picture of Neal">
+ </div>
+ <div class="media-body">
+ <strong>Neal</strong>は2015年にGnuPGについて仕事を始め、保守とすべての分野の開発のをサポートしています。
+ </div>
+ </div>
+ </div>
+</div>
+
+<div class="row">
+ <!-- Justus -->
+ <div class="camp-who col-md-6">
+ <div class="media">
+ <div class="media-left">
+ <img class="media-object" src="/share/campaign/img/team/justus.jpg" alt="Picture of Justus">
+ </div>
+ <div class="media-body">
+ <strong>Justus</strong>は2015年にGnuPGについて仕事を始め、保守とすべての分野の開発のをサポートしています。
+ </div>
+ </div>
+ </div>
+
+ <!-- Marcus -->
+ <div class="camp-who col-md-6">
+ <div class="media">
+ <div class="media-left">
+ <img class="media-object" src="/share/campaign/img/team/marcus.jpg" alt="Picture of Marcus">
+ </div>
+ <div class="media-body">
+ <strong>Marcus</strong>は2001年から2012年にGnuPGについて仕事をしました。
+ 2017年に再び参加してすべての分野について働いています。
+ </div>
+ </div>
+ </div>
+</div>
+
+<div class="row">
+ <!-- Kai -->
+ <div class="camp-who col-md-6">
+ <div class="media">
+ <div class="media-left">
+ <img class="media-object" src="/share/campaign/img/team/kai.jpg" alt="Picture of Kai">
+ </div>
+ <div class="media-body">
+ <strong>Kai</strong>は2015年からEnigmailプロジェクトに参加しています。
+ </div>
+ </div>
+ </div>
+
+ <!-- Gniibe -->
+ <div class="camp-who col-md-6">
+ <div class="media">
+ <div class="media-left">
+ <img class="media-object" src="/share/campaign/img/team/gniibe.jpg" alt="Picture of Niibe">
+ </div>
+ <div class="media-body">
+ <strong>g新部</strong>は古い自由ソフトウェアハッカーで、
+ GnuPGプロジェクトに2011に参加しました。スマートカードとGnukトークンのサポートをしています。
+ </div>
+ </div>
+ </div>
+</div>
</div>
</div>
diff --git a/web/donate/camp2017.org b/web/donate/camp2017.org
index 3cbe23b..bb13797 100644
--- a/web/donate/camp2017.org
+++ b/web/donate/camp2017.org
@@ -116,8 +116,9 @@
<h1>GnuPG Fundraising Rally</h1>
</div>
- <strong>[This is a snaphot of the page at the end of the
- campaign on 2017-09-05.]</strong>
+ <p>[<strong>This is a snaphot of the page at the end of the
+ campaign on 2017-09-05.</strong>]</p>
+
<div class="col-xs-12 col-lg-4">
<div class="row">
diff --git a/web/donate/index.org b/web/donate/index.org
index 1e84ab4..3570a6e 100644
--- a/web/donate/index.org
+++ b/web/donate/index.org
@@ -7,7 +7,7 @@
# fine as it is stripped before publishing.
-* GnuPG needs your support to help protect online privacy.
+* GnuPG needs your support to help protect online privacy
Activists, journalists, lawyers, and many others rely on GnuPG to
protect their communication. And, nearly all free software-based
-----------------------------------------------------------------------
Summary of changes:
web/donate/{index.de.org => camp2017.de.org} | 133 +++++++++++++++++++++++++--
web/donate/{index.fr.org => camp2017.fr.org} | 132 ++++++++++++++++++++++++--
web/donate/{index.ja.org => camp2017.ja.org} | 123 +++++++++++++++++++++++--
web/donate/camp2017.org | 5 +-
web/donate/index.org | 2 +-
5 files changed, 362 insertions(+), 33 deletions(-)
rename web/donate/{index.de.org => camp2017.de.org} (94%)
rename web/donate/{index.fr.org => camp2017.fr.org} (94%)
rename web/donate/{index.ja.org => camp2017.ja.org} (94%)
hooks/post-receive
--
The GnuPG website and other docs
http://git.gnupg.org
More information about the Gnupg-commits
mailing list