Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag '1.10.0' into trz/merge_1.10.0 | lookshe | 2016-02-22 | 1 | -9/+0 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/layout/activity_edit_account.xml src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-gl/strings.xml src/main/res/values-it/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nb-rNO/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values-zh-rTW/strings.xml src/main/res/values/strings.xml | ||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-02-19 | 1 | -9/+0 |
| | | |||||
* | | Unused preference 'picture_compression'. This feature is configured in our ↵ | steckbrief | 2016-02-13 | 1 | -1/+0 |
| | | | | | | | | variant via 'resize_picture' | ||||
* | | green bubbles and setting to choose green or white bubbles removed | steckbrief | 2016-02-12 | 1 | -2/+0 |
|/ | |||||
* | pulled translations from transifex | Daniel Gultsch | 2016-01-20 | 1 | -0/+22 |
| | |||||
* | pulled translations for 1.9.0 release from transifex | Daniel Gultsch | 2016-01-14 | 1 | -2/+0 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2016-01-12 | 1 | -4/+0 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2016-01-11 | 1 | -3/+0 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-12-11 | 1 | -0/+28 |
| | |||||
* | pulled new translations from transifex | Daniel Gultsch | 2015-12-02 | 1 | -9/+52 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-10-14 | 1 | -1/+0 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-09-15 | 1 | -2/+2 |
| | |||||
* | Merge pull request #1409 from sespivak/master | Daniel Gultsch | 2015-09-14 | 1 | -0/+14 |
|\ | | | | | some string localization for russian language | ||||
| * | some string localization for russian language | Sergey Spivak | 2015-09-14 | 1 | -0/+14 |
| | | |||||
* | | pulled translations from transifex | Daniel Gultsch | 2015-09-14 | 1 | -1/+0 |
|/ | |||||
* | pulled updated translations from transifex | Daniel Gultsch | 2015-08-28 | 1 | -1/+0 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-08-24 | 1 | -2/+0 |
| | |||||
* | renamed plain text to unencrypted. fixes #1331 | Daniel Gultsch | 2015-08-24 | 1 | -2/+2 |
| | |||||
* | sync translations with transifex | Daniel Gultsch | 2015-08-03 | 1 | -3/+0 |
| | |||||
* | made 'check image on http host' message more generic. fixed #1281 | Daniel Gultsch | 2015-07-16 | 1 | -5/+0 |
| | |||||
* | pulled new translations from transifex | Daniel Gultsch | 2015-06-23 | 1 | -0/+5 |
| | |||||
* | pulled updated translations from transifex | Daniel Gultsch | 2015-05-11 | 1 | -0/+2 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-05-01 | 1 | -0/+59 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-04-26 | 1 | -0/+106 |
| | |||||
* | pulled latest translations from transifex | Daniel Gultsch | 2015-04-20 | 1 | -1/+35 |
| | |||||
* | Remove title_activity_conversations and use app_name instead | kruks23 | 2015-01-30 | 1 | -1/+0 |
| | |||||
* | fetched translations from transifex | iNPUTmice | 2015-01-19 | 1 | -257/+251 |
| | |||||
* | make project translatable via transifex | Daniel Gultsch | 2015-01-09 | 1 | -26/+0 |
| | |||||
* | Updated languages for higher auto accept file sizes and changed labeling to ↵ | Christian Schneppe | 2015-01-05 | 1 | -22/+24 |
| | | | | MiB and KiB | ||||
* | Make `app_name' string untranslatable | Sam Whited | 2014-12-29 | 1 | -1/+0 |
| | | | | | | Remove untranslatable about message Escape single quote in NL translation | ||||
* | Make conversations the root project | Sam Whited | 2014-10-22 | 2 | -0/+284 |