diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-07 12:01:16 +0300 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-07 12:01:16 +0300 |
| commit | 7dd5e2235339401b44eda13b124f3482472539d4 (patch) | |
| tree | d7f1e6ad18a258e6467a75731ab44968fe005c9a /OpenKeychain/src/main/res/raw-ko | |
| parent | a2dcb579ff5d3565e7e6c6afe37878855361595b (diff) | |
| parent | d4612b5e173455a24adbae2bfd4654ae065556cc (diff) | |
| download | open-keychain-7dd5e2235339401b44eda13b124f3482472539d4.tar.gz open-keychain-7dd5e2235339401b44eda13b124f3482472539d4.tar.bz2 open-keychain-7dd5e2235339401b44eda13b124f3482472539d4.zip | |
Merge branch 'master' into backup-api
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
extern/openpgp-api-lib
Diffstat (limited to 'OpenKeychain/src/main/res/raw-ko')
| -rw-r--r-- | OpenKeychain/src/main/res/raw-ko/help_about.md | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/raw-ko/help_changelog.md | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/raw-ko/help_about.md b/OpenKeychain/src/main/res/raw-ko/help_about.md index f60a918da..dddbc60a3 100644 --- a/OpenKeychain/src/main/res/raw-ko/help_about.md +++ b/OpenKeychain/src/main/res/raw-ko/help_about.md @@ -65,7 +65,7 @@ * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache License v2) * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (MIT License) * [Snackbar](https://github.com/nispok/snackbar) (MIT License) - * [SpongyCastle](https://rtyley.github.io/bouncycastle/) (MIT X11 License) + * [BouncyCastle](https://github.com/open-keychain/bouncycastle) (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) diff --git a/OpenKeychain/src/main/res/raw-ko/help_changelog.md b/OpenKeychain/src/main/res/raw-ko/help_changelog.md index 929933144..95cf8fba4 100644 --- a/OpenKeychain/src/main/res/raw-ko/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-ko/help_changelog.md @@ -1,5 +1,12 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.9 + + * Detection and handling of text data + * Performance improvements + * UI improvements for Security Token handling + + ## 3.8 * Redesigned key editing |