yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 09:49:21 +02:00
Code Issues Releases Wiki Activity

Merge branch 'main' into adb/issue-3893

Browse source
This commit is contained in:
adb 2025-09-02 18:12:24 +02:00 • committed by GitHub
commit 4b8177f7f0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/main/res/values/strings.xml
View file

@ -368,20 +368,33 @@
</plurals>
<string name="file_saved_to">File saved to \"%1$s\".</string>
<!-- deprecated -->
<string name="videochat">Video Chat</string>
<!-- deprecated -->
<string name="videochat_invite_user_to_videochat">Invite %1$s to a video chat?</string>
<!-- deprecated -->
<string name="videochat_invite_user_hint">This requires a compatible app or browser on both ends.</string>
<!-- deprecated -->
<string name="videochat_contact_invited_hint">%1$s invited to a video chat.</string>
<!-- deprecated -->
<string name="videochat_you_invited_hint">You sent a video chat invitation.</string>
<!-- deprecated -->
<string name="videochat_tap_to_join">Tap to Join</string>
<!-- deprecated -->
<string name="videochat_tap_to_open">Tap to Open</string>
<!-- deprecated -->
<string name="videochat_instance">Video Chat Instance</string>
<!-- deprecated -->
<string name="videochat_instance_placeholder">Your Video Chat Instance</string>
<!-- Do not translate "$ROOM", since it is a fixed token Delta Chat will replace with a generated room ID like "aOclju5eCky" -->
<!-- deprecated -->
<string name="videochat_instance_example">Example: https://your-server.org/$ROOM</string>
<!-- deprecated -->
<string name="videochat_instance_explain_2">If enabled, you can start a video chat from each chat. Requires a compatible app or a browser on both ends.</string>
<!-- deprecated -->
<string name="videochat_instance_from_qr">Use \"%1$s\" to invite others to video chats?\n\nOnce set, you can start a video chat from each chat. This replaces any previous setting for video chats.</string>
<!-- deprecated -->
<string name="videochat_invitation">Video chat invitation</string>
<!-- deprecated -->
<string name="videochat_invitation_body">You are invited to a video chat, click %1$s to join.</string>
<!-- get confirmations -->
@ -868,8 +881,10 @@
<!-- "At once" in the meaning of "Immediately", without any intervening time. -->
<string name="autodel_at_once">At once after Download</string>
<string name="after_30_seconds">After 30 seconds</string>
<!-- deprecated -->
<string name="after_1_minute">After 1 minute</string>
<string name="after_5_minutes">After 5 minutes</string>
<!-- deprecated -->
<string name="after_30_minutes">After 30 minutes</string>
<string name="autodel_after_1_hour">After 1 hour</string>
<string name="autodel_after_1_day">After 1 day</string>
@ -923,8 +938,9 @@
<string name="ephemeral_timer_seconds_by_you">You set disappearing messages timer to %1$s seconds</string>
<!-- %1$s will be replaced by the number of seconds (always >1) the timer is set to, %2$s will be replaced by name and address of the contact -->
<string name="ephemeral_timer_seconds_by_other">Disappearing messages timer set to %1$s seconds by %2$s.</string>
<!-- deprecated, usage needs to be removed in core -->
<string name="ephemeral_timer_1_minute_by_you">You set disappearing messages timer to 1 minute.</string>
<!-- %1$s will be replaced by name and address of the contact -->
<!-- deprecated, usage needs to be removed in core -->
<string name="ephemeral_timer_1_minute_by_other">Disappearing messages timer set to 1 minute by %1$s.</string>
<string name="ephemeral_timer_1_hour_by_you">You set disappearing messages timer to 1 hour.</string>
<!-- %1$s will be replaced by name and address of the contact -->
@ -1149,7 +1165,7 @@
<string name="disabled_in_dc">Disabled in Delta Chat</string>
<string name="disabled_in_system_settings">Disabled in system settings</string>
<string name="bg_app_refresh_disabled">\"Background App Refresh\" disabled in system settings</string>
<!-- iOS connectivity view, Adjective, used eg. as "Notifications: Delayed" -->
<!-- deprecated, was used on iOS only -->
<string name="delayed">Delayed</string>
<string name="notifications_avg_minutes">On average every %1$d minutes</string>
<string name="notifications_avg_hours">On average every %1$d hours</string>