diff --git a/Simplenote/src/main/res/values-ar/strings.xml b/Simplenote/src/main/res/values-ar/strings.xml index 95984cd27..ace34a2f4 100644 --- a/Simplenote/src/main/res/values-ar/strings.xml +++ b/Simplenote/src/main/res/values-ar/strings.xml @@ -1,11 +1,12 @@ + سنرسل إليك كودًا بالبريد لتسجيل الدخول، أو يمكنك⁦%1$s⁩%2$s%3$s%4$s إدخال كلمة المرور الخاصة بالحساب ⁦%1$s⁩ لقد أرسلنا كودًا إلى \n%1$s. سيكون هذا الكود صالحًا لبضع دقائق. إدخال كلمة المرور diff --git a/Simplenote/src/main/res/values-de/strings.xml b/Simplenote/src/main/res/values-de/strings.xml index 975da9dcd..466597de8 100644 --- a/Simplenote/src/main/res/values-de/strings.xml +++ b/Simplenote/src/main/res/values-de/strings.xml @@ -1,11 +1,12 @@ + Wir senden dir eine E-Mail mit einem Anmelde-Code. Alternativ kannst du dich auch %1$s%2$s%3$smanuell anmelden%4$s. Gib das Passwort für das Konto %1$s ein Wir haben einen Code gesendet an: \n%1$s. Der Code ist einige Minuten gültig. Passwort eingeben diff --git a/Simplenote/src/main/res/values-es/strings.xml b/Simplenote/src/main/res/values-es/strings.xml index 57b278e67..1feaa2087 100644 --- a/Simplenote/src/main/res/values-es/strings.xml +++ b/Simplenote/src/main/res/values-es/strings.xml @@ -1,11 +1,12 @@ + 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. Introduce la contraseña de la cuenta %1$s Hemos enviado un código a \n%1$s. El código será válido durante unos minutos. Introduce la contraseña diff --git a/Simplenote/src/main/res/values-fr/strings.xml b/Simplenote/src/main/res/values-fr/strings.xml index 80923e1b3..beb6ea229 100644 --- a/Simplenote/src/main/res/values-fr/strings.xml +++ b/Simplenote/src/main/res/values-fr/strings.xml @@ -1,11 +1,12 @@ + Nous vous enverrons par e-mail un code pour vous connecter, ou vous pouvez %1$s%2$s%3$svous connecter manuellement%4$s. Saisir le mot de passe associé au compte %1$s Nous avons envoyé un code à \n%1$s. Ce code sera valide pendant quelques minutes. Saisir le mot de passe diff --git a/Simplenote/src/main/res/values-he/strings.xml b/Simplenote/src/main/res/values-he/strings.xml index 127ddbbda..78a942627 100644 --- a/Simplenote/src/main/res/values-he/strings.xml +++ b/Simplenote/src/main/res/values-he/strings.xml @@ -1,11 +1,12 @@ + נשלח לך אימייל עם קוד להתחברות, או שניתן %1$s%2$s%3$sלהתחבר באופן ידני%4$s. יש להזין את הסיסמה לחשבון ⁦%1$s⁩ שלחנו קוד אל \n%1$s. הקוד הזה יהיה בתוקף למשך מספר דקות. להזין סיסמה diff --git a/Simplenote/src/main/res/values-id/strings.xml b/Simplenote/src/main/res/values-id/strings.xml index 90fcc9161..8b82d2690 100644 --- a/Simplenote/src/main/res/values-id/strings.xml +++ b/Simplenote/src/main/res/values-id/strings.xml @@ -1,11 +1,12 @@ + Kami akan mengirimkan email berisi kode untuk %1$s%2$s%3$slogin atau Anda dapat login secara manual%4$s. Masukkan kata sandi untuk akun %1$s Kami telah mengirimkan kode ke \n%1$s. Kode ini valid selama beberapa menit. Masukkan kata sandi diff --git a/Simplenote/src/main/res/values-it/strings.xml b/Simplenote/src/main/res/values-it/strings.xml index b54c9edf4..d6483ee3e 100644 --- a/Simplenote/src/main/res/values-it/strings.xml +++ b/Simplenote/src/main/res/values-it/strings.xml @@ -1,11 +1,12 @@ + Ti invieremo un codice per l\'accesso, oppure puoi %1$s%2$s%3$seffettuare l\'accesso manualmente%4$s. Digita la password per l\'account %1$s Abbiamo inviato un codice a \n%1$s. Il codice sarà valido per pochi minuti. Inserisci password diff --git a/Simplenote/src/main/res/values-ja/strings.xml b/Simplenote/src/main/res/values-ja/strings.xml index 64623db9a..dc0bb4497 100644 --- a/Simplenote/src/main/res/values-ja/strings.xml +++ b/Simplenote/src/main/res/values-ja/strings.xml @@ -1,11 +1,12 @@ + ログインするためのコードをメールでお送りします。または、%1$s%2$s%3$s手動でログイン%4$sすることもできます。 アカウント %1$s のパスワードを入力 コードを \n に送信しました%1$s。 コードは数分間有効です。 パスワードを入力 diff --git a/Simplenote/src/main/res/values-ko/strings.xml b/Simplenote/src/main/res/values-ko/strings.xml index d097ed480..dbcfabaae 100644 --- a/Simplenote/src/main/res/values-ko/strings.xml +++ b/Simplenote/src/main/res/values-ko/strings.xml @@ -1,11 +1,12 @@ + 이메일을 통해 받으신 코드로 로그인할 수 있으며, %1$s%2$s%3$s수동으로 로그인%4$s할 수 있습니다. 계정 %1$s의 비밀번호를 입력하세요. 다음으로 코드를 보냈습니다: \n%1$s 코드는 몇 분 동안 유효합니다. 비밀번호 입력 diff --git a/Simplenote/src/main/res/values-nl/strings.xml b/Simplenote/src/main/res/values-nl/strings.xml index cc517d481..db5b1d468 100644 --- a/Simplenote/src/main/res/values-nl/strings.xml +++ b/Simplenote/src/main/res/values-nl/strings.xml @@ -1,11 +1,12 @@ + 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. Voer het wachtwoord van het account %1$s in We hebben een code gestuurd naar \n%1$s. De code is een paar minuten geldig. Voer wachtwoord in diff --git a/Simplenote/src/main/res/values-pt-rBR/strings.xml b/Simplenote/src/main/res/values-pt-rBR/strings.xml index fbe5e8879..f3902fc30 100644 --- a/Simplenote/src/main/res/values-pt-rBR/strings.xml +++ b/Simplenote/src/main/res/values-pt-rBR/strings.xml @@ -1,11 +1,12 @@ + Enviaremos o código de login por e-mail. Se preferir, %1$s%2$s%3$sfaça login manualmente%4$s. Digite a senha da conta %1$s Enviamos um código para \n%1$s. O código será válido por alguns minutos. Digite a senha diff --git a/Simplenote/src/main/res/values-ru/strings.xml b/Simplenote/src/main/res/values-ru/strings.xml index 5c5dc3fe7..3858a5ad8 100644 --- a/Simplenote/src/main/res/values-ru/strings.xml +++ b/Simplenote/src/main/res/values-ru/strings.xml @@ -1,11 +1,12 @@ + Мы пришлём вам код для входа по электронной почте, а кроме того, вы можете %1$s%2$s%3$sвыполнить вход вручную%4$s. Введите пароль для учётной записи %1$s Код отправлен на адрес \n%1$s. Код будет действителен в течение нескольких минут. Введите пароль diff --git a/Simplenote/src/main/res/values-sv/strings.xml b/Simplenote/src/main/res/values-sv/strings.xml index f001776fa..31cea1978 100644 --- a/Simplenote/src/main/res/values-sv/strings.xml +++ b/Simplenote/src/main/res/values-sv/strings.xml @@ -1,11 +1,12 @@ + 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. Ange lösenordet för kontot %1$s Vi har skickat en kod till \n%1$s. Koden kommer vara giltig i några minuter. Ange lösenord diff --git a/Simplenote/src/main/res/values-tr/strings.xml b/Simplenote/src/main/res/values-tr/strings.xml index f990521d2..c93e8a8b7 100644 --- a/Simplenote/src/main/res/values-tr/strings.xml +++ b/Simplenote/src/main/res/values-tr/strings.xml @@ -1,11 +1,12 @@ + 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. %1$s hesabınızın şifresini girin Şuraya bir kod gönderildi: \n%1$s. Kod birkaç dakikalığına geçerli olacak. Şifre girin diff --git a/Simplenote/src/main/res/values-zh-rCN/strings.xml b/Simplenote/src/main/res/values-zh-rCN/strings.xml index 356250dc5..af8a10a71 100644 --- a/Simplenote/src/main/res/values-zh-rCN/strings.xml +++ b/Simplenote/src/main/res/values-zh-rCN/strings.xml @@ -1,11 +1,12 @@ + 我们将通过电子邮件向您发送登录代码,您也可以%1$s%2$s%3$s手动登录%4$s。 输入账户 %1$s 的密码 我们已向 \n 发送代码%1$s。 此代码将在几分钟后失效。 输入密码 diff --git a/Simplenote/src/main/res/values-zh-rTW/strings.xml b/Simplenote/src/main/res/values-zh-rTW/strings.xml index e53d9e492..7b0478a93 100644 --- a/Simplenote/src/main/res/values-zh-rTW/strings.xml +++ b/Simplenote/src/main/res/values-zh-rTW/strings.xml @@ -1,11 +1,12 @@ + 我們會透過電子郵件傳送登入代碼給你,你也可以%1$s%2$s%3$s手動登入%4$s。 輸入 %1$s 帳號的密碼 我們已傳送驗證碼到 \n%1$s。 此驗證碼在幾分鐘內有效。 輸入密碼 diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb index 4bb3d3754..740c8b44d 100644 --- a/fastlane/lanes/release.rb +++ b/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! diff --git a/fastlane/metadata/android/ar/changelogs/default.txt b/fastlane/metadata/android/ar/changelogs/default.txt new file mode 100644 index 000000000..eb12d9be8 --- /dev/null +++ b/fastlane/metadata/android/ar/changelogs/default.txt @@ -0,0 +1,2 @@ +23.5: +- تم تحديث رابط إشعار الخصوصية الخاص بالمستخدمين في كاليفورنيا diff --git a/fastlane/metadata/android/de-DE/changelogs/default.txt b/fastlane/metadata/android/de-DE/changelogs/default.txt new file mode 100644 index 000000000..8146edb31 --- /dev/null +++ b/fastlane/metadata/android/de-DE/changelogs/default.txt @@ -0,0 +1,2 @@ +2.35: +Link zur Datenschutzerklärung für Benutzer in Kalifornien aktualisiert. diff --git a/fastlane/metadata/android/es-ES/changelogs/default.txt b/fastlane/metadata/android/es-ES/changelogs/default.txt new file mode 100644 index 000000000..15eabf3fc --- /dev/null +++ b/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. diff --git a/fastlane/metadata/android/fr-FR/changelogs/default.txt b/fastlane/metadata/android/fr-FR/changelogs/default.txt new file mode 100644 index 000000000..1628b96c9 --- /dev/null +++ b/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. diff --git a/fastlane/metadata/android/id/changelogs/default.txt b/fastlane/metadata/android/id/changelogs/default.txt new file mode 100644 index 000000000..a247740c4 --- /dev/null +++ b/fastlane/metadata/android/id/changelogs/default.txt @@ -0,0 +1,2 @@ +2.35: +- Tautan kebijakan privasi diperbarui untuk pengguna di California. diff --git a/fastlane/metadata/android/it-IT/changelogs/default.txt b/fastlane/metadata/android/it-IT/changelogs/default.txt new file mode 100644 index 000000000..2f130b4e6 --- /dev/null +++ b/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. diff --git a/fastlane/metadata/android/iw-IL/changelogs/default.txt b/fastlane/metadata/android/iw-IL/changelogs/default.txt new file mode 100644 index 000000000..d1ce4e7d2 --- /dev/null +++ b/fastlane/metadata/android/iw-IL/changelogs/default.txt @@ -0,0 +1,2 @@ +2.35: +עדכנו קישור למדיניות פרטיות למשתמשים בקליפורניה. diff --git a/fastlane/metadata/android/ja-JP/changelogs/default.txt b/fastlane/metadata/android/ja-JP/changelogs/default.txt new file mode 100644 index 000000000..8b178a54d --- /dev/null +++ b/fastlane/metadata/android/ja-JP/changelogs/default.txt @@ -0,0 +1,2 @@ +23.5: +カリフォルニア州のユーザー用のプライバシーポリシーのリンクを更新しました。 diff --git a/fastlane/metadata/android/ko-KR/changelogs/default.txt b/fastlane/metadata/android/ko-KR/changelogs/default.txt new file mode 100644 index 000000000..87a6bbcbc --- /dev/null +++ b/fastlane/metadata/android/ko-KR/changelogs/default.txt @@ -0,0 +1,2 @@ +2.35: +- 캘리포니아 사용자를 위한 개인정보 취급방침 링크가 업데이트됨 diff --git a/fastlane/metadata/android/nl-NL/changelogs/default.txt b/fastlane/metadata/android/nl-NL/changelogs/default.txt new file mode 100644 index 000000000..93cca8f36 --- /dev/null +++ b/fastlane/metadata/android/nl-NL/changelogs/default.txt @@ -0,0 +1,2 @@ +2.35: +Bijgewerkte link naar privacybeleid voor gebruikers in Californië. diff --git a/fastlane/metadata/android/pt-BR/changelogs/default.txt b/fastlane/metadata/android/pt-BR/changelogs/default.txt new file mode 100644 index 000000000..45b0f16b2 --- /dev/null +++ b/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. diff --git a/fastlane/metadata/android/ru-RU/changelogs/default.txt b/fastlane/metadata/android/ru-RU/changelogs/default.txt new file mode 100644 index 000000000..b1a6eb232 --- /dev/null +++ b/fastlane/metadata/android/ru-RU/changelogs/default.txt @@ -0,0 +1,2 @@ +2.35: +Обновлена ссылка на политику защиты конфиденциальности для пользователей из Калифорнии. diff --git a/fastlane/metadata/android/sv-SE/changelogs/default.txt b/fastlane/metadata/android/sv-SE/changelogs/default.txt new file mode 100644 index 000000000..cbdd87933 --- /dev/null +++ b/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. diff --git a/fastlane/metadata/android/tr-TR/changelogs/default.txt b/fastlane/metadata/android/tr-TR/changelogs/default.txt new file mode 100644 index 000000000..67d0eb692 --- /dev/null +++ b/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 diff --git a/fastlane/metadata/android/zh-CN/changelogs/default.txt b/fastlane/metadata/android/zh-CN/changelogs/default.txt new file mode 100644 index 000000000..8d5d22b05 --- /dev/null +++ b/fastlane/metadata/android/zh-CN/changelogs/default.txt @@ -0,0 +1,2 @@ +2.35: +更新了面向加州用户的隐私政策链接。 diff --git a/fastlane/metadata/android/zh-TW/changelogs/default.txt b/fastlane/metadata/android/zh-TW/changelogs/default.txt new file mode 100644 index 000000000..9ce58963f --- /dev/null +++ b/fastlane/metadata/android/zh-TW/changelogs/default.txt @@ -0,0 +1,2 @@ +2.35: +- 為加州使用者更新了隱私權政策連結。 diff --git a/version.properties b/version.properties index 4bed7b346..33fe9ec72 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -versionName=2.35-rc-3 -versionCode=177 \ No newline at end of file +versionName=2.35 +versionCode=179 \ No newline at end of file