Commit Graph

318 Commits

Author SHA1 Message Date
adbenitez 64752d3bae Merge remote-tracking branch 'upstream/adb/chat-description' 2026-02-17 23:39:53 +01:00
adbenitez 6145e0d2df Merge remote-tracking branch 'upstream/main' 2026-02-17 23:29:06 +01:00
adb af62041c14 Merge branch 'main' into adb/chat-description 2026-02-17 22:36:07 +01:00
B. Petersen e9ae9dc5bf add more translation context to strings 2026-02-17 15:27:13 +01:00
B. Petersen cbfa3b7e58 clarify 'Audio' string 2026-02-17 13:52:21 +01:00
adbenitez 6fa114c6c0 Merge remote-tracking branch 'upstream/main' 2026-02-11 20:22:37 +01:00
Hocuri a5892330dd Translate stock strings 2026-02-07 11:30:40 +01:00
adbenitez aa3d177243 allow to set chat description 2026-02-07 01:23:26 +01:00
B. Petersen 9ffc904ae5 more detailed call strings 2026-02-06 11:45:56 +01:00
adbenitez 8b5dd70d75 Merge remote-tracking branch 'upstream/main' 2026-02-05 20:25:35 +01:00
adbenitez df7d80319c show menu to select audio/video call modes 2026-02-04 19:36:34 +01:00
B. Petersen d574d33596 title-case the message-info send/received titles
we nowhere in the app use lower case field names
2026-01-29 18:33:57 +01:00
adbenitez 45b6a5c565 Merge remote-tracking branch 'upstream/main' 2026-01-24 02:44:04 +01:00
B. Petersen 13c34d9480 make clear, the blockage comes from user action 2026-01-19 17:47:48 +01:00
wch423 6a5a75131e Add indication for blocked contacts in user profile 2026-01-16 17:44:34 +01:00
adbenitez 1b0d3f8583 Merge remote-tracking branch 'upstream/main' 2026-01-08 17:42:54 +01:00
B. Petersen 5bfc91de1b remove unused strings, add new deprecated strings 2026-01-07 15:57:02 +01:00
B. Petersen b9d1aa4338 clarify position of "Add Second Device" settings
clarify, that the "Add Second Device" settings are within Delta Chat,
not within system or app settings.

we got reports of ppl searching within system settings,
esp. on iOS, some apps have additional settings there,
so it is not so far fetched.

