From c7b110e5bf13b6d036398ba2de9670abdee49e6d Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Mon, 15 Sep 2025 18:23:59 -0300
Subject: [PATCH 1/8] feat: new e2e flow

---
 app/stacks/InsideStack.tsx             |  2 +
 app/stacks/types.ts                    |  1 +
 app/views/E2EEnterYourPasswordView.tsx | 59 ++++++++++++----
 app/views/E2EResetYourPasswordView.tsx | 95 ++++++++++++++++++++++++++
 4 files changed, 144 insertions(+), 13 deletions(-)
 create mode 100644 app/views/E2EResetYourPasswordView.tsx

diff --git a/app/stacks/InsideStack.tsx b/app/stacks/InsideStack.tsx
index 1e4c52fbe9e..3e67f9b02e5 100644
--- a/app/stacks/InsideStack.tsx
+++ b/app/stacks/InsideStack.tsx
@@ -60,6 +60,7 @@ import E2ESaveYourPasswordView from '../views/E2ESaveYourPasswordView';
 import E2EHowItWorksView from '../views/E2EHowItWorksView';
 // E2EEnterYourPassword Stack
 import E2EEnterYourPasswordView from '../views/E2EEnterYourPasswordView';
+import E2EResetYourPasswordView from '../views/E2EResetYourPasswordView';
 // InsideStackNavigator
 import AttachmentView from '../views/AttachmentView';
 import ModalBlockView from '../views/ModalBlockView';
@@ -289,6 +290,7 @@ const E2EEnterYourPasswordStackNavigator = () => {
 	return (
 		<E2EEnterYourPasswordStack.Navigator screenOptions={{ ...defaultHeader, ...themedHeader(theme) }}>
 			<E2EEnterYourPasswordStack.Screen name='E2EEnterYourPasswordView' component={E2EEnterYourPasswordView} />
+			<E2EEnterYourPasswordStack.Screen name='E2EResetYourPasswordView' component={E2EResetYourPasswordView} />
 		</E2EEnterYourPasswordStack.Navigator>
 	);
 };
