Merge release/2.35 into trunk (#1711)

Simplenote/src/main/res/values-ar/strings.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-09-19 12:54:03+0000
+Translation-Revision-Date: 2024-10-24 09:54:03+0000
 Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;
 Generator: GlotPress/2.4.0-alpha
 Language: ar
 -->
 <resources>
+    <string name="signin_login_with_email_manually">سنرسل إليك كودًا بالبريد لتسجيل الدخول، أو يمكنك⁦%1$s⁩%2$s%3$s%4$s</string>
     <string name="login_with_password_message">إدخال كلمة المرور الخاصة بالحساب ⁦%1$s⁩</string>
     <string name="magic_link_confirm_code_message">لقد أرسلنا كودًا إلى \n%1$s. سيكون هذا الكود صالحًا لبضع دقائق.</string>
     <string name="magic_link_confirm_code_enter_pass_label">إدخال كلمة المرور</string>

Simplenote/src/main/res/values-de/strings.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-09-19 09:54:03+0000
+Translation-Revision-Date: 2024-10-24 11:54:03+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/2.4.0-alpha
 Language: de
 -->
 <resources>
+    <string name="signin_login_with_email_manually">Wir senden dir eine E-Mail mit einem Anmelde-Code. Alternativ kannst du dich auch %1$s%2$s%3$smanuell anmelden%4$s.</string>
     <string name="login_with_password_message">Gib das Passwort für das Konto %1$s ein</string>
     <string name="magic_link_confirm_code_message">Wir haben einen Code gesendet an: \n%1$s. Der Code ist einige Minuten gültig.</string>
     <string name="magic_link_confirm_code_enter_pass_label">Passwort eingeben</string>

Simplenote/src/main/res/values-es/strings.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-09-19 16:54:03+0000
+Translation-Revision-Date: 2024-10-24 09:54:03+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/2.4.0-alpha
 Language: es
 -->
 <resources>
+    <string name="signin_login_with_email_manually">Te enviaremos por correo electrónico un código para iniciar sesión; también puedes %1$s%2$s%3$shacerlo manualmente%4$s.</string>
     <string name="login_with_password_message">Introduce la contraseña de la cuenta %1$s</string>
     <string name="magic_link_confirm_code_message">Hemos enviado un código a \n%1$s. El código será válido durante unos minutos.</string>
     <string name="magic_link_confirm_code_enter_pass_label">Introduce la contraseña</string>

Simplenote/src/main/res/values-fr/strings.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-09-17 15:54:03+0000
+Translation-Revision-Date: 2024-10-23 14:54:03+0000
 Plural-Forms: nplurals=2; plural=n > 1;
 Generator: GlotPress/2.4.0-alpha
 Language: fr
 -->
 <resources>
+    <string name="signin_login_with_email_manually">Nous vous enverrons par e-mail un code pour vous connecter, ou vous pouvez %1$s%2$s%3$svous connecter manuellement%4$s.</string>
     <string name="login_with_password_message">Saisir le mot de passe associé au compte %1$s</string>
     <string name="magic_link_confirm_code_message">Nous avons envoyé un code à \n%1$s. Ce code sera valide pendant quelques minutes.</string>
     <string name="magic_link_confirm_code_enter_pass_label">Saisir le mot de passe</string>

Simplenote/src/main/res/values-he/strings.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-09-19 14:54:03+0000
+Translation-Revision-Date: 2024-10-23 14:45:22+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/2.4.0-alpha
 Language: he_IL
 -->
 <resources>
+    <string name="signin_login_with_email_manually">נשלח לך אימייל עם קוד להתחברות, או שניתן %1$s%2$s%3$sלהתחבר באופן ידני%4$s.</string>
     <string name="login_with_password_message">יש להזין את הסיסמה לחשבון ⁦%1$s⁩</string>
     <string name="magic_link_confirm_code_message">שלחנו קוד אל \n%1$s. הקוד הזה יהיה בתוקף למשך מספר דקות.</string>
     <string name="magic_link_confirm_code_enter_pass_label">להזין סיסמה</string>

Simplenote/src/main/res/values-id/strings.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-09-17 09:54:02+0000
+Translation-Revision-Date: 2024-10-24 09:54:03+0000
 Plural-Forms: nplurals=2; plural=n > 1;
 Generator: GlotPress/2.4.0-alpha
 Language: id
 -->
 <resources>
+    <string name="signin_login_with_email_manually">Kami akan mengirimkan email berisi kode untuk %1$s%2$s%3$slogin atau Anda dapat login secara manual%4$s.</string>
     <string name="login_with_password_message">Masukkan kata sandi untuk akun %1$s</string>
     <string name="magic_link_confirm_code_message">Kami telah mengirimkan kode ke \n%1$s. Kode ini valid selama beberapa menit.</string>
     <string name="magic_link_confirm_code_enter_pass_label">Masukkan kata sandi</string>

Simplenote/src/main/res/values-it/strings.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-09-17 15:54:03+0000
+Translation-Revision-Date: 2024-10-24 09:54:02+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/2.4.0-alpha
 Language: it
 -->
 <resources>
+    <string name="signin_login_with_email_manually">Ti invieremo un codice per l\'accesso, oppure puoi %1$s%2$s%3$seffettuare l\'accesso manualmente%4$s.</string>
     <string name="login_with_password_message">Digita la password per l\'account %1$s</string>
     <string name="magic_link_confirm_code_message">Abbiamo inviato un codice a \n%1$s. Il codice sarà valido per pochi minuti.</string>
     <string name="magic_link_confirm_code_enter_pass_label">Inserisci password</string>

Simplenote/src/main/res/values-ja/strings.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-09-17 09:54:03+0000
+Translation-Revision-Date: 2024-10-24 09:54:02+0000
 Plural-Forms: nplurals=1; plural=0;
 Generator: GlotPress/2.4.0-alpha
 Language: ja_JP
 -->
 <resources>
+    <string name="signin_login_with_email_manually">ログインするためのコードをメールでお送りします。または、%1$s%2$s%3$s手動でログイン%4$sすることもできます。</string>
     <string name="login_with_password_message">アカウント %1$s のパスワードを入力</string>
     <string name="magic_link_confirm_code_message">コードを \n に送信しました%1$s。 コードは数分間有効です。</string>
     <string name="magic_link_confirm_code_enter_pass_label">パスワードを入力</string>

Simplenote/src/main/res/values-ko/strings.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-09-20 09:54:16+0000
+Translation-Revision-Date: 2024-10-24 09:54:03+0000
 Plural-Forms: nplurals=1; plural=0;
 Generator: GlotPress/2.4.0-alpha
 Language: ko_KR
 -->
 <resources>
+    <string name="signin_login_with_email_manually">이메일을 통해 받으신 코드로 로그인할 수 있으며, %1$s%2$s%3$s수동으로 로그인%4$s할 수 있습니다.</string>
     <string name="login_with_password_message">계정 %1$s의 비밀번호를 입력하세요.</string>
     <string name="magic_link_confirm_code_message">다음으로 코드를 보냈습니다: \n%1$s 코드는 몇 분 동안 유효합니다.</string>
     <string name="magic_link_confirm_code_enter_pass_label">비밀번호 입력</string>

Simplenote/src/main/res/values-nl/strings.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-09-18 11:54:02+0000
+Translation-Revision-Date: 2024-10-24 11:54:03+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/2.4.0-alpha
 Language: nl
 -->
 <resources>
+    <string name="signin_login_with_email_manually">We sturen je via e-mail een code die je kan gebruiken om in te loggen, of je kan %1$s%2$s%3$shandmatig inloggen%4$s.</string>
     <string name="login_with_password_message">Voer het wachtwoord van het account %1$s in</string>
     <string name="magic_link_confirm_code_message">We hebben een code gestuurd naar \n%1$s. De code is een paar minuten geldig.</string>
     <string name="magic_link_confirm_code_enter_pass_label">Voer wachtwoord in</string>

Simplenote/src/main/res/values-pt-rBR/strings.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-09-18 17:54:02+0000
+Translation-Revision-Date: 2024-10-23 14:54:03+0000
 Plural-Forms: nplurals=2; plural=(n > 1);
 Generator: GlotPress/2.4.0-alpha
 Language: pt_BR
 -->
 <resources>
+    <string name="signin_login_with_email_manually">Enviaremos o código de login por e-mail. Se preferir, %1$s%2$s%3$sfaça login manualmente%4$s.</string>
     <string name="login_with_password_message">Digite a senha da conta %1$s</string>
     <string name="magic_link_confirm_code_message">Enviamos um código para \n%1$s. O código será válido por alguns minutos.</string>
     <string name="magic_link_confirm_code_enter_pass_label">Digite a senha</string>

Simplenote/src/main/res/values-ru/strings.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-09-19 14:54:03+0000
+Translation-Revision-Date: 2024-10-24 15:54:03+0000
 Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);
 Generator: GlotPress/2.4.0-alpha
 Language: ru
 -->
 <resources>
