diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-06 01:08:12 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-06 01:08:12 +0200 |
| commit | 881a50207af0a9f9f5aa69f451110de786779b54 (patch) | |
| tree | 776bf4363c3e8736c3678eba93017387fffd8463 /OpenKeychain/src/main/res/raw-zh/nfc_beam_share.html | |
| parent | 0bfac9989f801aa93d8bc336307d60b817995688 (diff) | |
| parent | 6ba7536838b8fbc69684bec7c3e847afcb5e9d6a (diff) | |
| download | open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.gz open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.bz2 open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.zip | |
Merge branch 'master' into yubikey
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
extern/openpgp-api-lib
settings.gradle
Diffstat (limited to 'OpenKeychain/src/main/res/raw-zh/nfc_beam_share.html')
| -rw-r--r-- | OpenKeychain/src/main/res/raw-zh/nfc_beam_share.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/raw-zh/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-zh/nfc_beam_share.html index 78f00c9f7..99ffe4c12 100644 --- a/OpenKeychain/src/main/res/raw-zh/nfc_beam_share.html +++ b/OpenKeychain/src/main/res/raw-zh/nfc_beam_share.html @@ -2,7 +2,7 @@ <head></head> <body> <ol> -<li>確定在 "設定" > "更多內容…" > "NFC" 裡面已經開啟 NFC 和 Android Beam。</li> +<li>確定在 "設定" > "更多內容…" > "NFC" 裡面已經開啟 NFC 和 Android Beam。</li> <li>將兩部裝置背對背貼近(幾乎接觸)，你會感覺到一股震動。</li> <li>震動之後你會看見你夥伴的畫面變成卡片狀，並且背景帶有如 Star Trek 般的特效。</li> <li>輕觸卡片，內容隨即顯示在你的裝置上。</li> |