diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-24 14:18:01 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-24 14:18:01 +0200 |
| commit | b4aec3114d9911cf9aef0d14ee697e5131b2853f (patch) | |
| tree | 7237de5955ec34d8849737b2f9229bfbb37d0c45 /OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md | |
| parent | c2163460971cc01e65d7dfd18eec491f01ebc744 (diff) | |
| parent | baac30508d24dcda6135bf8ae338c99d8c3b8ad8 (diff) | |
| download | open-keychain-b4aec3114d9911cf9aef0d14ee697e5131b2853f.tar.gz open-keychain-b4aec3114d9911cf9aef0d14ee697e5131b2853f.tar.bz2 open-keychain-b4aec3114d9911cf9aef0d14ee697e5131b2853f.zip | |
Merge branch 'development' into linked-identities
Conflicts:
Graphics/update-drawables.sh
OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md')
| -rw-r--r-- | OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md index e9d61d0f3..4a7ddb7f2 100644 --- a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md @@ -1,3 +1,4 @@ +[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) ## 3.2beta2 @@ -95,7 +96,7 @@ * Notification showing cached passphrases * Keys are connected to Android's contacts -<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p> +This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar ## 2.7 @@ -129,9 +130,9 @@ ## 2.4 -<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! +Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): -Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> +Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser. * New unified key list * Colorized key fingerprint |