diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-09 13:57:56 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-09 13:57:56 +0200 |
| commit | a4b7daf266b037c6a39cef0586aadedf32861ad5 (patch) | |
| tree | 8446f6aae86530a8546caa99af6f9bac4f095370 /.tx | |
| parent | d27925ad19b6800658a69670ceaed261776ba6d3 (diff) | |
| parent | dcaac4f85f07efff2fdfd8a2eec9ba8ee758659c (diff) | |
| download | open-keychain-a4b7daf266b037c6a39cef0586aadedf32861ad5.tar.gz open-keychain-a4b7daf266b037c6a39cef0586aadedf32861ad5.tar.bz2 open-keychain-a4b7daf266b037c6a39cef0586aadedf32861ad5.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Diffstat (limited to '.tx')
| -rw-r--r-- | .tx/config | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/.tx/config b/.tx/config index fe16cc2f4..16292a787 100644 --- a/.tx/config +++ b/.tx/config @@ -8,22 +8,22 @@ source_file = OpenKeychain/src/main/res/values/strings.xml source_lang = en [open-keychain.help-about] -file_filter = OpenKeychain/src/main/res/raw-<lang>/help_about.html -source_file = OpenKeychain/src/main/res/raw/help_about.html +file_filter = OpenKeychain/src/main/res/raw-<lang>/help_about.md +source_file = OpenKeychain/src/main/res/raw/help_about.md source_lang = en [open-keychain.help-changelog] -file_filter = OpenKeychain/src/main/res/raw-<lang>/help_changelog.html -source_file = OpenKeychain/src/main/res/raw/help_changelog.html +file_filter = OpenKeychain/src/main/res/raw-<lang>/help_changelog.md +source_file = OpenKeychain/src/main/res/raw/help_changelog.md source_lang = en [open-keychain.help-certification] -file_filter = OpenKeychain/src/main/res/raw-<lang>/help_certification.html -source_file = OpenKeychain/src/main/res/raw/help_certification.html +file_filter = OpenKeychain/src/main/res/raw-<lang>/help_certification.md +source_file = OpenKeychain/src/main/res/raw/help_certification.md source_lang = en [open-keychain.help-start] -file_filter = OpenKeychain/src/main/res/raw-<lang>/help_start.html -source_file = OpenKeychain/src/main/res/raw/help_start.html +file_filter = OpenKeychain/src/main/res/raw-<lang>/help_start.md +source_file = OpenKeychain/src/main/res/raw/help_start.md source_lang = en |