campaign: Also rename the translations of the main page
authorWerner Koch <wk@gnupg.org>
Tue, 5 Sep 2017 16:48:57 +0000 (18:48 +0200)
committerWerner Koch <wk@gnupg.org>
Tue, 5 Sep 2017 16:48:57 +0000 (18:48 +0200)
web/donate/camp2017.de.org [moved from web/donate/index.de.org with 94% similarity]
web/donate/camp2017.fr.org [moved from web/donate/index.fr.org with 94% similarity]
web/donate/camp2017.ja.org [moved from web/donate/index.ja.org with 94% similarity]
web/donate/camp2017.org
web/donate/index.org

similarity index 94%
rename from web/donate/index.de.org
rename to web/donate/camp2017.de.org
index 5504753..3f2f41a 100644 (file)
          <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>
          <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>
        <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>
 
similarity index 94%
rename from web/donate/index.fr.org
rename to web/donate/camp2017.fr.org
index 4e190b1..c51e97d 100644 (file)
          <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>
          <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>
        <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>
 
similarity index 94%
rename from web/donate/index.ja.org
rename to web/donate/camp2017.ja.org
index 1193529..39b979e 100644 (file)
          <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>
          <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>
        <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>
index 3cbe23b..bb13797 100644 (file)
          <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">
index 1e84ab4..3570a6e 100644 (file)
@@ -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