diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
| commit | 20eae3955700341188bc1907a506970f5817a153 (patch) | |
| tree | 6e50d9083a4392875b5f9dbe92b38973cf95c332 /README.md | |
| parent | 980a84a6ce4358e8662addf203695e01d9f931dc (diff) | |
| parent | ecbceae88b7a7aa871e5396efec1e2ff8d056d46 (diff) | |
Merge master-origin
Conflicts:
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
src/main/res/values-de/strings.xml
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 24 |
1 files changed, 14 insertions, 10 deletions
@@ -78,16 +78,7 @@ run your own XMPP server for you and your friends. These XEP's are: * [Diego Turtulici](http://efesto.eigenlab.org/~diesys) (Original) #### Translations - -* [Sergio Cárdenas](https://github.com/kruks23) (Spanish) -* [Benoit Bouvarel](https://github.com/BenoitBouvarel) (French) -* [Daniel Gultsch](https://github.com/iNPUTmice) (German) -* [Aitor Beriain](https://github.com/beriain) (Basque) -* [Ilia Rostovtsev](https://github.com/qooob) (Russian) -* [Jelmer Vernooij](https://github.com/jelmer) (Dutch) -* [Anders Sandblad](https://github.com/andersruneson) (Swedish) -* [Aizaz AZ](http://www.linkedin.com/in/aizazhaider) (Chinese) -* [Jaroslav Lichtblau] (https://github.com/svetlemodry) (Czech) +Translations are managed on [Transifex](https://www.transifex.com/projects/p/conversations/) ## FAQ @@ -103,6 +94,8 @@ The more convenient way — which not only gives you automatic updates but also supports the further development of Conversations — is to buy the App in the Google [Play Store](https://play.google.com/store/apps/details?id=eu.siacs.conversations). +Buying the App from the Play Store will also give you access to our [beta test](#beta). + #### I don't have a Google Account but I would still like to make a contribution I accept donations over PayPal, Bitcoin and Flattr. For donations via PayPal you @@ -277,6 +270,14 @@ this.) ### Development +<a name="beta"></a> +#### Beta testing +If you bought the App on [Google Play](https://play.google.com/store/apps/details?id=eu.siacs.conversations) +you can get access to the latest beta version by joining the +[Conversations Beta Testers](https://plus.google.com/communities/107649347599361240873) +community on Google+ and then using [this link](https://play.google.com/apps/testing/eu.siacs.conversations) +to sign up for the beta test. + #### How do I build Conversations Make sure to have ANDROID_HOME point to your Android SDK @@ -285,6 +286,9 @@ Make sure to have ANDROID_HOME point to your Android SDK cd Conversations ./gradlew build + +[](https://travis-ci.org/siacs/Conversations) + ### How do I update/add external libraries? If the library you want to update is in Maven Central or JCenter (or has its own |