+    <string name="signin_login_with_email_manually">Мы пришлём вам код для входа по электронной почте, а кроме того, вы можете %1$s%2$s%3$sвыполнить вход вручную%4$s.</string>
     <string name="login_with_password_message">Введите пароль для учётной записи %1$s</string>
     <string name="magic_link_confirm_code_message">Код отправлен на адрес \n%1$s. Код будет действителен в течение нескольких минут.</string>
     <string name="magic_link_confirm_code_enter_pass_label">Введите пароль</string>

Simplenote/src/main/res/values-sv/strings.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-09-14 07:12:10+0000
+Translation-Revision-Date: 2024-10-23 12:54:03+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/2.4.0-alpha
 Language: sv_SE
 -->
 <resources>
+    <string name="signin_login_with_email_manually">Vi skickar en kod till dig via e-post för att logga in, eller så kan du %1$s%2$s%3$slogga in manuellt%4$s.</string>
     <string name="login_with_password_message">Ange lösenordet för kontot %1$s</string>
     <string name="magic_link_confirm_code_message">Vi har skickat en kod till \n%1$s. Koden kommer vara giltig i några minuter.</string>
     <string name="magic_link_confirm_code_enter_pass_label">Ange lösenord</string>

Simplenote/src/main/res/values-tr/strings.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-09-17 09:54:02+0000
+Translation-Revision-Date: 2024-10-24 15:54:03+0000
 Plural-Forms: nplurals=2; plural=(n > 1);
 Generator: GlotPress/2.4.0-alpha
 Language: tr
 -->
 <resources>
