270cbbeded
Merge remote-tracking branch 'upstream/main'
2024-01-13 22:14:50 -05:00
b8b15cccdd
simplify string, mark old string as deprecated
2024-01-10 17:15:04 +01:00
c920ced553
reword self-name/-avatar hint; name is required
2024-01-10 17:15:04 +01:00
82405258ce
make 1to1-empty-hint working better with chatmail
...
the hint already led to confusion on 37c3 testings of chatmail.
the hint that appears when a one-to-one-chat was just created manually
(by entering an email address manually) is a bit misleading when using chatmail,
as it says it 'does not matter if the other side uses Delta Chat'.
this is still true, however, with chatmail it is needed that messages
outside the chatmail-server are encrypted,
which is arguably not so easy without delta chat and QR code scanning.
this PR therefore just removes the hint;
it would still be great if the error message 'cannot encrypt' is improved,
however, this is another thing.
2024-01-08 21:35:14 +01:00
5afe2cacb4
Merge remote-tracking branch 'upstream/main'
2023-12-12 11:47:54 -05:00
86c9227939
remove unused stock-string (ios/desktop also do not used that string, so even removing from translations is fine) ( #2905 )
2023-12-11 16:09:41 -05:00
cb1ccee136
upodate strings
2023-11-17 00:20:18 +01:00
1caca9ba28
show dialog if only self is in new group
2023-11-16 22:02:42 +01:00
d9e1345f0c
Merge remote-tracking branch 'upstream/main'
2023-11-14 23:25:17 +01:00
f8114d9862
Update res/values/strings.xml
2023-11-14 21:58:51 +01:00
5759ca0f98
Update res/values/strings.xml
...
Co-authored-by: bjoern <r10s@b44t.com >
2023-11-14 21:58:51 +01:00
a0852bcf87
try to improve device message
2023-11-14 21:58:51 +01:00
2c1e80fc1b
Merge remote-tracking branch 'upstream/main'
2023-11-14 12:34:33 +01:00
50b787c4bb
remove deprecated source strings
2023-11-13 22:48:53 +01:00
f4cde4ab7a
Merge remote-tracking branch 'upstream/main'
2023-11-13 12:40:58 +01:00
cfd093c58b
Merge remote-tracking branch 'upstream/adb/improve-new-contact'
2023-11-13 12:40:32 +01:00
631c006102
Update res/values/strings.xml
...
Co-authored-by: bjoern <r10s@b44t.com >
2023-11-12 14:16:37 -05:00
38afdfb965
Add stock string 173 (Member added)
2023-11-12 19:24:22 +01:00
101af6c082
fix comment
2023-11-12 16:52:44 +01:00
54f1be722d
Update res/values/strings.xml
...
Co-authored-by: bjoern <r10s@b44t.com >
2023-11-12 10:37:11 -05:00
30ab45a4a7
improve NewContactActivity, add "scan QR button"
2023-11-11 19:58:33 +01:00
97ec5b835a
Merge remote-tracking branch 'upstream/main'
2023-11-11 12:03:03 +01:00
9689791d99
Update res/values/strings.xml
...
Co-authored-by: bjoern <r10s@b44t.com >
2023-11-09 19:06:32 +01:00
88ba4aeb9d
Merge remote-tracking branch 'upstream/main'
2023-11-07 23:08:12 +01:00
3430fd7ac7
suggestion for better cannot-decrypt message
2023-11-07 16:16:42 +01:00
083081fcb4
draft a device message ( #2817 )
...
* draft a device message
* add others
* Update res/values/strings.xml
Co-authored-by: link2xt <link2xt@testrun.org >
* 'implovements in', remove double 'screen reader'
* move 'now' to the end; sounds as 'no' otherwise, and i also think, this is more fluent
* nicer group icon
* add an image showcasing the green checkmark
* more image like?
* split device message, delete old device messages
* add 'sync' to device message
---------
Co-authored-by: link2xt <link2xt@testrun.org >
2023-11-06 20:16:14 +01:00
0f093c8bd0
Merge remote-tracking branch 'upstream/main'
2023-11-05 21:20:16 +01:00
de8d3dcedf
update translations ( #2819 )
...
* mark soonish unused strings as deprecated
* update translations
* update translations after uploading source
2023-11-04 19:16:33 +01:00
8f3fc6171a
Merge remote-tracking branch 'upstream/main'
2023-11-04 00:17:05 +01:00
6e4a463fb5
Merge remote-tracking branch 'upstream/main'
2023-11-04 00:06:42 +01:00
16fac30fa9
cleanup chore: target duplicate autocrypt strings ( #2813 )
...
* remove placeholder from
that way, it can be used instead of show_key_transfer_message_desktop,
which is showing the code more layouted
* mark duplicated autocrypt strings as deprecated
2023-11-03 19:09:04 +01:00
b35b470106
update translations ( #2812 )
2023-11-03 18:33:06 +01:00
bff9f5213d
remove unused strings show_full_message_in_browser, files_and_webxdx_apps, new_group_or_subject, welcome_intro1_message, login_oauth2_checking_addr ( #2811 )
2023-11-03 18:25:47 +01:00
e0171aab45
remove "verified" from strings ( #2804 )
...
* remove "verified" from strings
* reword 'cannot introduce' to 'cannot establish guaranteed e2ee'
* removed old 'Verified' wording; this may be displayed only for legacy contacts until deltachat-desktop hides the row
2023-11-03 17:15:53 +01:00
396c319e84
adapt string.id
2023-11-02 23:48:05 +01:00
0ee81c0be2
rename "Clone" menu item to "Clone Chat"
2023-11-02 23:48:05 +01:00
0a9d62a09a
allow to clone groups and broadcasts
2023-11-02 23:48:05 +01:00
17be8f3f9f
update translations
2023-10-31 22:51:13 +01:00
79d10d0376
add "export all" button instead of checkbox
2023-10-31 22:39:28 +01:00
53e228ca80
adapt backup dialog to allow to select to export all accounts
2023-10-31 22:39:28 +01:00
2629f95ba7
add desktop strings ( #2785 )
...
* add desktop strings
* add broadcast_list_name
* add 'donate', 'disable_imap_idle', remove 'system_integration'
* add 'later', add 'add_to_sticker_collection'
* typo, create_broadcast_list -> create
2023-10-31 21:43:00 +01:00
740e5eec41
tweak create_verified_group_ask string
2023-10-31 18:59:04 +01:00
5d615f3162
add linebreak
2023-10-31 10:56:28 +01:00
83c5b73995
offer to create verified group
2023-10-31 02:25:47 +01:00
ae665dbfb4
typo
2023-10-31 00:20:35 +01:00
c9123dfd06
reword
2023-10-30 23:24:08 +01:00
74821f3234
see all contact list in verified groups, explain why they can't be added
2023-10-30 21:36:43 +01:00
6cbc1b4ddd
an added contact becomes a member
...
it does not really make sense to say what a member needs to be to become a member :)
2023-10-29 20:28:44 +01:00
a4026701a6
stay closer to wording of faq
2023-10-29 20:17:47 +01:00
cce766c827
'verified chats' are no longer experimental
...
we do no longer regard them as experimental.
they are here to stay.
2023-10-29 20:17:47 +01:00
adbenitez