Commits · 39aeb4cc3df85b591e6bf956a1e881324eea746b · Android-smartphones / Conversation

Jul 26, 2014
- Merge branch 'development' of github.com:siacs/Conversations into development · 39aeb4cc
  iNPUTmice authored Jul 26, 2014
  
  39aeb4cc
- Merge pull request #315 from jelmer/dutch · 251b8fd5
  Daniel Gultsch authored Jul 26, 2014
```
Update Dutch translations.
```
  251b8fd5
- Update Dutch translations. · 60e94ee9
  Jelmer Vernooĳ authored Jul 26, 2014
  
  60e94ee9
Jul 25, 2014
- Merge branch 'development' of github.com:siacs/Conversations into development · 0e1c8467
  iNPUTmice authored Jul 25, 2014
  
  0e1c8467
- Merge pull request #313 from suraia/translation-de · deb5046e
  Daniel Gultsch authored Jul 25, 2014
```
Update German translation
```
  deb5046e
Jul 24, 2014
- Update German translation. · 1b0b8478
  Michael Kuhn authored Jul 24, 2014
  
  1b0b8478
- version bump to 0.5 · 16e5139d
  iNPUTmice authored Jul 24, 2014
  
  16e5139d
- Merge pull request #312 from beriain/development · 36434d85
  Daniel Gultsch authored Jul 24, 2014
```
Some corrections
```
  36434d85
- Some corrections · 881e6106
  Aitor Beriain authored Jul 24, 2014
  
  881e6106
- updated screenshots · a6f8954b
  iNPUTmice authored Jul 24, 2014
  
  a6f8954b
- removed duplicates from muc suggestions · 52ad7182
  iNPUTmice authored Jul 24, 2014
  
  52ad7182
- included version string in crash reports · c7c3db47
  iNPUTmice authored Jul 24, 2014
  
  c7c3db47
- french translations by @BenoitBouvarel fixed #311 · 438538e2
  iNPUTmice authored Jul 24, 2014
  
  438538e2
- fixed spanish string. wild guessed + google translate fix for basque · 39841e6f
  iNPUTmice authored Jul 24, 2014
  
  39841e6f
- added some translations back that have been removed be accident · 9f9dc8f5
  iNPUTmice authored Jul 24, 2014
  
  9f9dc8f5
- Merge branch 'rostovtsev-development' into development · 4c84cf78
  iNPUTmice authored Jul 24, 2014
  
  4c84cf78
- Merge branch 'development' of https://github.com/rostovtsev/Conversations into... · 76de9dba
  iNPUTmice authored Jul 24, 2014
```
Merge branch 'development' of https://github.com/rostovtsev/Conversations into rostovtsev-development

Conflicts:
	res/values-ru/strings.xml
```
  76de9dba
- Update strings.xml · 4d0d35f6
  Ilia authored Jul 24, 2014
  
  4d0d35f6
- Added translations · 1a04b071
  Ilia authored Jul 24, 2014
```
Added translations per issue #309 - Missing Translations
```
  1a04b071
Jul 23, 2014
- added jelmer to the list of translators · 8d5f2a91
  iNPUTmice authored Jul 24, 2014
  
  8d5f2a91
- removed more legacy tls error handling stuff · d108a5f2
  iNPUTmice authored Jul 24, 2014
  
  d108a5f2
- removed outdated tls error · deab99c9
  iNPUTmice authored Jul 24, 2014
  
  deab99c9
- removed outdated translations from languge files · 3b786c34
  iNPUTmice authored Jul 24, 2014
  
  3b786c34
- presonalized read up to this point message · 983104f2
  iNPUTmice authored Jul 24, 2014
  
  983104f2
- answer correctly if both markers and receipts are requested · 7ee2ef52
  iNPUTmice authored Jul 24, 2014
  
  7ee2ef52
- fixed bug with otr session being initilized over and over again · 23e5fb5d
  iNPUTmice authored Jul 23, 2014
  
  23e5fb5d
- Merge branch 'development' of github.com:siacs/Conversations into development · b6e3ce4b
  iNPUTmice authored Jul 23, 2014
  
  b6e3ce4b
- more disco. fixed chat markers with jappix · 5c118f6d
  iNPUTmice authored Jul 23, 2014
  
  5c118f6d
- Merge pull request #307 from Erkan-Yilmaz/development · 01a03e5d
  Daniel Gultsch authored Jul 23, 2014
```
typos
```
  01a03e5d
- typos · a81a667c
  Erkan Yilmaz authored Jul 23, 2014
  
  a81a667c
Jul 22, 2014
- updated mtm · 04156e94
  iNPUTmice authored Jul 22, 2014
  
  04156e94
- Merge branch 'development' of github.com:siacs/Conversations into development · eacf56bf
  iNPUTmice authored Jul 22, 2014
  
  eacf56bf
- some cleanup · 1f4ea552
  iNPUTmice authored Jul 22, 2014
  
  1f4ea552
- Merge pull request #303 from kruks23/development · ce2b9626
  Daniel Gultsch authored Jul 22, 2014
```
Update Spanish Translations
```
  ce2b9626
- Update Spanish Translations · ae532ecf
  kruks23 authored Jul 22, 2014
  
  ae532ecf
- switched to mtm · 4607e2c5
  iNPUTmice authored Jul 22, 2014
  
  4607e2c5
- brought settings and manage account menu items back · 9fcc195a
  iNPUTmice authored Jul 22, 2014
  
  9fcc195a
- fixed #301 · 23453986
  iNPUTmice authored Jul 22, 2014
  
  23453986
- refactored message adapter into seperate class · 84642b74
  Daniel Gultsch authored Jul 22, 2014
  
  84642b74
- Merge branch 'development' of github.com:siacs/Conversations into development · 9e1c6686
  Daniel Gultsch authored Jul 22, 2014
  
  9e1c6686