Skip to content

Commit

Permalink
remove bad changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Septias authored and Simon-Laux committed Jun 4, 2024
1 parent 6785105 commit 0d23a88
Show file tree
Hide file tree
Showing 3 changed files with 166 additions and 865 deletions.
17 changes: 4 additions & 13 deletions _locales/en.xml
Original file line number Diff line number Diff line change
Expand Up @@ -504,8 +504,7 @@
<string name="multidevice_same_network_hint">Make sure both devices are on the same Wi-Fi or network</string>
<string name="multidevice_this_creates_a_qr_code">This creates a QR code that the second device can scan to copy the profile.</string>
<string name="multidevice_install_dc_on_other_device">Install Delta Chat on your other device (https://get.delta.chat)</string>
<!-- "I Already Have a Login / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
<string name="multidevice_tap_scan_on_other_device">Start Delta Chat, tap “I Already Have a Login / Add as Second Device” and scan the code shown here</string>
<string name="multidevice_tap_scan_on_other_device">Start Delta Chat, tap “Add as Second Device” and scan the code shown here</string>
<!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice ([email protected])" -->
<string name="multidevice_qr_subtitle">Scan to set up second device for %1$s</string>
<string name="multidevice_receiver_title">Add as Second Device</string>
Expand Down Expand Up @@ -587,7 +586,7 @@
<!-- for classic email, we use the classical term "Account" -->
<string name="login_explain">Log in with an existing e-mail account</string>
<string name="login_subheader">For known e-mail providers additional settings are set up automatically. Sometimes IMAP needs to be enabled in the web settings. Consult your e-mail provider or friends for help.</string>
<string name="login_no_servers_hint">Delta Chat does not collect user data, everything stays on your device.</string>
<string name="login_no_servers_hint">There are no Delta Chat servers, your data stays on your device.</string>
<string name="login_inbox">Inbox</string>
<string name="login_imap_login">IMAP Login Name</string>
<string name="login_imap_server">IMAP Server</string>
Expand All @@ -608,7 +607,7 @@
<string name="login_socks5_user">SOCKS5 User</string>
<string name="login_socks5_password">SOCKS5 Password</string>
<string name="login_info_oauth2_title">Continue with simplified setup?</string>
<string name="login_info_oauth2_text">The entered e-mail address supports a simplified setup (OAuth 2.0).\n\nIn the next step, please allow Delta Chat to act as your Chat over E-mail app.\n\nDelta Chat does not collect user data, everything stays on your device.</string>
<string name="login_info_oauth2_text">The entered e-mail address supports a simplified setup (OAuth 2.0).\n\nIn the next step, please allow Delta Chat to act as your Chat over E-mail app.\n\nThere are no Delta Chat servers, your data stays on your device.</string>
<string name="login_certificate_checks">Certificate Checks</string>
<string name="login_error_mail">Please enter a valid e-mail address</string>
<string name="login_error_server">Please enter a valid server / IP address</string>
Expand Down Expand Up @@ -646,7 +645,7 @@
<!-- preferences -->
<string name="pref_using_custom">Using custom: %s</string>
<string name="pref_using_default">Using default: %s</string>
<string name="pref_profile_info_headline">Your Profile</string>
<string name="pref_profile_info_headline">Your Profile Info</string>
<string name="pref_profile_photo">Profile Image</string>
<string name="pref_blocked_contacts">Blocked Contacts</string>
<string name="blocked_empty_hint">Blocked contacts will appear here.</string>
Expand Down Expand Up @@ -689,8 +688,6 @@
<string name="pref_incognito_keyboard_explain">Request keyboard to disable personalized learning</string>
<string name="pref_read_receipts">Read Receipts</string>
<string name="pref_read_receipts_explain">If read receipts are disabled, you won\'t be able to see read receipts from others.</string>
<string name="pref_server">Server</string>
<string name="pref_encryption">Encryption</string>
<string name="pref_manage_keys">Manage Keys</string>
<string name="pref_use_system_emoji">Use System Emoji</string>
<string name="pref_use_system_emoji_explain">Turn off Delta Chat\'s built-in emoji support</string>
Expand Down Expand Up @@ -767,8 +764,6 @@
<string name="pref_edit_profile">Edit Profile</string>
<string name="disable_imap_idle">Disable IMAP IDLE</string>
<string name="disable_imap_idle_explain">Do not use IMAP IDLE extension even if the server supports it. Enabling this option will delay message retrieval, enable it only for testing.</string>
<string name="enable_realtime">Enable Realtime APIs</string>
<string name="enable_realtime_explain"> Enable Webxdc realtime APIs which create direct connection between devices and leak IP addresses to each other.</string>
<string name="send_stats_to_devs">Send statistics to Delta Chat\'s developers</string>


Expand Down Expand Up @@ -819,9 +814,7 @@
<string name="autodel_after_1_year">After 1 year</string>

<!-- autocrypt -->
<!-- deprecated, used "Encryption" if a headline is needed -->
<string name="autocrypt">Autocrypt</string>
<!-- deprecated, the button "Send Autocrypt Setup Message" is enough -->
<string name="autocrypt_explain">Autocrypt is a new and open specification for automatic end-to-end e-mail encryption.\n\nYour end-to-end setup is created automatically as needed and you can transfer it between devices with Autocrypt Setup Messages.</string>
<string name="autocrypt_send_asm_title">Send Autocrypt Setup Message</string>
<string name="autocrypt_send_asm_explain_before">An Autocrypt Setup Message securely shares your end-to-end setup with other Autocrypt-compliant apps.\n\nThe setup will be encrypted by a setup code displayed here and must be typed on the other device.</string>
Expand Down Expand Up @@ -974,8 +967,6 @@
<string name="secure_join_started">%1$s invited you to join this group.\n\nWaiting for the device of %2$s to reply…</string>
<!-- placeholder will be replaced by the name of the inviter. -->
<string name="secure_join_replies">%1$s replied, waiting for being added to the group…</string>
<string name="secure_join_wait">Establishing guaranteed end-to-end encryption, please wait…</string>
<string name="secure_join_wait_timeout">Could not yet establish guaranteed end-to-end encryption, but you may already send a message.</string>
<string name="contact_verified">%1$s introduced.</string>
<string name="contact_not_verified">Cannot establish guaranteed end-to-end encryption with %1$s.</string>
<!-- Shown in contact profile. The placeholder will be replaced by the name of the contact that introduced the contact. -->
Expand Down
Loading

0 comments on commit 0d23a88

Please sign in to comment.