+    <string name="signin_login_with_email_manually">Oturum açmanız için size e-postayla bir kod göndereceğiz veya %1$s%2$s%3$smanuel olarak oturum açabilirsiniz%4$s.</string>
     <string name="login_with_password_message">%1$s hesabınızın şifresini girin</string>
     <string name="magic_link_confirm_code_message">Şuraya bir kod gönderildi: \n%1$s. Kod birkaç dakikalığına geçerli olacak.</string>
     <string name="magic_link_confirm_code_enter_pass_label">Şifre girin</string>

Simplenote/src/main/res/values-zh-rCN/strings.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-09-18 09:54:02+0000
+Translation-Revision-Date: 2024-10-23 14:54:03+0000
 Plural-Forms: nplurals=1; plural=0;
 Generator: GlotPress/2.4.0-alpha
 Language: zh_CN
 -->
 <resources>
+    <string name="signin_login_with_email_manually">我们将通过电子邮件向您发送登录代码，您也可以%1$s%2$s%3$s手动登录%4$s。</string>
     <string name="login_with_password_message">输入账户 %1$s 的密码</string>
     <string name="magic_link_confirm_code_message">我们已向 \n 发送代码%1$s。 此代码将在几分钟后失效。</string>
     <string name="magic_link_confirm_code_enter_pass_label">输入密码</string>

Simplenote/src/main/res/values-zh-rTW/strings.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-09-17 09:54:02+0000
+Translation-Revision-Date: 2024-10-24 09:54:03+0000
 Plural-Forms: nplurals=1; plural=0;
 Generator: GlotPress/2.4.0-alpha
 Language: zh_TW
 -->
 <resources>
