[git] gnupg-doc - branch, preview, updated. 1539cc59f77b00bdec6611a7060a1452350ea462
by NIIBE Yutaka
cvs at cvs.gnupg.org
Fri May 19 11:44:34 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, preview has been updated
via 1539cc59f77b00bdec6611a7060a1452350ea462 (commit)
via 46f6d334178cc49a2e9cb1c3f3dba3c577568f6b (commit)
from c85c2c97a899146b6978a255cd08e2a6376763c0 (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 1539cc59f77b00bdec6611a7060a1452350ea462
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Fri May 19 18:36:51 2017 +0900
campaign,ja: More translation.
diff --git a/web/donate/index.ja.org b/web/donate/index.ja.org
index 94f8ff6..85b0cf5 100644
--- a/web/donate/index.ja.org
+++ b/web/donate/index.ja.org
@@ -196,10 +196,10 @@
data-embed-list="PLjX3x3GHoOWLdrpy17aX5JaCnea2_CxBa">
<img src="/share/campaign/img/thumbs/p7ULsUdBMwM.jpg">
<div class="play-button"></div>
- <div class="video-text">Click to start the video
+ <div class="video-text">クリックして動画をスタート
<noscript><br />
<span style="font-size: 60%"
- >(requires JavaScript from YouTube.)
+ >(YouTubeからのJavaScriptが必要となります。)
</span>
</noscript>
</div>
@@ -213,64 +213,40 @@
<div id="about" class="camp-gutter container">
<div class="row">
<div class="col-sm-10 col-sm-offset-1">
- <h2>GnuPG Needs Your Help!</h2>
+ <h2>GnuPG はあなたの援助を必要としています!</h2>
<p class="text-justify">
<strong><a
href="https://lists.gnupg.org/pipermail/gnupg-devel/1997-December/014131.html"
- >For the past 20 years</a>, GnuPG has helped protect online
- communication.</strong>
+ >これまでの20年間</a>、GnuPGは通信のコミュニケーションを守るために役立ってきました。</strong>
<a href="https://www.eff.org/de/about/staff/cindy-cohn">Cindy
Cohn<img src="/share/campaign/img/headshots/cindy-cohn.jpg"
alt="Picture of Cindy Cohn" class="camp-headshot
- pull-right"></a>, Executive Director
- of the <a href="https://www.eff.org/">Electronic Frontier
- Foundation</a> (EFF), describes GnuPG as <i>"the way that
- I most often communicate with people who are in need
- around the
- world."</i> <a href="https://www.buzzfeed.com/sheerafrenkel"><img src="/share/campaign/img/headshots/sheera-frenkel.jpg"
+ pull-right"></a>, <a href="https://www.eff.org/">電子フロンティア財団</a> (EFF)のエグゼクティブ・ディレクターは、GnuPGを <i>"世界中で必要としている人と連絡するためにもっとも良く使う方法です"</i>と述べています。<a href="https://www.buzzfeed.com/sheerafrenkel"><img src="/share/campaign/img/headshots/sheera-frenkel.jpg"
alt="Picture of Sheera Frenkel" class="camp-headshot
pull-left">Sheera
- Frenkel</a>, Foreign Correspondent for BuzzFeed News,
- relates: <i>"<strong>As a news organization, we're trained
- on using GPG.</strong> "It's about your sources and what
- happens to them when you leave the country and you publish
- that explosive story and the government is looking for the
- whistleblower that handed you that key piece of
- information."</i> And famously, GnuPG was Edward
- Snowden's tool of choice to securely communicate with
- journalists about the NSA mass surveillance leaks.
+ Frenkel</a>, BuzzFeed Newsの外国特派員は、
+ <i>「<strong>報道機関として、わたしたちはGPGの使い方を習得しています。</strong>
+ 問題なのは情報源です。取材後にその国を離れ、大きな話題となるストーリーを報道した後に、重要な情報を提供した告発者を政府が探し出そうとするとき、そこで情報源に対してなにが起こるかです。」</i> そうです、有名なことですが、GnuPGはEdward
+ SnowdenがNSAの大規模監視の告発について、ジャーナリストと安全に連絡する手段として選択したものでした。
<p class="text-justify">
- But, GnuPG is not only used to encrypt
- email. <strong>GnuPG protects software updates</strong>
- for nearly all free software operating systems, which
- power <a href="https://en.wikipedia.org/wiki/Linux#Market_share_and_uptake">two-thirds
- of all servers on the Internet</a>. And, GnuPG is widely
- used by organizations and companies. For instance, Arthur
+ しかし、GnuPGは電子メールの暗号化だけに使われるのではありません。
+ ほとんどすべての自由ソフトウェアのオペレーティング・システムについて、
+ <strong>GnuPGはソフトウェアの更新を保護しており</strong>、
+ <a href="https://en.wikipedia.org/wiki/Linux#Market_share_and_uptake">インターネットのすべてのサーバの2/3がこうした自由なオペレーティング・システムで動いています</a>。そして、GnuPGは団体や会社で広く使われています。
+ たてえば、2Uの情報技術担当の副社長、Arthur
Jordan<img src="/share/campaign/img/headshots/arthur-jordan.jpg"
alt="Picture of Arthur Jordan"
- class="camp-headshot pull-left">, Vice-President of
- Information Technology at 2U, told us:
- <i>"when we reached out to universities about how they
- wanted to do secure file transfer, they were already using
- GPG encryption."</i>
+ class="camp-headshot pull-left">は、わたしたちにこう言いました:
+ <i>「わたしたちが大学に行ってセキュアなファイル転送になにを望むかを聞いたとき、すでに彼らはGPGの暗号化を使っていました。」</i>
<p class="text-justify">
- Yet, despite the critical role that GnuPG plays for
- journalists, activists, and lawyers in particular as well
- as anyone who uses the Internet in general, in 2012 GnuPG
- had a <strong>funding crisis</strong>. Due to a lack of
- contracts, Werner Koch, GnuPG's lead developer, was forced
- to lay off the only other person working on GnuPG
- full-time. And, by 2014, Werner had to take side jobs
- unrelated to GnuPG to supplement his income.
+ 特に、ジャーナリスト、活動家、弁護士といった方々、また、一般にインターネットを利用する誰もにとって、GnuPGが重要な役割を果たしているにも関わらず、2012年にGnuPGは
+ <strong>資金難の危機</strong>がありました。契約の欠如のため、
+ GnuPGの開発リーダ Werner Koch は、GnuPGに対してフルタイムで働くもう一人を解雇しなくてはなりませんでした。そして2014年までWernerは収入を補うためにGnuPGと関係ない別の仕事をしなければなりませんでした。
<p class="text-justify">
- The situation looked so bad that <strong>Werner was ready
- to give up. But, friends convinced him to give a donation
- campaign one last shot.</strong> The response was
- amazing. Not only did he receive enough money to fund
- himself, but <strong>he pulled in
- 250 000 euros in small donations</strong>, and
- Stripe, Facebook and the Linux Foundatation each committed
- to donating about 50 000 euros per year.
+ 状況はあまりにも深刻に思えたので、<strong>Wernerはあきらめてしまうところでした。しかし、友人達が彼を説得し、最後の一弾として、寄付のキャンペーンをやってみることになりました。
+</strong>
+ 反響は驚くべきものでした。彼にとって充分過ぎる以上の、<strong>小さな寄付が積もり重なって、あわせて 250 000 ユーロ</strong>ものお金が集まり、
+ Stripe, Facebook そして Linux Foundatation が、それぞれ、年額50 000 ユーロを提供すると申し出たのでした。
</p>
<div class="pull-right text-center team-img">
<a
@@ -279,7 +255,7 @@ href="https://www.gnupg.org/ftp/media/openpgp.conf/2016/gnupg-team-small.jpg"
src="https://www.gnupg.org/ftp/media/openpgp.conf/2016/gnupg-team-smaller.jpg"
/></a>
<p id="camp-caption-openpgp-conf">
- The GnuPG Team at OpenPGP.conf 2016
+ OpenPGP.conf 2016 での GnuPG チーム
</p>
</div>
<p class="text-justify">
commit 46f6d334178cc49a2e9cb1c3f3dba3c577568f6b
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Fri May 19 15:14:26 2017 +0900
campaign,ja: Update from English.
diff --git a/web/donate/index.ja.org b/web/donate/index.ja.org
index 004d4e8..94f8ff6 100644
--- a/web/donate/index.ja.org
+++ b/web/donate/index.ja.org
@@ -45,17 +45,17 @@
<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">
- <span class="flag-icon flag-icon-usuk"></span> English</a></li>
+ <span class="flag-icon flag-icon-usuk"></span>英語</a></li>
<li><a href="/donate/index.de.html">
- <span class="flag-icon flag-icon-de "></span> German</a></li>
+ <span class="flag-icon flag-icon-de "></span>ドイツ語</a></li>
<li><a href="/donate/index.fr.html">
- <span class="flag-icon flag-icon-fr "></span> French</a></li>
+ <span class="flag-icon flag-icon-fr "></span>フランス語</a></li>
<li><a href="/donate/index.ja.html">
- <span class="flag-icon flag-icon-jp "></span> Japanese</a></li>
+ <span class="flag-icon flag-icon-jp "></span>日本語</a></li>
</ul>
</li>
</ul>
- <a class="navbar-right visible-xs-inline pull-right btn btn-default btn-sm navbar-btn" style="margin-right: 10px" href="/donate/donate.ja.html" role="button">GnuPGをサポートする♥</a>
+ <a class="navbar-right visible-xs-inline pull-right btn btn-default btn-sm navbar-btn" style="margin-right: 10px" href="/donate/donate.ja.html" role="button">♥ 寄付する</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
@@ -74,17 +74,17 @@
<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">
- <span class="flag-icon flag-icon-usuk"></span> English</a></li>
+ <span class="flag-icon flag-icon-usuk"></span>英語</a></li>
<li><a href="/donate/index.de.html">
- <span class="flag-icon flag-icon-de "></span> German</a></li>
+ <span class="flag-icon flag-icon-de "></span>ドイツ語</a></li>
<li><a href="/donate/index.fr.html">
- <span class="flag-icon flag-icon-fr "></span> French</a></li>
+ <span class="flag-icon flag-icon-fr "></span>フランス語</a></li>
<li><a href="/donate/index.ja.html">
- <span class="flag-icon flag-icon-jp "></span> Japanese</a></li>
+ <span class="flag-icon flag-icon-jp "></span>日本語</a></li>
</ul>
</li>
</ul>
- <a class="navbar-right hidden-xs btn btn-default btn-sm navbar-btn" href="/donate/donate.html" role="button">GnuPGをサポートする♥</a>
+ <a class="navbar-right hidden-xs btn btn-default btn-sm navbar-btn" href="/donate/donate.html" role="button">♥ 寄付する</a>
</div><!--/.nav-collapse -->
</div>
</nav>
@@ -98,7 +98,13 @@
<div class="embed-responsive embed-responsive-16by9 camp-video" data-embed="yB3V1YP8cKw">
<img src="http://i0.kym-cdn.com/photos/images/facebook/001/217/711/afd.jpg_large">
<div class="play-button"></div>
- <div class="video-text">クリックして動画をスタート(YouTubeからのJavaScriptが必要となります)。</div>
+ <div class="video-text">クリックして動画をスタート
+ <noscript><br />
+ <span style="font-size: 60%"
+ >(YouTubeからのJavaScriptが必要となります。)
+ </span>
+ </noscript>
+ </div>
</div>
</div>
@@ -180,13 +186,23 @@
<div id="dailyvideo" class="camp-gutter camp-gutter-clump container">
<div class="row">
<div class="col-sm-10 col-sm-offset-1">
- <h2>Video of the Day: Rick Astley <small>GnuPG will never gonna give you up</small></h2>
+ <h2>Video of the Day: Rick Astley
+ <small>GnuPG will never gonna give you up</small>
+ </h2>
<div class="row">
<div class="col-lg-10 col-lg-offset-0">
- <div class="embed-responsive embed-responsive-16by9 camp-video" data-embed="DLzxrzFCyOs">
- <img src="http://i0.kym-cdn.com/photos/images/facebook/001/217/711/afd.jpg_large">
+ <div class="embed-responsive embed-responsive-16by9 camp-video"
+ data-embed="p7ULsUdBMwM,6qQt5_kJGnY,FpO6ePjIyVs"
+ data-embed-list="PLjX3x3GHoOWLdrpy17aX5JaCnea2_CxBa">
+ <img src="/share/campaign/img/thumbs/p7ULsUdBMwM.jpg">
<div class="play-button"></div>
- <div class="video-text">Click to start the video (requires JavaScript from YouTube).</div>
+ <div class="video-text">Click to start the video
+ <noscript><br />
+ <span style="font-size: 60%"
+ >(requires JavaScript from YouTube.)
+ </span>
+ </noscript>
+ </div>
</div>
</div>
</div>
@@ -204,14 +220,14 @@ href="https://lists.gnupg.org/pipermail/gnupg-devel/1997-December/014131.html"
>For the past 20 years</a>, GnuPG has helped protect online
communication.</strong>
<a href="https://www.eff.org/de/about/staff/cindy-cohn">Cindy
- Cohn<img src="/share/campaign/img/headshots/cindy-cohn.png"
+ Cohn<img src="/share/campaign/img/headshots/cindy-cohn.jpg"
alt="Picture of Cindy Cohn" class="camp-headshot
pull-right"></a>, Executive Director
of the <a href="https://www.eff.org/">Electronic Frontier
Foundation</a> (EFF), describes GnuPG as <i>"the way that
I most often communicate with people who are in need
around the
- world."</i> <a href="https://www.buzzfeed.com/sheerafrenkel"><img src="/share/campaign/img/headshots/sheera-frenkel.png"
+ world."</i> <a href="https://www.buzzfeed.com/sheerafrenkel"><img src="/share/campaign/img/headshots/sheera-frenkel.jpg"
alt="Picture of Sheera Frenkel" class="camp-headshot
pull-left">Sheera
Frenkel</a>, Foreign Correspondent for BuzzFeed News,
@@ -230,7 +246,7 @@ href="https://lists.gnupg.org/pipermail/gnupg-devel/1997-December/014131.html"
power <a href="https://en.wikipedia.org/wiki/Linux#Market_share_and_uptake">two-thirds
of all servers on the Internet</a>. And, GnuPG is widely
used by organizations and companies. For instance, Arthur
- Jordan<img src="/share/campaign/img/headshots/arthur-jordan.png"
+ Jordan<img src="/share/campaign/img/headshots/arthur-jordan.jpg"
alt="Picture of Arthur Jordan"
class="camp-headshot pull-left">, Vice-President of
Information Technology at 2U, told us:
@@ -416,7 +432,7 @@ src="https://www.gnupg.org/ftp/media/openpgp.conf/2016/gnupg-team-smaller.jpg"
<div id="myCarousel" class="carousel slide visible-lg" data-interval="false">
<div class="carousel-inner" role="listbox">
- <div class="item">
+ <div class="item active">
<!-- Slide 1 -->
<div class="row">
@@ -682,7 +698,7 @@ src="https://www.gnupg.org/ftp/media/openpgp.conf/2016/gnupg-team-smaller.jpg"
</div>
</div>
- <div class="item active">
+ <div class="item">
<!-- Slide 5 -->
<div class="row">
@@ -1117,7 +1133,7 @@ src="https://www.gnupg.org/ftp/media/openpgp.conf/2016/gnupg-team-smaller.jpg"
<div id="myCarouselSmall" class="carousel slide visible-xs" data-interval="false" aria-hidden="true">
<div class="carousel-inner" role="listbox">
- <div class="item">
+ <div class="item active">
<!-- Slide 1 XS -->
<div class="row">
@@ -1442,7 +1458,7 @@ src="https://www.gnupg.org/ftp/media/openpgp.conf/2016/gnupg-team-smaller.jpg"
</div>
</div>
- <div class="item active">
+ <div class="item">
<!-- Slide 13 XS -->
<div class="row">
@@ -1496,8 +1512,32 @@ src="https://www.gnupg.org/ftp/media/openpgp.conf/2016/gnupg-team-smaller.jpg"
</div>
</div>
</div>
-
</div>
+
+ <div class="item">
+ <!-- Slide 15 XS -->
+
+ <div class="row">
+ <div class="col-xs-12">
+ <div class="card">
+ <div class="card-img">
+ <img class="card-img-left" src="/share/campaign/img/cards/john-pershing.jpg" />
+ </div>
+ <div class="card-text">
+ <div class="card-quote">
+ “GPG hasn't saved our butt yet, but the
+ fact that it is there is—it let's us
+ sleep easier at night.”
+ </div>
+ <div class="card-meta">
+ <div class="card-name">John Pershing</div>
+ <div class="card-title">Distinguished Developer</div>
+ <div class="card-org">1010data</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
<div class="text-center">
<!--
@@ -1522,14 +1562,14 @@ src="https://www.gnupg.org/ftp/media/openpgp.conf/2016/gnupg-team-smaller.jpg"
</div>
<!-- End of testimonials. -->
- <div id="team" class="camp-gutter container">
- <div class="row">
+<div id="team" class="camp-gutter container">
+<div class="row">
<div class="col-xs-12">
<h2>Who we are</h2>
</div>
- </div>
+</div>
- <div class="row">
+<div class="row">
<!-- Werner -->
<div class="camp-who col-md-6">
<div class="media">
@@ -1556,9 +1596,9 @@ src="https://www.gnupg.org/ftp/media/openpgp.conf/2016/gnupg-team-smaller.jpg"
</div>
</div>
</div>
- </div>
+</div>
- <div class="row">
+<div class="row">
<!-- Justus -->
<div class="camp-who col-md-6">
<div class="media">
@@ -1585,9 +1625,9 @@ src="https://www.gnupg.org/ftp/media/openpgp.conf/2016/gnupg-team-smaller.jpg"
</div>
</div>
</div>
- </div>
+</div>
- <div class="row">
+<div class="row">
<!-- Kai -->
<div class="camp-who col-md-6">
<div class="media">
@@ -1613,16 +1653,36 @@ src="https://www.gnupg.org/ftp/media/openpgp.conf/2016/gnupg-team-smaller.jpg"
</div>
</div>
</div>
- </div>
- <div class="camp-final-pitch row">
- <div class="col">
- <center>
- <a class="btn btn-primary btn-lg" href="/donate/donate.html" role="button">Donate now!</a>
- </center>
- </div>
+</div>
+
+<div class="camp-final-pitch row">
+ <div class="col">
+ <center>
+ <a class="btn btn-primary btn-lg" href="/donate/donate.html" role="button">Donate now!</a>
+ </center>
+ </div>
+ </div>
+</div>
+</div>
+
+<div class="camp-gutter container-fluid" id="camp-footer">
+ <div class="container">
+ <div class="row">
+ <div id="cpyright">
+ <a rel="license" href="https://creativecommons.org/licenses/by-sa/3.0/">
+ <img alt="CC-BY-SA 4.0" style="border: 0"
+ src="/share/cc-by-sa_80x15.png"/></a>
+ This web page is
+ Copyright 2017 The GnuPG Project and licensed under a
+ <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/">
+ Creative Commons Attribution-ShareAlike 4.0 International License</a>. See
+ <a href="/copying.html">copying</a> for details.
</div>
</div>
- </body>
+ </div>
+</div>
+
+</body>
</html>
#+END_HTML
-----------------------------------------------------------------------
Summary of changes:
web/donate/index.ja.org | 204 ++++++++++++++++++++++++++++--------------------
1 file changed, 120 insertions(+), 84 deletions(-)
hooks/post-receive
--
The GnuPG website and other docs
http://git.gnupg.org
More information about the Gnupg-commits
mailing list