83c3b33f18
Merge branch 'development'
2014-09-12 17:53:42 +02:00
cee898084e
Merge branch 'master' of github.com:siacs/Conversations
2014-09-12 17:53:28 +02:00
ca560ae4de
updated swedish translations. thank you Anders Sandblad
2014-09-12 14:28:34 +02:00
00d2757b5a
Created Czech strings.xml translation file
2014-09-12 11:56:25 +02:00
19488d39dc
czech arrays.xml file created
2014-09-11 18:03:02 +02:00
c9a342fc6e
more formating
2014-09-11 16:32:49 +02:00
12b62adeca
added missing strings back. + formating
2014-09-11 16:22:33 +02:00
dee46f3453
match color in contact details to the colors in the send button. also migrated some other colors from hard coding to using resources
2014-09-11 14:24:10 +02:00
31f11070e3
IT'S CHRISTMAS ALREADY!
2014-09-10 17:59:57 +02:00
8d4ad58356
Update Spanish Translations
2014-09-09 18:45:03 +02:00
d92e8381db
setting to increase font size. fixed #420
2014-09-08 23:58:37 +02:00
d9c4637b31
hide encryption settings under 'expert options'
2014-09-08 22:11:48 +02:00
b23f8bd472
introduced downloadable interface. reverted some of the changes made to OTR
2014-09-08 20:09:44 +02:00
5cb11396f6
fixed sending offline pgp messages
2014-09-08 14:08:59 +02:00
58953e6193
settings to force encryption and setting for not saving messages to disk. fixed #353
2014-09-08 13:37:22 +02:00
19f98f5143
warn on missing presence subscription
2014-09-08 12:46:48 +02:00
409fdd8596
Merge branch 'development' of github.com:siacs/Conversations into development
2014-09-07 23:08:57 +02:00
449c2a544b
fixed #321 - delete otr fingerprints
2014-09-07 23:08:40 +02:00
f4d86ecff3
deleted some unused string-resources and imports, also deleted edit_account_dialog.xml.
2014-09-07 15:58:59 +02:00
0e5a0a07fd
made otr a little bit more solid when there is no presence subscription
2014-09-06 18:21:31 +02:00
dc02137106
warn user if no presence subscription exists
2014-09-05 13:29:45 +02:00
6b9219c5f4
added support for password protected muc - fixed #203 and fixed #395
2014-09-03 19:35:45 +02:00
1a09a4706b
added ability to disable notifications for specific conversations - fixed #322
2014-09-03 12:36:54 +02:00
3235c67e81
Merge branch 'unused_resources' of https://github.com/betheg/Conversations into betheg-unused_resources
2014-09-02 16:50:19 +02:00
97b52abaf9
fixed #410 by removing that config option
2014-09-02 16:00:03 +02:00
0ae852a633
refactored share with activity
2014-09-02 15:51:20 +02:00
8f0882eb1c
removed unused string resources.
2014-09-01 19:49:47 +02:00
e30599b993
Merge pull request #401 from jelmer/dutch-updates
...
Update Dutch translations.
2014-08-31 19:50:56 +02:00
86b85062ad
Update Dutch translations.
2014-08-31 19:45:54 +02:00
5ab025d008
Merge pull request #398 from betheg/fix_res
...
fix: warning: string 'publish_avatar' has no default translation.
2014-08-31 15:56:13 +02:00
8f8d4e320d
experimental message merging
2014-08-31 14:29:12 +02:00
733041aee4
fix: warning: string 'publish_avatar' has no default translation.
...
also altered the types of resources from array to string-array in some res-files.
2014-08-30 17:47:17 +02:00
9be78cbbbe
more swedish translations
2014-08-29 12:06:32 +02:00
33172246c9
fixed #389
2014-08-29 10:24:25 +02:00
fc7f57cdd6
Fix some typos in the German translation.
2014-08-28 22:54:40 +02:00
85b31b8d8b
fixed spelling thanks @betheg
2014-08-28 11:01:24 +02:00
12cbd07693
formating in strings file
2014-08-28 10:53:44 +02:00
d8eeab0879
Merge branch 'development' of https://github.com/beriain/Conversations into development
...
Conflicts:
res/values-eu/strings.xml
2014-08-28 10:48:25 +02:00
9c8b6b16d5
Update strings.xml
2014-08-27 14:48:31 +02:00
431d4ed44b
translated missing string in settings
2014-08-27 09:43:53 +02:00
16eb8c3952
added swedish translations by Anders Sandblad @andersruneson
2014-08-27 09:36:47 +02:00
d617f099a1
added missing string to german translation
2014-08-26 15:35:48 +02:00
b933a34a59
Updated to 0.6.1
...
1. Different bug fixed.
2. Added new __<string name="general">Общие</string>__, guys you must add this to your _Conversation_ code, because now, if you go to settings, you can't change the label General - it's hard-coded for all languages.
2014-08-26 17:26:03 +04:00
902f6c57b1
removed deprecated strings from translations
2014-08-26 11:20:10 +02:00
3ed29e5a8b
Merge pull request #376 from wapolinar/development
...
Update strings.xml
2014-08-25 20:25:29 +02:00
5e7450adfa
Update Spanish Translations
2014-08-25 19:49:35 +02:00
03a387242c
Update strings.xml
...
Typo in a key for the German translation.
2014-08-25 16:51:20 +02:00
dce001369d
Merge branch 'development' of github.com:siacs/Conversations into development
2014-08-24 17:18:10 +02:00
eae0a0aa2c
Update strings.xml
2014-08-24 17:14:47 +02:00
e0b759340d
jump right into edit account if now accounts are configured
2014-08-23 21:31:27 +02:00
iNPUTmice