+    <string name="signin_login_with_email_manually">我們會透過電子郵件傳送登入代碼給你，你也可以%1$s%2$s%3$s手動登入%4$s。</string>
     <string name="login_with_password_message">輸入 %1$s 帳號的密碼</string>
     <string name="magic_link_confirm_code_message">我們已傳送驗證碼到 \n%1$s。 此驗證碼在幾分鐘內有效。</string>
     <string name="magic_link_confirm_code_enter_pass_label">輸入密碼</string>

fastlane/lanes/release.rb

@@ -192,7 +192,7 @@
 
     push_to_git_remote(tags: false)
 
-    build_and_upload_release(create_release: true)
+    trigger_release_build(branch_to_build: release_branch_name)
 
     create_backmerge_prs!
 

fastlane/metadata/android/ar/changelogs/default.txt

@@ -0,0 +1,2 @@
+23.5:
+- تم تحديث رابط إشعار الخصوصية الخاص بالمستخدمين في كاليفورنيا

fastlane/metadata/android/de-DE/changelogs/default.txt

@@ -0,0 +1,2 @@
+2.35:
+Link zur Datenschutzerklärung für Benutzer in Kalifornien aktualisiert.

fastlane/metadata/android/es-ES/changelogs/default.txt

@@ -0,0 +1,2 @@
+2.35:
+Se ha actualizado el enlace que lleva a la política de privacidad para usuarios de California.

fastlane/metadata/android/fr-FR/changelogs/default.txt

@@ -0,0 +1,2 @@
+2.35 :
+Mise à jour du lien vers la politique de confidentialité pour les utilisateurs californiens.

fastlane/metadata/android/id/changelogs/default.txt

@@ -0,0 +1,2 @@
+2.35:
+- Tautan kebijakan privasi diperbarui untuk pengguna di California.

fastlane/metadata/android/it-IT/changelogs/default.txt

@@ -0,0 +1,2 @@
+2.35:
+Aggiornato il link all'informativa sulla privacy per utenti in California.

fastlane/metadata/android/iw-IL/changelogs/default.txt

@@ -0,0 +1,2 @@
+2.35:
+עדכנו קישור למדיניות פרטיות למשתמשים בקליפורניה.

fastlane/metadata/android/ja-JP/changelogs/default.txt

@@ -0,0 +1,2 @@
+23.5:
+カリフォルニア州のユーザー用のプライバシーポリシーのリンクを更新しました。

fastlane/metadata/android/ko-KR/changelogs/default.txt

@@ -0,0 +1,2 @@
+2.35:
+- 캘리포니아 사용자를 위한 개인정보 취급방침 링크가 업데이트됨

fastlane/metadata/android/nl-NL/changelogs/default.txt

@@ -0,0 +1,2 @@
+2.35:
+Bijgewerkte link naar privacybeleid voor gebruikers in Californië.

fastlane/metadata/android/pt-BR/changelogs/default.txt

@@ -0,0 +1,2 @@
+2.35:
+Link da política de privacidade para usuários residentes da Califórnia atualizado.

fastlane/metadata/android/ru-RU/changelogs/default.txt

@@ -0,0 +1,2 @@
+2.35:
+Обновлена ссылка на политику защиты конфиденциальности для пользователей из Калифорнии.

fastlane/metadata/android/sv-SE/changelogs/default.txt

@@ -0,0 +1,2 @@
+2.35:
+Uppdaterad länk till integritetspolicy för användare i Kalifornien.

fastlane/metadata/android/tr-TR/changelogs/default.txt

@@ -0,0 +1,2 @@
+2.35:
+Kaliforniya'daki kullanıcılar için gizlilik politikası bağlantısı güncellendi

fastlane/metadata/android/zh-CN/changelogs/default.txt

@@ -0,0 +1,2 @@
+2.35：
+更新了面向加州用户的隐私政策链接。

fastlane/metadata/android/zh-TW/changelogs/default.txt

@@ -0,0 +1,2 @@
+2.35:
+- 為加州使用者更新了隱私權政策連結。

version.properties

@@ -1,2 +1,2 @@
-versionName=2.35-rc-3
-versionCode=177
+versionName=2.35
+versionCode=179