Commit Graph

274 Commits

Author SHA1 Message Date
adbenitez e7649d54e7 Merge branch 'master' into deltalab 2020-07-09 21:23:09 -04:00
Alexander Krotov c71aaed79c Rename "Auto-delete messages" into "Delete old messages"
This change makes it clear which messages are deleted, so this setting
can't be confused with Ephemeral-Timer header, configured per chat.
2020-07-09 14:58:39 +03:00
B. Petersen 4071a98b04 reword 'timer is set' to just 'timer set' 2020-07-09 13:24:59 +02:00
B. Petersen fe2c33a6ba reword 'auto-delete' and 'message deletion' to 'disappearing messages' 2020-07-08 18:24:12 +02:00
adbenitez 2d7108e248 Merge branch 'master' into deltalab 2020-07-02 17:43:06 -04:00
Alexander Krotov 07c802c976 Update strings used for ephemeral messages
- For chat menu item, use already translated auto-delete string.
- For experimental setting, use untranslatable hard-coded string.
- Introduce a new translatable string for ephemeral dialog title
2020-07-01 22:53:54 +03:00
adbenitez c3388881f7 Merge branch 'master' into deltalab 2020-07-01 14:10:40 -04:00
cyberta 794fba6110 adapt strings after PR review 2020-07-01 20:34:00 +03:00
cyberta a3fd4bf962 add system message strings related to ephemeral messages 2020-07-01 20:34:00 +03:00
cyberta 1a0853a9f8 add missing system message strings unreleated to ephemeral messages 2020-07-01 20:34:00 +03:00
adbenitez 74036fc301 Merge branch 'master' into deltalab 2020-06-30 23:07:54 -04:00
cyBerta a2dc69e27e Merge pull request #1341 from deltachat/fix-sharing-multiple
Relay to multiple contacts, rework message relaying
2020-06-30 23:03:37 +02:00
cyberta 34361d7f7d avoid redundant strings in strings.xml 2020-06-30 11:50:53 +02:00
cyberta fee6859208 call it self-destructing instead of ephemeral 2020-06-29 23:56:01 +03:00
cyberta 66b33bd7b1 implement dialog for ephemeral message time selection 2020-06-29 23:56:01 +03:00
cyberta b13b03c56b add ephemeral messages time strings 2020-06-29 23:56:01 +03:00
cyberta f6599e3ae0 add experimental feature switch for ephemeral messages 2020-06-29 23:56:01 +03:00
adbenitez f903c804c8 Merge branch 'master' into deltalab 2020-06-24 15:30:29 -04:00
B. Petersen f766cbc3c2 add device message for 1.10 2020-06-24 14:17:03 +02:00
adbenitez 4b358e615f Merge branch 'master' into deltalab 2020-06-24 01:25:23 -04:00
cyberta 1599fc93e4 add info.plist permission description 2020-06-22 20:33:44 +02:00
adbenitez 3797611307 change app name and logo 2020-06-21 04:14:48 -04:00
adbenitez d8836d64b2 Merge remote-tracking branch 'upstream/master' into deltalab 2020-06-19 23:43:32 -04:00
B. Petersen 128667c35f say, what we're doing 2020-06-19 21:18:01 +02:00
adbenitez 63ee5a050c add pink theme 2020-06-17 20:25:16 -04:00
adbenitez 6e36e08c4d port to fork (first official commit) 2020-06-17 19:22:09 -04:00
Hocuri 66b95ae041 Remove "Do you want to" from sharing confirmation messages (the forwarding confirmation messages do not have it, either) 2020-06-12 22:36:54 +02:00
Hocuri 88bce39088 Fix forward to multiple string 2020-06-12 22:36:54 +02:00
Hocuri 65901bbfe0 Oops, add strings.xml 2020-06-12 22:36:54 +02:00
Hocuri 15e114ae6e Oops, add string 2020-06-12 22:35:46 +02:00
B. Petersen 68ed04cd44 remove unused device-message, avoid unneeded translations 2020-06-10 20:20:30 +02:00
B. Petersen d27ab85705 allow qr-account-creation from within configured app 2020-06-10 17:04:47 +02:00
cyberta 8aff85b21c remove unused blur related strings 2020-06-08 11:16:06 +02:00
cyberta 9f48ee0a74 first draft on face detection adapting signal's new feature 2020-06-05 14:46:30 +02:00
B. Petersen a2c2c6508b fix typo 2020-05-21 22:33:01 +02:00
B. Petersen c0d74a0acf show changed situation to 1.6 users 2020-05-11 01:11:22 +02:00
B. Petersen c9b8958b65 update translations 2020-05-02 22:49:33 +02:00
B. Petersen 9dccd7af2f tweak device-msg that explains the permantent-notification, esp. point out that it also acts as an indicator that things may not work as expected and make the link to dontkillmyapp.com clearer 2020-05-02 14:01:47 +02:00
B. Petersen 938dc404f7 update translations 2020-05-02 11:04:57 +02:00
B. Petersen 708515ef6a wording 2020-04-29 17:15:26 +02:00
B. Petersen 69d05ae0c7 show permantent-notification unconditionally and add a switch to disable it 2020-04-28 15:16:50 +02:00
B. Petersen 1e345a40c4 simplify translations 2020-04-28 11:02:01 +02:00
B. Petersen 214d33f015 add auto-delete-option 'after 1 year' 2020-04-28 00:41:19 +02:00
B. Petersen 8461c13f65 wording 2020-04-24 18:29:28 +02:00
B. Petersen 316eb47399 update translations 2020-04-23 00:23:19 +02:00
B. Petersen 90cc27dba2 show currently selected account in switch menu 2020-04-16 12:19:47 +02:00
B. Petersen 86ed4ee8e7 add basic switch menu 2020-04-16 12:19:46 +02:00
B. Petersen bf6607ee4f add menu entry and experimental optinon for account switching 2020-04-16 12:19:46 +02:00
B. Petersen 1d9d2148f6 update translations 2020-04-11 17:58:56 +02:00
B. Petersen 80dc60a222 improve wording to make more clear, this is sign-in, not-sign up 2020-04-08 12:48:02 +02:00