diff --git a/app/src/main/java/app/passwordstore/util/services/ClipboardService.kt b/app/src/main/java/app/passwordstore/util/services/ClipboardService.kt
index 76128a50a..e1771386a 100644
--- a/app/src/main/java/app/passwordstore/util/services/ClipboardService.kt
+++ b/app/src/main/java/app/passwordstore/util/services/ClipboardService.kt
@@ -4,6 +4,7 @@
  */
 package app.passwordstore.util.services
 
+import android.annotation.SuppressLint
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -116,6 +117,7 @@ class ClipboardService : Service() {
     }
   }
 
+  @SuppressLint("UnspecifiedImmutableFlag") // The offending code path cannot be hit on S
   private fun createNotification(clearTime: Int) {
     val clearTimeMs = clearTime * 1000L
     val clearIntent = Intent(this, ClipboardService::class.java).apply { action = ACTION_CLEAR }
@@ -136,11 +138,7 @@ class ClipboardService : Service() {
           this,
           0,
           clearIntent,
-          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
-          } else {
-            PendingIntent.FLAG_UPDATE_CURRENT
-          },
+          PendingIntent.FLAG_UPDATE_CURRENT,
         )
       }
     val notification =
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e8628be3b..4de86ad99 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -49,7 +49,6 @@
   <string name="password_dialog_text">Bitte setze ein Passwort für dieses Repository</string>
   <!-- Clone fragment -->
   <string name="server_url">Repository-URL</string>
-  <string name="server_branch">Branch</string>
   <string name="connection_mode">Authentifizierungsmethode</string>
   <!-- Git Config fragment -->
   <string name="git_user_name_hint">Nutzername</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ae0f27da7..e71117c17 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -53,7 +53,6 @@
   <string name="password_dialog_text">Renseignez le mot de passe pour ce dépôt</string>
   <!-- Clone fragment -->
   <string name="server_url">URL du dépôt</string>
-  <string name="server_branch">Branche</string>
   <string name="connection_mode">Méthode d\'authentification</string>
   <!-- Git Config fragment -->
   <string name="git_user_name_hint">Nom d\'utilisateur</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 31754f736..8813e02dd 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -53,7 +53,6 @@
   <string name="password_dialog_text">Escribe o contrasinal de este repositorio</string>
   <!-- Clone fragment -->
   <string name="server_url">URL do servidor</string>
-  <string name="server_branch">Póla</string>
   <string name="connection_mode">Modo de autenticación</string>
   <!-- Git Config fragment -->
   <string name="git_user_name_hint">Identificador</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index ee70dd4fe..df83cd4a2 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -53,7 +53,6 @@
   <string name="password_dialog_text">Sei pregato di fornire la password per questa repository</string>
   <!-- Clone fragment -->
   <string name="server_url">URL della repository</string>
-  <string name="server_branch">Ramo</string>
   <string name="connection_mode">Modalità di Autenticazione</string>
   <!-- Git Config fragment -->
   <string name="git_user_name_hint">Nome Utente</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index ece25d187..2d2e216ac 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -53,7 +53,6 @@
   <string name="password_dialog_text">Por favor, forneça a senha para este repositório</string>
   <!-- Clone fragment -->
   <string name="server_url">URL do repositório</string>
-  <string name="server_branch">Branch</string>
   <string name="connection_mode">Modo de autenticação</string>
   <!-- Git Config fragment -->
   <string name="git_user_name_hint">Usuário</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 54f2669fc..9dc839510 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -57,7 +57,6 @@
   <string name="password_dialog_text">Пожалуйста, введите пароль для репозитория</string>
   <!-- Clone fragment -->
   <string name="server_url">URL репозитория</string>
-  <string name="server_branch">Ветка</string>
   <string name="connection_mode">Тип авторизации</string>
   <!-- Git Config fragment -->
   <string name="git_user_name_hint">Имя пользователя</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 6981a83cf..ad3a1fb9b 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -52,7 +52,6 @@
   <string name="password_dialog_text">请提供此存储库的密码</string>
   <!-- Clone fragment -->
   <string name="server_url">仓库URL</string>
-  <string name="server_branch">分支</string>
   <string name="connection_mode">认证方式</string>
   <!-- Git Config fragment -->
   <string name="git_user_name_hint">用户名</string>
@@ -139,7 +138,7 @@
   <string name="ssh_keygen_message">%1$s
 
 将此公钥提设置到您的 Git 服务器</string>
-  <string name="ssh_key_gen_generating_progress">生成密钥...</string>
+  <string name="ssh_key_gen_generating_progress">生成密钥…</string>
   <string name="ssh_keygen_require_authentication">使用屏幕锁定进行保护</string>
   <string name="ssh_keygen_label_rsa">RSA</string>
   <string name="ssh_keygen_label_ecdsa">ECDSA</string>
