diff --git a/app/containers/UserGeneratedContentRules.tsx b/app/containers/UserGeneratedContentRules.tsx
index 885d2a6fe5..4b1f53d508 100644
--- a/app/containers/UserGeneratedContentRules.tsx
+++ b/app/containers/UserGeneratedContentRules.tsx
@@ -15,14 +15,13 @@ const styles = StyleSheet.create({
marginHorizontal: 30
},
bottomContainerText: {
- ...sharedStyles.textRegular,
- fontSize: 13,
+ ...sharedStyles.textMedium,
+ fontSize: 14,
+ lineHeight: 22,
textAlign: 'center'
},
- bottomContainerTextBold: {
- ...sharedStyles.textSemibold,
- fontSize: 13,
- textAlign: 'center'
+ bottomContainerTextUnderline: {
+ textDecorationLine: 'underline'
}
});
@@ -40,22 +39,16 @@ const UGCRules = ({ styleContainer }: { styleContainer?: ViewStyle }) => {
};
return (
-
- {`${I18n.t('Onboarding_agree_terms')}\n`}
- openContract('terms-of-service')}
- >
- {I18n.t('Terms_of_Service')}
- {' '}
- {I18n.t('and')}
- openContract('privacy-policy')}
- >
- {' '}
- {I18n.t('Privacy_Policy')}
-
+ {I18n.t('Onboarding_agree_terms')}
+ openContract('terms-of-service')}>
+ {I18n.t('Terms_of_Service')}
+
+ openContract('privacy-policy')}>
+ {I18n.t('Privacy_Policy')}
);
diff --git a/app/i18n/locales/ar.json b/app/i18n/locales/ar.json
index 69252aec1b..cffb8a0376 100644
--- a/app/i18n/locales/ar.json
+++ b/app/i18n/locales/ar.json
@@ -18,6 +18,7 @@
"All_users_in_the_channel_can_write_new_messages": "يمكن لجميع المستخدمين في القناة كتابة رسائل جديدة",
"All_users_in_the_team_can_write_new_messages": "يمكن لجميع المستخدمين في الفريق كتابة رسائل جديدة",
"Allow_Reactions": "السماح للتفاعلات",
+ "Already_have_an_account": "هل لديك حساب بالفعل؟",
"and": "و",
"and_N_more": "و{{count}} آخرين",
"Announcement": "إعلان",
@@ -484,6 +485,7 @@
"You_are_in_preview_mode": "أنت في وضع المعاينة",
"You_can_search_using_RegExp_eg": "يمكنك استخدام RegExp. مثال: `/^text$/i`",
"You_colon": "أنت: ",
+ "You_dont_have_account": "ليس لديك حساب؟",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "تحتاج إلى الوصول إلى خادم Rocket.Chat واحد على الأقل لمشاركة شيء ما",
"You_need_to_verifiy_your_email_address_to_get_notications": "يجب تأكيد البريد الإلكتروني حتى تصلك الإشعارات",
"you_were_mentioned": "تمت الإشارة إليك",
diff --git a/app/i18n/locales/bn-IN.json b/app/i18n/locales/bn-IN.json
index bd3fda9693..045a0a62c6 100644
--- a/app/i18n/locales/bn-IN.json
+++ b/app/i18n/locales/bn-IN.json
@@ -35,6 +35,7 @@
"All_users_in_the_channel_can_write_new_messages": "চ্যানেলে সকল ব্যবহারকারী নতুন মেসেজ লেখতে পারবে",
"All_users_in_the_team_can_write_new_messages": "দলে সকল ব্যবহারকারী নতুন মেসেজ লেখতে পারবে",
"Allow_Reactions": "প্রতিক্রিয়া অনুমতি",
+ "Already_have_an_account": "আপনার কি ইতিমধ্যেই একটি অ্যাকাউন্ট আছে?",
"Also_send_thread_message_to_channel_behavior": "সেইমসঙ্গে চ্যানেলে থ্রেড বার্তা প্রেরণ করুন",
"and": "এবং",
"and_N_more": "এবং {{count}} আর",
@@ -750,6 +751,7 @@
"You_are_leaving_the_team": "আপনি দলটি ছেড়ে যাচ্ছেন '{{team}}'",
"You_can_search_using_RegExp_eg": "আপনি RegExp ব্যবহার করতে পারেন। যেমন: `/^text$/i`",
"You_colon": "আপনি: ",
+ "You_dont_have_account": "অ্যাকাউন্ট নেই?",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "আপনাকে কিছু ভাগ করার জন্য কমপ্রয়োজন একটি Rocket.Chat ওয়ার্কস্পেসে অ্যাক্সেস করা।",
"You_need_to_verifiy_your_email_address_to_get_notications": "আপনাকে বিজ্ঞপ্তিগুলি পেতে আপনার ইমেল ঠিকানা যাচাই করতে হবে",
"you_were_mentioned": "আপনি উল্লেখ করা হয়েছিলেন",
diff --git a/app/i18n/locales/cs.json b/app/i18n/locales/cs.json
index a561550396..3b06fb1fec 100644
--- a/app/i18n/locales/cs.json
+++ b/app/i18n/locales/cs.json
@@ -37,6 +37,7 @@
"All_users_in_the_team_can_write_new_messages": "Všichni uživatelé v týmu mohou psát nové zprávy",
"Allow_push_notifications_for_rocket_chat": "Povolit oznámení push pro Rocket.Chat",
"Allow_Reactions": "Povolit reakce",
+ "Already_have_an_account": "Už máte účet?",
"Also_send_thread_message_to_channel_behavior": "Také odeslat zprávu vlákna na kanál",
"and": "a",
"and_N_more": "a {{count}} dalších",
@@ -825,6 +826,7 @@
"You_are_leaving_the_team": "Opouštíte tým '{{team}}''",
"You_can_search_using_RegExp_eg": "Můžete použít RegExp. např. `/^text$/i`",
"You_colon": "Vy: ",
+ "You_dont_have_account": "Nemáte účet?",
"You_dont_have_permission_to_perform_this_action": "Nemáte oprávnění k provedení této akce. Informujte se u správce pracovního prostoru.",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Abyste mohli něco sdílet, musíte mít přístup alespoň k jednomu pracovnímu prostoru Rocket.Chat.",
"You_need_to_verifiy_your_email_address_to_get_notications": "Abyste mohli dostávat oznámení, musíte ověřit svou e-mailovou adresu",
diff --git a/app/i18n/locales/de.json b/app/i18n/locales/de.json
index dc565d4a07..f6cd452b43 100644
--- a/app/i18n/locales/de.json
+++ b/app/i18n/locales/de.json
@@ -35,6 +35,7 @@
"All_users_in_the_channel_can_write_new_messages": "Alle Benutzer im Channel können neue Nachrichten schreiben",
"All_users_in_the_team_can_write_new_messages": "Alle Mitglieder eines Teams können neue Nachrichten schreiben",
"Allow_Reactions": "Reaktionen zulassen",
+ "Already_have_an_account": "Haben Sie bereits ein Konto?",
"Also_send_thread_message_to_channel_behavior": "Die Nachricht auch an den Kanal senden",
"and": "und",
"and_N_more": "und {{count}} weitere",
@@ -740,6 +741,7 @@
"You_are_leaving_the_team": "Sie verlassen das Team '{{team}}'",
"You_can_search_using_RegExp_eg": "Sie können mit RegExp suchen. z.B. `/ ^ text $ / i`",
"You_colon": "Sie: ",
+ "You_dont_have_account": "Haben Sie kein Konto?",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Sie benötigen Zugang zu mindestens einem Rocket.Chat-Server, um etwas zu teilen.",
"You_need_to_verifiy_your_email_address_to_get_notications": "Sie müssen deine Email-Adresse bestätigen um Benachrichtigungen zu erhalten.",
"you_were_mentioned": "Sie wurden erwähnt",
diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json
index 95a36428d9..8f1c93904b 100644
--- a/app/i18n/locales/en.json
+++ b/app/i18n/locales/en.json
@@ -37,6 +37,7 @@
"All_users_in_the_team_can_write_new_messages": "All users in the team can write new messages",
"Allow_push_notifications_for_rocket_chat": "Allow push notifications for Rocket.Chat",
"Allow_Reactions": "Allow reactions",
+ "Already_have_an_account": "Already have an account?",
"Also_send_thread_message_to_channel_behavior": "Also send thread message to channel",
"and": "and",
"and_N_more": "and {{count}} more",
@@ -845,6 +846,7 @@
"You_are_leaving_the_team": "You are leaving the team '{{team}}'",
"You_can_search_using_RegExp_eg": "You can use RegExp. e.g. `/^text$/i`",
"You_colon": "You: ",
+ "You_dont_have_account": "Don’t have an account?",
"You_dont_have_permission_to_perform_this_action": "You don’t have permission to perform this action. Check with a workspace administrator.",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "You need to access at least one Rocket.Chat workspace to share something.",
"You_need_to_change_your_password": "You need to change your password",
diff --git a/app/i18n/locales/es.json b/app/i18n/locales/es.json
index e8f766c798..384a09bdd3 100644
--- a/app/i18n/locales/es.json
+++ b/app/i18n/locales/es.json
@@ -13,6 +13,7 @@
"All_Messages": "Todos los mensajes",
"All_users_in_the_channel_can_write_new_messages": "Todos los usuarios en el canal pueden escribir mensajes",
"Allow_Reactions": "Permitir reacciones",
+ "Already_have_an_account": "¿Ya tienes una cuenta?",
"and": "y",
"and_N_more": "y {{count}} más",
"Announcement": "Anuncio",
@@ -300,6 +301,7 @@
"You_are_in_preview_mode": "Estás en modo vista previa",
"You_can_search_using_RegExp_eg": "Puedes usar expresiones regulares. Por ejemplo, `/^text$/i`",
"You_colon": "Tú: ",
+ "You_dont_have_account": "¿No tienes una cuenta?",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Necesita acceder al menos a un servidor Rocket.Chat para compartir algo.",
"you_were_mentioned": "has sido mencionado",
"You_will_not_be_able_to_recover_this_message": "¡No podrás recuperar este mensaje!",
diff --git a/app/i18n/locales/fi.json b/app/i18n/locales/fi.json
index 04210d90cf..8b86174790 100644
--- a/app/i18n/locales/fi.json
+++ b/app/i18n/locales/fi.json
@@ -28,6 +28,7 @@
"All_users_in_the_channel_can_write_new_messages": "Kaikki kanavan käyttäjät voivat kirjoittaa uusia viestejä",
"All_users_in_the_team_can_write_new_messages": "Kaikki tiimin käyttäjät voivat kirjoittaa uusia viestejä",
"Allow_Reactions": "Salli reaktiot",
+ "Already_have_an_account": "Onko sinulla jo tili?",
"Also_send_thread_message_to_channel_behavior": "Lähetä ketjun viesti myös kanavalle",
"and": "ja",
"and_N_more": "ja {{count}} lisää",
@@ -712,6 +713,7 @@
"You_are_leaving_the_team": "Poistut tiimistä {{team}}",
"You_can_search_using_RegExp_eg": "Voit käyttää säännöllisiä lausekkeita, esim. `/^teksti$/i`",
"You_colon": "Sinä:",
+ "You_dont_have_account": "Ei ole tiliä?",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Tarvitset pääsyn vähintään Rocket.Chat-palvelimeen jakamista varten.",
"You_need_to_verifiy_your_email_address_to_get_notications": "Vahvista sähköpostiosoitteesi, jotta saat ilmoituksia",
"you_were_mentioned": "sinut mainittiin",
diff --git a/app/i18n/locales/fr.json b/app/i18n/locales/fr.json
index 69c14e3545..ad06c7ea86 100644
--- a/app/i18n/locales/fr.json
+++ b/app/i18n/locales/fr.json
@@ -21,6 +21,7 @@
"All_users_in_the_channel_can_write_new_messages": "Tous les utilisateurs du canal peuvent écrire de nouveaux messages",
"All_users_in_the_team_can_write_new_messages": "Tous les utilisateurs de l'équipe peuvent écrire de nouveaux messages",
"Allow_Reactions": "Autoriser les réactions",
+ "Already_have_an_account": "Vous avez déjà un compte ?",
"and": "et",
"and_N_more": "et {{count}} de plus",
"Announcement": "Annonce",
@@ -631,6 +632,7 @@
"You_are_leaving_the_team": "Vous quittez l'équipe '{{team}}'",
"You_can_search_using_RegExp_eg": "Vous pouvez utiliser RegExp., par exemple `/^texte$/i`",
"You_colon": "Vous: ",
+ "You_dont_have_account": "Vous n'avez pas de compte ?",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Vous devez accéder à au moins un serveur Rocket.Chat pour partager quelque chose.",
"You_need_to_verifiy_your_email_address_to_get_notications": "Vous devez vérifier votre adresse e-mail pour recevoir des notifications",
"you_were_mentioned": "vous avez été mentionné",
diff --git a/app/i18n/locales/hi-IN.json b/app/i18n/locales/hi-IN.json
index 99ecdb2469..ae3cdf5c1a 100644
--- a/app/i18n/locales/hi-IN.json
+++ b/app/i18n/locales/hi-IN.json
@@ -35,6 +35,7 @@
"All_users_in_the_channel_can_write_new_messages": "चैनल में सभी उपयोगकर्ता नए संदेश लिख सकते हैं",
"All_users_in_the_team_can_write_new_messages": "टीम में सभी उपयोगकर्ता नए संदेश लिख सकते हैं",
"Allow_Reactions": "प्रतिक्रियाओं की अनुमति दें",
+ "Already_have_an_account": "क्या आपके पास पहले से एक खाता है?",
"Also_send_thread_message_to_channel_behavior": "थ्रेड संदेश को चैनल में भी भेजें",
"and": "और",
"and_N_more": "और {{count}} और",
@@ -750,6 +751,7 @@
"You_are_leaving_the_team": "आप टीम '{{team}}' को छोड़ रहे हैं",
"You_can_search_using_RegExp_eg": "आप विन्यास (RegExp) का उपयोग कर सकते हैं। उदा. `/^text$/i`",
"You_colon": "आप: ",
+ "You_dont_have_account": "क्या आपके पास खाता नहीं है?",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "आपको कुछ साझा करने के लिए कम से कम एक Rocket.Chat कार्यस्थान तक पहुँचना होगा।",
"You_need_to_verifiy_your_email_address_to_get_notications": "आपको सूचनाएं प्राप्त करने के लिए अपनी ईमेल पता का सत्यापित करना होगा",
"you_were_mentioned": "आपका उल्लेख किया गया था",
diff --git a/app/i18n/locales/hu.json b/app/i18n/locales/hu.json
index ff0c549126..11cfefc9e1 100644
--- a/app/i18n/locales/hu.json
+++ b/app/i18n/locales/hu.json
@@ -35,6 +35,7 @@
"All_users_in_the_channel_can_write_new_messages": "A csatorna minden felhasználója írhat új üzeneteket",
"All_users_in_the_team_can_write_new_messages": "A csapat minden felhasználója írhat új üzeneteket",
"Allow_Reactions": "Engedélyezze a reakciókat",
+ "Already_have_an_account": "Már van fiókja?",
"Also_send_thread_message_to_channel_behavior": "Szál üzenetet is küld a csatornára",
"and": "és",
"and_N_more": "és{{count}} további",
@@ -752,6 +753,7 @@
"You_are_leaving_the_team": "Ön elhagyja ezt a csapatot {{team}}",
"You_can_search_using_RegExp_eg": "Használhat RegExp-t. pl. `/^text$/i`",
"You_colon": "Ön:",
+ "You_dont_have_account": "Nincs fiókja?",
"You_dont_have_permission_to_perform_this_action": "Nincs jogosultsága a művelet végrehajtásához. Kérdezze meg a munkaterület rendszergazdáját.",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Legalább egy Rocket.Chat munkaterülethez hozzá kell férnie ahhoz, hogy megoszthasson valamit.",
"You_need_to_verifiy_your_email_address_to_get_notications": "Ellenőriznie kell az e-mail-címét az értesítések fogadásához",
diff --git a/app/i18n/locales/it.json b/app/i18n/locales/it.json
index 5b6f54fd8c..3e7e7fe2e4 100644
--- a/app/i18n/locales/it.json
+++ b/app/i18n/locales/it.json
@@ -22,6 +22,7 @@
"All_users_in_the_channel_can_write_new_messages": "Tutti gli utenti nel canale possono scrivere messaggi",
"All_users_in_the_team_can_write_new_messages": "Tutti gli utenti nel team possono scrivere nuovi messaggi",
"Allow_Reactions": "Permetti reazioni",
+ "Already_have_an_account": "Hai già un account?",
"and": "e",
"and_N_more": "e altri {{count}}",
"Announcement": "Annuncio",
@@ -534,6 +535,7 @@
"You_are_in_preview_mode": "Sei in modalità anteprima",
"You_can_search_using_RegExp_eg": "Puoi usare espressioni regolari. es. `/^testo$/i`",
"You_colon": "Tu: ",
+ "You_dont_have_account": "Non hai un account?",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Devi accedere ad almeno un server Rocket.Chat prima di condividere qualcosa.",
"You_need_to_verifiy_your_email_address_to_get_notications": "Devi verificare il tuo indirizzo e-mail per ricevere le notifiche",
"you_were_mentioned": "sei stato menzionato",
diff --git a/app/i18n/locales/ja.json b/app/i18n/locales/ja.json
index c510d13697..a7fb9e2f88 100644
--- a/app/i18n/locales/ja.json
+++ b/app/i18n/locales/ja.json
@@ -17,6 +17,7 @@
"All_users_in_the_channel_can_write_new_messages": "すべてのユーザーが新しいメッセージを書き込みできます",
"All_users_in_the_team_can_write_new_messages": "チームのすべてのユーザーが新しいメッセージを書き込むことができます",
"Allow_Reactions": "リアクションを許可",
+ "Already_have_an_account": "すでにアカウントをお持ちですか?",
"and": "と",
"and_N_more": "さらに{{count}}つ",
"Announcement": "アナウンス",
@@ -406,6 +407,7 @@
"You_are_in_preview_mode": "プレビューモードです。",
"You_can_search_using_RegExp_eg": "正規表現を利用できます。 例: `/^text$/i`",
"You_colon": "あなた: ",
+ "You_dont_have_account": "アカウントをお持ちでないですか?",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "シェアするためには1つ以上のサーバーにアクセスする必要があります。",
"you_were_mentioned": "あなたがメンションしました",
"You_will_be_logged_out_of_this_application": "アプリからログアウトします。",
diff --git a/app/i18n/locales/nl.json b/app/i18n/locales/nl.json
index b44e2b70a5..5b82f72145 100644
--- a/app/i18n/locales/nl.json
+++ b/app/i18n/locales/nl.json
@@ -21,6 +21,7 @@
"All_users_in_the_channel_can_write_new_messages": "Alle gebruikers in het kanaal kunnen nieuwe berichten schrijven",
"All_users_in_the_team_can_write_new_messages": "Alle gebruikers in het team kunnen nieuwe berichten schrijven",
"Allow_Reactions": "Reacties toestaan",
+ "Already_have_an_account": "Heeft u al een account?",
"and": "en",
"and_N_more": "en nog {{count}}",
"Announcement": "Aankondiging",
@@ -631,6 +632,7 @@
"You_are_leaving_the_team": "Je verlaat het team '{{team}}'",
"You_can_search_using_RegExp_eg": "Je kan RegExp. gebruiken, bijv. `/^tekst$/i`",
"You_colon": "Jij: ",
+ "You_dont_have_account": "Heeft u geen account?",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Je moet minstens toegang hebben tot één Rocket.Chat-server om iets te delen.",
"You_need_to_verifiy_your_email_address_to_get_notications": "Je moet je e-mailadres verifiëren om meldingen te ontvangen",
"you_were_mentioned": "je bent vermeld",
diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json
index da40be94f7..bc3e86a220 100644
--- a/app/i18n/locales/pt-BR.json
+++ b/app/i18n/locales/pt-BR.json
@@ -36,6 +36,7 @@
"All_users_in_the_team_can_write_new_messages": "Todos usuários no canal podem enviar mensagens novas",
"Allow_push_notifications_for_rocket_chat": "Permitir notificações push para Rocket.Chat",
"Allow_Reactions": "Permitir reagir",
+ "Already_have_an_account": "Já tem uma conta?",
"Also_send_thread_message_to_channel_behavior": "Também enviar mensagem do tópico para o canal",
"and": "e",
"and_N_more": "e mais {{count}}",
@@ -834,6 +835,7 @@
"You_are_leaving_the_team": "Você está deixando o time '{{team}}'",
"You_can_search_using_RegExp_eg": "Você pode usar expressões regulares, por exemplo `/^text$/i`",
"You_colon": "Você: ",
+ "You_dont_have_account": "Você não tem uma conta?",
"You_dont_have_permission_to_perform_this_action": "Você não tem permissão para realizar esta ação. Verifique com um administrador do espaço de trabalho.",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Você precisa acessar pelo menos uma workspace Rocket.Chat para compartilhar.",
"You_need_to_change_your_password": "Você precisa alterar sua senha",
diff --git a/app/i18n/locales/pt-PT.json b/app/i18n/locales/pt-PT.json
index 4c61335d44..2876f2a27e 100644
--- a/app/i18n/locales/pt-PT.json
+++ b/app/i18n/locales/pt-PT.json
@@ -16,6 +16,7 @@
"All_users_in_the_channel_can_write_new_messages": "Todos os utilizadores no canal podem escrever novas mensagens",
"All_users_in_the_team_can_write_new_messages": "Todos os usuários da equipa podem escrever novas mensagens",
"Allow_Reactions": "Permitir Reacções",
+ "Already_have_an_account": "Já tem uma conta?",
"and": "e",
"and_N_more": "e mais {{count}}",
"Announcement": "Anúncio",
@@ -375,6 +376,7 @@
"You_are_in_preview_mode": "Você está no modo de pré-visualização",
"You_can_search_using_RegExp_eg": "Você pode pesquisar usando RegEx. por exemplo, `/^text$/i`",
"You_colon": "Você: ",
+ "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!"
}
\ No newline at end of file
diff --git a/app/i18n/locales/ru.json b/app/i18n/locales/ru.json
index 94f2015dcb..5761c0f4b4 100644
--- a/app/i18n/locales/ru.json
+++ b/app/i18n/locales/ru.json
@@ -26,6 +26,7 @@
"All_users_in_the_channel_can_write_new_messages": "Все пользователи канала могут писать новые сообщения",
"All_users_in_the_team_can_write_new_messages": "Все пользователи в Команде могут писать новые сообщения",
"Allow_Reactions": "Разрешить реакции",
+ "Already_have_an_account": "Уже есть аккаунт?",
"Also_send_thread_message_to_channel_behavior": "Также отправить в чат",
"and": "и",
"and_N_more": "и еще {{count}}",
@@ -680,6 +681,7 @@
"You_are_leaving_the_team": "Вы покидаете Команду '{{team}}'",
"You_can_search_using_RegExp_eg": "Вы можете выполнить поиск с помощью регулярных выражений, например `/^text$/i`",
"You_colon": "Вы: ",
+ "You_dont_have_account": "У вас нет аккаунта?",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Вам нужно получить доступ как минимум к одному серверу Rocket.Chat, чтобы поделиться чем-то.",
"You_need_to_verifiy_your_email_address_to_get_notications": "Вам необходимо проверить ваш email адрес, чтобы получать уведомления",
"you_were_mentioned": "вы были упомянуты",
diff --git a/app/i18n/locales/sl-SI.json b/app/i18n/locales/sl-SI.json
index 94b6959bb4..80068ea743 100644
--- a/app/i18n/locales/sl-SI.json
+++ b/app/i18n/locales/sl-SI.json
@@ -25,6 +25,7 @@
"All_users_in_the_channel_can_write_new_messages": "Vsi uporabniki v kanalu lahko napišejo nova sporočila",
"All_users_in_the_team_can_write_new_messages": "Vsi uporabniki v kanalu lahko napišejo nova sporočila",
"Allow_Reactions": "Dovolite reakcijo",
+ "Already_have_an_account": "Imate že račun?",
"and": "in",
"and_N_more": "in še {{count}}",
"Announcement": "Obvestilo",
@@ -646,6 +647,7 @@
"You_are_leaving_the_team": "Zapuščate ekipo '{{team}}'",
"You_can_search_using_RegExp_eg": "Lahko iščete s pomočjo RegExp. npr. `/^text$/i`",
"You_colon": "Vi:",
+ "You_dont_have_account": "Nimate računa?",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Če želite nekaj deliti, morate dostopati do vsaj enega strežnika Rocket.Chat.",
"You_need_to_verifiy_your_email_address_to_get_notications": "Če želite prejemati obvestila, potrdite svoj e-poštni naslov",
"you_were_mentioned": "Bili ste omenjeni",
diff --git a/app/i18n/locales/sv.json b/app/i18n/locales/sv.json
index 38acee28f1..102e71aabe 100644
--- a/app/i18n/locales/sv.json
+++ b/app/i18n/locales/sv.json
@@ -28,6 +28,7 @@
"All_users_in_the_channel_can_write_new_messages": "Alla användare i kanalen kan skriva nya meddelanden",
"All_users_in_the_team_can_write_new_messages": "Alla användare i teamet kan skriva nya meddelanden",
"Allow_Reactions": "Tillåt reaktioner",
+ "Already_have_an_account": "Har du redan ett konto?",
"Also_send_thread_message_to_channel_behavior": "Skicka även trådmeddelande till kanalen",
"and": "och",
"and_N_more": "och ytterligare {{count}}",
@@ -710,6 +711,7 @@
"You_are_leaving_the_team": "Du lämnar teamet {{team}}",
"You_can_search_using_RegExp_eg": "Du kan använda reguljära uttryck, till exempel /^text$/i",
"You_colon": "Du:",
+ "You_dont_have_account": "Har du inget konto?",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Du behöver åtkomst till åtminstone en Rocket.Chat-server för att kunna dela.",
"You_need_to_verifiy_your_email_address_to_get_notications": "Du måste bekräfta din e-postadress för att få meddelanden",
"you_were_mentioned": "du nämndes",
diff --git a/app/i18n/locales/ta-IN.json b/app/i18n/locales/ta-IN.json
index 9c115a4790..0b01bec02b 100644
--- a/app/i18n/locales/ta-IN.json
+++ b/app/i18n/locales/ta-IN.json
@@ -35,6 +35,7 @@
"All_users_in_the_channel_can_write_new_messages": "சேனலில் உள்ள அனைத்து பயனாளர்களும் புதிய செய்திகளையும் எழுதலாம்",
"All_users_in_the_team_can_write_new_messages": "குழுவில் உள்ள அனைத்து பயனாளர்களும் புதிய செய்திகளையும் எழுதலாம்",
"Allow_Reactions": "பின்னால் பதில் செய்துள்ளலை அனுமதி கொண்டுள்ளது",
+ "Already_have_an_account": "ஊருக்குள் உங்கள் கணக்கு இருக்கிறதா?",
"Also_send_thread_message_to_channel_behavior": "உறுதிப்படுத்த செய்தி சேனலுக்கும் அனுப்புவது",
"and": "மற்றும்",
"and_N_more": "மற்றும் {{count}} க்கும் மேல்",
@@ -750,6 +751,7 @@
"You_are_leaving_the_team": "நீங்கள் குழுவினை விடுகின்றீர்கள் '{{team}}'",
"You_can_search_using_RegExp_eg": "RegExp ஐப் பயன்படுத்தவும். உதாரணமாக `/^text$/i`",
"You_colon": "நீங்கள்: ",
+ "You_dont_have_account": "உங்களிடம் கணக்கு இல்லை என்றா?",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "ஏதேனும் பகிர்ந்து கொள்ள உங்களுக்கு குறைந்தது ஒரு Rocket.Chat பணியோடு கொண்டுள்ளது.",
"You_need_to_verifiy_your_email_address_to_get_notications": "அறிவித்திருக்கும் உங்களுக்கு மின்னஞ்சல் முகவரியை சரிபார்க்க நீங்கள் உறுதிபடுத்த வேண்டும்",
"you_were_mentioned": "உங்களுக்கு குறிக்கப்பட்டார்",
diff --git a/app/i18n/locales/te-IN.json b/app/i18n/locales/te-IN.json
index 853d2d21e7..156f2d6fd9 100644
--- a/app/i18n/locales/te-IN.json
+++ b/app/i18n/locales/te-IN.json
@@ -35,6 +35,7 @@
"All_users_in_the_channel_can_write_new_messages": "చానల్లో ఉన్న అన్ని వాడుకలు కొత్త సందేశాలను రాయగలరు",
"All_users_in_the_team_can_write_new_messages": "జట్టులో ఉన్న అన్ని వాడుకలు కొత్త సందేశాలను రాయగలరు",
"Allow_Reactions": "ప్రతిక్రియలను అనుమతించండి",
+ "Already_have_an_account": "మీకు ఇప్పటికే ఖాతా ఉందా?",
"Also_send_thread_message_to_channel_behavior": "చానల్కు థ్రెడ్ సందేశాన్ని కూడా పంపండి",
"and": "మరియు",
"and_N_more": "మరింత {{count}}",
@@ -750,6 +751,7 @@
"You_are_leaving_the_team": "మీరు టీమ్ '{{team}}' ను విడిచిపోతున్నారు",
"You_can_search_using_RegExp_eg": "మీరు RegExp ఉపయోగించవచ్చు. ఉదా. `/^text$/i`",
"You_colon": "మీరు: ",
+ "You_dont_have_account": "మీ వద్ద ఖాతా లేదు?",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "ఏదిగానా ఏక Rocket.Chat వర్క్స్పేస్కి ప్రవేశించాలి కాబట్టి ఏదైనా షేర్ చేయడానికి.",
"You_need_to_verifiy_your_email_address_to_get_notications": "నోటిఫికేషన్లు పొందడానికి మీ ఇమెయిల్ చిరునామాని ధ్యానలోకి పెంచాలి",
"you_were_mentioned": "మీరు పేర్కొనబడింది",
diff --git a/app/i18n/locales/tr.json b/app/i18n/locales/tr.json
index e7c446590a..5b6c29ef0c 100644
--- a/app/i18n/locales/tr.json
+++ b/app/i18n/locales/tr.json
@@ -17,6 +17,7 @@
"All_Messages": "Tüm İletiler",
"All_users_in_the_channel_can_write_new_messages": "Kanaldaki tüm kullanıcılar yeni ileti yazabilir!",
"Allow_Reactions": "Tüm Tepkiler",
+ "Already_have_an_account": "Zaten bir hesabınız var mı?",
"and": "ve",
"and_N_more": "ve {{count}} daha",
"Announcement": "Duyuru",
@@ -517,6 +518,7 @@
"You_are_in_preview_mode": "İzleme modundasınız",
"You_can_search_using_RegExp_eg": "Düzenli ifadeleri (Regular Expressions) kullanabilirsiniz. Örneğin: `/^text$/i`",
"You_colon": "Siz: ",
+ "You_dont_have_account": "Hesabınız yok mu?",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Bir şeyler paylaşmak için Rocket.Chat sunucusuna erişmeniz gerekir.",
"You_need_to_verifiy_your_email_address_to_get_notications": "Bildirim almak için e-posta adresinizi doğrulamanız gerekiyor",
"you_were_mentioned": "senden bahsedildi",
diff --git a/app/i18n/locales/zh-CN.json b/app/i18n/locales/zh-CN.json
index b79a5d164c..26249ee96e 100644
--- a/app/i18n/locales/zh-CN.json
+++ b/app/i18n/locales/zh-CN.json
@@ -17,6 +17,7 @@
"All_Messages": "全部信息",
"All_users_in_the_channel_can_write_new_messages": "频道中的所有用户都可以发送新信息",
"Allow_Reactions": "允许表情贴",
+ "Already_have_an_account": "已经有账户了吗",
"and": "和",
"and_N_more": "另外{{count}}个",
"Announcement": "公告",
@@ -475,6 +476,7 @@
"You_are_in_preview_mode": "您处于预览模式",
"You_can_search_using_RegExp_eg": "您可用 RegExp 进行搜索。 例如`/^text$/i`",
"You_colon": "你:",
+ "You_dont_have_account": "没有账户?",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "您需要访问至少一台Rocket.Chat服务器才能共享某些内容。",
"You_need_to_verifiy_your_email_address_to_get_notications": "您需要先验证您的邮箱以启用通知",
"you_were_mentioned": "你被提到了",
diff --git a/app/i18n/locales/zh-TW.json b/app/i18n/locales/zh-TW.json
index 821d1c669d..a787ec0fb5 100644
--- a/app/i18n/locales/zh-TW.json
+++ b/app/i18n/locales/zh-TW.json
@@ -17,6 +17,7 @@
"All_Messages": "全部訊息",
"All_users_in_the_channel_can_write_new_messages": "頻道中的所有使用者都可以發送新訊息",
"Allow_Reactions": "允許表情貼",
+ "Already_have_an_account": "已經有帳戶了嗎?",
"and": "和",
"and_N_more": "另外{{count}}個",
"Announcement": "公告",
@@ -504,6 +505,7 @@
"You_are_in_preview_mode": "您處於預覽模式",
"You_can_search_using_RegExp_eg": "您可用 RegExp 進行搜尋。例如`/^text$/i`",
"You_colon": "你:",
+ "You_dont_have_account": "沒有帳戶?",
"You_need_to_access_at_least_one_RocketChat_server_to_share_something": "您需要至少連接一個 Rocket.Chat 伺服器才能共享某些内容。",
"You_need_to_verifiy_your_email_address_to_get_notications": "您需要先驗證您的電子郵件以啟用通知",
"you_were_mentioned": "你被提到了",
diff --git a/app/views/LoginView/UserForm.tsx b/app/views/LoginView/UserForm.tsx
index 5f114569e4..3f86d27d82 100644
--- a/app/views/LoginView/UserForm.tsx
+++ b/app/views/LoginView/UserForm.tsx
@@ -103,67 +103,65 @@ const UserForm = () => {
return (
<>
{I18n.t('Login')}
- setFocus('password')}
- testID='login-view-email'
- textContentType='username'
- autoComplete='username'
- />
-
-
- {Accounts_PasswordReset ? (
+
+ setFocus('password')}
+ testID='login-view-email'
+ textContentType='username'
+ autoComplete='username'
+ />
+
- ) : null}
- {showRegistrationButton ? (
-
- {I18n.t('Dont_Have_An_Account')}
-
- {I18n.t('Create_account')}
+
+
+ {Accounts_PasswordReset && (
+
+ {I18n.t('Forgot_password')}
+
+
+ )}
+ {showRegistrationButton ? (
+
+
+ {I18n.t('You_dont_have_account')}
+
+
+
+ ) : (
+
+ {Accounts_RegistrationForm_LinkReplacementText}
-
- ) : (
-
- {Accounts_RegistrationForm_LinkReplacementText}
-
- )}
-
+ )}
+
+
>
);
};
diff --git a/app/views/LoginView/styles.ts b/app/views/LoginView/styles.ts
index 40050d4b1e..8a818678a2 100644
--- a/app/views/LoginView/styles.ts
+++ b/app/views/LoginView/styles.ts
@@ -10,27 +10,26 @@ export default StyleSheet.create({
},
title: {
...sharedStyles.textBold,
- fontSize: 22
+ fontSize: 22,
+ marginBottom: 24
},
inputContainer: {
marginVertical: 16
},
+ credentialsContainer: {
+ gap: 20
+ },
bottomContainer: {
flexDirection: 'column',
- alignItems: 'center'
- },
- bottomContainerText: {
- ...sharedStyles.textRegular,
- fontSize: 13
- },
- bottomContainerTextBold: {
- ...sharedStyles.textSemibold,
- fontSize: 13
+ gap: 32,
+ marginTop: 32
},
- loginButton: {
- marginTop: 16
+ bottomContainerGroup: {
+ gap: 12
},
- ugcContainer: {
- marginTop: 32
+ bottomContainerText: {
+ ...sharedStyles.textMedium,
+ alignSelf: 'center',
+ fontSize: 14
}
});
diff --git a/app/views/RegisterView.tsx b/app/views/RegisterView.tsx
index d42d2acf0a..3c844a703d 100644
--- a/app/views/RegisterView.tsx
+++ b/app/views/RegisterView.tsx
@@ -30,22 +30,20 @@ const styles = StyleSheet.create({
marginVertical: 16
},
bottomContainer: {
- flexDirection: 'column',
- alignItems: 'center',
- marginBottom: 32,
- marginHorizontal: 30
+ marginBottom: 32
},
bottomContainerText: {
- ...sharedStyles.textRegular,
- fontSize: 13
- },
- bottomContainerTextBold: {
- ...sharedStyles.textSemibold,
- fontSize: 13
+ ...sharedStyles.textMedium,
+ fontSize: 14,
+ lineHeight: 22,
+ alignSelf: 'center'
},
registerButton: {
marginTop: 16,
marginBottom: 32
+ },
+ loginButton: {
+ marginTop: 12
}
});
@@ -307,18 +305,16 @@ class RegisterView extends React.Component {
style={styles.registerButton}
/>
-
-
{showLoginButton ? (
- {I18n.t('Do_you_have_an_account')}
-
-
- {I18n.t('Login')}
+ {I18n.t('Already_have_an_account')}
+
) : null}
+
+
);