Merge remote-tracking branch 'origin/develop' into feat/chat-start

* origin/develop:
  chore: update X account link tweet text

Author: bmc08gt

app/src/main/java/com/getcode/view/main/tip/ConnectAccountScreen.kt

@@ -116,7 +116,7 @@ private fun ColumnScope.RequestContent(state: TipConnectViewModel.State, onClick
             )
             Spacer(Modifier.width(CodeTheme.dimens.grid.x2))
             Text(
-                text = stringResource(R.string.action_postToConnect),
+                text = stringResource(R.string.action_messageGetCode),
             )
         }
     )
@@ -158,7 +158,7 @@ private fun composeTweet(context: Context, intent: Intent) {
 @Composable
 private fun Preview_TweetPreview() {
     CodeTheme {
-        TweetPreview(xMessage = "I’m connecting my X account with @getcode\n" +
+        TweetPreview(xMessage = "${stringResource(R.string.subtitle_connectXTweetText)}\n" +
                 "\n" +
                 "CodeAccount:349pQtzGmiBxU9vADVf6AUdMLLXyCCU3Zu4smrQPXved:zGmiBxU9vADVf6AUdMLLXyCCU3Zu4smrQP")
     }

app/src/main/java/com/getcode/view/main/tip/TipConnectViewModel.kt

@@ -48,7 +48,7 @@ class TipConnectViewModel @Inject constructor(
                 when (it) {
                     IdentityConnectionReason.TipCard -> {
                         """
-                            ${resources.getString(R.string.subtitle_linkingTwitter)}
+                            ${resources.getString(R.string.subtitle_connectXTweetText)}
                             
                             $verificationMessage
                         """.trimIndent()

app/src/main/res/values-ar/strings-localized.xml

@@ -36,6 +36,7 @@
   <string name="action_linkPhoneNumber">إرفاق رقم الهاتف</string>
   <string name="action_logIn">تسجيل الدخول</string>
   <string name="action_logout">تسجيل الخروج</string>
+  <string name="action_messageGetCode">أرسل رسالة إلي @getcode للربط</string>
   <string name="action_mute">كتم الصوت</string>
   <string name="action_next">التالي</string>
   <string name="action_noTryAgain">لا, حاول مرة أخرى</string>
@@ -234,6 +235,7 @@
   <string name="subtitle_chat_welcomeBonus">مكافأة ترحيبية</string>
   <string name="subtitle_chooseCountry">اختر بلدًا</string>
   <string name="subtitle_comingSoon">قريباً</string>
+  <string name="subtitle_connectXTweetText">\@getcode أرغب في ربط حسابي على X حتى أتمكن من تلقي النصائح من أشخاص في جميع أنحاء العالم</string>
   <string name="subtitle_delete">حذف</string>
   <string name="subtitle_deleteAccountDescription">تأكد من حفظ عبارة الاسترداد السرية الخاصة بك, ثم أدخل \"حذف\" لحذف حساب Code الخاص بك. لا يمكن الرجوع في هذا الإجراء.</string>
   <string name="subtitle_didntGetCode">ألم تتلقى رمزًا على %1$s؟</string>

app/src/main/res/values-bg/strings-localized.xml

@@ -36,6 +36,7 @@
   <string name="action_linkPhoneNumber">Свързване на телефонен номер </string>
   <string name="action_logIn">Вход </string>
   <string name="action_logout">Изход </string>
+  <string name="action_messageGetCode">Изпратете съобщение @getcode за свързване</string>
   <string name="action_mute">Изключване на звука </string>
   <string name="action_next">Следващ </string>
   <string name="action_noTryAgain">Не, опитайте отново</string>
@@ -234,6 +235,7 @@
   <string name="subtitle_chat_welcomeBonus">Бонус за донре дошли</string>
   <string name="subtitle_chooseCountry">Изберете държава </string>
   <string name="subtitle_comingSoon">Предстоящо</string>
+  <string name="subtitle_connectXTweetText">\@getcode Искам да свържа моя акаунт в X, за да мога да получавам съвети от хора по цял свят</string>
   <string name="subtitle_delete">Изтриване</string>
   <string name="subtitle_deleteAccountDescription">Уверете се, че сте запазили своята Тайна фраза за възстановяване и след това въведете \"Изтриване\", за за изтриете своя профил в Код. Това действие е необратимо.</string>
   <string name="subtitle_didntGetCode">Не получихте код на %1$s? </string>

app/src/main/res/values-cs/strings-localized.xml

@@ -36,6 +36,7 @@
   <string name="action_linkPhoneNumber">Odkázat na telefonní číslo</string>
   <string name="action_logIn">Přihlásit se</string>
   <string name="action_logout">Odhlásit se</string>
+  <string name="action_messageGetCode">Zpráva @getcode za účelem propojení</string>
   <string name="action_mute">Ztlumit</string>
   <string name="action_next">Dále</string>
   <string name="action_noTryAgain">Ne, zkusit znovu</string>
@@ -234,6 +235,7 @@
   <string name="subtitle_chat_welcomeBonus">Bonus na uvítanou</string>
   <string name="subtitle_chooseCountry">Zvolit zemi</string>
   <string name="subtitle_comingSoon">Již brzy</string>
+  <string name="subtitle_connectXTweetText">\@getcode, chci si propojit účet X a dostávat tipy od lidí z celého světa</string>
   <string name="subtitle_delete">Odstranit</string>
   <string name="subtitle_deleteAccountDescription">Ujistěte se, že máte uloženou tajnou frázi pro obnovení, a poté zadejte \"Odstranit\" pro odstranění účtu Code. Tato akce je nevratná.</string>
   <string name="subtitle_didntGetCode">Nedostali jste kód na %1$s?</string>

app/src/main/res/values-da/strings-localized.xml

@@ -36,6 +36,7 @@
   <string name="action_linkPhoneNumber">Link et telefonnummer</string>
   <string name="action_logIn">Log ind</string>
   <string name="action_logout">Log ud</string>
+  <string name="action_messageGetCode">Send en besked med @getcode for at oprette forbindelse</string>
   <string name="action_mute">Dæmp</string>
   <string name="action_next">Næste</string>
   <string name="action_noTryAgain">Nej, prøv igen</string>
@@ -234,6 +235,7 @@
   <string name="subtitle_chat_welcomeBonus">Velkomstbonus</string>
   <string name="subtitle_chooseCountry">Vælg land</string>
   <string name="subtitle_comingSoon">Kommer snart</string>
+  <string name="subtitle_connectXTweetText">\@getcode Jeg vil gerne forbinde min X-konto, så jeg kan modtage donationer fra folk over hele verden</string>
   <string name="subtitle_delete">Slet </string>
   <string name="subtitle_deleteAccountDescription">Sørg for at du har gemt din hemmelige gendannelsessætning og tast derefter \"Slet\" for at slette din Code-konto. Denne handling kan ikke fortrydes.  </string>
   <string name="subtitle_didntGetCode">Fik du ikke en kode i %1$s?</string>

app/src/main/res/values-de/strings-localized.xml

@@ -36,6 +36,7 @@
   <string name="action_linkPhoneNumber">Eine Telefonnummer verknüpfen</string>
   <string name="action_logIn">Einloggen</string>
   <string name="action_logout">Abmelden</string>
+  <string name="action_messageGetCode">Schreibe @getcode, um Dich zu verbinden</string>
   <string name="action_mute">Stummschalten</string>
   <string name="action_next">Weiter</string>
   <string name="action_noTryAgain">Nein, erneut versuchen</string>
@@ -234,6 +235,7 @@
   <string name="subtitle_chat_welcomeBonus">Willkommensbonus</string>
   <string name="subtitle_chooseCountry">Land auswählen</string>
   <string name="subtitle_comingSoon">Demnächst erhältlich</string>
+  <string name="subtitle_connectXTweetText">\@getcode Ich möchte mein X-Konto verknüpfen, damit ich Tipps von Menschen auf der ganzen Welt erhalte.</string>
   <string name="subtitle_delete">Löschen</string>
   <string name="subtitle_deleteAccountDescription">Vergewissern Sie sich, dass Sie Ihre geheime Wiederherstellungsphrase gespeichert haben, und geben Sie dann „Löschen\" ein, um Ihr Code-Konto zu löschen. Dieser Vorgang kann nicht rückgängig gemacht werden.</string>
   <string name="subtitle_didntGetCode">Sie haben keinen Code bei %1$s erhalten?</string>

app/src/main/res/values-el/strings-localized.xml

@@ -36,6 +36,7 @@
   <string name="action_linkPhoneNumber">Σύνδεση Αριθμού Τηλεφώνου</string>
   <string name="action_logIn">Σύνδεση</string>
   <string name="action_logout">Αποσύνδεση</string>
+  <string name="action_messageGetCode">Στείλε μήνυμα στο @getcode για Σύνδεση</string>
   <string name="action_mute">Σίγαση</string>
   <string name="action_next">Επόμενο</string>
   <string name="action_noTryAgain">Όχι, δοκιμάστε ξανά</string>
@@ -234,6 +235,7 @@
   <string name="subtitle_chat_welcomeBonus">Μπόνους καλωσορίσματος</string>
   <string name="subtitle_chooseCountry">Επιλέξτε χώρα</string>
   <string name="subtitle_comingSoon">Έρχεται Σύντομα</string>
+  <string name="subtitle_connectXTweetText">\@getcode θα ήθελα να συνδέσω τον λογαριασμό μου X, ώστε να μπορώ να λαμβάνω συμβουλές από άτομα σε όλο τον κόσμο</string>
   <string name="subtitle_delete">Διαγραφή</string>
   <string name="subtitle_deleteAccountDescription">Βεβαιωθείτε ότι έχετε αποθηκεύσει τη Μυστική Φράση Ανάκτησης και, στη συνέχεια, πληκτρολογήστε \"Διαγραφή\" για να διαγράψετε τον λογαριασμό σας στο Code. Αυτή η ενέργεια είναι μη αναστρέψιμη.</string>
   <string name="subtitle_didntGetCode">Δεν λάβατε κωδικό στο %1$s;</string>

app/src/main/res/values-en-rGB/strings-localized.xml

@@ -36,6 +36,7 @@
   <string name="action_linkPhoneNumber">Link a Phone Number</string>
   <string name="action_logIn">Log In</string>
   <string name="action_logout">Log Out</string>
+  <string name="action_messageGetCode">Message @getcode to Connect</string>
   <string name="action_mute">Mute</string>
   <string name="action_next">Next</string>
   <string name="action_noTryAgain">No, Try Again</string>
@@ -234,6 +235,7 @@
   <string name="subtitle_chat_welcomeBonus">Welcome Bonus</string>
   <string name="subtitle_chooseCountry">Choose a country</string>
   <string name="subtitle_comingSoon">Coming Soon</string>
+  <string name="subtitle_connectXTweetText">\@getcode I’d like to connect my X account so I can receive tips from people all over the world</string>
   <string name="subtitle_delete">Delete</string>
   <string name="subtitle_deleteAccountDescription">Make sure you have your Secret Recovery Phrase saved, and then enter \"Delete\" to delete your Code account. This action is irreversible.</string>
   <string name="subtitle_didntGetCode">Didn\'t get a code at %1$s?</string>

app/src/main/res/values-es/strings-localized.xml

@@ -36,6 +36,7 @@
   <string name="action_linkPhoneNumber">Vincular un número de teléfono</string>
   <string name="action_logIn">Iniciar sesión</string>
   <string name="action_logout">Cerrar sesión</string>
+  <string name="action_messageGetCode">Envía un mensaje a @getcode para conectarte</string>
   <string name="action_mute">Silenciar</string>
   <string name="action_next">Siguiente</string>
   <string name="action_noTryAgain">No, inténtalo de nuevo</string>
@@ -234,6 +235,7 @@
   <string name="subtitle_chat_welcomeBonus">Bonificación de bienvenida</string>
   <string name="subtitle_chooseCountry">Elegir un país</string>
   <string name="subtitle_comingSoon">Próximamente</string>
+  <string name="subtitle_connectXTweetText">\@getcode Me gustaría conectar mi cuenta de X para poder recibir consejos de personas de todo el mundo</string>
   <string name="subtitle_delete">Eliminar</string>
   <string name="subtitle_deleteAccountDescription">Asegúrate de tener guardada tu frase secreta de recuperación y, a continuación, introduce «Eliminar» para borrar tu cuenta de Code. Esta acción es irreversible.</string>
   <string name="subtitle_didntGetCode">¿No has recibido un código en %1$s?</string>