@@ -173,7 +172,7 @@
   <string name="show_password_pref_summary">控制密码解密后的可见性,这不会禁用复制到剪贴板</string>
   <string name="pwd_generate_button">生成</string>
   <string name="refresh_list">刷新列表</string>
-  <string name="send_plaintext_password_to">使用明文发送密码...</string>
+  <string name="send_plaintext_password_to">使用明文发送密码…</string>
   <string name="app_icon_hint">应用图标</string>
   <!-- Oreo Autofill -->
   <string name="oreo_autofill_select_and_fill_into">选择要填写的条目</string>
@@ -181,11 +180,11 @@
   <string name="oreo_autofill_match_with">与%1$s匹配</string>
   <string name="oreo_autofill_matches_clear_existing">清除现有匹配</string>
   <string name="oreo_autofill_filter_no_results">无返回值</string>
-  <string name="oreo_autofill_search_in_store">在存储库搜索...</string>
+  <string name="oreo_autofill_search_in_store">在存储库搜索…</string>
   <string name="oreo_autofill_save_internal_error">由于内部错误 保存失败</string>
   <string name="oreo_autofill_save_app_not_supported">目前不支持此应用</string>
   <string name="oreo_autofill_save_passwords_dont_match">密码不匹配</string>
-  <string name="oreo_autofill_generate_password">生成密码...</string>
+  <string name="oreo_autofill_generate_password">生成密码…</string>
   <string name="oreo_autofill_fill_otp_from_sms">从短信中提取代码…</string>
   <string name="oreo_autofill_max_matches_reached">已达到最大匹配数(%1$d) 在添加新匹配之前清除匹配</string>
   <string name="oreo_autofill_warning_publisher_header">自从您首次将密码存储条目与其关联后,此应用的发布者已更改:</string>
@@ -196,7 +195,7 @@
   <string name="oreo_autofill_warning_publisher_changed_disable_autofill_button">保持禁用自动填充</string>
   <string name="oreo_autofill_warning_publisher_reenable_button">重新启用自动填充</string>
   <string name="oreo_autofill_warning_publisher_warning_sign_description">警告</string>
-  <string name="oreo_autofill_warning_publisher_dataset_summary">点击了解详情...</string>
+  <string name="oreo_autofill_warning_publisher_dataset_summary">点击了解详情…</string>
   <string name="oreo_autofill_warning_publisher_dataset_title">疑似网络钓鱼攻击</string>
   <string name="oreo_autofill_general_fill_and_save_support">填写并保存凭据</string>
   <string name="oreo_autofill_general_fill_support">填写凭据</string>
@@ -248,8 +247,8 @@
   <string name="connection_mode_basic_authentication">密码</string>
   <string name="git_server_config_save_success">已成功保存配置</string>
   <string name="git_server_config_save_error">提供的存储库URL无效</string>
-  <string name="git_server_config_save_missing_username_https">请以https://username@example.com/...的形式指定HTTPS用户名</string>
-  <string name="git_server_config_save_missing_username_ssh">请以username@example.com:...的形式指定SSH用户名</string>
+  <string name="git_server_config_save_missing_username_https">请以https://username@example.com/…的形式指定HTTPS用户名</string>
+  <string name="git_server_config_save_missing_username_ssh">请以username@example.com:…的形式指定SSH用户名</string>
   <string name="git_server_config_save_auth_mode_mismatch">%1$s的有效身份验证模式:%2$s</string>
   <string name="git_operation_wrong_passphrase">密码错误</string>
   <string name="git_operation_wrong_password">密码错误</string>
@@ -284,7 +283,7 @@ personal.com</string>
   <string name="git_pull_merge_fail_error">合并失败，你处于冲突状态。TODO：添加恢复方法。</string>
   <string name="git_push_generic_error">推送被远程拒绝,原因: %1$s</string>
   <string name="git_unknown_host">未知主机: %1$s</string>
-  <string name="git_operation_running">运行Git操作...</string>
+  <string name="git_operation_running">运行Git操作…</string>
   <string name="git_break_out_of_detached_success">尝试变更时发生冲突,您的本地%1$s分支被推送到另一个名为%2$s的分支
 使用此分支解决计算机上的冲突</string>
   <string name="git_break_out_of_detached_unneeded">存储库没有变更,无需推送到另一个分支</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2711f2c3d..3840c0bc6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -65,7 +65,6 @@
   <!-- Clone fragment -->
 
   <string name="server_url">Repository URL</string>
-  <string name="server_branch">Branch</string>
 
   <string name="connection_mode">Authentication Mode</string>