From a8efe3a12ee6e368cc13fb857f97ff39900a82cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 30 Jun 2015 13:35:22 +0200 Subject: Update from transifex --- OpenKeychain/src/main/res/raw-zh/help_about.md | 65 ++++++++++++++-------- .../src/main/res/raw-zh/help_certification.md | 18 +++--- OpenKeychain/src/main/res/raw-zh/help_changelog.md | 21 +++++-- OpenKeychain/src/main/res/raw-zh/help_start.md | 24 ++++---- 4 files changed, 78 insertions(+), 50 deletions(-) (limited to 'OpenKeychain/src/main/res/raw-zh') diff --git a/OpenKeychain/src/main/res/raw-zh/help_about.md b/OpenKeychain/src/main/res/raw-zh/help_about.md index 9d635d9df..d7f61d16c 100644 --- a/OpenKeychain/src/main/res/raw-zh/help_about.md +++ b/OpenKeychain/src/main/res/raw-zh/help_about.md @@ -1,13 +1,17 @@ -[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +[//]: # (注意: 请把每个句子放在其本行中, Transifex把每一行放在它自己的位置！) [http://www.openkeychain.org](http://www.openkeychain.org) -[OpenKeychain](http://www.openkeychain.org) is an OpenPGP implementation for Android. +[OpenKeychain](http://www.openkeychain.org) 是安卓上的一个 OpenPGP 协议实现。 -License: GPLv3+ +许可协议：GPLv3+ -## Developers - * Dominik Schürmann (Maintainer) +## 主要开发者 + * Dominik Schürmann (维护者) + * Vincent Breitmoser + +## 贡献者 + * Adithya Abraham Philip * Art O Cathain * Ash Hughes * Brian C. Barnes @@ -15,32 +19,47 @@ License: GPLv3+ * Daniel Albert * Daniel Hammann * Daniel Haß + * Daniel Nelz + * Daniel Ramos * Greg Witczak + * 'iseki' + * Ishan Khanna + * 'jellysheep' + * 'Jesperbk' + * 'jkolo' + * Joey Castillo + * Kai Jiang + * Kartik Arora + * 'Kent' + * 'ligi' + * Lukas Zorich + * Manoj Khanna * 'mar-v-in' * Markus Doits * Miroojin Bakshi + * Morgan Gangwere * Nikhil Peter Raj * Paul Sarbinowski * 'Senecaso' * Signe Rüsch * Sreeram Boyapati - * Thialfihar (APG 1.x) + * 'steelman' + * 'Thialfihar' (APG 开发者) * Tim Bray - * Vincent Breitmoser -## Libraries - * [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) - * [KeybaseLib](https://github.com/timbray/KeybaseLib) (Apache License v2) - * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (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) - * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache License v2) - * [MaterialNavigationDrawer](https://github.com/neokree/MaterialNavigationDrawer) (Apache License v2) - * [Snackbar](https://github.com/nispok/snackbar) (MIT License) - * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Apache License v2) - * [HtmlTextView](https://github.com/dschuermann/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 许可证) + * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (MIT 许可证) + [Android Support Libraries](http://developer.android.com/tools/support-library/index.html) (Apache 许可证 v2) + * [KeybaseLib](https://github.com/timbray/KeybaseLib) (Apache 许可证 v2) + * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Apache 许可证 v2) + * [MiniDNS](https://github.com/rtreffer/minidns) (Apache 许可证 v2) + * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Apache 许可证 v2) + * [ZXing](https://github.com/zxing/zxing) (Apache 许可证 v2) + * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Apache 许可证 v2) + * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache License v2) + * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Apache 许可证 v2) + * [Snackbar](https://github.com/nispok/snackbar) (MIT 许可证) + * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Apache 许可证 v2) + * [HtmlTextView](https://github.com/sufficientlysecure/html-textview) (Apache 许可证 v2) + * [Markdown4J](https://github.com/jdcasey/markdown4j) (Apache 许可证 v2) \ No newline at end of file diff --git a/OpenKeychain/src/main/res/raw-zh/help_certification.md b/OpenKeychain/src/main/res/raw-zh/help_certification.md index 3518adf73..7e66b1dd7 100644 --- a/OpenKeychain/src/main/res/raw-zh/help_certification.md +++ b/OpenKeychain/src/main/res/raw-zh/help_certification.md @@ -1,18 +1,18 @@ -[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +[//]: # (注意: 请把每个句子放在其本行中, Transifex把每一行放在它自己的位置！) -## Key Confirmation -Without confirmation, you cannot be sure if a key really corresponds to a specific person. -The simplest way to confirm a key is by scanning the QR Code or exchanging it via NFC. -To confirm keys between more than two persons, we suggest to use the key exchange method available for your keys. +## 密钥确认 +在没有进行确认之前,你无法确保一个密钥与特定的人的密钥是相符的 +确认密钥相符的最简单方式是扫描二维码或者通过NFC交换 +为了确认多于2个人的密钥是相符的, 我们建议使用密钥交换的方法进行确认. -## Key Status +## 密钥状态 -Confirmed: You have already confirmed this key, e.g., by scanning the QR Code. +已确认: 你已经通过例如二维码扫描这种方式确认了这个密钥 -Unconfirmed: This key has not been confirmed yet. You cannot be sure if the key really corresponds to a specific person. +未确认: 这个密钥尚未被确认. 你无法确保这个密钥与指定的人的密钥是相同的. -Expired: This key is no longer valid. Only the owner can extend its validity. +已过期: 这个密钥不再有效. 只有它的拥有者能扩展它的正确性. Revoked: This key is no longer valid. It has been revoked by its owner. diff --git a/OpenKeychain/src/main/res/raw-zh/help_changelog.md b/OpenKeychain/src/main/res/raw-zh/help_changelog.md index ab7fa8773..d45ce636b 100644 --- a/OpenKeychain/src/main/res/raw-zh/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-zh/help_changelog.md @@ -1,9 +1,17 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) + +## 3.3 + + * New decryption screen + * Decryption of multiple files at once + * Better handling of YubiKey errors + ## 3.2 + * First version with full YubiKey support available from the user interface: Edit keys, bind YubiKey to keys,... * Material design - * Integration of QR Scanner (New permissions required) + * Integration of QR Code Scanning (New permissions required) * Improved key creation wizard * Fix missing contacts after sync * Requires Android 4 @@ -13,6 +21,7 @@ * Fix: Some valid keys were shown revoked or expired * Don't accept signatures by expired or revoked subkeys * Keybase.io support in advanced view + * Method to update all keys at once ## 3.1.2 @@ -35,7 +44,7 @@ * Redesigned decrypt screen * New icon usage and colors * Fix import of secret keys from Symantec Encryption Desktop - * Subkey IDs on Yubikeys are now checked correctly + * Experimental YubiKey support: Subkey IDs are now checked correctly ## 3.0.1 @@ -46,7 +55,6 @@ ## 3.0 - * Full support for Yubikey signature generation and decryption! * Propose installable compatible apps in apps list * New design for decryption screens * Many fixes for key import, also fixes stripped keys @@ -55,12 +63,13 @@ * Fixing user id revocation certificates * New cloud search (searches over traditional keyservers and keybase.io) * Support for stripping keys inside OpenKeychain + * Experimental YubiKey support: Support for signature generation and decryption ## 2.9.2 * Fix keys broken in 2.9.1 - * Yubikey decryption now working via API + * Experimental YubiKey support: Decryption now working via API ## 2.9.1 @@ -69,7 +78,7 @@ * Fix key flags handling (now supporting Mailvelope 0.7 keys) * Improved passphrase handling * Key sharing via SafeSlinger - * Yubikey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain + * Experimental YubiKey support: Preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain * Fix usage of stripped keys * SHA256 as default for compatibility * Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API @@ -80,7 +89,7 @@ * Fixing crashes introduced in v2.8 * Experimental ECC support - * Experimental Yubikey support (signing-only with imported keys) + * Experimental YubiKey support: Only signing with imported keys ## 2.8 diff --git a/OpenKeychain/src/main/res/raw-zh/help_start.md b/OpenKeychain/src/main/res/raw-zh/help_start.md index 4cc331942..183c63150 100644 --- a/OpenKeychain/src/main/res/raw-zh/help_start.md +++ b/OpenKeychain/src/main/res/raw-zh/help_start.md @@ -1,16 +1,16 @@ -[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +[//]: # (注意: 请把每个句子放在其本行中, Transifex把每一行放在它自己的位置！) -## How do I activate OpenKeychain in K-9 Mail? -To use OpenKeychain with K-9 Mail, you want to follow these steps: - 1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with. - 2. Select "Account settings", scroll to the very bottom and click "Cryptography". - 3. Click on "OpenPGP Provider" and select OpenKeychain from the list. +## 我怎样才能在 K-9 Mail 中激活 OpenKeychain？ +在K-9 Mail中使用OpenKeychain，请遵循以下步骤： + 1.打开K-9 Mail并长按你想要使用OpenKeychain的账户。 + 2.选择“账户设置”，滑到最下方，点击“加密”。 + 3.点击“OpenPGP提供者”并在列表中选择OpenKeychain。 -## I found a bug in OpenKeychain! -Please report the bug using the [issue tracker of OpenKeychain](https://github.com/openpgp-keychain/openpgp-keychain/issues). +## 我发现了OpenKeychain的问题！ +请使用 [OpenKeychain问题跟踪系统](https://github.com/openpgp-keychain/openpgp-keychain/issues)提交问题。 -## Contribute -If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code). +## 贡献 +如果你想要通过贡献代码来帮助开发OpenKeychain [请按照我们在Github上的一个小指引](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code). -## Translations -Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/). \ No newline at end of file +## 翻译 +帮助翻译OpenKeychain！每个人都可以参与。[OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/). \ No newline at end of file -- cgit v1.2.3