282 Commits

Author	SHA1	Message	Date
Aitor Beriain	881e610636	Some corrections	2014-07-24 17:34:57 +02:00
iNPUTmice	438538e2da	french translations by @BenoitBouvarel fixed #311	2014-07-24 11:48:56 +02:00
iNPUTmice	39841e6f57	fixed spanish string. wild guessed + google translate fix for basque	2014-07-24 10:16:05 +02:00
iNPUTmice	9f9dc8f5c0	added some translations back that have been removed be accident	2014-07-24 10:04:01 +02:00
iNPUTmice	76de9dba79	Merge branch 'development' of https://github.com/rostovtsev/Conversations into rostovtsev-development ... Conflicts: res/values-ru/strings.xml	2014-07-24 09:55:45 +02:00
Ilia	4d0d35f6bc	Update strings.xml	2014-07-24 10:46:13 +04:00
Ilia	1a04b071a5	Added translations ... Added translations per issue #309 - Missing Translations	2014-07-24 10:44:39 +04:00
iNPUTmice	3b786c34f2	removed outdated translations from languge files	2014-07-24 01:35:09 +02:00
iNPUTmice	983104f2f0	presonalized read up to this point message	2014-07-24 01:17:34 +02:00
iNPUTmice	eacf56bf37	Merge branch 'development' of github.com:siacs/Conversations into development	2014-07-22 18:58:38 +02:00
iNPUTmice	1f4ea552cd	some cleanup	2014-07-22 18:58:20 +02:00
kruks23	ae532ecf20	Update Spanish Translations	2014-07-22 17:47:25 +02:00
iNPUTmice	9fcc195a6d	brought settings and manage account menu items back	2014-07-22 17:23:31 +02:00
iNPUTmice	2345398652	fixed #301	2014-07-22 16:55:30 +02:00
Daniel Gultsch	9b53ebd44b	Merge pull request #299 from beriain/development ... Update strings.xml	2014-07-22 15:30:23 +02:00
Aitor Beriain	db91c15fcf	Update strings.xml	2014-07-22 15:12:19 +02:00
iNPUTmice	b223784560	added hint to explain the contact has read up to this point	2014-07-21 19:54:26 +02:00
iNPUTmice	2fe20ffa8e	fixed #267	2014-07-21 16:16:09 +02:00
iNPUTmice	9ddd2f195e	fixed typos reported by @jelmer fixed #288	2014-07-20 12:21:04 +02:00
Daniel Gultsch	0ee7cd136a	Merge pull request #289 from jelmer/dutch ... Add Dutch translations.	2014-07-20 12:17:14 +02:00
Jelmer Vernooij	cb0a87d7ff	Add Dutch translations.	2014-07-20 04:00:05 +02:00
kruks23	88857e7721	Update Spanish Translations	2014-07-18 18:36:22 +02:00
iNPUTmice	6b74c0594e	show snackbar if conference was not found	2014-07-18 12:44:33 +02:00
iNPUTmice	38a9242955	brought muc invites back. + couple of bug fixes + refactoring	2014-07-17 00:03:37 +02:00
kruks23	4e321c5187	Update Spanish Translations	2014-07-16 16:31:18 +02:00
iNPUTmice	e79a34b651	redesigned muc details a little bit	2014-07-16 12:34:09 +02:00
Daniel Gultsch	eb8253d49a	Merge pull request #278 from rostovtsev/development ... Russian Translations, fixed typos for English version	2014-07-15 22:33:49 +02:00
Ilia	31b5322570	Russian Localization	2014-07-16 00:10:06 +04:00
Ilia	88a556ec1e	Double-checked Russian localization	2014-07-16 00:06:43 +04:00
Ilia	eab756a1c5	Fixed typo Ouf -> Out	2014-07-15 22:59:32 +04:00
iNPUTmice	fc5143734e	added confirm dialog before contact and bookmark removal	2014-07-15 19:41:58 +02:00
Ilia	b6059a5687	Fixed typo mange -> manage	2014-07-15 19:48:45 +04:00
Ilia	a5d7b9b775	Fixed typo Decrpytion -> Decryption	2014-07-15 19:33:48 +04:00
Ilia	ed39920e6a	Update strings.xml	2014-07-15 19:18:24 +04:00
Ilia	ae0c660cf4	Russian Translation for Conversations ... Russian Translation for Conversations - an open source XMPP client for Android 4.0+ smart phones.	2014-07-15 18:09:48 +04:00
Ilia	3c9df212ab	Delete values-ru	2014-07-15 18:04:35 +04:00
Ilia	cdfaa98736	strings.xml ... Russian translation for Conversations	2014-07-15 18:04:08 +04:00
Daniel Gultsch	908bd59d21	Merge pull request #275 from BenoitBouvarel/development ... Update french translation	2014-07-15 15:13:59 +02:00
Benoit Bouvarel	05e2aef9f8	Update strings.xml	2014-07-15 14:41:30 +02:00
iNPUTmice	2ebd92b7a7	pushing bookmarks back to server	2014-07-15 14:32:19 +02:00
iNPUTmice	3fa3d5f02b	Merge branch 'development' of github.com:siacs/Conversations into development	2014-07-14 11:48:01 +02:00
iNPUTmice	e2f886d121	fetch bookmarks from server	2014-07-14 11:47:42 +02:00
kruks23	c4d6775f7d	Update Spanish Translations	2014-07-13 13:29:06 +02:00
iNPUTmice	4e910eee59	fixed #268	2014-07-12 17:08:01 +02:00
iNPUTmice	7a26f27212	switch SearchView with custom action view	2014-07-11 23:44:59 +02:00
iNPUTmice	610df2eddc	added join conference dialog	2014-07-11 19:48:41 +02:00
iNPUTmice	0193e0291c	cleanup. removed old contacts activity. WARNING: this will temporarly disable muc invites	2014-07-11 14:07:52 +02:00
iNPUTmice	e7a0040ec5	fixed #255 and made some other improvements to the subscription mgmt	2014-07-11 13:52:27 +02:00
Daniel Gultsch	8ebd14cef4	Merge pull request #262 from kruks23/development ... Show time in messages previous days	2014-07-11 13:12:25 +02:00
iNPUTmice	a523127a80	fixed #38	2014-07-10 19:42:37 +02:00