Merge release/2.36 into trunk

PasscodeLock/build.gradle

@@ -20,13 +20,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    buildTypes {
-        release {
-            minifyEnabled true
-            shrinkResources false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11

RELEASE-NOTES.txt

@@ -1,3 +1,7 @@
+2.37
+-----
+
+
 2.36
 -----
 

Simplenote/metadata/PlayStoreStrings.pot

@@ -11,16 +11,17 @@ msgstr ""
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
-msgctxt "release_note_0235"
+msgctxt "release_note_0236"
 msgid ""
-"2.35:\n"
-"Updated privacy policy link for California users.\n"
+"2.36:\n"
+"Enjoy a sleeker Simplenote with improved dark mode and full edge-to-edge support on Android 15, making your notes look better than ever.\n"
+"Plus, we’ve made behind-the-scenes enhancements to keep everything running fast, smooth, and reliable.\n"
 msgstr ""
 
-msgctxt "release_note_0234"
+msgctxt "release_note_0235"
 msgid ""
-"2.34:\n"
-"Under the hood improvements\n"
+"2.35:\n"
+"Updated privacy policy link for California users.\n"
 msgstr ""
 
 #. translators: Short description of the app to be displayed in the Play Store. Limit to 80 characters including spaces and commas!

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

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-10-24 09:54:03+0000
+Translation-Revision-Date: 2024-10-25 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="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-it/strings.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-10-24 09:54:02+0000
+Translation-Revision-Date: 2024-10-25 09:54:03+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="signin_login_with_email_manually">Ti invieremo via e-mail 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>

fastlane/metadata/android/en-US/changelogs/default.txt

@@ -1 +1,2 @@
-Updated privacy policy link for California users.
+Enjoy a sleeker Simplenote with improved dark mode and full edge-to-edge support on Android 15, making your notes look better than ever.
+Plus, we’ve made behind-the-scenes enhancements to keep everything running fast, smooth, and reliable.

version.properties

@@ -1,2 +1,2 @@
-versionName=2.35
-versionCode=179
+versionName=2.36-rc-2
+versionCode=181