@@ -24,6 +24,6 @@ Also include the value of any relevant preferences you have set in the app.
### Link to debug log
<!--
Immediately after the bug has happened capture a debug log via Settings -> Advanced -> Submit log and paste the link here.
If you can't access the menu, you can use ADB to grab the debug log: `adb logcat | grep $(adb shell ps | grep org.smssecure.smssecure | cut -c10-15)`.
If you can't access the menu, you can use ADB to grab the debug log: `adb logcat | grep $(adb shell ps | grep org.smssecure.smssecure | tr -s " " | cut -d " " -f2)`.
If your debug log contains sensitive data, you can censor it (please don't remove any relevant data) or send it to support@silence.im instead
Install the [Transifex Client](http://docs.transifex.com/developer/client/setup) to update project strings
Pull down all new translation updates:
-`tx pull -af --minimum-perc=1`
Pull down specific locales:
-`tx pull -l <locales>`
Push updated default strings:
-`tx push -s`
Push specific locales:
-`tx push -t -l <locales>`
Changing the source strings (this is a pain):
1. Make the string change
2. Pull the latest translations - `tx pull -af --minimum-perc=1`
3. Push your latest source strings - `tx push -s` (this will delete all the translations of the source strings you changed)
4. Push your local translations - `tx push -t` (this will restore the deleted translations)
NOTES:
- If anyone knows of a better way to do this, please contribute it, this way sucks.
- This should only be done where the meaning of the source string doesn't change (ie. fixing a typo/rewording).
- This will cause the restored translations to look like they're from you, not the original translator.
Full documentation at <http://docs.transifex.com/developer/client/>
Translations are available on [Weblate](https://translate.silence.dev) and automatically updated in the source code. Make sure you run on the latest `master` revision.
Setting up a development environment
------------------------------------
...
...
@@ -97,4 +71,4 @@ Setting up a development environment
Contributing code
-----------------
Code contributions should be sent via github as pull requests, from feature branches[as explained here](https://help.github.com/articles/using-pull-requests).
Code contributions should be sent via GitLab as merge requests, from feature branches.
3. Open an issue and follow the template carefully. If you can't get a debug log from Settings, you can use ADB to grab it: `adb logcat | grep $(adb shell ps | grep org.smssecure.smssecure | tr -s " " | cut -d " " -f2)`.
## Submitting pull requests
## Submitting merge requests
All useful PRs are accepted. Please respect [our template](https://github.com/SilenceIM/Silence/blob/master/.github/PULL_REQUEST_TEMPLATE.md) and ask to merge your commits in `unstable` (PRs in `master` will be closed).
All useful MRs are accepted. Please respect [our template](https://git.silence.dev/Silence/Silence-Android/blob/master/.gitlab/merge_request_templates/Merge Request.md) and ask to merge your commits in `unstable` (PRs in `master` will be closed).
@@ -25,21 +25,11 @@ Silence focuses on SMS and MMS. This fork aims to:
* Drop Google services dependencies (push messages are not available in Silence)
* Integrate upstream bugfixes and patches from TextSecure
## Migrating from TextSecure to Silence
* In TextSecure, export a plaintext backup. Warning: the backup will **not** be encrypted.
* Install Silence.
* In Silence, import the plaintext backup (this will import the TextSecure backup if no Silence backup is found).
* If TextSecure v2.6.4 or earlier is installed, update or uninstall it so it doesn't conflict (can cause errors with key exchanges).
* Enjoy Silence!
Note: You will have to start new secured sessions with your contacts.
# Contributing
See [CONTRIBUTING.md](https://github.com/SilenceIM/Silence/blob/master/CONTRIBUTING.md) for how to contribute code, translations, or bug reports.
See [CONTRIBUTING.md](https://git.silence.dev/Silence/Silence-Android/blob/master/CONTRIBUTING.md) for how to contribute code, translations, or bug reports.
Instructions on how to setup a development environment and build Silence can be found in [BUILDING.md](https://github.com/SilenceIM/Silence/blob/master/BUILDING.md).
Instructions on how to setup a development environment and build Silence can be found in [BUILDING.md](https://git.silence.dev/Silence/Silence-Android/blob/master/BUILDING.md).
