diff --git a/PasscodeLock/build.gradle b/PasscodeLock/build.gradle
index 801bcf863..11b58c6a8 100644
--- a/PasscodeLock/build.gradle
+++ b/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
diff --git a/PasscodeLock/proguard-rules.pro b/PasscodeLock/proguard-rules.pro
deleted file mode 100644
index 481bb4348..000000000
--- a/PasscodeLock/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index d977093af..891e05424 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,3 +1,7 @@
+2.37
+-----
+
+
 2.36
 -----
 
diff --git a/Simplenote/metadata/PlayStoreStrings.pot b/Simplenote/metadata/PlayStoreStrings.pot
index bd37cb231..fed5f3e1c 100644
--- a/Simplenote/metadata/PlayStoreStrings.pot
+++ b/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!
diff --git a/Simplenote/src/main/res/values-ar/strings.xml b/Simplenote/src/main/res/values-ar/strings.xml
index ace34a2f4..9428788db 100644
--- a/Simplenote/src/main/res/values-ar/strings.xml
+++ b/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>
diff --git a/Simplenote/src/main/res/values-it/strings.xml b/Simplenote/src/main/res/values-it/strings.xml
index d6483ee3e..7e5a66f0f 100644
--- a/Simplenote/src/main/res/values-it/strings.xml
+++ b/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>
diff --git a/fastlane/metadata/android/ar/changelogs/default.txt b/fastlane/metadata/android/ar/changelogs/default.txt
deleted file mode 100644
index eb12d9be8..000000000
--- a/fastlane/metadata/android/ar/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-23.5:
-- تم تحديث رابط إشعار الخصوصية الخاص بالمستخدمين في كاليفورنيا
diff --git a/fastlane/metadata/android/de-DE/changelogs/default.txt b/fastlane/metadata/android/de-DE/changelogs/default.txt
deleted file mode 100644
index 8146edb31..000000000
--- a/fastlane/metadata/android/de-DE/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-2.35:
-Link zur Datenschutzerklärung für Benutzer in Kalifornien aktualisiert.
diff --git a/fastlane/metadata/android/en-US/changelogs/default.txt b/fastlane/metadata/android/en-US/changelogs/default.txt
index 22ac39b26..0245a0b0b 100644
--- a/fastlane/metadata/android/en-US/changelogs/default.txt
+++ b/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.
diff --git a/fastlane/metadata/android/es-ES/changelogs/default.txt b/fastlane/metadata/android/es-ES/changelogs/default.txt
deleted file mode 100644
index 15eabf3fc..000000000
--- a/fastlane/metadata/android/es-ES/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 1628b96c9..000000000
--- a/fastlane/metadata/android/fr-FR/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index a247740c4..000000000
--- a/fastlane/metadata/android/id/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 2f130b4e6..000000000
--- a/fastlane/metadata/android/it-IT/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index d1ce4e7d2..000000000
--- a/fastlane/metadata/android/iw-IL/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-2.35:
-עדכנו קישור למדיניות פרטיות למשתמשים בקליפורניה.
diff --git a/fastlane/metadata/android/ja-JP/changelogs/default.txt b/fastlane/metadata/android/ja-JP/changelogs/default.txt
deleted file mode 100644
index 8b178a54d..000000000
--- a/fastlane/metadata/android/ja-JP/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-23.5:
-カリフォルニア州のユーザー用のプライバシーポリシーのリンクを更新しました。
diff --git a/fastlane/metadata/android/ko-KR/changelogs/default.txt b/fastlane/metadata/android/ko-KR/changelogs/default.txt
deleted file mode 100644
index 87a6bbcbc..000000000
--- a/fastlane/metadata/android/ko-KR/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-2.35:
-- 캘리포니아 사용자를 위한 개인정보 취급방침 링크가 업데이트됨
diff --git a/fastlane/metadata/android/nl-NL/changelogs/default.txt b/fastlane/metadata/android/nl-NL/changelogs/default.txt
deleted file mode 100644
index 93cca8f36..000000000
--- a/fastlane/metadata/android/nl-NL/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 45b0f16b2..000000000
--- a/fastlane/metadata/android/pt-BR/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index b1a6eb232..000000000
--- a/fastlane/metadata/android/ru-RU/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-2.35:
-Обновлена ссылка на политику защиты конфиденциальности для пользователей из Калифорнии.
diff --git a/fastlane/metadata/android/sv-SE/changelogs/default.txt b/fastlane/metadata/android/sv-SE/changelogs/default.txt
deleted file mode 100644
index cbdd87933..000000000
--- a/fastlane/metadata/android/sv-SE/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 67d0eb692..000000000
--- a/fastlane/metadata/android/tr-TR/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 8d5d22b05..000000000
--- a/fastlane/metadata/android/zh-CN/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-2.35：
-更新了面向加州用户的隐私政策链接。
diff --git a/fastlane/metadata/android/zh-TW/changelogs/default.txt b/fastlane/metadata/android/zh-TW/changelogs/default.txt
deleted file mode 100644
index 9ce58963f..000000000
--- a/fastlane/metadata/android/zh-TW/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-2.35:
-- 為加州使用者更新了隱私權政策連結。
diff --git a/version.properties b/version.properties
index 33fe9ec72..b93be00d4 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
-versionName=2.35
-versionCode=179
\ No newline at end of file
+versionName=2.36-rc-2
+versionCode=181
\ No newline at end of file