From 773913409f15803591030a5191d58e69e706d8b5 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Tue, 11 Feb 2025 21:54:50 +0100 Subject: [PATCH 1/8] hide the Encryption category completed for chatmail accounts --- .../securesms/preferences/AdvancedPreferenceFragment.java | 2 +- src/main/res/xml/preferences_advanced.xml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java index 6546d33f5..9a1899eff 100644 --- a/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java @@ -269,7 +269,7 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment } if (dcContext.isChatmail()) { - preferE2eeCheckbox.setVisible(false); + this.findPreference("pref_category_encryption").setVisible(false); showSystemContacts.setVisible(false); sentboxWatchCheckbox.setVisible(false); bccSelfCheckbox.setVisible(false); diff --git a/src/main/res/xml/preferences_advanced.xml b/src/main/res/xml/preferences_advanced.xml index 3de6b403f..ca571c429 100644 --- a/src/main/res/xml/preferences_advanced.xml +++ b/src/main/res/xml/preferences_advanced.xml @@ -70,7 +70,9 @@ - + Date: Wed, 12 Mar 2025 16:13:04 +0100 Subject: [PATCH 2/8] remove e2ee_enabled and import/export keys from advanced settings --- .../securesms/connect/DcHelper.java | 1 - .../AdvancedPreferenceFragment.java | 112 +----------------- src/main/res/xml/preferences_advanced.xml | 9 -- 3 files changed, 1 insertion(+), 121 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java index fba404de7..493ab595a 100644 --- a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java +++ b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java @@ -61,7 +61,6 @@ public class DcHelper { public static final String CONFIG_DISPLAY_NAME = "displayname"; public static final String CONFIG_SELF_STATUS = "selfstatus"; public static final String CONFIG_SELF_AVATAR = "selfavatar"; - public static final String CONFIG_E2EE_ENABLED = "e2ee_enabled"; public static final String CONFIG_SENTBOX_WATCH = "sentbox_watch"; public static final String CONFIG_MVBOX_MOVE = "mvbox_move"; public static final String CONFIG_ONLY_FETCH_MVBOX = "only_fetch_mvbox"; diff --git a/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java index 9a1899eff..12a523425 100644 --- a/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java @@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.preferences; import static android.app.Activity.RESULT_OK; import static android.text.InputType.TYPE_TEXT_VARIATION_URI; import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_BCC_SELF; -import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_E2EE_ENABLED; import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_MVBOX_MOVE; import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_ONLY_FETCH_MVBOX; import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SENTBOX_WATCH; @@ -11,13 +10,11 @@ import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SHOW_EMAILS; import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_WEBXDC_REALTIME_ENABLED; import static org.thoughtcrime.securesms.connect.DcHelper.getRpc; -import android.Manifest; import android.app.Activity; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.util.Log; import android.view.View; @@ -32,7 +29,6 @@ import androidx.preference.CheckBoxPreference; import androidx.preference.ListPreference; import androidx.preference.Preference; -import com.b44t.messenger.DcContext; import com.b44t.messenger.rpc.RpcException; import org.thoughtcrime.securesms.ApplicationPreferencesActivity; @@ -42,12 +38,9 @@ import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.RegistrationActivity; import org.thoughtcrime.securesms.connect.DcEventCenter; import org.thoughtcrime.securesms.connect.DcHelper; -import org.thoughtcrime.securesms.mms.AttachmentManager; -import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.proxy.ProxySettingsActivity; import org.thoughtcrime.securesms.util.Prefs; import org.thoughtcrime.securesms.util.ScreenLockUtil; -import org.thoughtcrime.securesms.util.StorageUtil; import org.thoughtcrime.securesms.util.StreamUtil; import org.thoughtcrime.securesms.util.Util; @@ -63,10 +56,8 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment implements DcEventCenter.DcEventDelegate { private static final String TAG = AdvancedPreferenceFragment.class.getSimpleName(); - public static final int PICK_SELF_KEYS = 29923; private ListPreference showEmails; - CheckBoxPreference preferE2eeCheckbox; CheckBoxPreference sentboxWatchCheckbox; CheckBoxPreference bccSelfCheckbox; CheckBoxPreference mvboxMoveCheckbox; @@ -92,11 +83,6 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment sendAsm.setOnPreferenceClickListener(new SendAsmListener()); } - preferE2eeCheckbox = (CheckBoxPreference) this.findPreference("pref_prefer_e2ee"); - if (preferE2eeCheckbox != null) { - preferE2eeCheckbox.setOnPreferenceChangeListener(new PreferE2eeListener()); - } - sentboxWatchCheckbox = (CheckBoxPreference) this.findPreference("pref_sentbox_watch"); if (sentboxWatchCheckbox != null) { sentboxWatchCheckbox.setOnPreferenceChangeListener((preference, newValue) -> { @@ -163,11 +149,6 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment }); } - Preference manageKeys = this.findPreference("pref_manage_keys"); - if (manageKeys != null) { - manageKeys.setOnPreferenceClickListener(new ManageKeysListener()); - } - Preference screenSecurity = this.findPreference(Prefs.SCREEN_SECURITY_PREF); if (screenSecurity != null) { screenSecurity.setOnPreferenceChangeListener(new ScreenShotSecurityListener()); @@ -269,7 +250,6 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment } if (dcContext.isChatmail()) { - this.findPreference("pref_category_encryption").setVisible(false); showSystemContacts.setVisible(false); sentboxWatchCheckbox.setVisible(false); bccSelfCheckbox.setVisible(false); @@ -292,7 +272,6 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment showEmails.setValue(value); updateListSummary(showEmails, value); - preferE2eeCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_E2EE_ENABLED)); sentboxWatchCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_SENTBOX_WATCH)); bccSelfCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_BCC_SELF)); mvboxMoveCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_MVBOX_MOVE)); @@ -304,24 +283,7 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (resultCode != RESULT_OK) return; - if (requestCode == REQUEST_CODE_CONFIRM_CREDENTIALS_KEYS) { - manageKeys(); - } else if (requestCode == PICK_SELF_KEYS) { - Uri uri = (data != null ? data.getData() : null); - if (uri == null) { - Log.e(TAG, " Can't import null URI"); - return; - } - try { - String name = AttachmentManager.getFileName(getContext(), uri); - if (name == null || name.isEmpty()) name = "FILE"; - File file = copyToCacheDir(uri); - showImportKeysDialog(file.getAbsolutePath(), name); - } catch (IOException e) { - Log.e(TAG, "Error calling copyToCacheDir()", e); - } - } else if (requestCode == REQUEST_CODE_CONFIRM_CREDENTIALS_ACCOUNT) { + if (resultCode == RESULT_OK && requestCode == REQUEST_CODE_CONFIRM_CREDENTIALS_ACCOUNT) { openRegistrationActivity(); } } @@ -470,76 +432,4 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment return true; } } - - private class PreferE2eeListener implements Preference.OnPreferenceChangeListener { - @Override - public boolean onPreferenceChange(@NonNull final Preference preference, Object newValue) { - boolean enabled = (Boolean) newValue; - dcContext.setConfigInt(CONFIG_E2EE_ENABLED, enabled? 1 : 0); - return true; - } - } - - /*********************************************************************************************** - * Key Import/Export - **********************************************************************************************/ - protected void showImportKeysDialog(String imexPath, String pathAsDisplayedToUser) { - new AlertDialog.Builder(requireActivity()) - .setTitle(R.string.pref_managekeys_import_secret_keys) - .setMessage(requireActivity().getString(R.string.pref_managekeys_import_explain, pathAsDisplayedToUser)) - .setNegativeButton(android.R.string.cancel, null) - .setPositiveButton(android.R.string.ok, (dialogInterface2, i2) -> startImexOne(DcContext.DC_IMEX_IMPORT_SELF_KEYS, imexPath, pathAsDisplayedToUser)) - .show(); - } - - private class ManageKeysListener implements Preference.OnPreferenceClickListener { - @Override - public boolean onPreferenceClick(@NonNull Preference preference) { - boolean result = ScreenLockUtil.applyScreenLock(requireActivity(), getString(R.string.pref_manage_keys), getString(R.string.enter_system_secret_to_continue), REQUEST_CODE_CONFIRM_CREDENTIALS_KEYS); - if (!result) { - manageKeys(); - } - return true; - } - } - - private void manageKeys() { - Activity activity = requireActivity(); - Permissions.with(activity) - .request(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE) - .alwaysGrantOnSdk30() - .ifNecessary() - .withPermanentDenialDialog(getString(R.string.perm_explain_access_to_storage_denied)) - .onAllGranted(() -> { - new AlertDialog.Builder(activity) - .setTitle(R.string.pref_managekeys_menu_title) - .setItems(new CharSequence[]{ - activity.getString(R.string.pref_managekeys_export_secret_keys), - activity.getString(R.string.pref_managekeys_import_secret_keys) - }, - (dialogInterface, i) -> { - if (i==0) { - new AlertDialog.Builder(activity) - .setTitle(R.string.pref_managekeys_export_secret_keys) - .setMessage(activity.getString(R.string.pref_managekeys_export_explain, DcHelper.getImexDir().getAbsolutePath())) - .setNegativeButton(android.R.string.cancel, null) - .setPositiveButton(android.R.string.ok, (dialogInterface2, i2) -> startImexOne(DcContext.DC_IMEX_EXPORT_SELF_KEYS)) - .show(); - } - else { - if (Build.VERSION.SDK_INT >= 30) { - AttachmentManager.selectMediaType(activity, "*/*", null, PICK_SELF_KEYS, StorageUtil.getDownloadUri()); - } else { - String path = DcHelper.getImexDir().getAbsolutePath(); - showImportKeysDialog(path, path); - } - } - } - ) - .setNegativeButton(R.string.cancel, null) - .setNeutralButton(R.string.learn_more, (d, w) -> DcHelper.openHelp(activity, "#importkey")) - .show(); - }) - .execute(); - } } diff --git a/src/main/res/xml/preferences_advanced.xml b/src/main/res/xml/preferences_advanced.xml index ca571c429..f106c7246 100644 --- a/src/main/res/xml/preferences_advanced.xml +++ b/src/main/res/xml/preferences_advanced.xml @@ -74,15 +74,6 @@ android:key="pref_category_encryption" android:title="@string/pref_encryption"> - - - - - From 218295c4f358c3db5ea007a241ce22899d0fa412 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Thu, 13 Mar 2025 17:22:53 +0100 Subject: [PATCH 3/8] remove ASM handling --- src/main/java/com/b44t/messenger/DcMsg.java | 1 - .../securesms/ConversationAdapter.java | 2 +- .../securesms/ConversationFragment.java | 81 ------------------- .../securesms/ConversationItem.java | 8 +- src/main/res/values/strings.xml | 1 + 5 files changed, 4 insertions(+), 89 deletions(-) diff --git a/src/main/java/com/b44t/messenger/DcMsg.java b/src/main/java/com/b44t/messenger/DcMsg.java index d1828b495..fc9996f1b 100644 --- a/src/main/java/com/b44t/messenger/DcMsg.java +++ b/src/main/java/com/b44t/messenger/DcMsg.java @@ -150,7 +150,6 @@ public class DcMsg { public native String getWebxdcHref (); public native boolean isForwarded (); public native boolean isInfo (); - public native boolean isSetupMessage (); public native boolean hasHtml (); public native String getSetupCodeBegin (); public native String getVideochatUrl (); diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationAdapter.java b/src/main/java/org/thoughtcrime/securesms/ConversationAdapter.java index 156496854..c2e805af4 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationAdapter.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationAdapter.java @@ -294,7 +294,7 @@ public class ConversationAdapter else if (type==DcMsg.DC_MSG_AUDIO || type==DcMsg.DC_MSG_VOICE) { return dcMsg.isOutgoing()? MESSAGE_TYPE_AUDIO_OUTGOING : MESSAGE_TYPE_AUDIO_INCOMING; } - else if (type==DcMsg.DC_MSG_FILE && !dcMsg.isSetupMessage()) { + else if (type==DcMsg.DC_MSG_FILE) { return dcMsg.isOutgoing()? MESSAGE_TYPE_DOCUMENT_OUTGOING : MESSAGE_TYPE_DOCUMENT_INCOMING; } else if (type==DcMsg.DC_MSG_IMAGE || type==DcMsg.DC_MSG_GIF || type==DcMsg.DC_MSG_VIDEO) { diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java index 09e4f5360..2d995b519 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java @@ -25,8 +25,6 @@ import android.content.Context; import android.content.Intent; import android.content.res.Configuration; import android.os.Bundle; -import android.text.Editable; -import android.text.TextWatcher; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; @@ -37,12 +35,10 @@ import android.view.ViewGroup; import android.view.Window; import android.view.animation.Animation; import android.view.animation.AnimationUtils; -import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; import androidx.annotation.NonNull; -import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.view.ActionMode; import androidx.recyclerview.widget.LinearLayoutManager; @@ -725,80 +721,6 @@ public class ConversationFragment extends MessageSelectorFragment Util.runOnAnyBackgroundThread(() -> dcContext.markseenMsgs(ids)); } - - void querySetupCode(final DcMsg dcMsg, String[] preload) - { - if( !dcMsg.isSetupMessage()) { - return; - } - - View gl = View.inflate(getActivity(), R.layout.setup_code_grid, null); - final EditText[] editTexts = { - gl.findViewById(R.id.setupCode0), gl.findViewById(R.id.setupCode1), gl.findViewById(R.id.setupCode2), - gl.findViewById(R.id.setupCode3), gl.findViewById(R.id.setupCode4), gl.findViewById(R.id.setupCode5), - gl.findViewById(R.id.setupCode6), gl.findViewById(R.id.setupCode7), gl.findViewById(R.id.setupCode8) - }; - AlertDialog.Builder builder1 = new AlertDialog.Builder(getActivity()); - builder1.setView(gl); - editTexts[0].setText(dcMsg.getSetupCodeBegin()); - editTexts[0].setSelection(editTexts[0].getText().length()); - - for( int i = 0; i < 9; i++ ) { - if( preload != null && i < preload.length ) { - editTexts[i].setText(preload[i]); - editTexts[i].setSelection(editTexts[i].getText().length()); - } - editTexts[i].addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - if( s.length()==4 ) { - for ( int i = 0; i < 8; i++ ) { - if( editTexts[i].hasFocus() && editTexts[i+1].getText().length()<4 ) { - editTexts[i+1].requestFocus(); - break; - } - } - } - } - - @Override - public void afterTextChanged(Editable s) { - } - }); - } - - builder1.setTitle(getActivity().getString(R.string.autocrypt_continue_transfer_title)); - builder1.setMessage(getActivity().getString(R.string.autocrypt_continue_transfer_please_enter_code)); - builder1.setNegativeButton(android.R.string.cancel, null); - builder1.setCancelable(false); // prevent the dialog from being dismissed accidentally (when the dialog is closed, the setup code is gone forever and the user has to create a new setup message) - builder1.setPositiveButton(android.R.string.ok, (dialog, which) -> { - String setup_code = ""; - final String[] preload1 = new String[9]; - for ( int i = 0; i < 9; i++ ) { - preload1[i] = editTexts[i].getText().toString(); - setup_code += preload1[i]; - } - boolean success = dcContext.continueKeyTransfer(dcMsg.getId(), setup_code); - - AlertDialog.Builder builder2 = new AlertDialog.Builder(getActivity()); - builder2.setTitle(getActivity().getString(R.string.autocrypt_continue_transfer_title)); - builder2.setMessage(getActivity().getString(success? R.string.autocrypt_continue_transfer_succeeded : R.string.autocrypt_bad_setup_code)); - if( success ) { - builder2.setPositiveButton(android.R.string.ok, null); - } - else { - builder2.setNegativeButton(android.R.string.cancel, null); - builder2.setPositiveButton(R.string.autocrypt_continue_transfer_retry, (dialog1, which1) -> querySetupCode(dcMsg, preload1)); - } - builder2.show(); - }); - builder1.show(); - } - private class ConversationFragmentItemClickListener implements ItemClickListener { @Override @@ -818,9 +740,6 @@ public class ConversationFragment extends MessageSelectorFragment actionMode.setTitleOptionalHint(false); // the title represents important information, also indicating implicitly, more items can be selected } } - else if(messageRecord.isSetupMessage()) { - querySetupCode(messageRecord,null); - } else if (messageRecord.getType()==DcMsg.DC_MSG_VIDEOCHAT_INVITATION) { new VideochatUtil().join(getActivity(), messageRecord.getId()); } diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationItem.java b/src/main/java/org/thoughtcrime/securesms/ConversationItem.java index e8835f3e2..9686528df 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationItem.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationItem.java @@ -390,7 +390,7 @@ public class ConversationItem extends BaseConversationItem } private boolean hasDocument(DcMsg dcMsg) { - return dcMsg.getType()==DcMsg.DC_MSG_FILE && !dcMsg.isSetupMessage(); + return dcMsg.getType()==DcMsg.DC_MSG_FILE; } private void setBodyText(DcMsg messageRecord) { @@ -399,11 +399,7 @@ public class ConversationItem extends BaseConversationItem String text = messageRecord.getText(); - if (messageRecord.isSetupMessage()) { - bodyText.setText(context.getString(R.string.autocrypt_asm_click_body)); - bodyText.setVisibility(View.VISIBLE); - } - else if (text.isEmpty()) { + if (text.isEmpty()) { bodyText.setVisibility(View.GONE); } else { diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 85c4a5ac0..766831385 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -876,6 +876,7 @@ Your setup has been sent to yourself. Switch to the other device and open the setup message. You should be asked for a setup code. Enter the following digits: Prefer End-To-End Encryption Autocrypt Setup Message + This is the Autocrypt Setup Message used to transfer your end-to-end setup between clients.\n\nTo decrypt and use your setup, open the message in an Autocrypt-compliant client and enter the setup code presented on the generating device. This is the Autocrypt Setup Message used to transfer your end-to-end setup between clients.\n\nTo decrypt and use your setup, tap or click on this message. Autocrypt Setup Message From 43d48fa5109b9f80a6c2c336ebaee5127bfbe2da Mon Sep 17 00:00:00 2001 From: adbenitez Date: Thu, 13 Mar 2025 17:47:36 +0100 Subject: [PATCH 4/8] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 235683719..4433da148 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * add mute option "8 hours" * add menu option to easily save/unsave selected message * improve deletion confirmation for "Device Messages" +* remove dangerous encryption options ## v1.54.4 2025-03 From 2968d033f2f80a6f6e759347f0bc098bc5107ec1 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Thu, 13 Mar 2025 17:47:43 +0100 Subject: [PATCH 5/8] update strings.xml --- src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index b6c3afe24..67b212e16 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -878,8 +878,8 @@ Your setup has been sent to yourself. Switch to the other device and open the setup message. You should be asked for a setup code. Enter the following digits: Prefer End-To-End Encryption Autocrypt Setup Message - This is the Autocrypt Setup Message used to transfer your end-to-end setup between clients.\n\nTo decrypt and use your setup, open the message in an Autocrypt-compliant client and enter the setup code presented on the generating device. + This is the Autocrypt Setup Message used to transfer your end-to-end setup between clients.\n\nTo decrypt and use your setup, tap or click on this message. Autocrypt Setup Message Please enter the setup code displayed on the other device. From 3578a9bef11ef3c0bb26d9af8d33d043e502b9d5 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sat, 15 Mar 2025 18:24:35 +0100 Subject: [PATCH 6/8] update deltachat-core-rust to 'chore(release): prepare for 1.157.2' of 'v1.157.2' --- jni/deltachat-core-rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jni/deltachat-core-rust b/jni/deltachat-core-rust index 35d4eb516..03b0185b8 160000 --- a/jni/deltachat-core-rust +++ b/jni/deltachat-core-rust @@ -1 +1 @@ -Subproject commit 35d4eb5168e17e1eba16f06b2e5622c1961c7415 +Subproject commit 03b0185b8ece2e25969807cdb5f06cfd40d6d603 From 1a84cd05a5db0f14983b5b1018a553a0be8bcb4a Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sat, 15 Mar 2025 18:44:49 +0100 Subject: [PATCH 7/8] update translations --- src/main/res/values-ar/strings.xml | 1 + src/main/res/values-az/strings.xml | 1 + src/main/res/values-bg/strings.xml | 3 ++- src/main/res/values-bqi/strings.xml | 3 ++- src/main/res/values-ca/strings.xml | 3 ++- src/main/res/values-ckb/strings.xml | 1 + src/main/res/values-cs/strings.xml | 19 ++++++++++--------- src/main/res/values-da/strings.xml | 3 ++- src/main/res/values-de/strings.xml | 4 +++- src/main/res/values-el/strings.xml | 3 ++- src/main/res/values-eo/strings.xml | 1 + src/main/res/values-es/strings.xml | 3 ++- src/main/res/values-eu/strings.xml | 1 + src/main/res/values-fa/strings.xml | 3 ++- src/main/res/values-fi/strings.xml | 3 ++- src/main/res/values-fr/strings.xml | 3 ++- src/main/res/values-gl/strings.xml | 3 ++- src/main/res/values-hr/strings.xml | 1 + src/main/res/values-hu/strings.xml | 11 ++++++----- src/main/res/values-in/strings.xml | 3 ++- src/main/res/values-it/strings.xml | 3 ++- src/main/res/values-ja/strings.xml | 1 + src/main/res/values-km/strings.xml | 3 ++- src/main/res/values-ko/strings.xml | 3 ++- src/main/res/values-lt/strings.xml | 3 ++- src/main/res/values-nb/strings.xml | 1 + src/main/res/values-nl/strings.xml | 4 +++- src/main/res/values-pl/strings.xml | 3 ++- src/main/res/values-pt-rBR/strings.xml | 3 ++- src/main/res/values-pt/strings.xml | 1 + src/main/res/values-ro/strings.xml | 3 ++- src/main/res/values-ru/strings.xml | 4 +++- src/main/res/values-sc/strings.xml | 1 + src/main/res/values-sk/strings.xml | 3 ++- src/main/res/values-sq/strings.xml | 4 +++- src/main/res/values-sr/strings.xml | 3 ++- src/main/res/values-sv/strings.xml | 3 ++- src/main/res/values-ta/strings.xml | 1 + src/main/res/values-te/strings.xml | 1 + src/main/res/values-tr/strings.xml | 3 ++- src/main/res/values-uk/strings.xml | 3 ++- src/main/res/values-vi/strings.xml | 3 ++- src/main/res/values-zh-rCN/strings.xml | 6 ++++-- src/main/res/values-zh-rTW/strings.xml | 3 ++- 44 files changed, 94 insertions(+), 45 deletions(-) diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index a1204c070..6a8373b7e 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -118,6 +118,7 @@ تقريب تصغير أكتم لمدة ساعة + أكتم لمدة ساعتين أكتم لمدة يوم أكتم لمدة أسبوع diff --git a/src/main/res/values-az/strings.xml b/src/main/res/values-az/strings.xml index 7fa6d3efd..d231e18ad 100644 --- a/src/main/res/values-az/strings.xml +++ b/src/main/res/values-az/strings.xml @@ -159,6 +159,7 @@ Qrup üzvlərinə yerləşdiyin yerini göndər Kontakta dəyişiklik 1 saatlıq söndür + 2 saatlıq söndür 1 günlük söndür 7 günlük söndür diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index 06deedbdd..a8dbc45da 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -294,6 +294,7 @@ Дарение Спиране на звука за 1 час + Спиране на звука за 2 часа Спиране на звука за 1 ден Спиране на звука за 7 дни @@ -329,7 +330,7 @@ Сигурни ли сте, че искате да напуснете тази група? - + Да бъде ли изтрито %d съобщение? Да бъдат ли изтрити %d съобщения? diff --git a/src/main/res/values-bqi/strings.xml b/src/main/res/values-bqi/strings.xml index 7f1e51e2a..40bb7c79b 100644 --- a/src/main/res/values-bqi/strings.xml +++ b/src/main/res/values-bqi/strings.xml @@ -228,6 +228,7 @@ دیسنیڌن کود بونچک بؽ دونگ کردن سی 1 ساعت + بؽ دونگ کردن سی 2 ساعت بؽ دونگ کردن سی 1 رۊ بؽ دونگ کردن سی 7 رۊ @@ -243,7 +244,7 @@ گوفت ۉ لوفت ویدیویی موکش و گوفت ۉ لوفت ویدیویی - + êxuy %d payom pāk bu? اخۊی %d پیوم پاک بۊ؟ diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index b84ee4bc5..810821fe3 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -332,6 +332,7 @@ Feu un donatiu Silencia 1 hora + Silencia 2 hores Silencia 1 dia Silencia 7 dies @@ -377,7 +378,7 @@ ¿Esborra %d missatge de tots els teus dispositius? ¿Esborra %d missatges de tots els teus dispositius? - + Vols esborrar %d missatge? Voleu esborrar %d missatges? diff --git a/src/main/res/values-ckb/strings.xml b/src/main/res/values-ckb/strings.xml index 96d382e6c..8155e9114 100644 --- a/src/main/res/values-ckb/strings.xml +++ b/src/main/res/values-ckb/strings.xml @@ -205,6 +205,7 @@ پەیامە ڕەسەنەکە نەدۆزرایەوە وەڵامدانەوەی نهێنی بێدەنگ کردن بۆ ماوەی 1 کاتژمێر + بێدەنگ کردن بۆ ماوەی 2 کاتژمێر بێدەنگ کردن بۆ ماوەی 1 ڕۆژ بێدەنگ کردن بۆ ماوەی 7 ڕۆژ diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index f28cea822..b98b1b9f4 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -327,7 +327,7 @@ Přejít na zprávu Přejít na původní zprávu Kopírovat JSON - Přepsat rozepsané + Nahradit rozepsanou zprávu Sdílet polohu se všemi členy skupiny Zprávy v zařízení Lokálně vygenerované zprávy @@ -350,6 +350,7 @@ Darovat Ztlumit na 1 hodinu + Ztlumit na 2 hodiny Ztlumit na 1 den Ztlumit na 7 dní @@ -401,7 +402,7 @@ Smazat %d zpráv ze všech Vašich zařízení? Smazat %d zpráv ze všech vašich zařízení? - + Smazat %d zprávu? Smazat %d zprávy? @@ -410,7 +411,7 @@ Přejete si přeposlat zprávy do chatu %1$s? Přejete si přeposlat zprávy do %1$d chatů? - Uložením příloh je zpřístupníte ostatním aplikacím na tomto přístroji.\n\nPřejete si pokračovat? + Uložením příloh je zpřístupníte ostatním aplikacím na tomto zařízení.\n\nPřejete si pokračovat? Přejete si zablokovat tento kontakt?\n\nSoukromé zprávy a skupiny vytvořené zablokovanými kontakty budou skryty.\n\nV ostatních skupinách, ve kterých se zablokované kontakty nacházejí, se jejich zprávy budou zobrazovat i nadále. Přejete si odblokovat tento kontakt? Přejete si smazat kontakty?\n\nKontakty s probíhajícími chaty a kontakty ze systémového adresáře nelze smazat permanentně. @@ -462,7 +463,7 @@ Seznam vysílání slouží k posílání zpráv příjemcům v chatu, který je pro ně pouze pro čtení. Ostatní tuto skupinu uvidí až poté, co odešlete první zprávu. Zrušit tahem - K nahrání hlasové zprávy stiskněte a držte mikrofon, uvolněte pro odeslání. + Pro nahrání hlasové zprávy stiskněte a držte ikonu mikrofonu; uvolněte pro odeslání. Žádné chaty.\nStiskem \"+\" založte nový chat. Všechny chaty jsou archivovány.\nStiskem \"+\" založte nový chat. Sdílet s @@ -473,7 +474,7 @@ Zprávy poslané sobě Zde se zobrazí archivované chaty. Uložené zprávy - • Přepošlete si sem zprávy pro rychlý přístup\n\n• Tvořte si poznámky textové i hlasové\n\n• Uložte si sem multimédia + Sem si můžete:\n\n• přeposílat zprávy pro rychlý přístup,\n\n• zapisovat textové i hlasové poznámky,\n\n• ukládat multimédia Uložené Uložit jako @@ -657,7 +658,7 @@ Přihlásit se se stávajícím účtem pro e-mail. Pro standardní poskytovatele jsou nastavení dopněna automaticky. Někdy je potřeba povolit IMAP ve webovém rozhraní. Potřebujete-li pomoc, obraťte se na svého poskytovatele e-mailu nebo přátele. - Delta Chat nemá žádné vlastní servery, všechna data zůstávají na vašem přístroji. + Delta Chat nesbírá uživatelská data, vše zůstává na vašem zařízení. Příchozí IMAP uživatelské jméno IMAP server @@ -685,7 +686,7 @@ Sdílet odkaz Pokračovat se zjednodušeným nastavením? - Zadaný e-mail podporuje zjednodušené nastavení (OAuth 2.0).\n\nV příštím kroku dej prosím Delta Chatu povolení chovat se jako chat přes e-mail. \n\nŽádné servery Delta Chat nemá, tvá data zůstávají na tvém přístroji. + Zadaný e-mail podporuje zjednodušené nastavení (OAuth 2.0).\n\nV následujícím kroku, prosíme, povolte Delta Chatu chovat se jako aplikace typu Chat přes e-mail.\n\nDelta Chat nesbírá uživatelská data, vše zůstává na vašem zařízení. Kontroly certifikátu Prosím, zadejte platnou e-mailovou adresu Prosím, zadejte platný server / IP adresu @@ -878,7 +879,7 @@ Mazat staré zprávy - Mazat zprávy z přístroje + Mazat zprávy ze zařízení Mazat zprávy ze serveru Skutečně smazat %1$d zpráv a všechny v budoucnu stažené zprávy \"%2$s\"?\n\n• Toto zahrnuje všechna multimédia\n\n• Zprávy budou smazány bez ohledu na jejich přečtení\n\n• \"Uložené zprávy\" budou ponechány @@ -928,7 +929,7 @@ Uživatel %3$s změnil název skupiny z \"%1$s\" na \"%2$s\". Změnili jste obrázek skupiny. - Uživatel %1$s změnil název skupiny. + Uživatel %1$s změnil obrázek skupiny. Člen %1$s byl přidán. diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml index 1c44f262f..c54f7efde 100644 --- a/src/main/res/values-da/strings.xml +++ b/src/main/res/values-da/strings.xml @@ -224,6 +224,7 @@ Oprindelig besked ikke fundet Svar privat Dæmp i 1 time + Dæmp i 2 timer Dæmp i 1 dag Dæmp i 7 dage @@ -256,7 +257,7 @@ Forlad denne gruppe? - + Slet %d besked? Slet %d beskeder? diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 50244271d..c9e8357ec 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -332,7 +332,9 @@ Spenden Stumm für 1 Stunde + Stumm für 2 Stunden + Stumm für 8 Stunden Stumm für 1 Tag Stumm für 7 Tage Stumm für immer @@ -377,7 +379,7 @@ %d Nachricht von allen Geräten löschen? %d Nachrichten von allen Geräten löschen? - + %d Nachricht löschen? %d Nachrichten löschen? diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index 77a792633..08e5e15ff 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -264,6 +264,7 @@ Προσθήκη στην κεντρική οθόνη Σίγαση για 1 ώρα + Σίγαση για 2 ώρες Σίγαση για 1 ημέρα Σίγαση για 7 ημέρες @@ -299,7 +300,7 @@ Είστε σίγουρος/-η ότι θέλετε να βγείτε από αυτή την ομάδα; - + Διαγραφή %d μηνύματος; Διαγραφή %d μηνυμάτων; diff --git a/src/main/res/values-eo/strings.xml b/src/main/res/values-eo/strings.xml index f0015ef42..f5e7d8e97 100644 --- a/src/main/res/values-eo/strings.xml +++ b/src/main/res/values-eo/strings.xml @@ -267,6 +267,7 @@ Depingli Silentigi por 1 horo + Silentigi por 2 horoj Silentigi por 1 tago Silentigi por 7 tagoj diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 9391a971b..6bc666915 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -341,6 +341,7 @@ Donar Silenciar por 1 hora + Silenciar por 2 horas Silenciar por 1 día Silenciar por 7 días @@ -389,7 +390,7 @@ ¿Eliminar %d mensajes de todos tus dispositivos? ¿Eliminar %d mensajes de todos tus dispositivos? - + ¿Eliminar %d mensaje? ¿Eliminar %d mensajes? diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index d0b62432e..4f64c5510 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -177,6 +177,7 @@ Desfinkatu Mututu ordubete + Mututu 2 ordu Mututu egun bat Mututu 7 egun diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml index 4d520ba59..0fcb363d7 100644 --- a/src/main/res/values-fa/strings.xml +++ b/src/main/res/values-fa/strings.xml @@ -316,6 +316,7 @@ حمایت مالی ساکت کردن به مدت۱ ساعت + ساکت کردن به مدت ۲ ساعت ساکت کردن به مدت ۱ روز ساکت کردن به مدت۷ روز @@ -354,7 +355,7 @@ https://meet.jit.si/$ROOM مطمئن هستید می‌خواهید این گروه را ترک کنید؟ - + می‌خواهید %dپیام پاک شود؟ می‌خواهید %d پیام پاک شود؟ diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml index 061f43feb..9205e0a96 100644 --- a/src/main/res/values-fi/strings.xml +++ b/src/main/res/values-fi/strings.xml @@ -294,6 +294,7 @@ Lahjoita Mykistä 1 tunniksi + Mykistä 2 tunniksi Mykistä 1 päiväksi Mykistä 7 päiväksi @@ -329,7 +330,7 @@ Haluatko varmasti poistua tästä ryhmästä? - + Poista %d viesti? Poista %d viestiä? diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index f092790cb..03a2d38ee 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -337,6 +337,7 @@ Faire un don Désactiver pour 1 heure + Désactiver pour 2 heures Désactiver pour 1 jour Désactiver pour 7 jours @@ -378,7 +379,7 @@ Effacer %d messages ici et sur le serveur ? Effacer %d messages ici et sur le serveur  ? - + Supprimer %d message ? Supprimer %d messages ? diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index 98ab9852e..f94d207e0 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -270,6 +270,7 @@ Engadir á pantalla de Inicio Acalar durante 1 h. + Acalar durante 2 h. Acalar durante 1 día Acalar durante 7 días @@ -305,7 +306,7 @@ Seguro que desexa abandonar o grupo? - + Borrar %d mensaxe? Borrar %d mensaxes? diff --git a/src/main/res/values-hr/strings.xml b/src/main/res/values-hr/strings.xml index f010eb7b5..8068f9f47 100644 --- a/src/main/res/values-hr/strings.xml +++ b/src/main/res/values-hr/strings.xml @@ -133,6 +133,7 @@ Postavke Napredno Utišaj na 1 sat + Utišaj na 2 sata Utišaj na 1 dan Utišaj na 7 dana diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml index 939504ed5..7da53a67e 100644 --- a/src/main/res/values-hu/strings.xml +++ b/src/main/res/values-hu/strings.xml @@ -30,7 +30,7 @@ Törlés Törlés számomra Törlés mindenki számára - Infó + Információk Frissítés Emodzsi Csatolmány @@ -312,8 +312,8 @@ Piszkozat cseréje Helyszín megosztása a csoport összes tagjával Eszközüzenetek - Helyileg előállított üzenetek - Az üzenetek ebben a csevegésben az Ön készülékén kerülnek előállításra, hogy tájoékoztassák Önt az alkalmazás frissítéseiről és a használat közben felmerülő problémákról. + Helyben előállított üzenetek + Az üzenetek ebben a csevegésben az Ön készülékén kerülnek előállításra, hogy tájékoztassák Önt az alkalmazás frissítéseiről és a használat közben felmerülő problémákról. Lépjen kapcsolatba a partnereivel!\n\n🙌 Koppintson a „QR-kódra” mind a két eszköz főképernyőjén. Válassza a „QR-kód beolvasása” lehetőséget az egyik eszközön, és irányítsa a másik eszközre\n\n🌍 Ha nem ugyanabban a szobában tartózkodnak a partnerével, akkor olvassa be a QR-kódját egy videohíváson keresztül, vagy ossza meg a meghívó-hivatkozást a „QR-kód bolvasása”-ból.\n\nMajd: Élvezze az üzenetküldés-élményt a valaha létezett legnagyobb decentralizált hálózaton keresztül, ami az e-mail és - más népszerű alkalmazásokkal ellentétben - központi kiszolgáló vagy nyomon követés nélkül, illetve anélkül, hogy önt, partnereit, kollégáit vagy családját nagy szervezeteknek adná el. Névjegy szerkesztése @@ -332,6 +332,7 @@ Adományozás Némítás 1 órára + Némítás 2 órára Némítás 1 napra Némítás 7 napra @@ -377,7 +378,7 @@ Töröl %d üzenetet az összes eszközén? Töröl %d üzenetet az összes eszközén? - + %d üzenet törlése? %d üzenet törlése? @@ -887,7 +888,7 @@ Ez az üzenet nem dekódolható.\n\n• Már az is segíthet, ha egyszerűen válaszol erre az üzenetre, és megkéri a feladóját, hogy küldje el újra az üzenetet.\n\n• Ha most telepítette újra a Delta Chatet, akkor a legjobb, ha most újraindítja a Delta Chatet, és kiválasztja a „Második eszközként való hozzáadás” lehetőséget, vagy importál egy biztonsági mentést. - Az üzenet küldője ismeretlen ebben a csevegésben. További részletekért nézze meg az \'Infót\'. + Az üzenet feladója ismeretlen ebben a csevegésben. További részletekért tekintse meg az „Információkat”. Üzenet tőle: %1$s Nem sikerült elküldeni az üzenetet „%1$s” számára. diff --git a/src/main/res/values-in/strings.xml b/src/main/res/values-in/strings.xml index 0da84d10a..bd4bdac09 100644 --- a/src/main/res/values-in/strings.xml +++ b/src/main/res/values-in/strings.xml @@ -257,6 +257,7 @@ Pesan orisinil tidak ditemukan Balas secara privat Diamkan untuk 1 jam + Diamkan untuk 2 jam Diamkan untuk 1 hari Diamkan untuk 7 hari @@ -287,7 +288,7 @@ Apakah anda yakin untuk keluar dari grup ini? - + Menghapus pesan %d? diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 9191d420f..049971090 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -341,6 +341,7 @@ Dona Silenzia per 1 ora + Silenzia per 2 ore Silenzia per 1 giorno Silenzia per 7 giorni @@ -389,7 +390,7 @@ Cancella %d messaggi su tutti i tuoi dispositivi? Cancella %d messaggi su tutti i tuoi dispositivi? - + Eliminare %d messaggio? Eliminare %d messaggi? diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 751963670..d0259b5e5 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -221,6 +221,7 @@ メッセージが見つかりません 個別に返信する 1時間停止する + 2時間停止する 24時間停止する 7日間停止する diff --git a/src/main/res/values-km/strings.xml b/src/main/res/values-km/strings.xml index 1111fc4e8..5b146c83f 100644 --- a/src/main/res/values-km/strings.xml +++ b/src/main/res/values-km/strings.xml @@ -238,6 +238,7 @@ រកមិនឃើញសារដើម ឆ្លើយតបដោយឯកជន ធ្វើឲ្យមិនឃើញមិនលឺរយៈពេល១ម៉ោង + ធ្វើឲ្យមិនឃើញមិនលឺរយៈពេល២ម៉ោង ធ្វើឲ្យមិនឃើញមិនលឺរយៈពេល១ថ្ងៃ ធ្វើឲ្យមិនឃើញមិនលឺរយៈពេល៧ថ្ងៃ @@ -269,7 +270,7 @@ តើអ្នកប្រាកដហើយថាចង់ចាកចេញពីក្រុមនេះ? - + លុបសារ %d diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index dbfaae3d1..f079c647b 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -256,6 +256,7 @@ 홈 스크린에 추가 1시간 동안 알림 끄기 + 2시간 동안 알림 끄기 1일 동안 알림 끄기 7일 동안 알림 끄기 @@ -289,7 +290,7 @@ 이 그룹에서 나가시겠습니까? - + %d개의 메시지를 삭제하시겠습니까? diff --git a/src/main/res/values-lt/strings.xml b/src/main/res/values-lt/strings.xml index 6d6f0c6b5..792b4a908 100644 --- a/src/main/res/values-lt/strings.xml +++ b/src/main/res/values-lt/strings.xml @@ -279,6 +279,7 @@ Paaukoti Išjungti 1 valandai + Išjungti 2 valandoms Išjungti 1 dienai Išjungti 7 dienoms @@ -308,7 +309,7 @@ Ar tikrai norite išeiti iš šios grupės? - + Ištrinti %d žinutę? Ištrinti %d žinutes? diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml index 38aa3335d..5d4bb68b0 100644 --- a/src/main/res/values-nb/strings.xml +++ b/src/main/res/values-nb/strings.xml @@ -183,6 +183,7 @@ Løsn Demp i 1 time + Demp i 2 timer Demp i 1 dag Demp i 7 dager diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 8aaa049d8..1f9e68430 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -332,7 +332,9 @@ Doneren 1 uur lang uitschakelen + 2 uur lang uitschakelen + 8 uur lang uitschakelen 1 dag lang uitschakelen 7 dagen lang uitschakelen Permanent uitschakelen @@ -377,7 +379,7 @@ Wil je %d bericht verwijderen van al je apparaten? Wil je %d berichten verwijderen van al je apparaten? - + Wil je %d bericht verwijderen? Wil je %d berichten verwijderen? diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 4f7b5c220..d3cd72fa5 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -350,6 +350,7 @@ Wspomóż Wyłącz na 1 godzinę + Wyłącz na 2 godziny Wyłącz na 1 dzień Wyłącz na 7 dni @@ -401,7 +402,7 @@ Usunąć %d wiadomości ze wszystkich urządzeń? Usunąć %d wiadomości ze wszystkich urządzeń? - + Usunąć %d wiadomość? Usunąć %d wiadomości? diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 152082c88..6d4dbdf6b 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -290,6 +290,7 @@ Adicionar à Tela Inicial Silenciar por 1 hora + Silenciar por 2 horas Silenciar por 1 dia Silenciar por 7 dias @@ -326,7 +327,7 @@ Quer mesmo sair do grupo? - + Apagar %d mensagem? Apagar %d mensagens? diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index 0709ceda4..c4da78fea 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -132,6 +132,7 @@ Avançado Ver perfil Calado por 1 hora + Calado por 2 horas Calado por 1 dia Calado por 7 dias diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml index 08a3df305..4ebe990af 100644 --- a/src/main/res/values-ro/strings.xml +++ b/src/main/res/values-ro/strings.xml @@ -280,6 +280,7 @@ Adăugați la ecranul principal Silențios timp de 1 oră + Silențios timp de 2 ore Silențios pentru 1 zi Silențios timp de 7 zile @@ -316,7 +317,7 @@ Ești sigur că vrei să părăsești acest grup? - + Ștergeți %d mesaj? Ștergeți %d mesaje? diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 5a7f423e6..335b893fd 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -350,7 +350,9 @@ Пожертвовать На 1 час + На 2 часа + На 8 часов На 1 день На 7 дней Постоянно @@ -401,7 +403,7 @@ Удалить %d сообщений на всех ваших устройствах? Удалить %d сообщений на всех ваших устройствах? - + Удалить %d сообщение? Удалить %d сообщения? diff --git a/src/main/res/values-sc/strings.xml b/src/main/res/values-sc/strings.xml index bf91c6a46..0093c26e2 100644 --- a/src/main/res/values-sc/strings.xml +++ b/src/main/res/values-sc/strings.xml @@ -191,6 +191,7 @@ Isbloca A sa muda pro 1 ora + A sa muda pro 2 oras A sa muda pro 1 die A sa muda pro 7 dies diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index ba2231e89..efad4cc77 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -280,6 +280,7 @@ Pridať na domovskú obrazovku Stíšiť na 1 hodinu + Stíšiť na 2 hodiny Stíšiť na 1 deň Stíšiť na 7 dní @@ -317,7 +318,7 @@ Naozaj chcete opustiť túto skupinu? - + Odstrániť %d správu? Odstrániť %d správy? diff --git a/src/main/res/values-sq/strings.xml b/src/main/res/values-sq/strings.xml index e6f89b746..443a4df06 100644 --- a/src/main/res/values-sq/strings.xml +++ b/src/main/res/values-sq/strings.xml @@ -328,7 +328,9 @@ Dhuroni Heshtoji për 1 orë + Heshtoji për 2 orë + Heshtoje për 8 orë Heshtoji për 1 ditë Heshtoji për 7 ditë Heshtoje përgjithmonë @@ -373,7 +375,7 @@ Të fshihet %d mesazh në krejt pajisjet tuaja? Të fshihen %d mesazhe në krejt pajisjet tuaja? - + Të fshihet %d mesazh? Të fshihen %d mesazhe? diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index 11c979a96..f5a0ad897 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -283,6 +283,7 @@ Додај на главни екран Утишај на 1 сат + Утишај на 2 сата Утишај на 1 дан Утишај на 7 дана @@ -319,7 +320,7 @@ Да ли заиста желите да напустите ову групу? - + Да ли желите да избришите %d поруку? Да ли желите да избришите %d поруке? diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 8d9638658..8da5dafbf 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -300,6 +300,7 @@ Donera Tysta 1 timma + Tysta 2 timmar Tysta 1 dag Tysta 7 dagar @@ -335,7 +336,7 @@ Är du säker på att du vill lämna den här gruppen? - + Vill du ta bort %d meddelande? Vill du ta bort %d meddelanden? diff --git a/src/main/res/values-ta/strings.xml b/src/main/res/values-ta/strings.xml index 75c661f68..074e7af7c 100644 --- a/src/main/res/values-ta/strings.xml +++ b/src/main/res/values-ta/strings.xml @@ -133,6 +133,7 @@ மேம்பட்ட அமைப்புகள் சுயவிவரத்தை காண்பி 1 மணி இதற்காக ஊமையாக்கு + 2 மணிகள் இதற்காக ஊமையாக்கு 1 நாள் இதற்காக ஊமையாக்கு 7 நாட்கள் இதற்காக ஊமையாக்கு diff --git a/src/main/res/values-te/strings.xml b/src/main/res/values-te/strings.xml index 10217a834..14ff26c1b 100644 --- a/src/main/res/values-te/strings.xml +++ b/src/main/res/values-te/strings.xml @@ -117,6 +117,7 @@ పెద్దదిగా చూపు పెద్దది చెయ్యి 1 గంట నిశబ్దంగా ఉంచు + 2 గంటలు నిశబ్దంగా ఉంచు 1 రోజు నిశబ్దంగా ఉంచు 7 రోజులు నిశబ్దంగా ఉంచు diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index 40034f183..d377f6e22 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -332,6 +332,7 @@ Bağış 1 saatliğine sessize al + 2 saatliğine sessize al 1 günlüğüne sessize al 7 günlüğüne sessize al @@ -377,7 +378,7 @@ Tüm aygıtlarınızdaki %d ileti silinsin mi? Tüm aygıtlarınızdaki %d ileti silinsin mi? - + %d ileti silinsin mi? %d ileti silinsin mi? diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index eb981ed17..e357dde4d 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -347,6 +347,7 @@ Пожертвувати Відключити сповіщення на 1 годину + Відключити сповіщення на 2 години Відключити сповіщення на 1 день Відключити сповіщення на 7 днів @@ -384,7 +385,7 @@ Ви впевнені, що хочете залишити цю групу? - + Видалити %d повідомлення? Видалити %d повідомлення? diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml index e6d939adb..89bd6f25d 100644 --- a/src/main/res/values-vi/strings.xml +++ b/src/main/res/values-vi/strings.xml @@ -283,6 +283,7 @@ Quyên tặng Tắt tiếng trong 1 giờ + Tắt tiếng trong 2 giờ Tắt tiếng trong 1 ngày Tắt tiếng trong 7 ngày @@ -317,7 +318,7 @@ Bạn có chắc chắn muốn rời khỏi nhóm này không? - + Xóa %d tin nhắn? diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index d92713158..47522c3bd 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -1,7 +1,7 @@ - 德尔塔聊 + Delta Chat 确定 取消 清除搜索 @@ -323,7 +323,9 @@ 捐赠 静音 1 小时 + 静音 2 小时 + 静音 8 小时 静音 1 天 静音 7 天 永久静音 @@ -365,7 +367,7 @@ 是否删除所有设备上的 %d 条消息？ - + 删除 %d 条消息吗？ diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 2d761d724..4ee92fbcd 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -323,6 +323,7 @@ 捐贈 靜音1小時 + 靜音2小時 靜音1天 靜音7天 @@ -365,7 +366,7 @@ 是否刪除所有裝置上的%d條訊息？ - + 刪除%d則訊息？ From 5789390451934e8e31a24b060dac7e2e99f096ad Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sat, 15 Mar 2025 18:48:34 +0100 Subject: [PATCH 8/8] update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ab593358..2c494c360 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ * add menu option to easily save/unsave selected message * improve deletion confirmation for "Device Messages" * always paste as plain text in message draft area +* some small bug fixes and updated translations +* update to core 1.157.2 ## v1.54.4 2025-03