but also for other OS, the hint to start Delta Chat is useful
and not only noise.
2026-01-05 13:29:27 +01:00
adbenitez fa7a3c9c32 Merge remote-tracking branch 'upstream/main' 2025-12-16 18:50:00 +01:00
Hocuri 114731f722 Make sending of statistics into a setting (#3794)
Counterpart of https://github.com/chatmail/core/pull/6851

* Make sending of statistics into a setting

* feat: Count securejoin sources and UI paths

* feat: Rename self_reporting to send_statistics

* Adapt core's API change

* WIP, untested: Adapt to a rename on the core side

* Adapt to generated jsonrpc

* New strings and a new dialog

* Adapt to the API change

* Rewording: `...and support research`

* "More Info" button rather than link

* Small fixes

* Open the correct survey (though it doesn't work yet)

* Changelog

* Update help

* Fix compile error

* Fix compilation

* Revert submodule change

* Don't show a device message yet

* Move "Send Statistics" setting

* Fix compilation error

* Remove unused constant

---------

Co-authored-by: adb <adb@merlinux.eu>
2025-12-16 13:10:51 +01:00
B. Petersen 4a73ac19c2 tweak another occurance of 'Chats and Media' 2025-12-15 17:21:04 +01:00
B. Petersen 9c3281e182 chats preferences is called just 'Chats'
it was renamed first on iOS from 'Chats and Media' to 'Chats'
to not confuse with 'All Apps and Media' -
however, that point is also valid for android,
but even if not, it is good for inner consistency and simpler documentation.

moreover, the settings are in reality also about contacts and more,
so just a broad chats is fine.

but also for outer consistency,
this seems better - also in quite some other apps,
it is just called 'chats'
2025-12-15 17:21:04 +01:00
B. Petersen 6acb2203ef simpler 'really delete?' wordings
this removes the addendum 'on all your devices'
from the 'really delete?' questions.

- after polls, and looking at what other apps are doing,
  it is just the default expectation, that a message is deleted from all devices,
  also, we do not have an option (nor do not want to have)

- so, at that point - fresh user, one device -
  there is no need to clutter with other convepts and relativation.
  also, most user will never have more devices.

- ppl anyway do not read -
  but if they do, it is good to have things as much on point as possible :)

- the question fits better to the "delete for everyone" option

- simplify code and strings,
  as device message deletion is no longer special
  (there, we never said "on all your devices")

the addendum 'from your devices' was added as
one year ago, for technical limitations, deletion was really on one device.
when we removed that limitation, we added to addendum,
so ppl used to old apps have a chance to get the change.
meanwhile, the new default is clear and settled and the addendum
does more harm and raise questions than doing good.
2025-12-15 11:29:02 +01:00
adbenitez e289432a09 Merge remote-tracking branch 'upstream/main' 2025-12-13 11:51:12 +01:00
B. Petersen 0a4f1ded54 tune down 'account' wording 2025-12-11 18:40:00 +01:00
adbenitez 2a54867724 improve welcome message and intro graphic 2025-12-10 16:10:48 +01:00
adbenitez 210e5c7fbc Merge remote-tracking branch 'upstream/main' 2025-12-10 13:32:40 +01:00
B. Petersen 0f82b3ca93 deprecate strings used to create profiles from main scanner
instead, one should be asked whether to add a transport.

- it is very probably the more wanted action -
  when one wants a new profile, it is better to learn first,
  that one has to go over "switch profil"

- less can go wrong -
  if ppl play around,
  adding a transport is less harmful than a new profile
  where they do not know how to switch, send from different ones etc.
2025-12-09 18:27:47 +01:00
adbenitez e5149ac255 Merge remote-tracking branch 'upstream/main' 2025-12-08 19:16:02 +01:00
B. Petersen e94f571744 remove more deprecated strings 2025-12-08 16:25:19 +01:00
B. Petersen 1b9bfc37ad remove deprecated strings 2025-12-08 15:20:30 +01:00
B. Petersen 8cb1c195b1 mark unused string as deprecated 2025-12-08 13:38:20 +01:00
B. Petersen 41f963332c remove 'email' from welcome message 2025-12-08 13:38:20 +01:00
B. Petersen dc6dee6a1a reword 'transport' to 'relay' 2025-12-08 13:38:20 +01:00
adbenitez fcc98e81d5 Merge remote-tracking branch 'upstream/main' 2025-12-04 23:19:42 +01:00
B. Petersen 66e8fa9d9e clearly say that experiments may be unstable/changed/removed
by the bare title, this is not clear to everyone.
technically, i also tried <PreferenceCategory summary>,
but that does not wrap text.

moved down 'app picker' for better layout and to match
order of other UI.
2025-12-03 20:28:33 +01:00
adbenitez 67a2e3fcd9 Merge remote-tracking branch 'upstream/main' 2025-12-01 22:04:51 +01:00
B. Petersen 5d0b5f7947 remove InfoPlist_NSContactsUsageDescription, this should no longer go to InfoPlist files 2025-12-01 17:54:57 +01:00
B. Petersen ff438731d8 mark strings as deprecated 2025-11-29 13:20:55 +01:00
B. Petersen 08913a5e76 adapt wording to 'delete contact' question; we no longer check the address book 2025-11-29 13:19:24 +01:00
adbenitez 4af065aad9 Merge remote-tracking branch 'upstream/main' 2025-11-29 00:46:41 +01:00
B. Petersen 8df792a8e3 mark strings that are about to be no longer needed as deprecated 2025-11-25 20:25:06 +01:00
B. Petersen 0693f8ad60 mark strings that are about to be no longer needed as deprecated 2025-11-25 13:50:39 +01:00
adbenitez 999a33e77c remove public bot list from menu 2025-11-22 00:35:30 +01:00
adbenitez b75b29cf08 Merge remote-tracking branch 'upstream/main' 2025-11-21 23:13:00 +01:00
B. Petersen 9a6abed1e4 'which help' refers to 'statistics', so it should be plural 2025-11-21 19:49:39 +01:00
Hocuri 53f401caf5 feat: Add missing core stock strings (#4044) 2025-11-21 09:54:59 +01:00
B. Petersen 1e6d1ed917 shorten QR scan hints and make them work for channels as well 2025-11-20 18:22:57 +01:00
B. Petersen 8450349e19 remove deprecated strings and update some translator hints 2025-11-18 12:00:06 +01:00
adb bc82f56353 Merge branch 'main' into adb/tweak-multidevice-str-keys 2025-11-18 03:26:09 +01:00