From 900e8ce990862534370df84e6dea53716b7b594c Mon Sep 17 00:00:00 2001
From: Thialfihar <thi@thialfihar.org>
Date: Sun, 23 Mar 2014 12:32:13 +0100
Subject: Adjust credits

---
 OpenPGP-Keychain/src/main/res/raw-ja/help_about.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'OpenPGP-Keychain/src/main/res/raw-ja/help_about.html')

diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html b/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html
index 206fc9f8d..206334bcd 100644
--- a/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html
+++ b/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html
@@ -15,9 +15,8 @@
 </ul>
 <h2>APG 1.xの開発者達</h2>
 <ul>
-<li>'Thialfihar' (主任開発者)</li>
+<li>Thialfihar (主任開発者)</li>
 <li>'Senecaso' (QRコード, 鍵署名, 鍵アップロード関係)</li>
-<li>Oliver Runge</li>
 <li>Markus Doits</li>
 </ul>
 <h2>ライブラリ</h2>
-- 
cgit v1.2.3


From 3dfcb037dcf5ae18ab34eb8a42a220d695febfe7 Mon Sep 17 00:00:00 2001
From: Thialfihar <thi@thialfihar.org>
Date: Sun, 23 Mar 2014 12:57:06 +0100
Subject: Remove icon set credits

---
 OpenPGP-Keychain/src/main/res/raw-ja/help_about.html | 2 --
 1 file changed, 2 deletions(-)

(limited to 'OpenPGP-Keychain/src/main/res/raw-ja/help_about.html')

diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html b/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html
index 206334bcd..72c7616a3 100644
--- a/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html
+++ b/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html
@@ -37,8 +37,6 @@
 <a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li>
 <li>
 <a href="https://github.com/johnkil/Android-AppMsg">Android AppMsg Library</a> (Apache License v2)</li>
-<li>Icons from <a href="http://rrze-icon-set.berlios.de/">RRZE Icon Set</a> (Creative Commons Attribution Share-Alike licence 3.0)</li>
-<li>Icons from <a href="http://tango.freedesktop.org/">Tango Icon Set</a> (パブリックドメイン)</li>
 </ul>
 </body>
 </html>
-- 
cgit v1.2.3


From 7d5896b107643803aa7d32c0ef4c33c40246a1e2 Mon Sep 17 00:00:00 2001
From: Thialfihar <thi@thialfihar.org>
Date: Sun, 23 Mar 2014 21:28:29 +0100
Subject: Add recent contributors to credits

---
 OpenPGP-Keychain/src/main/res/raw-ja/help_about.html | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'OpenPGP-Keychain/src/main/res/raw-ja/help_about.html')

diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html b/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html
index 72c7616a3..3f630264c 100644
--- a/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html
+++ b/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html
@@ -11,6 +11,12 @@
 <li>Ash Hughes (暗号関係パッチ提供)</li>
 <li>Brian C. Barnes</li>
 <li>Bahtiar 'kalkin' Gadimov (UI)</li>
+<li>Daniel Hammann</li>
+<li>Daniel Haß</li>
+<li>Greg Witczak</li>
+<li>Miroojin Bakshi</li>
+<li>Paul Sarbinowski</li>
+<li>Vincent Breitmoser</li>
 
 </ul>
 <h2>APG 1.xの開発者達</h2>
-- 
cgit v1.2.3


From 619c079f008dc214639d1988757e66b03b32c661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 26 Mar 2014 22:55:33 +0100
Subject: Sync changelog and about with transifex

---
 OpenPGP-Keychain/src/main/res/raw-ja/help_about.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenPGP-Keychain/src/main/res/raw-ja/help_about.html')

diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html b/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html
index 3f630264c..e60add867 100644
--- a/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html
+++ b/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html
@@ -15,9 +15,10 @@
 <li>Daniel Haß</li>
 <li>Greg Witczak</li>
 <li>Miroojin Bakshi</li>
+<li>Nikhil Peter Raj</li>
 <li>Paul Sarbinowski</li>
+<li>Sreeram Boyapati</li>
 <li>Vincent Breitmoser</li>
-
 </ul>
 <h2>APG 1.xの開発者達</h2>
 <ul>
-- 
cgit v1.2.3