Commit graph

38 commits

Author SHA1 Message Date
iNPUTmice defb127d6e Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference
Conflicts:
	src/main/res/values-de/strings.xml
	src/main/res/values/strings.xml
2015-04-14 15:17:06 +02:00
BrianBlade 878066ca99 Add option to use MTM without default TrustManager
Add a new "Don't trust system CAs" preference under advanced options
that will change the behaviour of the MemorizingTrustManager. All
formerly unknown certificates will raise a warning if checked.
2015-04-11 15:13:42 +02:00
BrianBlade dace8ba3d3 Enable end-conversation by swipe gesture
Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4
to enable swipe-out for ListViews

Re-enable selectableItemBackground

Dont end selectedConversation on swipe

Call mConversationFragment.reinit() instead.
Add separate undo string for swipe MUC.

Add blacklistedConversation for undo swipe

Update title_undo_swipe_* strings

Fix undo(), rename blacklistedConversation

Fix discardUndo(); re-init selectedConversation

maintain scroll position after undo

clear notification when dismissing a conversation

modified / simplified maintain scroll position code

simplify handling of selectedConversation

change undo_muc string, remove notifyDataSetChanged()
2015-04-08 23:29:52 +02:00
iNPUTmice 64d6a2970e pulled translations from transifex 2015-04-01 20:26:28 +02:00
iNPUTmice ad8f1902d1 pulled translations 2015-03-22 18:56:28 +01:00
iNPUTmice 4aab45533a pulled new translations from transifex 2015-03-16 11:52:42 +01:00
iNPUTmice 0d6907f1e0 pulled new translations from transifex 2015-02-27 17:20:41 +01:00
iNPUTmice 3e8314459c pulled new translations from transifex 2015-02-23 21:56:06 +01:00
iNPUTmice a6e6959614 pulled translations from transifex 2015-02-16 16:56:40 +01:00
iNPUTmice 33530a9e30 pulled translations from transifex 2015-02-01 17:04:29 +01:00
Sam Whited ce5c6c6257 Removes some unused strings (the legacy SSL stuff) 2015-02-01 08:58:35 -05:00
kruks23 e76a9c06c3 Remove title_activity_conversations and use app_name instead 2015-01-30 17:02:53 +01:00
iNPUTmice 14fc520ec0 updated translations 2015-01-25 16:36:57 +01:00
Sam Whited 503237087f Remove legacy SSL support 2015-01-19 11:02:13 -05:00
iNPUTmice c5d087ad55 fetched translations from transifex 2015-01-19 12:14:55 +01:00
Sam Whited dfc1cea882 Correct the download file string on notifications
Fixes #896
2015-01-17 09:11:04 -05:00
Daniel Gultsch a9159568b9 allow for very basic muc configuration 2015-01-08 21:29:26 +01:00
Daniel Gultsch f8dc59be81 fixed german translation 2015-01-08 00:41:37 +01:00
Christian S. 45c1e88a08 Updated German translations for more muc options 2015-01-07 19:06:18 +01:00
Christian S 9d43ddbf59 Updated German translations...
...I'm not sure if "Weitere Einstellungen" is the right translation for "advanced mode". Has anybody a better translation?

I've changed the translations.

Updated German translations...

Updated German translations...
2015-01-07 18:08:18 +01:00
Christian Schneppe 47a8a39595 corrected German spellings
and shorten some strings
2015-01-05 15:59:21 +01:00
kriztan b739a0d200 corrected German 'private_message_to' 2015-01-04 11:16:21 +01:00
kriztan 58b7e71e58 Added and modified German translations 2015-01-03 19:35:58 +01:00
kriztan eca826caf3 Added German translations 2015-01-02 09:12:17 +01:00
Sam Whited 0882da2568 Make `app_name' string untranslatable
Remove untranslatable about message

Escape single quote in NL translation
2014-12-29 19:38:47 -05:00
kriztan 3b3d51b39a Update german translations 2014-12-27 10:42:15 +01:00
kriztan 3b127ab743 Update german translations 2014-12-25 09:14:34 +01:00
kriztan 948112c2f3 Update german translations 2014-12-18 12:10:03 +01:00
Holger Weiß b5b6589b44 Update/improve German translations 2014-12-02 18:02:17 +01:00
kriztan e1e28e9ef6 Update german translations
modified translations a bit
2014-11-26 11:39:40 +01:00
kriztan 4d841587c8 Update german translations 2014-11-23 15:21:12 +01:00
kriztan 13bb46d550 Update german translations 2014-11-20 19:20:49 +01:00
kriztan 6847594363 Update german translations 2014-11-19 08:51:23 +01:00
Sam Whited 62404b234c Spelling fix in German translation 2014-11-14 22:13:42 -05:00
kriztan fca3e3c756 Update German language
deleted 'pref_about_message'
2014-11-12 20:09:14 +01:00
kriztan b971965697 Update German language 2014-11-12 13:13:59 +01:00
Sam Whited 46f147a82c Merge branch 'gradle' into development
Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib
2014-10-30 15:33:13 -04:00
Sam Whited 281ce3105f Make conversations the root project 2014-10-22 15:47:11 -04:00
Renamed from conversations/src/main/res/values-de/strings.xml (Browse further)