diff --git a/app/stacks/types.ts b/app/stacks/types.ts
index 4634b2457b2..d79f7538434 100644
--- a/app/stacks/types.ts
+++ b/app/stacks/types.ts
@@ -271,6 +271,7 @@ export type E2ESaveYourPasswordStackParamList = {
 
 export type E2EEnterYourPasswordStackParamList = {
 	E2EEnterYourPasswordView: undefined;
+	E2EResetYourPasswordView: undefined;
 };
 
 export type InsideStackParamList = {
diff --git a/app/views/E2EEnterYourPasswordView.tsx b/app/views/E2EEnterYourPasswordView.tsx
index 5f5f5483568..6e44a0e8640 100644
--- a/app/views/E2EEnterYourPasswordView.tsx
+++ b/app/views/E2EEnterYourPasswordView.tsx
@@ -1,9 +1,11 @@
-import { useIsFocused, useNavigation } from '@react-navigation/native';
+import { useIsFocused } from '@react-navigation/native';
 import React, { useEffect, useLayoutEffect, useRef } from 'react';
-import { ScrollView, StyleSheet, Text, AccessibilityInfo } from 'react-native';
+import { ScrollView, StyleSheet, Text, AccessibilityInfo, View } from 'react-native';
 import { useDispatch } from 'react-redux';
 import { useForm } from 'react-hook-form';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 
+import { E2EEnterYourPasswordStackParamList } from '../stacks/types';
 import { encryptionDecodeKey } from '../actions/encryption';
 import Button from '../containers/Button';
 import * as HeaderButton from '../containers/Header/components/HeaderButton';
@@ -18,6 +20,7 @@ import { useTheme } from '../theme';
 import sharedStyles from './Styles';
 import { showToast } from '../lib/methods/helpers/showToast';
 import { showErrorAlert, useDebounce } from '../lib/methods/helpers';
+import { Separator } from '../containers/List';
 
 const styles = StyleSheet.create({
 	info: {
@@ -25,12 +28,24 @@ const styles = StyleSheet.create({
 		lineHeight: 24,
 		marginTop: 24,
 		...sharedStyles.textRegular
+	},
+	content: {
+		gap: 32
+	},
+	e2eePasswordInput: {
+		marginBottom: 0
+	},
+	forgotE2EEPasswordButton: {
+		marginTop: 0
 	}
 });
 
-const E2EEnterYourPasswordView = (): React.ReactElement => {
+interface IE2EEnterYourPasswordView {
+	navigation: NativeStackNavigationProp<E2EEnterYourPasswordStackParamList, 'E2EEnterYourPasswordView'>;
+}
+
+const E2EEnterYourPasswordView = ({ navigation }: IE2EEnterYourPasswordView): React.ReactElement => {
 	const { colors } = useTheme();
-	const navigation = useNavigation();
 	const isFocused = useIsFocused();
 	const dispatch = useDispatch();
 	const { enabled: encryptionEnabled, failure: encryptionFailure } = useAppSelector(state => state.encryption);
@@ -96,12 +111,14 @@ const E2EEnterYourPasswordView = (): React.ReactElement => {
 			<ScrollView
 				{...scrollPersistTaps}
 				style={sharedStyles.container}
-				contentContainerStyle={{ ...sharedStyles.containerScrollView, paddingTop: 24 }}>
-				<SafeAreaView style={{ backgroundColor: colors.surfaceRoom }} testID='e2e-enter-your-password-view'>
+				contentContainerStyle={{ ...sharedStyles.containerScrollView }}>
+				<SafeAreaView style={{ ...styles.content, backgroundColor: colors.surfaceRoom }} testID='e2e-enter-your-password-view'>
+					<Text style={[styles.info, { color: colors.fontDefault }]}>{I18n.t('Enter_E2EE_Password_description')}</Text>
+
 					<ControlledFormTextInput
 						name='password'
 						control={control}
-						label={I18n.t('Password')}
+						label={I18n.t('E2EE_password')}
 						error={errors.password?.message}
 						returnKeyType='send'
 						secureTextEntry
@@ -110,15 +127,31 @@ const E2EEnterYourPasswordView = (): React.ReactElement => {
 						autoComplete='password'
 						textContentType='password'
 						importantForAutofill='yes'
-						containerStyle={{ marginBottom: 0 }}
+						containerStyle={styles.e2eePasswordInput}
 					/>
+					<View>
+						<Button
+							onPress={handleSubmit(submit)}
+							title={I18n.t('Enable_encryption_button_label')}
+							testID='e2e-enter-your-password-view-confirm'
+						/>
+						<Button
+							type='secondary'
+							onPress={() => navigation.navigate('E2EResetYourPasswordView')}
+							title={I18n.t('Forgot_E2EE_password')}
+							testID='e2e-enter-your-password-view-forgot-password'
+							style={styles.forgotE2EEPasswordButton}
+						/>
+					</View>
+
+					<Separator />
+
 					<Button
-						onPress={handleSubmit(submit)}
-						title={I18n.t('Confirm')}
-						testID='e2e-enter-your-password-view-confirm'
-						style={{ marginTop: 36 }}
+						type='secondary'
+						onPress={() => navigation.goBack()}
+						title={I18n.t('Do_it_later')}
+						testID='e2e-enter-your-password-view-do-it-later'
 					/>
-					<Text style={[styles.info, { color: colors.fontDefault }]}>{I18n.t('Enter_E2EE_Password_description')}</Text>
 				</SafeAreaView>
 			</ScrollView>
 		</KeyboardView>
diff --git a/app/views/E2EResetYourPasswordView.tsx b/app/views/E2EResetYourPasswordView.tsx
new file mode 100644
index 00000000000..e0ecf9b5b87
--- /dev/null
+++ b/app/views/E2EResetYourPasswordView.tsx
@@ -0,0 +1,95 @@
+import React, { useLayoutEffect } from 'react';
+import { ScrollView, StyleSheet, Text, View } from 'react-native';
+import { useDispatch } from 'react-redux';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
+
+import { E2EEnterYourPasswordStackParamList } from '../stacks/types';
+import { useTheme } from '../theme';
+import { Services } from '../lib/services';
+import { showConfirmationAlert, showErrorAlert } from '../lib/methods/helpers';
+import { logout } from '../actions/login';
+import log, { events, logEvent } from '../lib/methods/helpers/log';
+import Button from '../containers/Button';
+import * as HeaderButton from '../containers/Header/components/HeaderButton';
+import KeyboardView from '../containers/KeyboardView';
+import SafeAreaView from '../containers/SafeAreaView';
+import I18n from '../i18n';
+import sharedStyles from './Styles';
+import scrollPersistTaps from '../lib/methods/helpers/scrollPersistTaps';
+
+const styles = StyleSheet.create({
+	info: {
+		fontSize: 16,
+		lineHeight: 24,
+		marginTop: 24,
+		...sharedStyles.textRegular
+	},
+	content: {
+		gap: 32
+	}
+});
+
+interface IE2EResetYourPasswordView {
+	navigation: NativeStackNavigationProp<E2EEnterYourPasswordStackParamList, 'E2EResetYourPasswordView'>;
+}
+
+const E2EResetYourPasswordView = ({ navigation }: IE2EResetYourPasswordView): React.ReactElement => {
+	const { colors } = useTheme();
+	const dispatch = useDispatch();
+
+	const resetE2EEPassword = () => {
+		showConfirmationAlert({
+			title: I18n.t('Are_you_sure_question_mark'),
+			message: I18n.t('E2E_encryption_reset_message'),
+			confirmationText: I18n.t('E2E_encryption_reset_confirmation'),
+			onPress: async () => {
+				logEvent(events.E2E_SEC_RESET_OWN_KEY);
+				try {
+					const res = await Services.e2eResetOwnKey();
+
+					if (res?.success === true) {
+						dispatch(logout());
+					}
+				} catch (e) {
+					log(e);
+					showErrorAlert(I18n.t('E2E_encryption_reset_error'));
+				}
+			}
+		});
+	};
+
+	const cancel = () => {
+		navigation.getParent()?.goBack();
+	};
+
+	useLayoutEffect(() => {
+		navigation.setOptions({
+			headerLeft: () => <HeaderButton.CloseModal testID='e2e-reset-your-password-view-close' />,
+			title: I18n.t('Reset_E2EE_Password')
+		});
+	}, [navigation]);
+
+	return (
+		<KeyboardView>
+			<ScrollView
+				{...scrollPersistTaps}
+				style={sharedStyles.container}
+				contentContainerStyle={{ ...sharedStyles.containerScrollView }}>
+				<SafeAreaView style={{ ...styles.content, backgroundColor: colors.surfaceRoom }} testID='e2e-enter-your-password-view'>
+					<Text style={[styles.info, { color: colors.fontDefault }]}>{I18n.t('Enter_E2EE_Password_description')}</Text>
+
+					<View>
+						<Button
+							onPress={resetE2EEPassword}
+							title={I18n.t('Reset_E2EE_Password')}
+							testID='e2e-reset-your-password-view-reset-password'
+						/>
+						<Button type='secondary' onPress={cancel} title={I18n.t('Cancel')} testID='e2e-enter-your-password-view-cancel' />
+					</View>
+				</SafeAreaView>
+			</ScrollView>
+		</KeyboardView>
+	);
+};
+
+export default E2EResetYourPasswordView;

From c9ac9b83cc6d2185bbff45566653625bbe2f78cb Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Mon, 15 Sep 2025 18:24:36 -0300
Subject: [PATCH 2/8] feat: new translation

---
 app/i18n/locales/ar.json    | 7 ++++++-
 app/i18n/locales/bn-IN.json | 7 ++++++-
 app/i18n/locales/cs.json    | 6 ++++++
 app/i18n/locales/de.json    | 7 ++++++-
 app/i18n/locales/en.json    | 7 ++++++-
 app/i18n/locales/es.json    | 6 ++++++
 app/i18n/locales/fi.json    | 7 ++++++-
 app/i18n/locales/fr.json    | 7 ++++++-
 app/i18n/locales/hi-IN.json | 7 ++++++-
 app/i18n/locales/hu.json    | 7 ++++++-
 app/i18n/locales/it.json    | 7 ++++++-
 app/i18n/locales/ja.json    | 7 ++++++-
 app/i18n/locales/nl.json    | 7 ++++++-
 app/i18n/locales/nn.json    | 7 ++++++-
 app/i18n/locales/no.json    | 7 ++++++-
 app/i18n/locales/pt-BR.json | 7 ++++++-
 app/i18n/locales/pt-PT.json | 7 ++++++-
 app/i18n/locales/ru.json    | 7 ++++++-
 app/i18n/locales/sl-SI.json | 7 ++++++-
 app/i18n/locales/sv.json    | 7 ++++++-
 app/i18n/locales/ta-IN.json | 7 ++++++-
 app/i18n/locales/te-IN.json | 7 ++++++-
 app/i18n/locales/tr.json    | 7 ++++++-
 app/i18n/locales/zh-CN.json | 7 ++++++-
 app/i18n/locales/zh-TW.json | 7 ++++++-
 25 files changed, 150 insertions(+), 23 deletions(-)

diff --git a/app/i18n/locales/ar.json b/app/i18n/locales/ar.json
index eef5e76afbc..9396dcbcfed 100644
--- a/app/i18n/locales/ar.json
+++ b/app/i18n/locales/ar.json
@@ -140,6 +140,7 @@
   "Discussion_name_required": "مطلوب اسم المناقشة",
   "Discussions": "مناقشات",
   "Displays_action_text": "يعرض نص الإجراء",
+  "Do_it_later": "قم بذلك لاحقاً",
   "Do_you_have_a_certificate": "هل لديك شهادة لهذا المساحة؟",
   "Do_you_have_an_account": "هل لديك حساب؟",
   "Do_you_really_want_to_key_this_room_question_mark": "هل تريد حقاً {{key}} هذه الغرفة؟",
@@ -149,6 +150,7 @@
   "E2E_How_It_Works_info2": "التشفير يتم بين الطرفيات بمعنى أن المفتاح سيستخدم لتشفير وفك تشفير رسائلك ولن يتم حفظه في الخادم. لذلك يترتب عليك حفظ كلمة المرور هذه في مكان آمن",
   "E2E_How_It_Works_info3": "حين الاستمرار سيتم إنشاء كلمة المرور بين الطرفيات",
   "E2E_How_It_Works_info4": "بإمكانك أيضاً إنشاء كلمة مرور جديدة لمفتاح التشفير في أي وقت عند دخولك بكلمة المرور الحالية لمفتاح التشفير",
+  "E2EE_password": "كلمة المرور E2EE",
   "Edit": "تعديل",
   "Edit_Avatar": "تعديل الصورة الرمزية",
   "Edit_Invite": "تعديل الدعوة",
@@ -162,6 +164,7 @@
   "Email_required": "البريد الإلكتروني مطلوب",
   "Emoji_selector": "محدد الرموز التعبيرية",
   "Enable_Auto_Translate": "تمكين الترجمة التلقائية",
+  "Enable_encryption_button_label": "تمكين التشفير",
   "Encrypted": "مشفر",
   "Encrypted_message": "رسالة مشفرة",
   "encrypted_room_description": "أدخل كلمة المرور الخاصة بالتشفير من طرف إلى طرف للوصول.",
@@ -170,7 +173,7 @@
   "Encryption_error_title": "كلمة المرور غير صحيحة",
   "End_to_end_encrypted_room": "غرفة مشفرة بين الطرفيات",
   "Enter_E2EE_Password": "أدخل كلمة المرور E2EE",
-  "Enter_E2EE_Password_description": "للوصول إلى قنواتك المشفرة والرسائل المباشرة، أدخل كلمة المرور الخاصة بالتشفير. هذا لا يتم تخزينه على الخادم، لذا ستحتاج إلى استخدامه على كل جهاز.",
+  "Enter_E2EE_Password_description": "أدخل كلمة مرور E2EE لعرض وإرسال الرسائل المشفرة.\n\nيجب إدخال كلمة المرور على كل جهاز.",
   "Error_incorrect_password": "كلمة المرور غير صحيحة",
   "Error_prefix": "خطأ: {{message}}",
   "Error_uploading": "خطأ في الرفع",
@@ -205,6 +208,7 @@
   "Following_thread": "متابعة الموضوع",
   "Food_and_drink": "طعام وشراب",
   "For_your_security_you_must_enter_your_current_password_to_continue": "لأمانك، يجب عليك إدخال كلمة مرور حسابك للمتابعة.",
+  "Forgot_E2EE_password": "هل نسيت كلمة مرور E2EE؟",
   "Forgot_password": "هل نسيت كلمة المرور؟",
   "Forgot_password_If_this_email_is_registered": "إن كان البريد الإلكتروني مسجلاً، فسنرسل تعليمات إعادة تعيين كلمة المرور الخاصة بك. إذا لم تتلق بريداً إلكترونياً قريباً، فيرجى العودة والمحاولة مرة أخرى",
   "Forward": "إعادة توجيه",
@@ -436,6 +440,7 @@
   "Required": "مطلوب",
   "Resend": "أعد الإرسال",
   "RESET": "إعادة",
+  "Reset_E2EE_Password": "إعادة تعيين كلمة مرور E2EE",
   "Reset_password": "إعادة تعيين كلمة المرور",
   "resetting_password": "إعادة تعيين كلمة المرور",
   "Review_app_desc": "قم بإعطائنا 5 نجوم {{store}}",
diff --git a/app/i18n/locales/bn-IN.json b/app/i18n/locales/bn-IN.json
index 95e5dc0cfba..0f04b53246d 100644
--- a/app/i18n/locales/bn-IN.json
+++ b/app/i18n/locales/bn-IN.json
@@ -224,6 +224,7 @@
   "Discussion_name_required": "আলোচনা নাম প্রয়োজন",
   "Discussions": "আলোচনা",
   "Display": "ডিসপ্লে",
+  "Do_it_later": "পরে করুন",
   "Do_you_have_a_certificate": "আপনার কি এই ওয়ার্কস্পেসের জন্য একটি সার্টিফিকেট আছে?",
   "Do_you_have_an_account": "আপনার কি একটি অ্যাকাউন্ট আছে?",
   "Do_you_really_want_to_key_this_room_question_mark": "আপনি কি সত্যিই চান যে আপনি এই রুমটি {{key}} করতে?",
@@ -247,6 +248,7 @@
   "E2E_How_It_Works_info2": "এটি * এন্ড টু এন্ড এনক্রিপশন * তাই আপনার বার্তা কোড/ডিকোড করতে এবং এগুলি কাজকর্মে সংরক্ষণ হবে না। এই কারণে * আপনাকে এই পাসওয়ার্ডটি কোথাও নিরাপদে সংরক্ষণ করা * প্রয়োজন যা আপনি পরবর্তীতে যদি প্রয়োজন হয় তা অ্যাক্সেস করতে হবে।",
   "E2E_How_It_Works_info3": "আপনি যদি এগিয়ে যান তবে এটি স্বয়ংক্রিয় ভাবে একটি E2E পাসওয়ার্ড জেনারেট হবে।",
   "E2E_How_It_Works_info4": "আপনি যে কোনও ব্রাউজার থেকে একটি নতুন পাসওয়ার্ড সেটআপ করতে পারেন আপনার এনক্রিপশন কীর জন্য সময়ের মধ্যে যে কোনও ব্রাউজারে যাতে আপনি বর্তমানের E2E পাসওয়ার্ড দিয়ে এনটার করেছেন।",
+  "E2EE_password": "এন্ড-টু-এন্ড এনক্রিপ্টেড পাসওয়ার্ড",
   "Edit": "সম্পাদনা করুন",
   "Edit_Avatar": "অবতার সম্পাদনা করুন",
   "Edit_Invite": "ইনভাইট সম্পাদনা করুন",
@@ -261,6 +263,7 @@
   "Emoji_selector": "ইমোজি নির্বাচনকারী",
   "Empty": "খালি",
   "Enable_Auto_Translate": "অটো-অনুবাদ সক্রিয় করুন",
+  "Enable_encryption_button_label": "এনক্রিপশন সক্রিয় করুন",
   "Enable_Message_Parser": "বার্তা পার্সার সক্ষম করুন",
   "Enable_writing_in_room": "রুমে লেখা সক্ষম করুন",
   "Enabled_E2E_Encryption_for_this_room": "এই রুমের জন্য E2E এনক্রিপশন সক্রিয় করা হয়েছে",
@@ -272,7 +275,7 @@
   "Encryption_error_title": "ভুল পাসওয়ার্ড",
   "End_to_end_encrypted_room": "শেষ হতে শেষ এনক্রিপ্টেড রুম",
   "Enter_E2EE_Password": "E2EE পাসওয়ার্ড দিন",
-  "Enter_E2EE_Password_description": "আপনার এনক্রিপ্টেড চ্যানেলগুলি এবং সরাসরি বার্তাগুলি অ্যাক্সেস করতে, আপনার এনক্রিপশন পাসওয়ার্ড লিখুন। এটি সার্ভারে সংরক্ষিত হয় না, তাই আপনাকে প্রতিটি ডিভাইসে এটি ব্যবহার করতে হবে।",
+  "Enter_E2EE_Password_description": "আপনার ই2ইইই পাসওয়ার্ড প্রবেশ করান গোপন বার্তা দেখতে এবং পাঠানোর জন্য।\n\nপ্রতিটি যন্ত্রে পাসওয়ার্ড প্রবেশ করতে হবে।",
   "Error_Download_file": "ফাইল ডাউনলোড করতে ত্রুটি",
   "Error_incorrect_password": "ভুল পাসওয়ার্ড",
   "Error_prefix": "ত্রুটি: {{message}}",
@@ -314,6 +317,7 @@
   "Following_thread": "থ্রেড অনুসরণ করছেন",
   "Food_and_drink": "খাদ্য ও পানীয়",
   "For_your_security_you_must_enter_your_current_password_to_continue": "আপনার নিরাপত্তার জন্য, চালিয়ে যেতে হলে আপনাকে আপনার অ্যাকাউন্টের পাসওয়ার্ড প্রবেশ করতে হবে।",
+  "Forgot_E2EE_password": "E2EE পাসওয়ার্ড ভুলে গেছেন?",
   "Forgot_password": "আপনার পাসওয়ার্ড ভুলে গিয়েছেন?",
   "Forgot_password_If_this_email_is_registered": "যদি এই ইমেইলটি নিবন্ধিত হয়ে থাকে, আমরা আপনাকে কীভাবে আপনার পাসওয়ার্ড রিসেট করতে হয় তা সম্পর্কে নির্দেশনা প্রেরণ করব। যদি আপনি শীঘ্রই একটি ইমেইল পাননি, তবে অনুগ্রহ করে ফিরে আসুন এবং আবার চেষ্টা করুন।",
   "Forward": "ফরোয়ার্ড",
@@ -621,6 +625,7 @@
   "Required": "প্রয়োজনীয়",
   "Resend": "পুনরায় পাঠান",
   "RESET": "রিসেট",
+  "Reset_E2EE_Password": "E2EE পাসওয়ার্ড রিসেট করুন",
   "Reset_password": "পাসওয়ার্ড রিসেট করুন",
   "resetting_password": "পাসওয়ার্ড রিসেট করা হচ্ছে",
   "Resume": "পুনরায় শুরু করুন",
diff --git a/app/i18n/locales/cs.json b/app/i18n/locales/cs.json
index 97e92642ab1..81984fecba6 100644
--- a/app/i18n/locales/cs.json
+++ b/app/i18n/locales/cs.json
@@ -241,6 +241,7 @@
   "Discussions": "Diskuse",
   "Display": "Zobrazit",
   "Displays_action_text": "Zobrazí akční text",
+  "Do_it_later": "Udělám to později",
   "Do_you_have_a_certificate": "Máte certifikát pro tento pracovní prostor?",
   "Do_you_have_an_account": "Máte účet?",
   "Do_you_really_want_to_key_this_room_question_mark": "Opravdu chcete {{key}} tento pokoj?",
@@ -265,6 +266,7 @@
   "E2E_How_It_Works_info2": "Toto je *šifrování od konce do konce*, takže klíč pro zakódování/dekódování vašich zpráv a nebudou uloženy na pracovní ploše. Z tohoto důvodu *musíte toto heslo uložit někde v bezpečí*, ke kterému budete mít přístup později, pokud budete potřebovat .",
   "E2E_How_It_Works_info3": "Pokud budete pokračovat, bude automaticky vygenerováno heslo E2E.",
   "E2E_How_It_Works_info4": "Nové heslo pro svůj šifrovací klíč můžete také nastavit kdykoli z libovolného prohlížeče, kde jste zadali stávající heslo E2E.",
+  "E2EE_password": "E2EE heslo",
   "Edit": "Upravit",
   "Edit_Avatar": "Upravit avatar",
   "Edit_Invite": "Upravit pozvánku",
@@ -279,6 +281,7 @@
   "Emoji_selector": "Výběr emoji",
   "Empty": "Prázdný",
   "Enable_Auto_Translate": "Povolit automatický překlad",
+  "Enable_encryption_button_label": "Povolit šifrování",
   "Enable_Message_Parser": "Povolit analyzátor zpráv",
   "Enable_writing_in_room": "Povolit psaní v místnosti",
   "Enabled_E2E_Encryption_for_this_room": "povoleno E2E šifrování pro tuto místnost",
@@ -287,6 +290,7 @@
   "Encryption_error_desc": "Nebyla možná dekódovat váš šifrovací klíč.",
   "Encryption_error_title": "Nesprávné heslo",
   "End_to_end_encrypted_room": "End to end šifrovaná místnost",
+  "Enter_E2EE_Password_description": "Zadejte své heslo E2EE pro zobrazení a odesílání šifrovaných zpráv.\n\nHeslo je třeba zadat na každém zařízení.",
   "Enter_the_code": "Zadejte kód, který jsme vám právě poslali e-mailem.",
   "Enter_Your_E2E_Password": "Zadejte heslo E2E",
   "Enter_Your_Encryption_Password_desc1": "To vám umožní přístup k vašim zašifrovaným soukromým skupinám a přímým zprávám.",
@@ -333,6 +337,7 @@
   "Following_thread": "Následující vlákno",
   "Food_and_drink": "Jídlo a pití",
   "For_your_security_you_must_enter_your_current_password_to_continue": "Pro vaši bezpečnost musíte zadat heslo k účtu, abyste mohli pokračovat.",
+  "Forgot_E2EE_password": "Zapomněli jste heslo E2EE?",
   "Forgot_password": "Zapomněli jste heslo?",
   "Forgot_password_If_this_email_is_registered": "Pokud je tento e-mail zaregistrován, zašleme Vám pokyny, jak obnovit heslo. Pokud e-mail v nejbližší době neobdržíte, vraťte se a zkuste to znovu.",
   "Forward": "Vpřed",
@@ -669,6 +674,7 @@
   "Resend": "Přeposlat",
   "Resend_email": "Přeposlat email",
   "RESET": "Resetovat",
+  "Reset_E2EE_Password": "Obnovit E2EE heslo",
   "Reset_password": "Obnovit heslo",
   "resetting_password": "resetování hesla",
   "Resume": "Životopis",
diff --git a/app/i18n/locales/de.json b/app/i18n/locales/de.json
index ad6c59d0ba3..0b7b40c75b6 100644
--- a/app/i18n/locales/de.json
+++ b/app/i18n/locales/de.json
@@ -219,6 +219,7 @@
   "Discussions": "Diskussionen",
   "Display": "Anzeige",
   "Displays_action_text": "Zeigt den Aktionstext",
+  "Do_it_later": "Später erledigen",
   "Do_you_have_a_certificate": "Haben Sie ein Zertifikat für diesen Arbeitsbereich?",
   "Do_you_have_an_account": "Sie haben schon ein Konto?",
   "Do_you_really_want_to_key_this_room_question_mark": "Möchten Sie diesen Raum wirklich {{key}}?",
@@ -242,6 +243,7 @@
   "E2E_How_It_Works_info2": "Dies ist *Ende-zu-Ende-Verschlüsselung*, daher wird der Schlüssel um die Nachrichten zu ver-/entschlüsseln nicht auf dem Server gespeichert. Aus diesem Grund müssen Sie dieses Passwort an einem sicheren Ort speichern, sodass Sie später bei Bedarf darauf zugreifen können.",
   "E2E_How_It_Works_info3": "Wenn Sie fortfahren, wird automatisch ein ein E2E-Passwort erzeugt.",
   "E2E_How_It_Works_info4": "Sie können außerdem jederzeit, in jedem Browser, in dem Sie das bestehende Passwort eingegeben haben, ein neues Passwort setzen.",
+  "E2EE_password": "E2EE-Passwort",
   "Edit": "Bearbeiten",
   "Edit_Avatar": "Avatar bearbeiten",
   "Edit_Invite": "Einladung bearbeiten",
@@ -256,6 +258,7 @@
   "Emoji_selector": "Emoji-Auswahl",
   "Empty": "Leer",
   "Enable_Auto_Translate": "Automatische Übersetzung aktivieren",
+  "Enable_encryption_button_label": "Verschlüsselung aktivieren",
   "Enable_Message_Parser": "Nachrichtenparser aktivieren",
   "Enabled_E2E_Encryption_for_this_room": "hat E2E-Verschlüsselung für diesen Raum aktiviert",
   "Encrypted": "Verschlüsselt",
@@ -266,7 +269,7 @@
   "Encryption_error_title": "Falsches Passwort",
   "End_to_end_encrypted_room": "Ende-zu-Ende-verschlüsselter Raum",
   "Enter_E2EE_Password": "E2EE-Passwort eingeben",
-  "Enter_E2EE_Password_description": "Um auf Ihre verschlüsselten Kanäle und Direktnachrichten zuzugreifen, geben Sie Ihr Verschlüsselungspasswort ein. Dies wird nicht auf dem Server gespeichert, daher müssen Sie es auf jedem Gerät verwenden.",
+  "Enter_E2EE_Password_description": "Geben Sie Ihr E2EE-Passwort ein, um verschlüsselte Nachrichten anzuzeigen und zu senden.\n\nDas Passwort muss auf jedem Gerät eingegeben werden.",
   "Error_Download_file": "Fehler beim Herunterladen der Datei",
   "Error_incorrect_password": "Falsches Passwort",
   "Error_prefix": "Fehler: {{message}}",
@@ -308,6 +311,7 @@
   "Following_thread": "Thread folgen",
   "Food_and_drink": "Essen und Trinken",
   "For_your_security_you_must_enter_your_current_password_to_continue": "Zu Ihrer Sicherheit müssen Sie Ihr Kontopasswort eingeben, um fortzufahren.",
+  "Forgot_E2EE_password": "E2EE-Passwort vergessen?",
   "Forgot_password": "Passwort vergessen",
   "Forgot_password_If_this_email_is_registered": "Wenn es sich um eine registrierte E-Mail-Adresse handelt, werden wir an diese eine Anleitung zum Zurücksetzen des Passworts senden. Sollten Sie in Kürzen keine E-Mail erhalten, kommen Sie wieder und versuchen Sie es noch einmal.",
   "Forward": "Weiterleiten",
@@ -609,6 +613,7 @@
   "Required": "Erforderlich",
   "Resend": "Erneut senden",
   "RESET": "Zurücksetzen",
+  "Reset_E2EE_Password": "E2EE-Passwort zurücksetzen",
   "Reset_password": "Passwort zurücksetzen",
   "resetting_password": "Passwort zurücksetzen",
   "Resume": "Fortsetzen",
diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json
index 2f93a5b9d92..1679931e50e 100644
--- a/app/i18n/locales/en.json
+++ b/app/i18n/locales/en.json
@@ -248,6 +248,7 @@
   "Discussions": "Discussions",
   "Display": "Display",
   "Displays_action_text": "Displays action text",
+  "Do_it_later": "Do it later",
   "Do_you_have_a_certificate": "Do you have a certificate for this workspace?",
   "Do_you_have_an_account": "Do you have an account?",
   "Do_you_really_want_to_key_this_room_question_mark": "Do you really want to {{key}} this room?",
@@ -274,6 +275,7 @@
   "E2E_How_It_Works_info4": "You can also setup a new password for your encryption key any time from any browser you have entered the existing E2E password.",
   "e2ee_disabled": "End-to-end encryption is disabled",
   "e2ee_enabled": "End-to-end encryption is enabled",
+  "E2EE_password": "E2EE password",
   "Edit": "Edit",
   "Edit_Avatar": "Edit avatar",
   "Edit_Invite": "Edit invite",
@@ -289,6 +291,7 @@
   "Empty": "Empty",
   "Enable": "Enable",
   "Enable_Auto_Translate": "Enable auto-translate",
+  "Enable_encryption_button_label": "Enable encryption",
   "Enable_encryption_description": "Ensure conversations are kept private",
   "Enable_encryption_title": "Enable encryption",
   "Enable_Message_Parser": "Enable message parser",
@@ -308,7 +311,7 @@
   "Encryption_keys_reset_failed": "Encryption keys reset failed",
   "End_to_end_encrypted_room": "End to end encrypted room",
   "Enter_E2EE_Password": "Enter E2EE password",
-  "Enter_E2EE_Password_description": "To access your encrypted channels and direct messages, enter your encryption password. This is not stored on the server, so you’ll need to use it on every device.",
+  "Enter_E2EE_Password_description": "Enter your E2EE password to view and send encrypted messages.\n\nPassword need to be entered on each device.",
   "Enter_the_code": "Enter the code we just emailed you.",
   "Error_Download_file": "Error while downloading file",
   "Error_incorrect_password": "Incorrect password",
@@ -353,6 +356,7 @@
   "Following_thread": "Following thread",
   "Food_and_drink": "Food and drink",
   "For_your_security_you_must_enter_your_current_password_to_continue": "For your security, you must enter your account password to continue.",
+  "Forgot_E2EE_password": "Forgot E2EE password?",
   "Forgot_password": "Forgot your password?",
   "Forgot_password_If_this_email_is_registered": "If this email is registered, we'll send instructions on how to reset your password. If you do not receive an email shortly, please come back and try again.",
   "Forward": "Forward",
@@ -693,6 +697,7 @@
   "Resend_email": "Resend email",
   "RESET": "Reset",
   "Reset": "Reset",
+  "Reset_E2EE_Password": "Reset E2EE Password",
   "Reset_encryption_keys": "Reset encryption keys",
   "Reset_encryption_keys_info__room_type__": "Resetting E2EE keys is only recommend if no {{room_type}} member has a valid key to regain access to the previously encrypted content.",
   "Reset_password": "Reset password",
diff --git a/app/i18n/locales/es.json b/app/i18n/locales/es.json
index 8bf86b78caf..f150244d91e 100644
--- a/app/i18n/locales/es.json
+++ b/app/i18n/locales/es.json
@@ -119,9 +119,11 @@
   "Discussion_name_required": "Se requiere nombre para la discusión",
   "Discussions": "Conversaciones",
   "Displays_action_text": "Mostrar texto de acción",
+  "Do_it_later": "Hazlo más tarde",
   "Do_you_have_a_certificate": "¿Tienes un certificado para este espacio de trabajo?",
   "Do_you_really_want_to_key_this_room_question_mark": "¿Deseas {{key}} de esta sala?",
   "Dont_Have_An_Account": "¿Todavía no tienes una cuenta?",
+  "E2EE_password": "Contraseña E2EE",
   "Edit": "Editar",
   "Edit_Avatar": "Editar avatar",
   "Edit_Room_Photo": "Editar Foto de la sala",
@@ -131,8 +133,10 @@
   "Email_required": "Correo electrónico obligatorio",
   "Emoji_selector": "Selector de emojis",
   "Enable_Auto_Translate": "Permitir Auto-Translate",
+  "Enable_encryption_button_label": "Activar cifrado",
   "Encryption_error_desc": "No fue posible descifrar tu clave de cifrado.",
   "Encryption_error_title": "Contraseña incorrecta",
+  "Enter_E2EE_Password_description": "Ingrese su contraseña E2EE para ver y enviar mensajes cifrados.\n\nLa contraseña debe ingresarse en cada dispositivo.",
   "Error_incorrect_password": "Contraseña incorrecta",
   "Error_prefix": "Error: {{mensaje}}",
   "Error_uploading": "Error en la subida",
@@ -163,6 +167,7 @@
   "Following_thread": "Siguiendo hilo",
   "Food_and_drink": "Comida y bebida",
   "For_your_security_you_must_enter_your_current_password_to_continue": "Por su seguridad, debe ingresar la contraseña de su cuenta para continuar.",
+  "Forgot_E2EE_password": "¿Olvidó la contraseña de E2EE?",
   "Forgot_password": "¿Ha olvidado su contraseña?",
   "Forgot_password_If_this_email_is_registered": "Si este email está registrado, te enviaremos las instrucciones para resetear tu contraseña. Si no recibes un email en breve, vuelve aquí e inténtalo de nuevo.",
   "Full_name": "Nombre completo",
@@ -305,6 +310,7 @@
   "Required": "Requerido",
   "Resend": "Reenviar",
   "RESET": "Reset",
+  "Reset_E2EE_Password": "Restablecer contraseña E2EE",
   "Reset_password": "Resetear contraseña",
   "resetting_password": "reseteando contraseña",
   "Review_message": "Revisar mensaje",
diff --git a/app/i18n/locales/fi.json b/app/i18n/locales/fi.json
index ddbdee2f698..e84154cf211 100644
--- a/app/i18n/locales/fi.json
+++ b/app/i18n/locales/fi.json
@@ -204,6 +204,7 @@
   "Discussions": "Keskustelut",
   "Display": "Näytä",
   "Displays_action_text": "Näyttää toimintotekstin",
+  "Do_it_later": "Tee se myöhemmin",
   "Do_you_have_a_certificate": "Onko sinulla varmenne tälle työtilalle?",
   "Do_you_have_an_account": "Onko sinulla tili?",
   "Do_you_really_want_to_key_this_room_question_mark": "Haluatko varmasti {{key}} tämän huoneen?",
@@ -227,6 +228,7 @@
   "E2E_How_It_Works_info2": "Tämä on *täysi salaus*, joten viestiesi salaamiseen ja salauksen purkuun käytettävää avainta ei tallenneta palvelimeen. Siksi *sinun on tallennettava tämä salasana turvalliseen paikkaan*, johon pääset myöhemmin tarvittaessa.",
   "E2E_How_It_Works_info3": "Jos jatkat, täyden salauksen salasana luodaan automaattisesti.",
   "E2E_How_It_Works_info4": "Voit myös määrittää uuden salasanan salausavaimellesi milloin tahansa missä tahansa selaimessa, jossa olet antanut nykyisen täyden salauksen salasanan.",
+  "E2EE_password": "E2EE-salasana",
   "Edit": "Muokkaa",
   "Edit_Avatar": "Muokkaa avataria",
   "Edit_Invite": "Muokkaa kutsua",
@@ -241,6 +243,7 @@
   "Emoji_selector": "Emojin valitsin",
   "Empty": "Tyhjä",
   "Enable_Auto_Translate": "Ota käyttöön automaattikäännös",
+  "Enable_encryption_button_label": "Ota salaus käyttöön",
   "Enable_Message_Parser": "Ota käyttöön viestin jäsentäjä",
   "Enabled_E2E_Encryption_for_this_room": "otti täyden salauksen käyttöön tässä huoneessa",
   "Encrypted": "Salattu",
@@ -251,7 +254,7 @@
   "Encryption_error_title": "Virheellinen salasana",
   "End_to_end_encrypted_room": "Täysin salattu huone",
   "Enter_E2EE_Password": "Anna E2EE-salasana",
-  "Enter_E2EE_Password_description": "Päästäksesi käsiksi salattuihin kanaviisi ja suoriin viesteihisi, syötä salaus salasanasi. Tätä ei tallenneta palvelimelle, joten sinun on käytettävä sitä jokaisella laitteella.",
+  "Enter_E2EE_Password_description": "Syötä E2EE-salasanasi, jotta voit tarkastella ja lähettää salattuja viestejä.\n\nSalasana on syötettävä jokaisella laitteella.",
   "Error_Download_file": "Virhe ladattaessa tiedostoa",
   "Error_incorrect_password": "Virheellinen salasana",
   "Error_prefix": "Virhe: {{message}}",
@@ -293,6 +296,7 @@
   "Following_thread": "Seurataan ketjua",
   "Food_and_drink": "Ruoka ja juoma",
   "For_your_security_you_must_enter_your_current_password_to_continue": "Turvallisuutesi vuoksi sinun on syötettävä tilisi salasana jatkaaksesi.",
+  "Forgot_E2EE_password": "Unohditko E2EE-salasanan?",
   "Forgot_password": "Unohditko salasanasi?",
   "Forgot_password_If_this_email_is_registered": "Jos tämä sähköpostiosoite on rekisteröity, lähetämme salasanan nollausohjeet. Jos et saa sähköpostia pian, palaa ja yritä uudelleen.",
   "Forward": "Välitä",
@@ -584,6 +588,7 @@
   "Required": "Vaadittu",
   "Resend": "Lähetä uudelleen",
   "RESET": "Nollaa",
+  "Reset_E2EE_Password": "Nollaa E2EE-salasana",
   "Reset_password": "Nollaa salasana",
   "resetting_password": "nollaa salasanaa",
   "Resume": "Jatka",
diff --git a/app/i18n/locales/fr.json b/app/i18n/locales/fr.json
index 2e8c7694546..11c3f4b5b64 100644
--- a/app/i18n/locales/fr.json
+++ b/app/i18n/locales/fr.json
@@ -172,6 +172,7 @@
   "Discussions": "Discussions",
   "Display": "Affichage",
   "Displays_action_text": "Affiche le texte d'action",
+  "Do_it_later": "Faites-le plus tard",
   "Do_you_have_a_certificate": "Avez-vous un certificat pour cet espace de travail ?",
   "Do_you_have_an_account": "Avez-vous un compte ?",
   "Do_you_really_want_to_key_this_room_question_mark": "Voulez-vous vraiment {{key}} ce salon ?",
@@ -195,6 +196,7 @@
   "E2E_How_It_Works_info2": "Il s'agit du *chiffrement de bout en bout*, la clé permettant de coder/décoder vos messages ne sera pas enregistrée sur le serveur. C'est pourquoi *vous devez stocker ce mot de passe à un endroit sûr* auquel vous pourrez accéder plus tard si vous en avez besoin.",
   "E2E_How_It_Works_info3": "Si vous continuez, un mot de passe E2E sera automatiquement généré.",
   "E2E_How_It_Works_info4": "Vous pouvez également configurer un nouveau mot de passe pour votre clé de cryptage à tout moment à partir de n'importe quel navigateur dans lequel vous avez entré le mot de passe E2E existant.",
+  "E2EE_password": "Mot de passe E2EE",
   "Edit": "Modifier",
   "Edit_Avatar": "Modifier l'avatar",
   "Edit_Invite": "Modifier l'invitation",
@@ -209,6 +211,7 @@
   "Emoji_selector": "Sélecteur d'émojis",
   "Empty": "Vide",
   "Enable_Auto_Translate": "Activer la traduction automatique",
+  "Enable_encryption_button_label": "Activer le chiffrement",
   "Enable_Message_Parser": "Activer le parseur de messages",
   "Encrypted": "Crypté",
   "Encrypted_message": "Message crypté",
@@ -218,7 +221,7 @@
   "Encryption_error_title": "Mot de passe incorrect",
   "End_to_end_encrypted_room": "Salon crypté de bout en bout",
   "Enter_E2EE_Password": "Entrez le mot de passe E2EE",
-  "Enter_E2EE_Password_description": "Pour accéder à vos canaux cryptés et à vos messages directs, entrez votre mot de passe de cryptage. Celui-ci n'est pas stocké sur le serveur, vous devrez donc l'utiliser sur chaque appareil.",
+  "Enter_E2EE_Password_description": "Entrez votre mot de passe E2EE pour consulter et envoyer des messages chiffrés.\n\nLe mot de passe doit être saisi sur chaque appareil.",
   "Error_Download_file": "Erreur lors du téléchargement du fichier",
   "Error_incorrect_password": "Mot de passe incorrect",
   "Error_prefix": "Erreur : {{message}}",
@@ -258,6 +261,7 @@
   "Following_thread": "Suivre le fil",
   "Food_and_drink": "Nourriture et boisson",
   "For_your_security_you_must_enter_your_current_password_to_continue": "Pour votre sécurité, vous devez entrer le mot de passe de votre compte pour continuer.",
+  "Forgot_E2EE_password": "Mot de passe E2EE oublié ?",
   "Forgot_password": "Mot de passe oublié ?",
   "Forgot_password_If_this_email_is_registered": "Si cet e-mail est enregistré, nous vous enverrons des instructions pour réinitialiser votre mot de passe. Si vous ne recevez pas d'e-mail sous peu, veuillez revenir et réessayer.",
   "Forward": "Transmettre",
@@ -540,6 +544,7 @@
   "Required": "Requis",
   "Resend": "Renvoyer",
   "RESET": "Réinitialiser",
+  "Reset_E2EE_Password": "Réinitialiser le mot de passe E2EE",
   "Reset_password": "Réinitialiser le mot de passe",
   "resetting_password": "réinitialisation du mot de passe",
   "Resume": "Reprendre",
diff --git a/app/i18n/locales/hi-IN.json b/app/i18n/locales/hi-IN.json
index bd76d399119..e9e6306daf7 100644
--- a/app/i18n/locales/hi-IN.json
+++ b/app/i18n/locales/hi-IN.json
@@ -224,6 +224,7 @@
   "Discussion_name_required": "चर्चा का नाम आवश्यक है।",
   "Discussions": "चर्चाएँ",
   "Display": "प्रदर्शन",
+  "Do_it_later": "बाद में करें",
   "Do_you_have_a_certificate": "क्या आपके पास इस कार्यक्षेत्र के लिए प्रमाणपत्र है?",
   "Do_you_have_an_account": "क्या आपके पास एक खाता है?",
   "Do_you_really_want_to_key_this_room_question_mark": "क्या आप वाकई इस कमरे को {{key}} करना चाहते हैं?",
@@ -247,6 +248,7 @@
   "E2E_How_It_Works_info2": "यह *इंड-टू-इंड एन्क्रिप्शन* है, इसलिए आपके संदेशों को एनकोड/डीकोड करने के लिए एक कुंजी है और इसे कार्यस्थान में सहेजा नहीं जाएगा। इस कारण *आपको इस पासवर्ड को कहीं सुरक्षित रखना होगा*, जिसे आप बाद में आवश्यकता होने पर उपयोग कर सकते हैं।",
   "E2E_How_It_Works_info3": "यदि आप आगे बढ़ते हैं, तो एक इंड-टू-इंड पासवर्ड स्वच्छता से उत्पन्न हो जाएगा।",
   "E2E_How_It_Works_info4": "आप अपने इंड-टू-इंड पासवर्ड से पुनः ब्राउज़र में किसी भी स्थान से कभी भी एक नए पासवर्ड को सेटअप कर सकते हैं।",
+  "E2EE_password": "E2EE पासवर्ड",
   "Edit": "संपादित करें",
   "Edit_Avatar": "अवतार संपादित करें",
   "Edit_Invite": "आमंत्रण संपादित करें",
@@ -261,6 +263,7 @@
   "Emoji_selector": "इमोजी चयनकर्ता",
   "Empty": "खाली",
   "Enable_Auto_Translate": "स्वच्छता से अनुवाद सक्षम करें",
+  "Enable_encryption_button_label": "एन्क्रिप्शन सक्षम करें",
   "Enable_Message_Parser": "संदेश पार्सर सक्षम करें",
   "Enable_writing_in_room": "कमरे में लेखन सक्षम करें",
   "Enabled_E2E_Encryption_for_this_room": "इस कक्ष के लिए ईटूई एन्क्रिप्शन सक्षम किया गया है",
@@ -272,7 +275,7 @@
   "Encryption_error_title": "गलत पासवर्ड",
   "End_to_end_encrypted_room": "इंड-टू-इंड एन्क्रिप्टेड कमरा",
   "Enter_E2EE_Password": "E2EE पासवर्ड डालें",
-  "Enter_E2EE_Password_description": "अपने एन्क्रिप्टेड चैनल्स और डायरेक्ट मैसेजेस तक पहुँचने के लिए, अपना एन्क्रिप्शन पासवर्ड दर्ज करें। यह सर्वर पर संग्रहीत नहीं होता है, इसलिए आपको इसे हर डिवाइस पर उपयोग करना होगा।",
+  "Enter_E2EE_Password_description": "एन्क्रिप्टेड संदेश देखने और भेजने के लिए अपना E2EE पासवर्ड दर्ज करें।\n\nप्रत्येक डिवाइस पर पासवर्ड दर्ज करना आवश्यक है।",
   "Error_Download_file": "फ़ाइल डाउनलोड करते समय त्रुटि",
   "Error_incorrect_password": "गलत पासवर्ड",
   "Error_prefix": "त्रुटि: {{संदेश}}",
@@ -314,6 +317,7 @@
   "Following_thread": "निरंतर थ्रेड",
   "Food_and_drink": "भोजन और पेय",
   "For_your_security_you_must_enter_your_current_password_to_continue": "आपकी सुरक्षा के लिए, जारी रखने के लिए आपको अपने खाते का पासवर्ड दर्ज करना होगा।",
+  "Forgot_E2EE_password": "E2EE पासवर्ड भूल गए?",
   "Forgot_password": "पासवर्ड भूल गए हैं?",
   "Forgot_password_If_this_email_is_registered": "यदि यह ईमेल पंजीकृत है, तो हम आपको पासवर्ड रीसेट करने के लिए निर्देश भेजेंगे। यदि आपको शीघ्रता से एक ईमेल प्राप्त नहीं होता है, तो कृपया वापस आकर पुनः प्रयास करें।",
   "Forward": "आगे बढ़ें",
@@ -621,6 +625,7 @@
   "Required": "आवश्यक",
   "Resend": "पुनः भेजें",
   "RESET": "रीसेट",
+  "Reset_E2EE_Password": "E2EE पासवर्ड रीसेट करें",
   "Reset_password": "पासवर्ड रीसेट करें",
   "resetting_password": "पासवर्ड रीसेट हो रहा है",
   "Resume": "फिर से शुरू करें",
diff --git a/app/i18n/locales/hu.json b/app/i18n/locales/hu.json
index a28d72ec1bc..99da42ec65b 100644
--- a/app/i18n/locales/hu.json
+++ b/app/i18n/locales/hu.json
@@ -224,6 +224,7 @@
   "Discussion_name_required": "Beszélgetés neve szükséges",
   "Discussions": "Megbeszélések",
   "Display": "Megjelenítés",
+  "Do_it_later": "Csak később tedd meg",
   "Do_you_have_a_certificate": "Van tanúsítványa ehhez a munkaterülethez?",
   "Do_you_have_an_account": "Van fiókja?",
   "Do_you_really_want_to_key_this_room_question_mark": "Biztosan ez a kulcsot {{key}} szeretné ehhez a szobához?",
@@ -247,6 +248,7 @@
   "E2E_How_It_Works_info2": "Ez egy *végtől-végig titkosítás*, így az üzenetek kódolásának/dekódolásának kulcsa nem kerül elmentésre a munkaterületre. Ezért *ezt a jelszót valahol biztonságban kell tárolnia*, amelyhez később hozzáférhet, ha szüksége van rá.",
   "E2E_How_It_Works_info3": "Ha folytatja, automatikusan generál egy E2E jelszót.",
   "E2E_How_It_Works_info4": "A titkosítási kulcshoz bármikor beállíthat egy új jelszót is, bármelyik böngészőből, ahová a meglévő E2E jelszót beírta.",
+  "E2EE_password": "E2EE jelszó",
   "Edit": "Szerkesztés",
   "Edit_Avatar": "Avatar szerkesztése",
   "Edit_Invite": "Meghívás szerkesztése",
@@ -261,6 +263,7 @@
   "Emoji_selector": "Emoji kiválasztó",
   "Empty": "Üres",
   "Enable_Auto_Translate": "Automatikus fordítás engedélyezése",
+  "Enable_encryption_button_label": "A titkosítás engedélyezése",
   "Enable_Message_Parser": "Üzenetelemző engedélyezése",
   "Enable_writing_in_room": "Írás engedélyezése a szobában",
   "Enabled_E2E_Encryption_for_this_room": "E2E engedélyezve ennél a szobánál",
@@ -272,7 +275,7 @@
   "Encryption_error_title": "Helytelen jelszó",
   "End_to_end_encrypted_room": "Végponttól végpontig titkosított szoba",
   "Enter_E2EE_Password": "Adja meg az E2EE jelszót",
-  "Enter_E2EE_Password_description": "Az titkosított csatornákhoz és közvetlen üzenetekhez való hozzáféréshez írja be a titkosítási jelszavát. Ez nincs tárolva a szerveren, így minden eszközön használnia kell.",
+  "Enter_E2EE_Password_description": "Adja meg az E2EE jelszavát a titkosított üzenetek megtekintéséhez és küldéséhez.\n\nA jelszót minden eszközön meg kell adni.",
   "Error_Download_file": "Hiba a fájl letöltése közben",
   "Error_incorrect_password": "Helytelen jelszó",
   "Error_prefix": "Hiba: {{üzenet}}",
@@ -314,6 +317,7 @@
   "Following_thread": "Követett szál",
   "Food_and_drink": "Étel és ital",
   "For_your_security_you_must_enter_your_current_password_to_continue": "A biztonsága érdekében meg kell adnia a fiókja jelszavát a folytatáshoz.",
+  "Forgot_E2EE_password": "Elfelejtette az E2EE jelszót?",
   "Forgot_password": "Elfelejtette a jelszavát?",
   "Forgot_password_If_this_email_is_registered": "Ha ez az e-mail-cím regisztrálva van, akkor utasításokat küldünk a jelszó visszaállításához. Ha nem kap rövidesen e-mailt, akkor térjen vissza, és próbálja meg újra.",
   "Forward": "Továbbítás",
@@ -622,6 +626,7 @@
   "Required": "Kötelező",
   "Resend": "Újraküldés",
   "RESET": "Visszaállítás",
+  "Reset_E2EE_Password": "E2EE jelszó visszaállítása",
   "Reset_password": "Jelszó visszaállítása",
   "resetting_password": "jelszó visszaállítása",
   "Resume": "Folytatás",
diff --git a/app/i18n/locales/it.json b/app/i18n/locales/it.json
index 9cf5879cfa2..7597b46bd4b 100644
--- a/app/i18n/locales/it.json
+++ b/app/i18n/locales/it.json
@@ -151,6 +151,7 @@
   "Discussion_name_required": "Nome della discussione richiesto",
   "Discussions": "Discussioni",
   "Displays_action_text": "Mostra il testo di azione",
+  "Do_it_later": "Fallo più tardi",
   "Do_you_have_a_certificate": "Hai un certificato per questo spazio di lavoro?",
   "Do_you_have_an_account": "Hai un account?",
   "Do_you_really_want_to_key_this_room_question_mark": "Sei sicuro di voler {{key}} questa stanza?",
@@ -173,6 +174,7 @@
   "E2E_How_It_Works_info2": "Questa è *crittografia end-to-end*, quindi la chiave per cifrare/decifrare i messaggi non verrà salvata sul server. Per questo motivo *devi salvare questa password in un luogo sicuro* dove poterla recuperare in seguito qualora necessario.",
   "E2E_How_It_Works_info3": "Procedendo verrà generata automaticamente una password E2E.",
   "E2E_How_It_Works_info4": "Puoi impostare una nuova password per la chiave di cifratura in qualsiasi momento da uno dei browser dove hai inserito la password E2E esistente.",
+  "E2EE_password": "password E2EE",
   "Edit": "Modifica",
   "Edit_Avatar": "Modifica avatar",
   "Edit_Invite": "Modifica invito",
@@ -186,6 +188,7 @@
   "Email_required": "Email obbligatorio",
   "Emoji_selector": "Selettore di emoji",
   "Enable_Auto_Translate": "Abilita traduzione automatica",
+  "Enable_encryption_button_label": "Abilita crittografia",
   "Encrypted": "Crittografato",
   "Encrypted_message": "Messaggio crittografato",
   "encrypted_room_description": "Inserisci la tua password di crittografia end-to-end per accedere.",
@@ -194,7 +197,7 @@
   "Encryption_error_title": "Password errata",
   "End_to_end_encrypted_room": "Stanza crittografata end to end",
   "Enter_E2EE_Password": "Inserisci la password E2EE",
-  "Enter_E2EE_Password_description": "Per accedere ai tuoi canali criptati e ai messaggi diretti, inserisci la tua password di crittografia. Questa non viene memorizzata sul server, quindi dovrai usarla su ogni dispositivo.",
+  "Enter_E2EE_Password_description": "Inserisci la tua password E2EE per visualizzare e inviare messaggi crittografati.\n\nLa password deve essere inserita su ciascun dispositivo.",
   "Error_incorrect_password": "Password errata",
   "Error_prefix": "Errore: {{message}}",
   "Error_uploading": "Errore nel caricamento di",
@@ -231,6 +234,7 @@
   "Following_thread": "Thread seguito",
   "Food_and_drink": "Cibo e bevande",
   "For_your_security_you_must_enter_your_current_password_to_continue": "Per la tua sicurezza, devi inserire la password del tuo account per continuare.",
+  "Forgot_E2EE_password": "Dimenticato la password E2EE?",
   "Forgot_password": "Password dimenticata",
   "Forgot_password_If_this_email_is_registered": "Se questa e-mail è registrata, manderemo istruzioni su come resettare la tua password. Se non ricevi nulla, torna qui e riprova di nuovo.",
   "Forward": "Inoltra",
@@ -471,6 +475,7 @@
   "Required": "Richiesto",
   "Resend": "Invia di nuovo",
   "RESET": "Ripristina",
+  "Reset_E2EE_Password": "Reimposta password E2EE",
   "Reset_password": "Ripristina password",
   "resetting_password": "ripristinando password",
   "Review_app_desc": "Dacci 5 stesse su {{store}}",
diff --git a/app/i18n/locales/ja.json b/app/i18n/locales/ja.json
index 02a3a78a5d2..d37854f5a86 100644
--- a/app/i18n/locales/ja.json
+++ b/app/i18n/locales/ja.json
@@ -139,6 +139,7 @@
   "Discussion_name_required": "ディスカッション名が必要です",
   "Discussions": "ディスカッション",
   "Displays_action_text": "アクションテキストを表示",
+  "Do_it_later": "後でやる",
   "Do_you_have_a_certificate": "このワークスペースの証明書をお持ちですか？",
   "Do_you_have_an_account": "アカウントをお持ちですか？",
   "Do_you_really_want_to_key_this_room_question_mark": "本当にこのルームを{{key}}しますか？",
@@ -148,6 +149,7 @@
   "E2E_How_It_Works_info2": "これは*エンドツーエンド*の暗号化であり、メッセージをエンコード/デコードするためのキーであるため、サーバーには保存されません。そのため、必要に応じて後でアクセスできる*安全な場所にこのパスワードを保管する*必要があります。",
   "E2E_How_It_Works_info3": "処理を進めると、E2Eパスワードが自動生成されます。",
   "E2E_How_It_Works_info4": "既存のE2Eパスワードを入力した任意のブラウザから、暗号化キーの新しいパスワードをいつでも設定することもできます。",
+  "E2EE_password": "E2EE パスワード",
   "Edit": "編集",
   "Edit_Avatar": "アバターを編集",
   "Edit_Invite": "編集に招待",
@@ -161,6 +163,7 @@
   "Email_required": "メールアドレスが必要です。",
   "Emoji_selector": "絵文字セレクター",
   "Enable_Auto_Translate": "自動翻訳を有効にする",
+  "Enable_encryption_button_label": "暗号化を有効にする",
   "Encrypted": "暗号化済み",
   "Encrypted_message": "暗号化されたメッセージ",
   "encrypted_room_description": "エンドツーエンドの暗号化パスワードを入力してアクセスしてください。",
@@ -169,7 +172,7 @@
   "Encryption_error_title": "パスワードが間違っています。",
   "End_to_end_encrypted_room": "暗号化されたエンドツーエンドのルーム",
   "Enter_E2EE_Password": "E2EEパスワードを入力",
-  "Enter_E2EE_Password_description": "暗号化されたチャンネルとダイレクトメッセージにアクセスするには、暗号化パスワードを入力してください。これはサーバーに保存されないため、すべてのデバイスで使用する必要があります。",
+  "Enter_E2EE_Password_description": "E2EEパスワードを入力して、暗号化されたメッセージを表示および送信してください。\n\n各デバイスでパスワードを入力する必要があります。",
   "Error_incorrect_password": "パスワードが違います。",
   "Error_prefix": "エラー: {{message}}",
   "Error_uploading": "アップロードエラー",
@@ -205,6 +208,7 @@
   "Following_thread": "スレッド更新時に通知",
   "Food_and_drink": "飲食物",
   "For_your_security_you_must_enter_your_current_password_to_continue": "セキュリティのために、続行するにはアカウントのパスワードを入力する必要があります。",
+  "Forgot_E2EE_password": "E2EEパスワードを忘れましたか？",
   "Forgot_password": "パスワードを忘れた",
   "Forgot_password_If_this_email_is_registered": "送信したメールアドレスが登録されていれば、パスワードのリセット方法を送信しました。メールアドレスがすぐに来ない場合はやり直してください。",
   "Forward": "転送",
@@ -387,6 +391,7 @@
   "Required": "必須",
   "Resend": "再送信",
   "RESET": "リセット",
+  "Reset_E2EE_Password": "E2EEパスワードをリセット",
   "Reset_password": "パスワードをリセット",
   "resetting_password": "パスワードを再設定",
   "Review_app_desc": "{{store}}で5段階で評価をお願いします",
diff --git a/app/i18n/locales/nl.json b/app/i18n/locales/nl.json
index 60811def28a..28137d82019 100644
--- a/app/i18n/locales/nl.json
+++ b/app/i18n/locales/nl.json
@@ -172,6 +172,7 @@
   "Discussions": "Discussies",
   "Display": "Weergave",
   "Displays_action_text": "Geeft actietekst weer",
+  "Do_it_later": "Doe het later",
   "Do_you_have_a_certificate": "Heeft u een certificaat voor deze werkruimte?",
   "Do_you_have_an_account": "Heb je een account?",
   "Do_you_really_want_to_key_this_room_question_mark": "Wil je deze kamer echt {{key}}?",
@@ -195,6 +196,7 @@
   "E2E_How_It_Works_info2": "Dit is *end-to-end codering*, dus de sleutel om jouw berichten te coderen/decoderen en deze wordt niet op de server opgeslagen. Daarom *moet je dit wachtwoord op een veilige plaats opslaan* waar je later toegang hebt als je dat nodig hebt.",
   "E2E_How_It_Works_info3": "Als je doorgaat, wordt er automatisch een E2E-wachtwoord gegenereerd.",
   "E2E_How_It_Works_info4": "Je kan ook op elk moment een nieuw wachtwoord voor uw coderingssleutel instellen vanuit elke browser waarin u het bestaande E2E-wachtwoord hebt ingevoerd.",
+  "E2EE_password": "E2EE-wachtwoord",
   "Edit": "Bewerk",
   "Edit_Avatar": "Avatar bewerken",
   "Edit_Invite": "Bewerk uitnodiging",
@@ -209,6 +211,7 @@
   "Emoji_selector": "Emoji-selector",
   "Empty": "Leeg",
   "Enable_Auto_Translate": "Automatisch vertalen inschakelen",
+  "Enable_encryption_button_label": "Versleuteling inschakelen",
   "Enable_Message_Parser": "Berichtparser inschakelen",
   "Encrypted": "Versleuteld",
   "Encrypted_message": "Versleuteld bericht",
@@ -218,7 +221,7 @@
   "Encryption_error_title": "Onjuist wachtwoord",
   "End_to_end_encrypted_room": "End-to-end versleutelde kamer",
   "Enter_E2EE_Password": "Voer E2EE-wachtwoord in",
-  "Enter_E2EE_Password_description": "Om toegang te krijgen tot uw versleutelde kanalen en directe berichten, voert u uw versleutelingswachtwoord in. Dit wordt niet op de server opgeslagen, dus u moet het op elk apparaat gebruiken.",
+  "Enter_E2EE_Password_description": "Voer je E2EE-wachtwoord in om versleutelde berichten te bekijken en te verzenden.\n\nHet wachtwoord moet op elk apparaat worden ingevoerd.",
   "Error_Download_file": "Fout tijdens het downloaden van bestand",
   "Error_incorrect_password": "Onjuist wachtwoord",
   "Error_prefix": "Fout: {{message}}",
@@ -258,6 +261,7 @@
   "Following_thread": "Volg draad",
   "Food_and_drink": "Eten en drinken",
   "For_your_security_you_must_enter_your_current_password_to_continue": "Voor uw veiligheid moet u uw accountwachtwoord invoeren om door te gaan.",
+  "Forgot_E2EE_password": "E2EE-wachtwoord vergeten?",
   "Forgot_password": "Wachtwoord vergeten?",
   "Forgot_password_If_this_email_is_registered": "Als dit e-mailadres geregistreerd is, sturen we instructies om je wachtwoord opnieuw in te stellen. Als je geen e-mail ontvangt, kom dan terug en probeer het opnieuw.",
   "Forward": "Doorsturen",
@@ -540,6 +544,7 @@
   "Required": "Vereist",
   "Resend": "Opnieuw verzenden",
   "RESET": "Reset",
+  "Reset_E2EE_Password": "Wachtwoord voor E2EE Resetten",
   "Reset_password": "Wachtwoord resetten",
   "resetting_password": "wachtwoord aan het resetten",
   "Resume": "Hervatten",
diff --git a/app/i18n/locales/nn.json b/app/i18n/locales/nn.json
index 5ffb8ed781d..52f1ab48ae7 100644
--- a/app/i18n/locales/nn.json
+++ b/app/i18n/locales/nn.json
@@ -111,10 +111,12 @@
   "Discussions": "Totalt antall diskusjoner",
   "Display": "Utstilling",
   "Displays_action_text": "Viser handlingstekst",
+  "Do_it_later": "Gjer det seinare",
   "Documentation": "Dokumentasjon",
   "E2E_Encryption": "Ende-til-ende-kryptering",
   "E2E_encryption_change_password_title": "Endre krypteringspassord",
   "e2ee_enabled": "Ende-til-ende-kryptering er aktivert",
+  "E2EE_password": "E2EE-passord",
   "Edit": "Rediger",
   "email": "E-post",
   "Email": "E-post",
@@ -123,6 +125,7 @@
   "Email_Notification_Mode_Disabled": "Funksjonshemmet",
   "Email_required": "E-post nødvendig",
   "Enable": "Aktiver",
+  "Enable_encryption_button_label": "Aktiver kryptering",
   "Enable_encryption_description": "Sørg for at samtaler holdes private",
   "Enable_encryption_title": "Aktiver kryptering",
   "Enabled": "aktivert",
@@ -132,7 +135,7 @@
   "Encryption_keys_reset": "Krypteringsnøkler tilbakestilt",
   "Encryption_keys_reset_failed": "Tilbakestilling av krypteringsnøkler mislyktes",
   "Enter_E2EE_Password": "Skriv inn Ende-Til-Ende-passord",
-  "Enter_E2EE_Password_description": "For å få tilgang til dine krypterte private grupper og direktemeldinger, skriv inn krypteringspassordet ditt. Du må skrive inn dette passordet for å kode/dekode meldingene dine på hver klient du bruker, siden nøkkelen ikke er lagret på serveren.",
+  "Enter_E2EE_Password_description": "Skriv inn E2EE-passordet ditt for å vise og sende krypterte meldinger.\n\nPassordet må skrives inn på hver enhet.",
   "Enter_the_code": "Skriv inn koden vi nettopp sendte deg på e-post.",
   "error-action-not-allowed": "{{action}} er ikke tillatt",
   "error-avatar-invalid-url": "Ugyldig avatar URL: {{url}}",
@@ -154,6 +157,7 @@
   "Filter": "Filter",
   "Flags": "Flags",
   "Following": "Følgende",
+  "Forgot_E2EE_password": "Gløymt E2EE-passord?",
   "Forgot_password": "Glemt passordet",
   "Forgot_password_If_this_email_is_registered": "Hvis denne e-posten er registrert, sender vi instruksjoner om hvordan du tilbakestiller passordet ditt. Hvis du ikke mottar en epost, vennligst kom tilbake og prøv igjen.",
   "Forward": "Framover",
@@ -276,6 +280,7 @@
   "Resend_email": "Send e-post på nytt",
   "RESET": "Tilbakestill",
   "Reset": "Tilbakestill",
+  "Reset_E2EE_Password": "Tilbakestill E2EE-passord",
   "Reset_encryption_keys": "Tilbakestill krypteringsnøkler",
   "Reset_password": "Tilbakestilling av passord",
   "Resume": "Gjenoppta",
diff --git a/app/i18n/locales/no.json b/app/i18n/locales/no.json
index d408d613d36..13cc3eeeb3e 100644
--- a/app/i18n/locales/no.json
+++ b/app/i18n/locales/no.json
@@ -235,6 +235,7 @@
   "Discussions": "Diskusjoner",
   "Display": "Vise",
   "Displays_action_text": "Viser handlingstekst",
+  "Do_it_later": "Gjør det senere",
   "Do_you_have_a_certificate": "Har du et sertifikat for dette arbeidsområdet?",
   "Do_you_have_an_account": "Har du en konto?",
   "Do_you_really_want_to_key_this_room_question_mark": "Vil du virkelig {{key}} dette rommet?",
@@ -261,6 +262,7 @@
   "E2E_How_It_Works_info4": "Du kan også sette opp et nytt passord for krypteringsnøkkelen din når som helst fra hvilken som helst nettleser du har angitt det eksisterende E2E-passordet.",
   "e2ee_disabled": "End-to-end-kryptering er deaktivert",
   "e2ee_enabled": "End-to-end-kryptering er aktivert",
+  "E2EE_password": "E2EE passord",
   "Edit": "Redigere",
   "Edit_Avatar": "Rediger avatar",
   "Edit_Invite": "Rediger invitasjon",
@@ -276,6 +278,7 @@
   "Empty": "Tømme",
   "Enable": "Aktiver",
   "Enable_Auto_Translate": "Aktiver automatisk oversettelse",
+  "Enable_encryption_button_label": "Aktiver kryptering",
   "Enable_encryption_description": "Sørg for at samtaler holdes private",
   "Enable_encryption_title": "Aktiver kryptering",
   "Enable_Message_Parser": "Aktiver meldingsparser",
@@ -295,7 +298,7 @@
   "Encryption_keys_reset_failed": "Tilbakestilling av krypteringsnøkler mislyktes",
   "End_to_end_encrypted_room": "Ende til ende kryptert kom",
   "Enter_E2EE_Password": "Skriv inn E2EE-passord",
-  "Enter_E2EE_Password_description": "Skriv inn krypteringspassordet ditt for å få tilgang til dine krypterte kanaler og direktemeldinger. Dette er ikke lagret på serveren, så du må bruke det på alle enheter.",
+  "Enter_E2EE_Password_description": "Skriv inn E2EE-passordet ditt for å vise og sende krypterte meldinger.\n\nPassordet må angis på hver enhet.",
   "Enter_the_code": "Skriv inn koden vi nettopp sendte deg på e-post.",
   "Error_Download_file": "Feil under nedlasting av fil",
   "Error_play_video": "Det oppsto en feil under avspilling av denne videoen",
@@ -332,6 +335,7 @@
   "Following": "Følger",
   "Following_thread": "Følger tråd",
   "For_your_security_you_must_enter_your_current_password_to_continue": "Av sikkerhetshensyn må du skrive inn kontopassordet for å fortsette.",
+  "Forgot_E2EE_password": "Glemt E2EE-passord?",
   "Forgot_password": "Glemt passordet?",
   "Forgot_password_If_this_email_is_registered": "Hvis denne e-posten er registrert, sender vi instruksjoner om hvordan du tilbakestiller passordet ditt. Hvis du ikke mottar en e-post innen kort tid, vennligst prøv igjen.",
   "Forward": "Videresend melding",
@@ -654,6 +658,7 @@
   "Resend_email": "Send e-post igjen",
   "RESET": "Tilbakestill",
   "Reset": "Tilbakestill",
+  "Reset_E2EE_Password": "Tilbakestill E2EE-passord",
   "Reset_encryption_keys": "Tilbakestill krypteringsnøkler",
   "Reset_encryption_keys_info__room_type__": "Tilbakestilling av E2EE-nøkler anbefales kun hvis ingen {{room_type}}-medlemmer har en gyldig nøkkel for å få tilbake tilgang til det tidligere krypterte innholdet.",
   "Reset_password": "Tilbakestill passord",
diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json
index 4bebaf7f8a2..7cad1bc8128 100644
--- a/app/i18n/locales/pt-BR.json
+++ b/app/i18n/locales/pt-BR.json
@@ -245,6 +245,7 @@
   "Discussions": "Discussões",
   "Display": "Display",
   "Displays_action_text": "Exibe texto da ação",
+  "Do_it_later": "Faça isso mais tarde",
   "Do_you_have_a_certificate": "Você tem um certificado para este workspace?",
   "Do_you_have_an_account": "Você tem uma conta?",
   "Do_you_really_want_to_key_this_room_question_mark": "Você quer realmente {{key}} esta sala?",
@@ -269,6 +270,7 @@
   "E2E_How_It_Works_info2": "Esta é a criptografia *ponta a ponta (E2E)*, portanto, a chave para codificar/decodificar suas mensagens e elas não serão salvas na workspace. Por esse motivo *você precisa armazenar esta senha em algum lugar seguro* que você pode acessar mais tarde se precisar.",
   "E2E_How_It_Works_info3": "Se você continuar, será gerada automaticamente uma senha E2E.",
   "E2E_How_It_Works_info4": "Você também pode configurar uma nova senha para sua chave de criptografia a qualquer momento em qualquer navegador em que tenha inserido a senha E2E existente.",
+  "E2EE_password": "Senha E2EE",
   "Edit": "Editar",
   "Edit_Avatar": "Editar avatar",
   "Edit_Invite": "Editar convite",
@@ -284,6 +286,7 @@
   "Empty": "Vazio",
   "Enable": "Habilitar",
   "Enable_Auto_Translate": "Ativar a tradução automática",
+  "Enable_encryption_button_label": "Habilitar criptografia",
   "Enable_encryption_description": "Garante a privacidade das suas conversas",
   "Enable_encryption_title": "Habilitar criptografia",
   "Enable_Message_Parser": "Habilita analisador de mensagem",
@@ -299,7 +302,7 @@
   "Encryption_error_title": "Senha incorreta",
   "End_to_end_encrypted_room": "Sala criptografada de ponta a ponta",
   "Enter_E2EE_Password": "Digite a senha E2EE",
-  "Enter_E2EE_Password_description": "Para acessar seus canais criptografados e mensagens diretas, insira sua senha de criptografia. Isso não é armazenado no servidor, então você precisará usá-la em cada dispositivo.",
+  "Enter_E2EE_Password_description": "Digite sua senha E2EE para visualizar e enviar mensagens criptografadas.\n\nA senha precisa ser inserida em cada dispositivo.",
   "Enter_the_code": "Insira o código que acabamos de enviar por e-mail.",
   "Error_Download_file": "Erro ao baixar o arquivo",
   "Error_incorrect_password": "Senha incorreta",
@@ -344,6 +347,7 @@
   "Following_thread": "Começou a seguir tópico",
   "Food_and_drink": "Comida e bebida",
   "For_your_security_you_must_enter_your_current_password_to_continue": "Para sua segurança, você deve inserir a senha da sua conta para continuar.",
+  "Forgot_E2EE_password": "Esqueceu a senha de E2EE?",
   "Forgot_password": "Esqueceu sua senha?",
   "Forgot_password_If_this_email_is_registered": "Se este e-mail estiver cadastrado, enviaremos instruções sobre como redefinir sua senha. Se você não receber um e-mail em breve, volte e tente novamente.",
   "Forward": "Encaminhar",
@@ -678,6 +682,7 @@
   "Resend": "Reenviar",
   "Resend_email": "Reenviar e-mail",
   "RESET": "Resetar",
+  "Reset_E2EE_Password": "Redefinir Senha E2EE",
   "Reset_password": "Resetar senha",
   "resetting_password": "redefinindo senha",
   "Resume": "Continuar",
diff --git a/app/i18n/locales/pt-PT.json b/app/i18n/locales/pt-PT.json
index 19d1f2b6e4b..7fe84ee4170 100644
--- a/app/i18n/locales/pt-PT.json
+++ b/app/i18n/locales/pt-PT.json
@@ -135,6 +135,7 @@
   "Discussion_name_required": "Nome da discussão necessário",
   "Discussions": "Discussões",
   "Displays_action_text": "Exibe texto da acção",
+  "Do_it_later": "Faça isso mais tarde",
   "Do_you_have_a_certificate": "Tem um certificado para este espaço de trabalho?",
   "Do_you_have_an_account": "Você tem uma conta?",
   "Do_you_really_want_to_key_this_room_question_mark": "Você quer mesmo {{key}} esta sala?",
@@ -144,6 +145,7 @@
   "E2E_How_It_Works_info2": "Isto é  *criptografia ponto a ponto* portanto a chave para codificar/descodificar as suas mensagens não será salva no servidor. Por essa razão *você precisa armazenar esta senha em algum lugar seguro* que você posa aceder mais tarde, se precisar.",
   "E2E_How_It_Works_info3": "Se você prosseguir, uma senha E2E será gerada automaticamente.",
   "E2E_How_It_Works_info4": "Você também pode configurar uma nova senha para sua chave de criptografia a qualquer momento a partir de qualquer navegador que você tenha inserido a senha existente do E2E.",
+  "E2EE_password": "Palavra-passe E2EE",
   "Edit": "Editar",
   "Edit_Avatar": "Editar avatar",
   "Edit_Invite": "Editar Convite",
@@ -157,6 +159,7 @@
   "Email_required": "Email obrigatório",
   "Emoji_selector": "Seletor de emojis",
   "Enable_Auto_Translate": "Activar Auto-Tradução",
+  "Enable_encryption_button_label": "Ativar encriptação",
   "Encrypted": "Encriptado",
   "Encrypted_message": "Mensagem encriptada",
   "encrypted_room_description": "Insira a sua palavra-passe de encriptação de ponta a ponta para aceder.",
@@ -165,7 +168,7 @@
   "Encryption_error_title": "Palavra-passe incorreta",
   "End_to_end_encrypted_room": "Sala encriptada de ponta a ponta",
   "Enter_E2EE_Password": "Digite a senha E2EE",
-  "Enter_E2EE_Password_description": "Para aceder aos seus canais encriptados e mensagens diretas, introduza a sua palavra-passe de encriptação. Isto não é armazenado no servidor, pelo que terá de o utilizar em cada dispositivo.",
+  "Enter_E2EE_Password_description": "Introduza a sua palavra-passe E2EE para ver e enviar mensagens encriptadas.\n\nA palavra-passe precisa ser introduzida em cada dispositivo.",
   "Error_incorrect_password": "Palavra-passe incorreta",
   "Error_prefix": "Erro: {{message}}",
   "Error_uploading": "Erro ao fazer o envio",
@@ -200,6 +203,7 @@
   "Following_thread": "Seguir discussão",
   "Food_and_drink": "Comida e bebida",
   "For_your_security_you_must_enter_your_current_password_to_continue": "Para sua segurança, deve introduzir a palavra-passe da sua conta para continuar.",
+  "Forgot_E2EE_password": "Esqueceu-se da palavra-passe E2EE?",
   "Forgot_password": "Esquecer palavra-passe",
   "Forgot_password_If_this_email_is_registered": "Se este e-mail estiver registado, enviaremos instruções sobre como repor a sua palavra-passe. Se você não receber um e-mail em breve, volte e tente novamente.",
   "Forward": "Reencaminhar",
@@ -397,6 +401,7 @@
   "Required": "Obrigatório",
   "Resend": "Reenviar",
   "RESET": "Repor",
+  "Reset_E2EE_Password": "Repor Palavra-passe de E2EE",
   "Reset_password": "Repor palavra-passe",
   "resetting_password": "a repor palavra-passe",
   "Review_message": "Rever mensagem",
diff --git a/app/i18n/locales/ru.json b/app/i18n/locales/ru.json
index 42a1ff2ee93..c2638a08d1e 100644
--- a/app/i18n/locales/ru.json
+++ b/app/i18n/locales/ru.json
@@ -196,6 +196,7 @@
   "Discussions": "Обсуждения",
   "Display": "Внешний вид",
   "Displays_action_text": "Показать текст действия",
+  "Do_it_later": "Сделай это позже",
   "Do_you_have_a_certificate": "У вас есть сертификат для этого рабочего пространства?",
   "Do_you_have_an_account": "У вас есть аккаунт?",
   "Do_you_really_want_to_key_this_room_question_mark": "Вы действительно хотите {{key}} этот канал?",
@@ -219,6 +220,7 @@
   "E2E_How_It_Works_info2": "Это *сквозное шифрование*, поэтому ключ для шифрования/расшифровки ваших сообщений не будет сохранен на сервере. Значит *Вам нужно сохранить этот пароль где-то в безопасном месте*, где он будет Вам доступен, если потребуется.",
   "E2E_How_It_Works_info3": "В случаем продолжения, пароль Е2Е будет сгенерирован автоматически.",
   "E2E_How_It_Works_info4": "Так же Вы можете задать новый пароль для вашего ключа шифрования в любое время при помощи браузера там же, где Вы ввели существующий Е2Е пароль.",
+  "E2EE_password": "Пароль E2EE",
   "Edit": "Правка",
   "Edit_Avatar": "Редактировать аватар",
   "Edit_Invite": "Редактировать Приглашение",
@@ -233,6 +235,7 @@
   "Emoji_selector": "Выбор emoji",
   "Empty": "Пусто",
   "Enable_Auto_Translate": "Включить автоперевод",
+  "Enable_encryption_button_label": "Включить шифрование",
   "Enable_Message_Parser": "Включить парсер сообщений",
   "Encrypted": "Зашифрован",
   "Encrypted_message": "Зашифрованное сообщение",
@@ -242,7 +245,7 @@
   "Encryption_error_title": "Неверный пароль",
   "End_to_end_encrypted_room": "Чат со сквозным шифрованием",
   "Enter_E2EE_Password": "Введите E2EE Пароль",
-  "Enter_E2EE_Password_description": "Чтобы получить доступ к вашим зашифрованным каналам и прямым сообщениям, введите свой пароль шифрования. Он не хранится на сервере, поэтому вам нужно будет использовать его на каждом устройстве.",
+  "Enter_E2EE_Password_description": "Введите ваш E2EE пароль, чтобы просматривать и отправлять зашифрованные сообщения.\n\nПароль необходимо вводить на каждом устройстве.",
   "Error_Download_file": "Ошибка при скачивании файла",
   "Error_incorrect_password": "Неверный пароль",
   "Error_prefix": "Ошибка: {{сообщение}}",
@@ -283,6 +286,7 @@
   "Following_thread": "Следить за тредом",
   "Food_and_drink": "Еда и напитки",
   "For_your_security_you_must_enter_your_current_password_to_continue": "Для вашей безопасности вы должны ввести пароль от вашего аккаунта, чтобы продолжить.",
+  "Forgot_E2EE_password": "Забыли пароль E2EE?",
   "Forgot_password": "Забыли пароль",
   "Forgot_password_If_this_email_is_registered": "Если эта электронная почта зарегистрирована, мы отправим инструкции о том, как сбросить пароль. Если вы не получите письмо в ближайшее время, вернитесь и повторите попытку.",
   "Forward": "Перенаправить",
@@ -571,6 +575,7 @@
   "Required": "Обязательно",
   "Resend": "Отправить повторно",
   "RESET": "Сброс",
+  "Reset_E2EE_Password": "Сбросить пароль E2EE",
   "Reset_password": "Сброс пароля",
   "resetting_password": "сброс пароля",
   "Resume": "Возобновить",
diff --git a/app/i18n/locales/sl-SI.json b/app/i18n/locales/sl-SI.json
index c91815a088f..897bd1ed6b4 100644
--- a/app/i18n/locales/sl-SI.json
+++ b/app/i18n/locales/sl-SI.json
@@ -182,6 +182,7 @@
   "Discussions": "Razprave",
   "Display": "Prikaz",
   "Displays_action_text": "Prikaže ukazno besedilo",
+  "Do_it_later": "Naredi kasneje",
   "Do_you_have_a_certificate": "Ali imate certifikat za ta delovni prostor?",
   "Do_you_have_an_account": "Imate račun?",
   "Do_you_really_want_to_key_this_room_question_mark": "Ali res želite {{key}} to sobo?",
@@ -205,6 +206,7 @@
   "E2E_How_It_Works_info2": "To je *šifriranje na obeh straneh* in ključ za kodiranje/dekodiranje sporočil ne bo shranjen na strežniku. Zaradi tega *morate to geslo varno shraniti*, da do njega lahko dostopate kasneje, če boste morda potrebovali.",
   "E2E_How_It_Works_info3": "Če nadaljujete, bo to samodejno ustvarilo geslo E2E.",
   "E2E_How_It_Works_info4": "Novo geslo za šifrirni ključ lahko nastavite tudi kadar koli iz katerega koli brskalnika, ki ste ga vnesli obstoječe geslo E2E.",
+  "E2EE_password": "Geslo E2EE",
   "Edit": "Uredi",
   "Edit_Avatar": "Uredi avatar",
   "Edit_Invite": "Uredi povabilo",
@@ -219,6 +221,7 @@
   "Emoji_selector": "Izbirnik emojijev",
   "Empty": "Prazno",
   "Enable_Auto_Translate": "Omogoči samodejni prenos",
+  "Enable_encryption_button_label": "Omogoči šifriranje",
   "Enable_Message_Parser": "Omogoči razčlenjevalnik sporočil",
   "Encrypted": "Šifrirano",
   "Encrypted_message": "Šifrirano sporočilo",
@@ -228,7 +231,7 @@
   "Encryption_error_title": "Napačno geslo",
   "End_to_end_encrypted_room": "Obojestransko (E2E) šifrirane sobe",
   "Enter_E2EE_Password": "Vnesite geslo E2EE",
-  "Enter_E2EE_Password_description": "Za dostop do vaših šifriranih kanalov in neposrednih sporočil vnesite svoje šifrirno geslo. To ni shranjeno na strežniku, zato ga boste morali uporabljati na vsaki napravi.",
+  "Enter_E2EE_Password_description": "Vnesite svoje geslo E2EE za ogled in pošiljanje šifriranih sporočil.\n\nGeslo je treba vnesti na vsaki napravi.",
   "Error_Download_file": "Napaka med prenosom datoteke",
   "Error_incorrect_password": "Napačno geslo",
   "Error_prefix": "Napaka: {{message}}",
@@ -269,6 +272,7 @@
   "Following_thread": "Naslednja nit",
   "Food_and_drink": "Hrana in pijača",
   "For_your_security_you_must_enter_your_current_password_to_continue": "Zaradi vaše varnosti morate vnesti geslo za svoj račun, da nadaljujete.",
+  "Forgot_E2EE_password": "Ste pozabili geslo za E2EE?",
   "Forgot_password": "Pozabljeno geslo",
   "Forgot_password_If_this_email_is_registered": "Če je ta elektronski naslov registriran, bomo poslali navodila, kako ponastaviti geslo. Če v kratkem ne prejmete e -pošte, se vrnite in poskusite znova.",
   "Forward": "Posreduj",
@@ -552,6 +556,7 @@
   "Required": "Obvezno",
   "Resend": "Ponovno poslati",
   "RESET": "Ponastaviti",
+  "Reset_E2EE_Password": "Ponastavi geslo E2EE",
   "Reset_password": "Ponastavitev gesla",
   "resetting_password": "Ponastavitev gesla",
   "Resume": "Nadaljuj",
diff --git a/app/i18n/locales/sv.json b/app/i18n/locales/sv.json
index bbcf557036a..fb038eae95e 100644
--- a/app/i18n/locales/sv.json
+++ b/app/i18n/locales/sv.json
@@ -204,6 +204,7 @@
   "Discussions": "Diskussioner",
   "Display": "Visa",
   "Displays_action_text": "Visar åtgärdstext",
+  "Do_it_later": "Gör det senare",
   "Do_you_have_a_certificate": "Har du ett certifikat för denna arbetsyta?",
   "Do_you_have_an_account": "Har du ett konto?",
   "Do_you_really_want_to_key_this_room_question_mark": "Vill du verkligen {{key}} rummet?",
@@ -227,6 +228,7 @@
   "E2E_How_It_Works_info2": "Det här görs med *end-to-end-kryptering*, så nyckeln för att koda/avkoda meddelanden sparas inte på servern. Därför *måste du lagra lösenordet på en säker plats* där du kan åtkomma det senare om du behöver.",
   "E2E_How_It_Works_info3": "Om du fortsätter genereras ett E2E-lösenord automatiskt",
   "E2E_How_It_Works_info4": "Du kan när som helst ställa in ett nytt lösenord för krypteringsnyckeln i en webbläsare där du har angett det befintliga E2E-lösenordet.",
+  "E2EE_password": "E2EE-lösenord",
   "Edit": "Redigera",
   "Edit_Avatar": "Redigera avatar",
   "Edit_Invite": "Redigera inbjudan",
@@ -241,6 +243,7 @@
   "Emoji_selector": "Emoji-väljare",
   "Empty": "Tom",
   "Enable_Auto_Translate": "Aktivera automatisk översättning",
+  "Enable_encryption_button_label": "Aktivera kryptering",
   "Enable_Message_Parser": "Aktivera meddelandetolken",
   "Enabled_E2E_Encryption_for_this_room": "aktivera E2E-kryptering för det här rummet",
   "Encrypted": "Krypterat",
@@ -251,7 +254,7 @@
   "Encryption_error_title": "Felaktigt lösenord",
   "End_to_end_encrypted_room": "End-to-end-krypterat rum",
   "Enter_E2EE_Password": "Ange E2EE-lösenord",
-  "Enter_E2EE_Password_description": "För att komma åt dina krypterade kanaler och direkta meddelanden, ange ditt krypteringslösenord. Detta lagras inte på servern, så du måste använda det på varje enhet.",
+  "Enter_E2EE_Password_description": "Ange ditt E2EE-lösenord för att visa och skicka krypterade meddelanden.\n\nLösenordet måste anges på varje enhet.",
   "Error_Download_file": "Fel vid nedladdning av fil",
   "Error_incorrect_password": "Felaktigt lösenord",
   "Error_prefix": "Fel: {{message}}",
@@ -292,6 +295,7 @@
   "Following_thread": "Följer tråd",
   "Food_and_drink": "Mat och dryck",
   "For_your_security_you_must_enter_your_current_password_to_continue": "För din säkerhet måste du ange ditt kontolösenord för att fortsätta.",
+  "Forgot_E2EE_password": "Glömt lösenordet för E2EE?",
   "Forgot_password": "Glömt lösenordet?",
   "Forgot_password_If_this_email_is_registered": "Om e-postadressen är registrerad skickar vi anvisningar för hur du återställer lösenordet. Om du inte får ett e-postmeddelande inom kort får du komma tillbaka och försöka igen.",
   "Forward": "Vidarebefordra",
@@ -583,6 +587,7 @@
   "Required": "Obligatorisk",
   "Resend": "Skicka igen",
   "RESET": "Återställ",
+  "Reset_E2EE_Password": "Återställ E2EE-lösenord",
   "Reset_password": "Återställ lösenordet",
   "resetting_password": "återställer lösenordet",
   "Resume": "Återuppta",
diff --git a/app/i18n/locales/ta-IN.json b/app/i18n/locales/ta-IN.json
index 34dad132dfe..09e4c2e187d 100644
--- a/app/i18n/locales/ta-IN.json
+++ b/app/i18n/locales/ta-IN.json
@@ -224,6 +224,7 @@
   "Discussion_name_required": "அரசடியில் கலந்துரையாடல் பெயர் தேவை",
   "Discussions": "உரையாடல்கள்",
   "Display": "காட்சி",
+  "Do_it_later": "பிறகு செய்யுங்கள்",
   "Do_you_have_a_certificate": "இந்த வேலைத்தளத்திற்கு சான்றிதழ் உண்டா?",
   "Do_you_have_an_account": "உங்களுக்கு ஒரு கணக்கு உள்ளதுஇல்லையா?",
   "Do_you_really_want_to_key_this_room_question_mark": "நீங்கள் உறுதியாகவே {{key}} இந்த அறையை விரும்புகின்றீர்களா?",
@@ -247,6 +248,7 @@
   "E2E_How_It_Works_info2": "இது *என்ட் டு என்ட் என்கிரிப்ஷன்* என்றால் உங்கள் செய்திகளை குறியீடு/திருதிகொள்ள குரல் உடைய மூலம் கொண்டுவரும் மற்றும் அவை பொருத்தப்படாது. அந்த காரணத்தால் *நீங்கள் இந்த கடவுச்சொல்லை எங்களுக்குக் கொண்டுவர வேண்டும்* அந்த பாஸ்வேர்டை பிற நாட்களில் அணுக முடியும்.",
   "E2E_How_It_Works_info3": "நீங்கள் முன்னேற்றமாக இருந்தால், E2E பாஸ்வேர்ட் தானாக உருவாகும்.",
   "E2E_How_It_Works_info4": "நீங்கள் ஏற்கனவே உள்ள E2E பாஸ்வேர்டை உள்ளீடு செய்த உலாவியிலிருந்து எந்த பருவமும் புதிய பாஸ்வேர்டை அமைக்கலாம்.",
+  "E2EE_password": "E2EE கடவுச்சொல்",
   "Edit": "திருத்து",
   "Edit_Avatar": "அவதாரத்தை திருத்து",
   "Edit_Invite": "அழைப்பை திருத்து",
@@ -261,6 +263,7 @@
   "Emoji_selector": "எமோஜி தேர்வாளர்",
   "Empty": "காலி",
   "Enable_Auto_Translate": "தானாக மொழிபெயர்க்க அனுமதிக்கவும்",
+  "Enable_encryption_button_label": "என்க்ரிப்ஷனை இயக்கு",
   "Enable_Message_Parser": "செய்தி பார்சரை இயக்கு",
   "Enable_writing_in_room": "அறையில் எழுதலை இயக்கு",
   "Enabled_E2E_Encryption_for_this_room": "இந்த அறைக்கு E2E குறியீடு செயல்படுத்தப்பட்டுள்ளது",
@@ -272,7 +275,7 @@
   "Encryption_error_title": "தவறான கடவுச்சொல்",
   "End_to_end_encrypted_room": "குறிபாக என்று என்கிரிப்டுக்கப்பட்ட அறை",
   "Enter_E2EE_Password": "E2EE கடவுச்சொல் உள்ளிடவும்",
-  "Enter_E2EE_Password_description": "உங்கள் என்கிரிப்ட் செய்யப்பட்ட சேனல்கள் மற்றும் நேரடி செய்திகளை அணுக, உங்கள் என்கிரிப்ஷன் கடவுச்சொல்லை உள்ளிடவும். இது சர்வரில் சேமிக்கப்படாது, எனவே நீங்கள் ஒவ்வொரு சாதனத்திலும் இதை பயன்படுத்த வேண்டும்.",
+  "Enter_E2EE_Password_description": "உங்கள் கடவுச்சொல்லைப் பதிவு செய்து குறியாக்கச் செய்திகளைப் பார்க்கவும் மற்றும் அனுப்பவும். \n\nஒவ்வொரு சாதனத்திலும் கடவுச்சொல்லை உள்ளிட வேண்டும்.",
   "Error_Download_file": "கோப்பு பதிவிறக்கம் செய்யும் போது பிழை",
   "Error_incorrect_password": "தவறான கடவுச்சொல்",
   "Error_prefix": "பிழை: {{message}}",
@@ -314,6 +317,7 @@
   "Following_thread": "பின்னூட்டம் பின்னுக்குகின்றது",
   "Food_and_drink": "உணவு மற்றும் பானம்",
   "For_your_security_you_must_enter_your_current_password_to_continue": "உங்கள் பாதுகாப்பிற்காக, தொடர்ந்து செல்ல உங்கள் கணக்கு கடவுச்சொல்லை உள்ளிட வேண்டும்.",
+  "Forgot_E2EE_password": "உங்கள் E2EE கடவுச்சொல்லை மறந்துவிட்டீர்களா?",
   "Forgot_password": "உங்கள் கடவுச்சொல்லை மறந்துவிட்டீர்களா?",
   "Forgot_password_If_this_email_is_registered": "இந்த மின்னஞ்சல் பதிவு செய்யப்பட்டிருந்தால், உங்கள் கடவுச்சொல் எப்போது மீள்விக்கப்படும் என்று நிருபருக்கு அறிவித்துக் கொள்ளும். குறிப்பாக ஏதேனும் புதிய மின்னஞ்சல் பெறாதால், மீண்டும் மீண்டும் வருகின்று முயற்சிக்கவும்.",
   "Forward": "முன்னேற்று",
@@ -621,6 +625,7 @@
   "Required": "தேவையானது",
   "Resend": "மீண்டும் அனுப்பு",
   "RESET": "மீளமை",
+  "Reset_E2EE_Password": "E2EE கடவுச்சொல்லை மீட்டமை",
   "Reset_password": "கடவுச்சொல் மீளமைக்க",
   "resetting_password": "கடவுச்சொல் மீளமைக்கப்படுகின்றது",
   "Resume": "மீட்கவும்",
diff --git a/app/i18n/locales/te-IN.json b/app/i18n/locales/te-IN.json
index fe8d6c578ce..22ba313c28f 100644
--- a/app/i18n/locales/te-IN.json
+++ b/app/i18n/locales/te-IN.json
@@ -223,6 +223,7 @@
   "Discussion_name_required": "चर्चा के लिए नाम आवश्यक है।",
   "Discussions": "చర్చలు",
   "Display": "ప్రదర్శించు",
+  "Do_it_later": "తర్వాత చెయ్యి",
   "Do_you_have_a_certificate": "ఈ వర్క్‌స్పేస్‌కు సర్టిఫికేట్ ఉందా?",
   "Do_you_have_an_account": "మీకు ఖాతా ఉందా?",
   "Do_you_really_want_to_key_this_room_question_mark": "మీరు ఖచ్చితంగా {{key}} ఈ కొరకుని తెచ్చాలా?",
@@ -246,6 +247,7 @@
   "E2E_How_It_Works_info2": "ఇది * ఎండ్ టు ఎండ్ ఎన్క్రిప్షన్ * కాదా, మీ సందేశాలను ఎన్కోడ్ / డీకోడ్ చేయడానికి కీలు అని ఉండదు. ఈ కారణంతో * మీరు ఇక్కడికి ఉపయోగించే మూలం ఇప్పటివరకు ప్రదానించిపెట్టబడదు.",
   "E2E_How_It_Works_info3": "మీరు ముందు నడుపదిని కొత్తగా ఉంచవచ్చు, అది స్వయంగా ఒక E2E పాస్‌వర్డ్ యాటోమేటిక్‌గా సృష్టించబడుతుంది.",
   "E2E_How_It_Works_info4": "మీరు అనుమతి పొందకపోతే, మీరు ప్రస్తుతం ఉపయోగించిన E2E పాస్‌వర్డ్ నుండి ఎంక్రిప్షన్ కీకి కొత్త పాస్‌వర్డ్ సెట్ చేయవచ్చు.",
+  "E2EE_password": "E2EE పాస్వర్డ్",
   "Edit": "సవరించు",
   "Edit_Avatar": "अवतार संपादित करें",
   "Edit_Invite": "ఆహ్వానాన్ని సవరించు",
@@ -260,6 +262,7 @@
   "Emoji_selector": "इमोजी चयनकर्ता",
   "Empty": "ఖాళీ",
   "Enable_Auto_Translate": "స్వయం-అనువదించడం అనుమతించండి",
+  "Enable_encryption_button_label": "గూఢీకరణను ప్రారంభించు",
   "Enable_Message_Parser": "సందేశ పార్సర్‌ను సక్రియం చేయండి",
   "Enable_writing_in_room": "{{roomName}}లో రచన అనుమతించండి",
   "Enabled_E2E_Encryption_for_this_room": "ఈ రూమ్‌కు E2E ఎన్క్రిప్షన్ ప్రారంభించబడింది",
@@ -271,7 +274,7 @@
   "Encryption_error_title": "गलत पासवर्ड",
   "End_to_end_encrypted_room": "ఎండ్ టు ఎండ్ ఎన్క్రిప్టెడ్ రూం",
   "Enter_E2EE_Password": "E2EE పాస్‌వర్డ్ నమోదు చేయండి",
-  "Enter_E2EE_Password_description": "మీ ఎన్క్రిప్టెడ్ ఛానెల్స్ మరియు డైరెక్ట్ మెసేజెస్‌ను యాక్సెస్ చేయడానికి, మీ ఎన్క్రిప్షన్ పాస్‌వర్డ్‌ను నమోదు చేయండి. ఇది సర్వర్‌లో నిల్వ చేయబడదు, కాబట్టి మీరు ప్రతి పరికరంపై దీనిని ఉపయోగించాలి.",
+  "Enter_E2EE_Password_description": "ఎన్‌క్రిప్ట్ చేయబడిన సందేశాలను వీక్షించడానికి మరియు పంపడానికి మీ {{E2EE}} పాస్‌వర్డ్‌ని నమోదు చెయ్యండి.\n\nప్రతీ పరికరంలో పాస్‌వర్డ్‌ని నమోదు చేయాల్సి ఉంటుంది.",
   "Error_Download_file": "ఫైల్ డౌన్‌లోడ్ చేస్తున్నప్పుడు తప్పిబాటు",
   "Error_incorrect_password": "गलत पासवर्ड",
   "Error_prefix": "त्रुटि: {{संदेश}}",
@@ -313,6 +316,7 @@
   "Following_thread": "అనుసరించుకోవడానికి థ్రెడ్",
   "Food_and_drink": "भोजन और पेय",
   "For_your_security_you_must_enter_your_current_password_to_continue": "आपकी सुरक्षा के लिए, जारी रखने के लिए आपको अपने खाते का पासवर्ड दर्ज करना होगा।",
+  "Forgot_E2EE_password": "E2EE పాస్‌వర్డ్ మర్చిపోయారా?",
   "Forgot_password": "మీ పాస్‌వర్డ్ మరచిపోయారా?",
   "Forgot_password_If_this_email_is_registered": "ఈ ఇ-మెయిల్ నమోదు చేసినట్లు, మేము మీ పాస్‌వర్డ్‌ను రీసెట్ చేయడానికి సూచనలు పంపబడిపోతాము. మీరు చాలా తక్కువగా ఒక ఇ-మెయిల్ లభిస్తే, దయచేసి మరియువకాయ ప్రయాసించండి.",
   "Forward": "అగ్రగామించండి",
@@ -620,6 +624,7 @@
   "Required": "అవసరమైనది",
   "Resend": "మళ్ళీ పంపించు",
   "RESET": "రీసెట్",
+  "Reset_E2EE_Password": "E2EE పాస్‌వర్డ్‌ను పునస్ధాపించండి",
   "Reset_password": "పాస్‌వర్డ్ను రీసెట్ చేయండి",
   "resetting_password": "పాస్‌వర్డ్ను రీసెట్ చేస్తోంది",
   "Resume": "క్రింద పోవడానికి",
diff --git a/app/i18n/locales/tr.json b/app/i18n/locales/tr.json
index 301918ac80c..8d37339011d 100644
--- a/app/i18n/locales/tr.json
+++ b/app/i18n/locales/tr.json
@@ -140,6 +140,7 @@
   "Discussion_name_required": "Tartışma adı gerekli",
   "Discussions": "Tartışmalar",
   "Displays_action_text": "Görüntüler aksiyon metni",
+  "Do_it_later": "Daha sonra yap",
   "Do_you_have_a_certificate": "Bu çalışma alanı için bir sertifikanız var mı?",
   "Do_you_have_an_account": "Hesabın var mı?",
   "Do_you_really_want_to_key_this_room_question_mark": "Bu odayı gerçekten {{key}} istiyor musun?",
@@ -162,6 +163,7 @@
   "E2E_How_It_Works_info2": "Bu, *Uçtan Uca Şifreleme'dir (E2E)*, böylece iletilerinizi şifrelemek / çözmek için anahtar ve bunlar sunucuya kaydedilmez. Bu nedenle *bu şifreyi daha sonra ihtiyaç duyduğunuzda erişebileceğiniz güvenli bir yerde* saklamanız gerekir.",
   "E2E_How_It_Works_info3": "Devam ederseniz, otomatik olarak bir Uçtan Uca Şifreleme (E2E) şifresi oluşturulacaktır.",
   "E2E_How_It_Works_info4": "Mevcut Uçtan Uca Şifreleme (E2E) şifresini, herhangi bir tarayıcıdan istediğiniz zaman girdiğiniz şifreleme anahtarınız için yeni bir şifre de ayarlayabilirsiniz.",
+  "E2EE_password": "E2EE şifresi",
   "Edit": "Düzenle",
   "Edit_Avatar": "Avatarı düzenle",
   "Edit_Invite": "Daveti Düzenle",
@@ -175,6 +177,7 @@
   "Email_required": "E-posta gerekli",
   "Emoji_selector": "Emoji seçici",
   "Enable_Auto_Translate": "Otomatik Çeviriyi Etkinleştir",
+  "Enable_encryption_button_label": "Şifrelemeyi etkinleştir",
   "Encrypted": "Şifreli",
   "Encrypted_message": "Şifreli ileti",
   "encrypted_room_description": "Erişmek için uçtan uca şifreleme şifrenizi girin.",
@@ -183,7 +186,7 @@
   "Encryption_error_title": "Yanlış parola",
   "End_to_end_encrypted_room": "Uçtan uca şifreli oda",
   "Enter_E2EE_Password": "E2EE Şifresini Girin",
-  "Enter_E2EE_Password_description": "Şifreli kanallarınıza ve doğrudan mesajlarınıza erişmek için şifreleme şifrenizi girin. Bu, sunucuda saklanmaz, bu nedenle her cihazda kullanmanız gerekir.",
+  "Enter_E2EE_Password_description": "Şifreli mesajları görüntülemek ve göndermek için E2EE şifrenizi girin.\n\nHer cihazda şifre girişi yapılmalıdır.",
   "Error_incorrect_password": "Yanlış parola",
   "Error_prefix": "Hata: {{message}}",
   "Error_uploading": "Yükleme hatası",
@@ -218,6 +221,7 @@
   "Following_thread": "Konu takip ediliyor",
   "Food_and_drink": "Yiyecek ve içecek",
   "For_your_security_you_must_enter_your_current_password_to_continue": "Güvenliğiniz için devam etmek üzere hesap şifrenizi girmeniz gerekmektedir.",
+  "Forgot_E2EE_password": "E2EE şifresini mi unuttunuz?",
   "Forgot_password": "Parolanızı mı unuttunuz?",
   "Forgot_password_If_this_email_is_registered": "Bu e-posta kayıtlıysa, şifrenizi nasıl sıfırlayacağınıza dair talimatlar göndereceğiz. Kısa süre içinde bir e-posta almazsanız, lütfen geri gelin ve tekrar deneyin.",
   "Forward": "İlet",
@@ -454,6 +458,7 @@
   "Required": "Gerekli",
   "Resend": "Yeniden yolla",
   "RESET": "Sifirla",
+  "Reset_E2EE_Password": "E2EE Şifresini Sıfırla",
   "Reset_password": "Şifre sıfırla",
   "resetting_password": "şifre sıfırlanıyor",
   "Review_app_desc": "{{store}} üzerinde bize 5 yıldız verin",
diff --git a/app/i18n/locales/zh-CN.json b/app/i18n/locales/zh-CN.json
index a8cf20156b4..140c12cee26 100644
--- a/app/i18n/locales/zh-CN.json
+++ b/app/i18n/locales/zh-CN.json
@@ -136,6 +136,7 @@
   "Discussion_name": "讨论区名称",
   "Discussion_name_required": "需要讨论名称",
   "Discussions": "讨论区",
+  "Do_it_later": "稍后再做",
   "Do_you_have_a_certificate": "您有此工作区的证书吗？",
   "Do_you_have_an_account": "是否拥有帐号?",
   "Do_you_really_want_to_key_this_room_question_mark": "您真的想要{{key}}这个聊天室吗?",
@@ -158,6 +159,7 @@
   "E2E_How_It_Works_info2": "这是點對點加密，因此编码/解码邮件的密钥不会保存在服务器上。因此，您需要将密码存储在安全的地方。您需要在希望使用點對點加密的其他设备上输入。",
   "E2E_How_It_Works_info3": "如果继续，将自动生成一组 E2E 密码",
   "E2E_How_It_Works_info4": "您也可以随时从已输入既有密码的任何浏览器设定新密码给您的加密金钥。",
+  "E2EE_password": "E2EE 密码",
   "Edit": "编辑",
   "Edit_Avatar": "编辑头像",
   "Edit_Invite": "编辑邀请",
@@ -171,6 +173,7 @@
   "Email_required": "需要电子邮件地址",
   "Emoji_selector": "表情符号选择器",
   "Enable_Auto_Translate": "开启自动翻译",
+  "Enable_encryption_button_label": "启用加密",
   "Encrypted": "已加密",
   "Encrypted_message": "加密信息",
   "encrypted_room_description": "输入您的端到端加密密码以访问。",
@@ -179,7 +182,7 @@
   "Encryption_error_title": "密码错误",
   "End_to_end_encrypted_room": "E2E 加密聊天室",
   "Enter_E2EE_Password": "输入 E2EE 密码",
-  "Enter_E2EE_Password_description": "要访问您的加密频道和直接消息，请输入您的加密密码。这不会存储在服务器上，因此您需要在每个设备上使用它。",
+  "Enter_E2EE_Password_description": "输入您的E2EE密码以查看和发送加密消息。\n\n每台设备都需要输入密码。",
   "Error_incorrect_password": "密码错误",
   "Error_prefix": "错误：{{message}}",
   "Error_uploading": "错误上传",
@@ -214,6 +217,7 @@
   "Following_thread": "追踪的讨论串",
   "Food_and_drink": "食品和饮料",
   "For_your_security_you_must_enter_your_current_password_to_continue": "为了您的安全，您必须输入您的账户密码才能继续。",
+  "Forgot_E2EE_password": "忘记 E2EE 密码？",
   "Forgot_password": "忘记密码",
   "Forgot_password_If_this_email_is_registered": "如果这邮箱已注册，我们将发送如何重置密码的说明。如果您没有在短时间内收到电子邮件，请再试一次。",
   "Forward": "转发",
@@ -435,6 +439,7 @@
   "Required": "必填",
   "Resend": "重新发送",
   "RESET": "重置",
+  "Reset_E2EE_Password": "重置 E2EE 密码",
   "Reset_password": "重置密码",
   "resetting_password": "正在重置密码",
   "Review_app_desc": "请在 {{store}} 给予我们 5 星好评",
diff --git a/app/i18n/locales/zh-TW.json b/app/i18n/locales/zh-TW.json
index 1a202782ebf..c7e1cb02dc3 100644
--- a/app/i18n/locales/zh-TW.json
+++ b/app/i18n/locales/zh-TW.json
@@ -142,6 +142,7 @@
   "Discussion_name_required": "需要討論名稱",
   "Discussions": "討論區",
   "Displays_action_text": "顯示文字行動",
+  "Do_it_later": "稍後再做",
   "Do_you_have_a_certificate": "您有此工作區的證書嗎？",
   "Do_you_have_an_account": "是否擁有帳號?",
   "Do_you_really_want_to_key_this_room_question_mark": "您真的想要{{key}}這個聊天室嗎?",
@@ -164,6 +165,7 @@
   "E2E_How_It_Works_info2": "這是*點對點的加密*，所以用來加密/解密的金鑰將不會儲存到伺服器上。為此，*您必須安全存放您的密碼*。如果您希望在其他裝置上使用對點加密時，會需要輸入此密碼。",
   "E2E_How_It_Works_info3": "如果繼續，將自動產生一組 E2E 密碼",
   "E2E_How_It_Works_info4": "您也可以隨時從已輸入既有密碼的任何瀏覽器設定新密碼給您的加密金鑰。",
+  "E2EE_password": "E2EE 密碼",
   "Edit": "編輯",
   "Edit_Avatar": "編輯頭像",
   "Edit_Invite": "編輯邀請",
@@ -177,6 +179,7 @@
   "Email_required": "需要電子郵件地址",
   "Emoji_selector": "表情符號選擇器",
   "Enable_Auto_Translate": "開啟自動翻譯",
+  "Enable_encryption_button_label": "啟用加密",
   "Encrypted": "已加密",
   "Encrypted_message": "加密訊息",
   "encrypted_room_description": "輸入您的端對端加密密碼以存取。",
@@ -185,7 +188,7 @@
   "Encryption_error_title": "密碼錯誤",
   "End_to_end_encrypted_room": "E2E 加密聊天室",
   "Enter_E2EE_Password": "輸入 E2EE 密碼",
-  "Enter_E2EE_Password_description": "要存取您的加密頻道和直接訊息，請輸入您的加密密碼。這不會儲存在伺服器上，因此您需要在每個裝置上使用它。",
+  "Enter_E2EE_Password_description": "輸入您的E2EE密碼以查看和發送加密訊息。\n\n每個設備都需要輸入密碼。",
   "Error_incorrect_password": "密碼錯誤",
   "Error_prefix": "錯誤：{{message}}",
   "Error_uploading": "錯誤上傳",
@@ -222,6 +225,7 @@
   "Following_thread": "追蹤的討論串",
   "Food_and_drink": "食物和飲料",
   "For_your_security_you_must_enter_your_current_password_to_continue": "為了您的安全，您必須輸入您的帳戶密碼以繼續。",
+  "Forgot_E2EE_password": "忘記 E2EE 密碼？",
   "Forgot_password": "忘記密碼",
   "Forgot_password_If_this_email_is_registered": "如果此電子郵件已註冊，我們將發送有關如何重設密碼的說明。如果您未在短時間內收到電子郵件，請再試一次。",
   "Forward": "轉發",
@@ -453,6 +457,7 @@
   "Required": "必填",
   "Resend": "重新發送",
   "RESET": "重置",
+  "Reset_E2EE_Password": "重設 E2EE 密碼",
   "Reset_password": "重置密碼",
   "resetting_password": "正在重置密碼",
   "Review_app_desc": "請在 {{store}} 給予我們 5 星好評",

From 5028210bdddd2f7de3181ab0bead747fb15653fd Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Mon, 15 Sep 2025 18:24:50 -0300
Subject: [PATCH 3/8] chore: E2EE password flow test

---
 .../E2EEncryption/enter-e2ee-encryption.yaml  | 114 ++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 .maestro/tests/E2EEncryption/enter-e2ee-encryption.yaml

diff --git a/.maestro/tests/E2EEncryption/enter-e2ee-encryption.yaml b/.maestro/tests/E2EEncryption/enter-e2ee-encryption.yaml
new file mode 100644
index 00000000000..522958423b6
--- /dev/null
+++ b/.maestro/tests/E2EEncryption/enter-e2ee-encryption.yaml
@@ -0,0 +1,114 @@
+appId: chat.rocket.reactnative
+name: Enter E2EE encryption
+onFlowStart:
+  - runFlow: '../../helpers/setup.yaml'
+onFlowEnd:
+  - evalScript: ${output.utils.deleteCreatedUsers()}
+
+---
+# Reset E2E password from settings
+- runFlow: ../../helpers/launch-app.yaml
+- runFlow: ../../helpers/login.yaml
+- tapOn: 'Menu'
+- tapOn: 'Settings'
+- tapOn: 'Security and privacy'
+- tapOn: 'End-to-end encryption'
+- tapOn:
+    id: 'e2e-encryption-security-view-password'
+- inputText: 'password123encrypted'
+- tapOn: 'Save changes'
+- tapOn: 'Yes, change it'
+- extendedWaitUntil:
+    visible:
+      text: 'E2E key password changed successfully!'
+    timeout: 60000
+
+# Enter E2EE password
+- tapOn:
+    id: custom-header-back
+- tapOn:
+    id: custom-header-back
+- tapOn: Menu
+- tapOn: Chats
+- runFlow: '../../helpers/logout.yaml'
+- runFlow: '../../helpers/navigate-to-login.yaml'
+- tapOn:
+    id: login-view-email
+- inputText: ${USERNAME || output.createdUser.email}
+- tapOn:
+    text: '.*Username or email.*'
+- tapOn:
+    id: login-view-password
+- inputText: ${PASSWORD || output.createdUser.password}
+- tapOn:
+    text: Login
+    index: 0
+- tapOn:
+    id: login-view-submit
+- extendedWaitUntil:
+    visible:
+      id: rooms-list-view
+    timeout: 60000
+- tapOn: 'Enter E2EE password'
+- tapOn:
+    id: 'e2e-enter-your-password-view-password'
+- inputText: 'password123encrypted'
+- tapOn: 'Enable encryption'
+- extendedWaitUntil:
+    visible:
+      id: rooms-list-view
+    timeout: 60000
+- extendedWaitUntil:
+    notVisible:
+      text: 'Enter E2EE password'
+    timeout: 60000
+
+# Reset E2EE password from Enter E2EE password view
+- tapOn: 'Menu'
+- tapOn: 'Settings'
+- tapOn: 'Security and privacy'
+- tapOn: 'End-to-end encryption'
+- tapOn:
+    id: 'e2e-encryption-security-view-password'
+- inputText: 'password123encrypted'
+- tapOn: 'Save changes'
+- tapOn: 'Yes, change it'
+- extendedWaitUntil:
+    visible:
+      text: 'E2E key password changed successfully!'
+    timeout: 60000
+- tapOn:
+    id: custom-header-back
+- tapOn:
+    id: custom-header-back
+- tapOn: Menu
+- tapOn: Chats
+- runFlow: '../../helpers/logout.yaml'
+- runFlow: '../../helpers/navigate-to-login.yaml'
+- tapOn:
+    id: login-view-email
+- inputText: ${USERNAME || output.createdUser.email}
+- tapOn:
+    text: '.*Username or email.*'
+- tapOn:
+    id: login-view-password
+- inputText: ${PASSWORD || output.createdUser.password}
+- tapOn:
+    text: Login
+    index: 0
+- tapOn:
+    id: login-view-submit
+- extendedWaitUntil:
+    visible:
+      id: rooms-list-view
+    timeout: 60000
+- tapOn: 'Enter E2EE password'
+- tapOn:
+    id: 'e2e-enter-your-password-view-forgot-password'
+- tapOn:
+    text: 'Reset E2EE password'
+#- tapOn: 'Enter E2EE password'
+#- tapOn: 'Forgot E2EE password?'
+#- tapOn:
+#    id: 'e2e-reset-your-password-view-reset-password'
+#- tapOn: 'Yes, reset it'

From 11d4a2f5132e0d6175ea6fec21b1e911003e9801 Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Fri, 19 Sep 2025 18:04:47 -0300
Subject: [PATCH 4/8] chore: code improvements

---
 .../E2EEncryption/enter-e2ee-encryption.yaml   |  5 -----
 app/i18n/locales/pt-PT.json                    | 18 +++++++++---------
 app/i18n/locales/te-IN.json                    |  2 +-
 app/views/E2EResetYourPasswordView.tsx         |  4 ++--
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/.maestro/tests/E2EEncryption/enter-e2ee-encryption.yaml b/.maestro/tests/E2EEncryption/enter-e2ee-encryption.yaml
index 522958423b6..07755709e3b 100644
--- a/.maestro/tests/E2EEncryption/enter-e2ee-encryption.yaml
+++ b/.maestro/tests/E2EEncryption/enter-e2ee-encryption.yaml
@@ -107,8 +107,3 @@ onFlowEnd:
     id: 'e2e-enter-your-password-view-forgot-password'
 - tapOn:
     text: 'Reset E2EE password'
-#- tapOn: 'Enter E2EE password'
-#- tapOn: 'Forgot E2EE password?'
-#- tapOn:
-#    id: 'e2e-reset-your-password-view-reset-password'
-#- tapOn: 'Yes, reset it'
diff --git a/app/i18n/locales/pt-PT.json b/app/i18n/locales/pt-PT.json
index 7fe84ee4170..ecb841d7022 100644
--- a/app/i18n/locales/pt-PT.json
+++ b/app/i18n/locales/pt-PT.json
@@ -82,12 +82,12 @@
   "Clear_cache_loading": "A limpar a cache.",
   "Click_to_join": "Clique para Entrar!",
   "Close": "Fechar",
-  "Code_or_password_invalid": "Código ou senha inválidos",
+  "Code_or_password_invalid": "Código ou palavra-passe inválidos",
   "Code_required": "Código necessário",
   "Collaborative": "Colaborativa",
   "Confirm": "Confirmar",
   "Confirm_password": "Confirmar palavra-passe",
-  "Confirm_Password": "Confirme sua senha",
+  "Confirm_Password": "Confirme sua palavra-passe",
   "Connect": "Ligar",
   "Connect_to_server_as_user": "Ligar a {{serverUrl}} como {{user}}",
   "Connecting": "A ligar...",
@@ -142,9 +142,9 @@
   "Dont_Have_An_Account": "Não tem uma conta?",
   "E2E_Encryption": "Encriptação E2E",
   "E2E_How_It_Works_info1": "Agora você pode criar grupos privados criptografados e mensagens diretas. Você também pode alterar grupos privados existentes ou DMs para criptografados.",
-  "E2E_How_It_Works_info2": "Isto é  *criptografia ponto a ponto* portanto a chave para codificar/descodificar as suas mensagens não será salva no servidor. Por essa razão *você precisa armazenar esta senha em algum lugar seguro* que você posa aceder mais tarde, se precisar.",
-  "E2E_How_It_Works_info3": "Se você prosseguir, uma senha E2E será gerada automaticamente.",
-  "E2E_How_It_Works_info4": "Você também pode configurar uma nova senha para sua chave de criptografia a qualquer momento a partir de qualquer navegador que você tenha inserido a senha existente do E2E.",
+  "E2E_How_It_Works_info2": "Isto é  *criptografia ponto a ponto* portanto a chave para codificar/descodificar as suas mensagens não será salva no servidor. Por essa razão *você precisa armazenar esta palavra-passe em algum lugar seguro* que você posa aceder mais tarde, se precisar.",
+  "E2E_How_It_Works_info3": "Se você prosseguir, uma palavra-passe E2E será gerada automaticamente.",
+  "E2E_How_It_Works_info4": "Você também pode configurar uma nova palavra-passe para sua chave de criptografia a qualquer momento a partir de qualquer navegador que você tenha inserido a palavra-passe existente do E2E.",
   "E2EE_password": "Palavra-passe E2EE",
   "Edit": "Editar",
   "Edit_Avatar": "Editar avatar",
@@ -167,7 +167,7 @@
   "Encryption_error_desc": "Não foi possível descodificar a sua chave de encriptação.",
   "Encryption_error_title": "Palavra-passe incorreta",
   "End_to_end_encrypted_room": "Sala encriptada de ponta a ponta",
-  "Enter_E2EE_Password": "Digite a senha E2EE",
+  "Enter_E2EE_Password": "Digite a palavra-passe E2EE",
   "Enter_E2EE_Password_description": "Introduza a sua palavra-passe E2EE para ver e enviar mensagens encriptadas.\n\nA palavra-passe precisa ser introduzida em cada dispositivo.",
   "Error_incorrect_password": "Palavra-passe incorreta",
   "Error_prefix": "Erro: {{message}}",
@@ -223,7 +223,7 @@
   "Hide_System_Messages": "Esconder mensagens do sistema",
   "Hide_type_messages": "Esconder mensagens \"{{type}}\"",
   "How_It_Works": "Como Funciona",
-  "I_Saved_My_E2E_Password": "Guardei a minha senha E2E",
+  "I_Saved_My_E2E_Password": "Guardei a minha palavra-passe E2E",
   "In_app": "Na aplicação",
   "In_App_And_Desktop": "Na aplicação e área de trabalho",
   "In_App_and_Desktop_Alert_info": "Exibe um banner no topo da tela quando a aplicação está aberto, e exibe uma notificação na área de trabalho",
@@ -486,7 +486,7 @@
   "Username_or_email": "Nome de utilizador ou e-mail",
   "Username_required": "Nome de utilizador necessário",
   "View_Thread": "Exibir thread",
-  "Whats_the_password_for_your_certificate": "Qual é a senha para o seu certificado?",
+  "Whats_the_password_for_your_certificate": "Qual é a palavra-passe para o seu certificado?",
   "Workspace_URL": "URL do espaço de trabalho",
   "Workspace_URL_Example": "open.rocket.chat",
   "Yes_action_it": "Sim, {{action}}!",
@@ -499,5 +499,5 @@
   "You_dont_have_account": "Não tem uma conta?",
   "you_were_mentioned": "você foi mencionado",
   "You_will_not_be_able_to_recover_this_message": "Você será incapaz de recuperar esta mensagem!",
-  "Your_Password_Must_Have": "Sua senha deve ter:"
+  "Your_Password_Must_Have": "Sua palavra-passe deve ter:"
 }
\ No newline at end of file
diff --git a/app/i18n/locales/te-IN.json b/app/i18n/locales/te-IN.json
index 22ba313c28f..a308f26cfa5 100644
--- a/app/i18n/locales/te-IN.json
+++ b/app/i18n/locales/te-IN.json
@@ -274,7 +274,7 @@
   "Encryption_error_title": "गलत पासवर्ड",
   "End_to_end_encrypted_room": "ఎండ్ టు ఎండ్ ఎన్క్రిప్టెడ్ రూం",
   "Enter_E2EE_Password": "E2EE పాస్‌వర్డ్ నమోదు చేయండి",
-  "Enter_E2EE_Password_description": "ఎన్‌క్రిప్ట్ చేయబడిన సందేశాలను వీక్షించడానికి మరియు పంపడానికి మీ {{E2EE}} పాస్‌వర్డ్‌ని నమోదు చెయ్యండి.\n\nప్రతీ పరికరంలో పాస్‌వర్డ్‌ని నమోదు చేయాల్సి ఉంటుంది.",
+  "Enter_E2EE_Password_description": "ఎన్‌క్రిప్ట్ చేయబడిన సందేశాలను వీక్షించడానికి మరియు పంపడానికి మీ E2EE పాస్‌వర్డ్‌ని నమోదు చెయ్యండి.\n\nప్రతీ పరికరంలో పాస్‌వర్డ్‌ని నమోదు చేయాల్సి ఉంటుంది.",
   "Error_Download_file": "ఫైల్ డౌన్‌లోడ్ చేస్తున్నప్పుడు తప్పిబాటు",
   "Error_incorrect_password": "गलत पासवर्ड",
   "Error_prefix": "त्रुटि: {{संदेश}}",
diff --git a/app/views/E2EResetYourPasswordView.tsx b/app/views/E2EResetYourPasswordView.tsx
index e0ecf9b5b87..36452aea0d8 100644
--- a/app/views/E2EResetYourPasswordView.tsx
+++ b/app/views/E2EResetYourPasswordView.tsx
@@ -75,7 +75,7 @@ const E2EResetYourPasswordView = ({ navigation }: IE2EResetYourPasswordView): Re
 				{...scrollPersistTaps}
 				style={sharedStyles.container}
 				contentContainerStyle={{ ...sharedStyles.containerScrollView }}>
-				<SafeAreaView style={{ ...styles.content, backgroundColor: colors.surfaceRoom }} testID='e2e-enter-your-password-view'>
+				<SafeAreaView style={{ ...styles.content, backgroundColor: colors.surfaceRoom }} testID='e2e-reset-your-password-view'>
 					<Text style={[styles.info, { color: colors.fontDefault }]}>{I18n.t('Enter_E2EE_Password_description')}</Text>
 
 					<View>
@@ -84,7 +84,7 @@ const E2EResetYourPasswordView = ({ navigation }: IE2EResetYourPasswordView): Re
 							title={I18n.t('Reset_E2EE_Password')}
 							testID='e2e-reset-your-password-view-reset-password'
 						/>
-						<Button type='secondary' onPress={cancel} title={I18n.t('Cancel')} testID='e2e-enter-your-password-view-cancel' />
+						<Button type='secondary' onPress={cancel} title={I18n.t('Cancel')} testID='e2e-reset-your-password-view-cancel' />
 					</View>
 				</SafeAreaView>
 			</ScrollView>

From 278a308c8b3fd355e787251875444c5f218bd494 Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Fri, 19 Sep 2025 18:51:14 -0300
Subject: [PATCH 5/8] feat: finished e2e tests

---
 .../E2EEncryption/enter-e2ee-encryption.yaml  | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/.maestro/tests/E2EEncryption/enter-e2ee-encryption.yaml b/.maestro/tests/E2EEncryption/enter-e2ee-encryption.yaml
index 07755709e3b..38732fdac1a 100644
--- a/.maestro/tests/E2EEncryption/enter-e2ee-encryption.yaml
+++ b/.maestro/tests/E2EEncryption/enter-e2ee-encryption.yaml
@@ -97,13 +97,36 @@ onFlowEnd:
     text: Login
     index: 0
 - tapOn:
-    id: login-view-submit
+    id: 'login-view-submit'
 - extendedWaitUntil:
     visible:
-      id: rooms-list-view
+      id: 'rooms-list-view'
     timeout: 60000
 - tapOn: 'Enter E2EE password'
 - tapOn:
     id: 'e2e-enter-your-password-view-forgot-password'
 - tapOn:
     text: 'Reset E2EE password'
+- tapOn:
+    id: e2e-reset-your-password-view-reset-password
+- tapOn: 'Yes, reset it'
+- assertVisible: 'Add workspace'
+- runFlow: '../../helpers/navigate-to-login.yaml'
+- tapOn:
+    id: login-view-email
+- inputText: ${USERNAME || output.createdUser.email}
+- tapOn:
+    text: '.*Username or email.*'
+- tapOn:
+    id: 'login-view-password'
+- inputText: ${PASSWORD || output.createdUser.password}
+- tapOn:
+    text: 'Login'
+    index: 0
+- tapOn:
+    id: 'login-view-submit'
+- extendedWaitUntil:
+    visible:
+      id: 'rooms-list-view'
+    timeout: 60000
+- assertVisible: 'Save your encryption password'

From 1686600d37affba9cf234ff5e36488b4988c172f Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Thu, 25 Sep 2025 17:29:21 -0300
Subject: [PATCH 6/8] fix: encryption disabled toast

---
 app/views/E2EEnterYourPasswordView.tsx | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/views/E2EEnterYourPasswordView.tsx b/app/views/E2EEnterYourPasswordView.tsx
index 6e44a0e8640..40d970ed1c3 100644
--- a/app/views/E2EEnterYourPasswordView.tsx
+++ b/app/views/E2EEnterYourPasswordView.tsx
@@ -1,5 +1,5 @@
-import { useIsFocused } from '@react-navigation/native';
-import React, { useEffect, useLayoutEffect, useRef } from 'react';
+import { useFocusEffect } from '@react-navigation/native';
+import React, { useCallback, useEffect, useLayoutEffect, useRef } from 'react';
 import { ScrollView, StyleSheet, Text, AccessibilityInfo, View } from 'react-native';
 import { useDispatch } from 'react-redux';
 import { useForm } from 'react-hook-form';
@@ -46,7 +46,6 @@ interface IE2EEnterYourPasswordView {
 
 const E2EEnterYourPasswordView = ({ navigation }: IE2EEnterYourPasswordView): React.ReactElement => {
 	const { colors } = useTheme();
-	const isFocused = useIsFocused();
 	const dispatch = useDispatch();
 	const { enabled: encryptionEnabled, failure: encryptionFailure } = useAppSelector(state => state.encryption);
 	const prevEncryptionFailure = useRef<boolean>(encryptionFailure);
@@ -81,9 +80,18 @@ const E2EEnterYourPasswordView = ({ navigation }: IE2EEnterYourPasswordView): Re
 	}
 
 	// If screen is closed and e2ee is still disabled, warns the user via toast
-	if (!isFocused && !encryptionEnabled) {
-		showToast(I18n.t('e2ee_disabled'));
-	}
+	useFocusEffect(
+		useCallback(
+			() => () => {
+				const navigatingToResetPassword = navigation.getState().routes.some(route => route.name === 'E2EResetYourPasswordView');
+
+				if (!encryptionEnabled && !navigatingToResetPassword) {
+					showToast(I18n.t('e2ee_disabled'));
+				}
+			},
+			[navigation, encryptionEnabled]
+		)
+	);
 
 	useLayoutEffect(() => {
 		navigation.setOptions({

From 88cec16177fff10ee96db77243476420b7b026df Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Thu, 25 Sep 2025 17:51:01 -0300
Subject: [PATCH 7/8] fix: barrel files

---
 app/views/E2EResetYourPasswordView.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/E2EResetYourPasswordView.tsx b/app/views/E2EResetYourPasswordView.tsx
index 36452aea0d8..1c33b9a9597 100644
--- a/app/views/E2EResetYourPasswordView.tsx
+++ b/app/views/E2EResetYourPasswordView.tsx
@@ -5,7 +5,7 @@ import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 
 import { E2EEnterYourPasswordStackParamList } from '../stacks/types';
 import { useTheme } from '../theme';
-import { Services } from '../lib/services';
+import { e2eResetOwnKey } from '../lib/services/restApi';
 import { showConfirmationAlert, showErrorAlert } from '../lib/methods/helpers';
 import { logout } from '../actions/login';
 import log, { events, logEvent } from '../lib/methods/helpers/log';
@@ -45,7 +45,7 @@ const E2EResetYourPasswordView = ({ navigation }: IE2EResetYourPasswordView): Re
 			onPress: async () => {
 				logEvent(events.E2E_SEC_RESET_OWN_KEY);
 				try {
-					const res = await Services.e2eResetOwnKey();
+					const res = await e2eResetOwnKey();
 
 					if (res?.success === true) {
 						dispatch(logout());

From 1ce13f058401352e9bf5d5729d7c22c622d3b13f Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Fri, 26 Sep 2025 16:40:54 -0300
Subject: [PATCH 8/8] chore: add resetPassword on masterstackdetail

---
 app/stacks/MasterDetailStack/index.tsx | 2 ++
 app/stacks/MasterDetailStack/types.ts  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/app/stacks/MasterDetailStack/index.tsx b/app/stacks/MasterDetailStack/index.tsx
index 94fbeecb608..c19b82d20e1 100644
--- a/app/stacks/MasterDetailStack/index.tsx
+++ b/app/stacks/MasterDetailStack/index.tsx
@@ -59,6 +59,7 @@ import CreateDiscussionView from '../../views/CreateDiscussionView';
 import E2ESaveYourPasswordView from '../../views/E2ESaveYourPasswordView';
 import E2EHowItWorksView from '../../views/E2EHowItWorksView';
 import E2EEnterYourPasswordView from '../../views/E2EEnterYourPasswordView';
+import E2EResetYourPasswordView from '../../views/E2EResetYourPasswordView';
 import ShareView from '../../views/ShareView';
 import QueueListView from '../../ee/omnichannel/views/QueueListView';
 import AddChannelTeamView from '../../views/AddChannelTeamView';
@@ -186,6 +187,7 @@ const ModalStackNavigator = React.memo(({ navigation }: INavigation) => {
 				<ModalStack.Screen name='E2ESaveYourPasswordView' component={E2ESaveYourPasswordView} />
 				<ModalStack.Screen name='E2EHowItWorksView' component={E2EHowItWorksView} />
 				<ModalStack.Screen name='E2EEnterYourPasswordView' component={E2EEnterYourPasswordView} />
+				<ModalStack.Screen name='E2EResetYourPasswordView' component={E2EResetYourPasswordView} />
 				<ModalStack.Screen name='UserPreferencesView' component={UserPreferencesView} />
 				<ModalStack.Screen name='UserNotificationPrefView' component={UserNotificationPrefView} />
 				<ModalStack.Screen name='SecurityPrivacyView' component={SecurityPrivacyView} />
diff --git a/app/stacks/MasterDetailStack/types.ts b/app/stacks/MasterDetailStack/types.ts
index c2a2a80ea5e..83499a781f2 100644
--- a/app/stacks/MasterDetailStack/types.ts
+++ b/app/stacks/MasterDetailStack/types.ts
@@ -191,6 +191,7 @@ export type ModalStackParamList = {
 		showCloseModal: boolean;
 	};
 	E2EEnterYourPasswordView: undefined;
+	E2EResetYourPasswordView: undefined;
 	UserPreferencesView: undefined;
 	UserNotificationPrefView: undefined;
 	SecurityPrivacyView: undefined;