aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/raw-ja
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-08-25 19:14:13 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-08-25 19:14:13 +0200
commit588e84d4b1a3e54aa33cb5996eb0fdc02b6cde2f (patch)
treebf1ea47fa8aeb97e16b00bce0304b25c224116ac /OpenKeychain/src/main/res/raw-ja
parentb3ed33c1c733b84d8983c85fb9c589d9b01f4c4d (diff)
downloadopen-keychain-588e84d4b1a3e54aa33cb5996eb0fdc02b6cde2f.tar.gz
open-keychain-588e84d4b1a3e54aa33cb5996eb0fdc02b6cde2f.tar.bz2
open-keychain-588e84d4b1a3e54aa33cb5996eb0fdc02b6cde2f.zip
Pull from transifex
Diffstat (limited to 'OpenKeychain/src/main/res/raw-ja')
-rw-r--r--OpenKeychain/src/main/res/raw-ja/help_about.md37
-rw-r--r--OpenKeychain/src/main/res/raw-ja/help_changelog.md6
2 files changed, 25 insertions, 18 deletions
diff --git a/OpenKeychain/src/main/res/raw-ja/help_about.md b/OpenKeychain/src/main/res/raw-ja/help_about.md
index ea3fc701f..17e3e17e3 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_about.md
+++ b/OpenKeychain/src/main/res/raw-ja/help_about.md
@@ -6,14 +6,21 @@
ライセンス: GPLv3以降
+[//]: # (NOTE: Alphabetic ordering)
+
## メイン開発者
* Dominik Schürmann (メンテナ)
* Vincent Breitmoser
-## 貢献者
+## 最優秀貢献者たち
* Adithya Abraham Philip
- * Art O Cathain
* Ash Hughes
+ * 'mar-v-in'
+ * 'Thialfihar' (APG 開発者)
+ * Tim Bray
+
+## 時折貢献してくれる方たち
+ * Art O Cathain
* Brian C. Barnes
* Bahtiar 'kalkin' Gadimov
* Daniel Albert
@@ -34,7 +41,6 @@
* 'ligi'
* Lukas Zorich
* Manoj Khanna
- * 'mar-v-in'
* Markus Doits
* Miroojin Bakshi
* Morgan Gangwere
@@ -44,22 +50,23 @@
* Signe Rüsch
* Sreeram Boyapati
* 'steelman'
- * 'Thialfihar' (APG 開発者)
- * Tim Bray
+
+[//]: # (NOTE: Alphabetic ordering)
## ライブラリ
- * [SpongyCastle](http://rtyley.github.com/spongycastle/) (MIT X11 License)
- * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (MIT License)
* [Android Support Libraries](http://developer.android.com/tools/support-library/index.html) (Apache License v2)
+ * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Apache License v2)
+ * [HtmlTextView](https://github.com/sufficientlysecure/html-textview) (Apache License v2)
* [KeybaseLib](https://github.com/timbray/KeybaseLib) (Apache License v2)
- * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Apache License v2)
+ * [Markdown4J](https://github.com/jdcasey/markdown4j) (Apache License v2)
+ * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Apache License v2)
* [MiniDNS](https://github.com/rtreffer/minidns) (Apache License v2)
- * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Apache License v2)
- * [ZXing](https://github.com/zxing/zxing) (Apache License v2)
- * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Apache License v2)
+ * [OkHttp](http://square.github.io/okhttp/) (Apache License v2)
* [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache License v2)
- * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Apache License v2)
+ * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (MIT License)
* [Snackbar](https://github.com/nispok/snackbar) (MIT License)
- * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Apache License v2)
- * [HtmlTextView](https://github.com/sufficientlysecure/html-textview) (Apache License v2)
- * [Markdown4J](https://github.com/jdcasey/markdown4j) (Apache License v2) \ No newline at end of file
+ * [SpongyCastle](http://rtyley.github.com/spongycastle/) (MIT X11 License)
+ * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Apache License v2)
+ * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Apache License v2)
+ * [ZXing](https://github.com/zxing/zxing) (Apache License v2)
+ * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Apache License v2) \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-ja/help_changelog.md b/OpenKeychain/src/main/res/raw-ja/help_changelog.md
index caa90384c..148a33206 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-ja/help_changelog.md
@@ -2,9 +2,9 @@
## 3.5
- * Key revocation on key deletion
- * Improved checks for insecure cryptography
- * Fix: Don't close OpenKeychain after first time wizard succeeds
+ * 鍵削除時の鍵の破棄
+ * セキュアではない暗号についてのチェックの改善
+ * 修正: OpenKeychainの初回ウィザード成功後クローズされない問題
* API: Version 8
## 3.4