cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' into linked-identities

Browse Source 
Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
This commit is contained in:
Vincent Breitmoser
2015-04-09 13:57:56 +02:00
parent d27925ad19 dcaac4f85f
commit a4b7daf266
236 changed files with 10295 additions and 8379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -141,7 +141,7 @@ Translations are hosted on Transifex, which is configured by ".tx/config".
1. To pull newest translations install transifex client (e.g. ``apt-get install transifex-client``)
2. Config Transifex client with "~/.transifexrc"
3. Go into root folder of git repo
4. execute ``tx pull`` (``tx pull -a`` to get all languages)
4. execute ``tx pull -af --skip``
see http://help.transifex.net/features/client/index.html#user-client
@@ -195,7 +195,7 @@ Some parts and some libraries are Apache License v2, MIT X11 License (see below)
### Libraries
See https://github.com/open-keychain/open-keychain/blob/development/OpenKeychain/src/main/res/raw/help_about.html
See https://github.com/open-keychain/open-keychain/blob/development/OpenKeychain/src/main/res/raw/help_about.md
### Images
* icon.svg