diff --git a/app/src/main/java/io/heckel/ntfy/ui/ClientCertificateFragment.kt b/app/src/main/java/io/heckel/ntfy/ui/ClientCertificateFragment.kt
index f2c08041..e26ac8e2 100644
--- a/app/src/main/java/io/heckel/ntfy/ui/ClientCertificateFragment.kt
+++ b/app/src/main/java/io/heckel/ntfy/ui/ClientCertificateFragment.kt
@@ -292,7 +292,7 @@ class ClientCertificateFragment : DialogFragment() {
                 val p12Base64 = Base64.encodeToString(data, Base64.NO_WRAP)
                 repository.addClientCertificate(url, p12Base64, pwd)
                 withContext(Dispatchers.Main) {
-                    Toast.makeText(context, R.string.client_certificate_dialog_added_toast, Toast.LENGTH_SHORT).show()
+                    Toast.makeText(context, R.string.common_certificate_added_toast, Toast.LENGTH_SHORT).show()
                     listener?.onCertificateAdded()
                     dismiss()
                 }
@@ -309,7 +309,7 @@ class ClientCertificateFragment : DialogFragment() {
         lifecycleScope.launch(Dispatchers.IO) {
             repository.removeClientCertificate(url)
             withContext(Dispatchers.Main) {
-                Toast.makeText(context, R.string.client_certificate_dialog_deleted_toast, Toast.LENGTH_SHORT).show()
+                Toast.makeText(context, R.string.common_certificate_deleted_toast, Toast.LENGTH_SHORT).show()
                 listener?.onCertificateDeleted()
                 dismiss()
             }
diff --git a/app/src/main/java/io/heckel/ntfy/ui/TrustedCertificateFragment.kt b/app/src/main/java/io/heckel/ntfy/ui/TrustedCertificateFragment.kt
index 48a57200..2d9e66b2 100644
--- a/app/src/main/java/io/heckel/ntfy/ui/TrustedCertificateFragment.kt
+++ b/app/src/main/java/io/heckel/ntfy/ui/TrustedCertificateFragment.kt
@@ -358,7 +358,7 @@ class TrustedCertificateFragment : DialogFragment() {
             repository.addTrustedCertificate(url, pem)
             withContext(Dispatchers.Main) {
                 if (mode != Mode.UNKNOWN) {
-                    Toast.makeText(context, R.string.trusted_certificate_dialog_added_toast, Toast.LENGTH_SHORT).show()
+                    Toast.makeText(context, R.string.common_certificate_added_toast, Toast.LENGTH_SHORT).show()
                 }
                 listener?.onCertificateTrusted(certificate)
                 dismiss()
@@ -371,7 +371,7 @@ class TrustedCertificateFragment : DialogFragment() {
         lifecycleScope.launch(Dispatchers.IO) {
             repository.removeTrustedCertificate(url)
             withContext(Dispatchers.Main) {
-                Toast.makeText(context, R.string.trusted_certificate_dialog_deleted_toast, Toast.LENGTH_SHORT).show()
+                Toast.makeText(context, R.string.common_certificate_deleted_toast, Toast.LENGTH_SHORT).show()
                 listener?.onCertificateDeleted()
                 dismiss()
             }
diff --git a/app/src/main/res/layout/fragment_client_certificate_dialog.xml b/app/src/main/res/layout/fragment_client_certificate_dialog.xml
index 42225c2b..d3422053 100644
--- a/app/src/main/res/layout/fragment_client_certificate_dialog.xml
+++ b/app/src/main/res/layout/fragment_client_certificate_dialog.xml
@@ -171,7 +171,7 @@
                     android:id="@+id/client_certificate_subject_label"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/client_certificate_dialog_subject"
+                    android:text="@string/common_certificate_subject"
                     android:textSize="12sp"
                     android:textColor="?android:textColorSecondary"
                     android:paddingStart="4dp"
@@ -192,7 +192,7 @@
                     android:id="@+id/client_certificate_issuer_label"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/client_certificate_dialog_issuer"
+                    android:text="@string/common_certificate_issuer"
                     android:textSize="12sp"
                     android:textColor="?android:textColorSecondary"
                     android:paddingStart="4dp"
@@ -213,7 +213,7 @@
                     android:id="@+id/client_certificate_fingerprint_label"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/client_certificate_dialog_fingerprint"
+                    android:text="@string/common_certificate_fingerprint"
                     android:textSize="12sp"
                     android:textColor="?android:textColorSecondary"
                     android:paddingStart="4dp"
@@ -246,7 +246,7 @@
                         <TextView
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:text="@string/client_certificate_dialog_valid_from"
+                            android:text="@string/common_certificate_valid_from"
                             android:textSize="12sp"
                             android:textColor="?android:textColorSecondary"
                             android:paddingStart="4dp"
@@ -271,7 +271,7 @@
                         <TextView
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:text="@string/client_certificate_dialog_valid_until"
+                            android:text="@string/common_certificate_valid_until"
                             android:textSize="12sp"
                             android:textColor="?android:textColorSecondary"
                             android:paddingStart="4dp"
diff --git a/app/src/main/res/layout/fragment_trusted_certificate_dialog.xml b/app/src/main/res/layout/fragment_trusted_certificate_dialog.xml
index 6502031b..7ee716ce 100644
--- a/app/src/main/res/layout/fragment_trusted_certificate_dialog.xml
+++ b/app/src/main/res/layout/fragment_trusted_certificate_dialog.xml
@@ -192,7 +192,7 @@
                     android:id="@+id/trusted_certificate_subject_label"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/trusted_certificate_dialog_subject"
+                    android:text="@string/common_certificate_subject"
                     android:textSize="12sp"
                     android:textColor="?android:textColorSecondary"
                     android:paddingStart="4dp"
@@ -213,7 +213,7 @@
                     android:id="@+id/trusted_certificate_issuer_label"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/trusted_certificate_dialog_issuer"
+                    android:text="@string/common_certificate_issuer"
                     android:textSize="12sp"
                     android:textColor="?android:textColorSecondary"
                     android:paddingStart="4dp"
@@ -234,7 +234,7 @@
                     android:id="@+id/trusted_certificate_fingerprint_label"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/trusted_certificate_dialog_fingerprint"
+                    android:text="@string/common_certificate_fingerprint"
                     android:textSize="12sp"
                     android:textColor="?android:textColorSecondary"
                     android:paddingStart="4dp"
@@ -268,7 +268,7 @@
                             android:id="@+id/trusted_certificate_valid_from_label"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:text="@string/trusted_certificate_dialog_valid_from"
+                            android:text="@string/common_certificate_valid_from"
                             android:textSize="12sp"
                             android:textColor="?android:textColorSecondary"
                             android:paddingStart="4dp"
@@ -294,7 +294,7 @@
                             android:id="@+id/trusted_certificate_valid_until_label"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:text="@string/trusted_certificate_dialog_valid_until"
+                            android:text="@string/common_certificate_valid_until"
                             android:textSize="12sp"
                             android:textColor="?android:textColorSecondary"
                             android:paddingStart="4dp"
diff --git a/app/src/main/res/menu/menu_client_certificate_dialog.xml b/app/src/main/res/menu/menu_client_certificate_dialog.xml
index 36a41095..a5a22959 100644
--- a/app/src/main/res/menu/menu_client_certificate_dialog.xml
+++ b/app/src/main/res/menu/menu_client_certificate_dialog.xml
@@ -3,17 +3,17 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/client_certificate_action_next"
-        android:title="@string/client_certificate_dialog_button_next"
+        android:title="@string/common_button_next"
         android:visible="false"
         app:showAsAction="always" />
     <item
         android:id="@+id/client_certificate_action_save"
-        android:title="@string/client_certificate_dialog_button_save"
+        android:title="@string/common_button_save"
         android:visible="false"
         app:showAsAction="always" />
     <item
         android:id="@+id/client_certificate_action_delete"
-        android:title="@string/client_certificate_dialog_button_delete"
+        android:title="@string/common_button_delete"
         android:visible="false"
         app:showAsAction="always" />
 </menu>
diff --git a/app/src/main/res/menu/menu_custom_header_dialog.xml b/app/src/main/res/menu/menu_custom_header_dialog.xml
index f0691940..318abbcf 100644
--- a/app/src/main/res/menu/menu_custom_header_dialog.xml
+++ b/app/src/main/res/menu/menu_custom_header_dialog.xml
@@ -3,12 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/custom_header_dialog_action_save"
-        android:title="@string/custom_headers_dialog_button_add"
+        android:title="@string/common_button_add"
         android:enabled="false"
         app:showAsAction="always" />
     <item
         android:id="@+id/custom_header_dialog_action_delete"
-        android:title="@string/custom_headers_dialog_button_delete"
+        android:title="@string/common_button_delete"
         android:visible="false"
         app:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/menu/menu_trusted_certificate_dialog.xml b/app/src/main/res/menu/menu_trusted_certificate_dialog.xml
index 2db02bb6..910abe58 100644
--- a/app/src/main/res/menu/menu_trusted_certificate_dialog.xml
+++ b/app/src/main/res/menu/menu_trusted_certificate_dialog.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/trusted_certificate_action_next"
-        android:title="@string/trusted_certificate_dialog_button_next"
+        android:title="@string/common_button_next"
         android:visible="false"
         app:showAsAction="always" />
     <item
@@ -13,7 +13,7 @@
         app:showAsAction="always" />
     <item
         android:id="@+id/trusted_certificate_action_delete"
-        android:title="@string/trusted_certificate_dialog_button_delete"
+        android:title="@string/common_button_delete"
         android:visible="false"
         app:showAsAction="always" />
 </menu>
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index a412fe1f..4bc46ba2 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -18,7 +18,7 @@
     <string name="user_dialog_button_add">Voeg gebruiker by</string>
     <string name="user_dialog_button_cancel">Kanselleer</string>
     <string name="user_dialog_button_delete">Verwyder gebruiker</string>
-    <string name="user_dialog_button_save">Bewaar</string>
+    <string name="common_button_save">Bewaar</string>
     <string name="detail_settings_about_header">Oor</string>
     <string name="detail_settings_about_topic_url_title">Onderwerp URL</string>
     <string name="user_dialog_title_edit">Wysig gebruiker</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 9594956a..87c5bc93 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -22,7 +22,7 @@
     <string name="detail_item_menu_cancel">إلغاء التنزيل</string>
     <string name="detail_item_menu_save_file">حفظ الملف</string>
     <string name="detail_item_menu_copy_url">إنسخ الرابط</string>
-    <string name="user_dialog_button_save">حفظ</string>
+    <string name="common_button_save">حفظ</string>
     <string name="add_dialog_base_urls_dropdown_choose">اختر عنوان URL للخدمة</string>
     <string name="add_dialog_login_title">تسجيل الدخول مطلوب</string>
     <string name="common_copied_to_clipboard">تم نسخه إلى الحافظة</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 5f294a2b..c66a79f2 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -199,7 +199,7 @@
     <string name="settings_notifications_auto_delete_summary_one_month">Премахват се автоматично след един месец</string>
     <string name="settings_notifications_auto_delete_summary_three_months">Премахват се автоматично след три месеца</string>
     <string name="settings_advanced_connection_protocol_entry_ws">WebSockets</string>
-    <string name="user_dialog_button_save">Запазване</string>
+    <string name="common_button_save">Запазване</string>
     <string name="user_dialog_button_delete">Премахване</string>
     <string name="user_dialog_button_add">Добавяне</string>
     <string name="user_dialog_password_hint_edit">Парола (без промяна ако е празна)</string>
@@ -412,7 +412,7 @@
     <string name="custom_headers_dialog_error_reserved_name">Тази заглавка е запазена и се задава от ntfy</string>
     <string name="custom_headers_dialog_error_user_exists">Не може да бъде добавена заглавка Authorization ако за сървъра е зададен потребител</string>
     <string name="custom_headers_dialog_error_duplicate">Заглавка с това име вече има за този сървър</string>
-    <string name="custom_headers_dialog_button_add">Добавяне</string>
-    <string name="custom_headers_dialog_button_save">Запазване</string>
-    <string name="custom_headers_dialog_button_delete">Премахване</string>
+    <string name="common_button_add">Добавяне</string>
+    <string name="common_button_save">Запазване</string>
+    <string name="common_button_delete">Премахване</string>
 </resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index cb5f78dc..baef9269 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -338,5 +338,5 @@
     <string name="settings_about_header">Quant a</string>
     <string name="settings_advanced_export_logs_entry_upload_original">Carregar i copiar enllaç</string>
     <string name="user_dialog_button_delete">Eliminar usuari</string>
-    <string name="user_dialog_button_save">Guardar</string>
+    <string name="common_button_save">Guardar</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 3b2bcc78..f24c1489 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -227,7 +227,7 @@
     <string name="user_dialog_button_add">Přidat uživatele</string>
     <string name="user_dialog_button_cancel">Zrušit</string>
     <string name="user_dialog_button_delete">Odstranit uživatele</string>
-    <string name="user_dialog_button_save">Uložit</string>
+    <string name="common_button_save">Uložit</string>
     <string name="refresh_message_error_one">Nepodařilo se obnovit odběr: %1$s</string>
     <string name="channel_subscriber_notification_instant_text_four">Přihlášeno k odběru čtyř témat okamžitého doručení</string>
     <string name="channel_subscriber_notification_noinstant_text_three">Odběr tří témat</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c1721a75..1c2653ce 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -230,7 +230,7 @@
     <string name="user_dialog_button_add">Benutzer hinzufügen</string>
     <string name="user_dialog_button_cancel">Abbrechen</string>
     <string name="user_dialog_button_delete">Benutzer löschen</string>
-    <string name="user_dialog_button_save">Speichern</string>
+    <string name="common_button_save">Speichern</string>
     <string name="main_menu_notifications_disabled_until">Benachrichtigungen stummgeschaltet bis %1$s</string>
     <string name="main_menu_settings_title">Einstellungen</string>
     <string name="main_banner_battery_button_remind_later">Später fragen</string>
@@ -354,9 +354,9 @@
     <string name="settings_advanced_custom_headers_prefs_header_add_summary">Header werden mit jeder HTTP-Anfrage gesendet. Jeder ntfy-Server kann eigene benutzerdefinierte Header haben.</string>
     <string name="custom_headers_dialog_title_add">Neuen Header hinzufügen</string>
     <string name="custom_headers_dialog_title_edit">Header bearbeiten</string>
-    <string name="custom_headers_dialog_button_add">Hinzufügen</string>
-    <string name="custom_headers_dialog_button_save">Speichern</string>
-    <string name="custom_headers_dialog_button_delete">Löschen</string>
+    <string name="common_button_add">Hinzufügen</string>
+    <string name="common_button_save">Speichern</string>
+    <string name="common_button_delete">Löschen</string>
     <string name="custom_headers_dialog_error_invalid_name">Ungültige Zeichen im Header-Namen</string>
     <string name="custom_headers_dialog_error_reserved_name">Dieser Header ist reserviert und wird von ntfy gesetzt</string>
     <string name="custom_headers_dialog_error_user_exists">Authorization-Header kann nicht hinzugefügt werden, wenn ein Benutzer für diesen Server konfiguriert ist</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 46ba64a1..9a0ec575 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -219,7 +219,7 @@
     <string name="user_dialog_password_hint_edit">Contraseña (no se modifica si lo deja vacío)</string>
     <string name="user_dialog_button_add">Añadir usuario</string>
     <string name="user_dialog_button_cancel">Cancelar</string>
-    <string name="user_dialog_button_save">Guardar</string>
+    <string name="common_button_save">Guardar</string>
     <string name="channel_notifications_high_name">Prioridad alta</string>
     <string name="channel_subscriber_notification_instant_text">Suscrito a tópicos de entrega instantánea</string>
     <string name="main_item_status_unified_push">%1$s (UnifiedPush)</string>
@@ -389,7 +389,7 @@
     <string name="custom_headers_dialog_error_reserved_name">Esta cabecera está reservada para uso por ntfy</string>
     <string name="custom_headers_dialog_error_user_exists">No se puede añadir una cabecera \"Authorization\" si ya hay un usuario configurado para este servidor</string>
     <string name="custom_headers_dialog_error_duplicate">Una cabecera con este nombre ya existe para este servidor</string>
-    <string name="custom_headers_dialog_button_add">Añadir</string>
-    <string name="custom_headers_dialog_button_save">Guardar</string>
-    <string name="custom_headers_dialog_button_delete">Borrar</string>
+    <string name="common_button_add">Añadir</string>
+    <string name="common_button_save">Guardar</string>
+    <string name="common_button_delete">Borrar</string>
 </resources>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index c40c34d3..d964a2bb 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -315,7 +315,7 @@
     <string name="user_dialog_button_add">Lisa kasutaja</string>
     <string name="user_dialog_button_cancel">Katkesta</string>
     <string name="user_dialog_button_delete">Kustuta kasutaja</string>
-    <string name="user_dialog_button_save">Salvesta</string>
+    <string name="common_button_save">Salvesta</string>
     <string name="settings_advanced_exact_alarms_title">Täpsed äratused</string>
     <string name="settings_advanced_exact_alarms_true">ntfy võib ajastada täpseid äratusi. Need on vajalikud WebSocketsi toimimiseks taustal. Klõpsa selle õiguse keelamiseks.</string>
     <string name="settings_advanced_exact_alarms_false">ntfy ei või ajastada täpseid äratusi. Need on vajalikud WebSocketsi toimimiseks taustal. Klõpsa selle õiguse lubamiseks.</string>
@@ -397,9 +397,9 @@
     <string name="custom_headers_dialog_value_hint">Päise väärtus (nt. 9f3c2e4a1b2d4e)</string>
     <string name="custom_headers_dialog_error_invalid_name">Päisenimes on kelatud väärtusi</string>
     <string name="custom_headers_dialog_error_reserved_name">Selle päisekirje kasutamine on piiratud ning määratud vaid ntfy poolt</string>
-    <string name="custom_headers_dialog_button_add">Lisa</string>
-    <string name="custom_headers_dialog_button_save">Salvesta</string>
-    <string name="custom_headers_dialog_button_delete">Kustuta</string>
+    <string name="common_button_add">Lisa</string>
+    <string name="common_button_save">Salvesta</string>
+    <string name="common_button_delete">Kustuta</string>
     <string name="custom_headers_dialog_error_duplicate">Sellise nimega päisekirje on selle serveri jaoks juba olemas</string>
     <string name="custom_headers_dialog_error_user_exists">Kui kasutaja on seadistatud selle serveri jaoks, siis „Authorization“ kirjet väärtustada ei saa</string>
     <string name="custom_headers_dialog_description_edit">Sa võid valitud päisekirje nime ja väärtust muuta või kustutada.</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index c499899b..7d733afb 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -96,7 +96,7 @@
     <string name="user_dialog_username_hint">نام کاربری</string>
     <string name="user_dialog_password_hint_add">گذرواژه</string>
     <string name="user_dialog_button_cancel">لغو</string>
-    <string name="user_dialog_button_save">ذخیره</string>
+    <string name="common_button_save">ذخیره</string>
     <string name="main_banner_websocket_reconnect_button_dismiss">رد کردن</string>
     <string name="publish_dialog_title_hint">عنوان</string>
     <string name="publish_dialog_message_hint">پیام</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 79d0513e..1e8633dc 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -72,7 +72,7 @@
     <string name="settings_advanced_export_logs_entry_upload_original">Tallenna ja kopioi linkki</string>
     <string name="main_banner_battery_button_fix_now">Korjaa nyt</string>
     <string name="detail_item_download_info_not_downloaded">Ei ladattu</string>
-    <string name="user_dialog_button_save">Tallenna</string>
+    <string name="common_button_save">Tallenna</string>
     <string name="detail_delete_dialog_cancel">Peruuta</string>
     <string name="notification_popup_action_download">Lataa</string>
     <string name="detail_item_cannot_download">Liitettä ei voi avata tai ladata. Linkki vanhentui, eikä paikallista tiedostoa löytynyt.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 692a5248..36c3d51b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -259,7 +259,7 @@
     <string name="user_dialog_button_add">Ajouter utilisateur</string>
     <string name="user_dialog_button_cancel">Annuler</string>
     <string name="user_dialog_button_delete">Supprimer utilisateur</string>
-    <string name="user_dialog_button_save">Enregistrer</string>
+    <string name="common_button_save">Enregistrer</string>
     <string name="settings_advanced_clear_logs_deleted_toast">Journaux supprimés</string>
     <string name="settings_notifications_min_priority_summary_x_or_higher">Affiche les notifications si la priorité est %1$d (%2$s) ou supérieure</string>
     <string name="settings_notifications_auto_delete_never">Jamais</string>
@@ -409,9 +409,9 @@
     <string name="custom_headers_dialog_error_reserved_name">Cet en-tête est réservé et défini par ntfy</string>
     <string name="custom_headers_dialog_error_user_exists">Impossible d\'ajouter l\'en-tête d\'autorisation si un utilisateur est configuré pour ce serveur</string>
     <string name="custom_headers_dialog_error_duplicate">Un en-tête avec ce nom existe déjà pour ce serveur</string>
-    <string name="custom_headers_dialog_button_add">Ajouter</string>
-    <string name="custom_headers_dialog_button_save">Sauvegarder</string>
-    <string name="custom_headers_dialog_button_delete">Supprimer</string>
+    <string name="common_button_add">Ajouter</string>
+    <string name="common_button_save">Sauvegarder</string>
+    <string name="common_button_delete">Supprimer</string>
     <string name="publish_dialog_title">Publier sur %1$s</string>
     <string name="publish_dialog_title_hint">Titre</string>
     <string name="publish_dialog_delay_placeholder">e.g. 30m, 1h, today 9pm (en anglais uniquement)</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 0ac3d4d2..e09459a0 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -330,7 +330,7 @@
     <string name="user_dialog_title_add">Engadir usuaria</string>
     <string name="user_dialog_button_cancel">Cancelar</string>
     <string name="user_dialog_button_delete">Eliminar usuaria</string>
-    <string name="user_dialog_button_save">Gardar</string>
+    <string name="common_button_save">Gardar</string>
     <string name="settings_advanced_unifiedpush_title">Activar UnifiedPush</string>
     <string name="user_dialog_title_edit">Editar usuaria</string>
     <string name="user_dialog_description_add">Podes engadir aquí unha usuaria. Todos os temas do servidor indicado usarán esta usuaria.</string>
@@ -412,7 +412,7 @@
     <string name="custom_headers_dialog_error_reserved_name">Esta cabeceira está reservada e establecida por ntfy</string>
     <string name="custom_headers_dialog_error_user_exists">Non se pode engadir unha cabeceira de Autenticación se unha usuaria está configurada neste servidor</string>
     <string name="custom_headers_dialog_error_duplicate">Xa existe unha cabeceira con este nome para este servidor</string>
-    <string name="custom_headers_dialog_button_add">Engadir</string>
-    <string name="custom_headers_dialog_button_save">Gardar</string>
-    <string name="custom_headers_dialog_button_delete">Eliminar</string>
+    <string name="common_button_add">Engadir</string>
+    <string name="common_button_save">Gardar</string>
+    <string name="common_button_delete">Eliminar</string>
 </resources>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index e49ca85e..3952204b 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -214,7 +214,7 @@
     <string name="settings_notifications_min_priority_summary_x_or_higher">Tampilkan notifikasi jika prioritas adalah %1$d (%2$s) atau di atas</string>
     <string name="settings_notifications_auto_download_summary_always">Unduh semua lampiran secara otomatis</string>
     <string name="settings_notifications_auto_download_500k">Jika di bawah 500 kB</string>
-    <string name="user_dialog_button_save">Simpan</string>
+    <string name="common_button_save">Simpan</string>
     <string name="channel_notifications_high_name">Prioritas tinggi</string>
     <string name="main_action_mode_delete_dialog_permanently_delete">Hapus secara permanen</string>
     <string name="add_dialog_button_subscribe">Berlangganan</string>
@@ -412,7 +412,7 @@
     <string name="custom_headers_dialog_error_reserved_name">Header ini disediakan dan diatur oleh ntfy</string>
     <string name="custom_headers_dialog_error_user_exists">Tidak dapat menambahkan header Otorisasi jika pengguna diatur untuk server ini</string>
     <string name="custom_headers_dialog_error_duplicate">Header dengan nama ini sudah ada untuk server ini</string>
-    <string name="custom_headers_dialog_button_add">Tambah</string>
-    <string name="custom_headers_dialog_button_save">Simpan</string>
-    <string name="custom_headers_dialog_button_delete">Hapus</string>
+    <string name="common_button_add">Tambah</string>
+    <string name="common_button_save">Simpan</string>
+    <string name="common_button_delete">Hapus</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d1cd71d3..240f8b5a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -173,7 +173,7 @@
     <string name="user_dialog_button_add">Aggiungi utente</string>
     <string name="user_dialog_button_cancel">Annulla</string>
     <string name="user_dialog_button_delete">Elimina utente</string>
-    <string name="user_dialog_button_save">Salva</string>
+    <string name="common_button_save">Salva</string>
     <string name="channel_subscriber_notification_noinstant_text_more">Iscritto a %1$d argomenti</string>
     <string name="channel_notifications_default_name">Priorità predefinita</string>
     <string name="channel_notifications_min_name">Priorità minima</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 2786e043..f7ebbb89 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -288,7 +288,7 @@
     <string name="user_dialog_username_hint">שם משתמש</string>
     <string name="user_dialog_button_cancel">ביטול</string>
     <string name="user_dialog_button_delete">מחיקת משתמש</string>
-    <string name="user_dialog_button_save">שמירה</string>
+    <string name="common_button_save">שמירה</string>
     <string name="detail_item_cannot_delete">לא ניתן למחוק צרופה: %1$s</string>
     <string name="detail_item_download_failed">לא ניתן להוריד צרופה: %1$s</string>
     <string name="detail_item_download_info_not_downloaded_expired">לא ירדה, תוקף הקישור פג</string>
@@ -386,9 +386,9 @@
     <string name="settings_general_language_summary_system">להשתמש בברירת המחדל של המערכת</string>
     <string name="settings_general_language_system_default">ברירת המחדל של המערכת</string>
     <string name="settings_general_dynamic_colors_title">צבעים דינמיים</string>
-    <string name="custom_headers_dialog_button_delete">מחיקה</string>
-    <string name="custom_headers_dialog_button_save">שמירה</string>
-    <string name="custom_headers_dialog_button_add">הוספה</string>
+    <string name="common_button_delete">מחיקה</string>
+    <string name="common_button_save">שמירה</string>
+    <string name="common_button_add">הוספה</string>
     <string name="custom_headers_dialog_error_duplicate">כבר יש כותרת בשם הזה בשרת הזה</string>
     <string name="custom_headers_dialog_error_reserved_name">הכותרת הזאת שמורה ומוגדרת על ידי ntfy</string>
     <string name="custom_headers_dialog_error_invalid_name">שם הכותרת מכיל תווים שגויים</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index f9d1062d..001efdee 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -288,7 +288,7 @@
     <string name="user_dialog_username_hint">ユーザー名</string>
     <string name="user_dialog_button_add">ユーザー追加</string>
     <string name="user_dialog_button_delete">ユーザー削除</string>
-    <string name="user_dialog_button_save">保存</string>
+    <string name="common_button_save">保存</string>
     <string name="user_dialog_password_hint_add">パスワード</string>
     <string name="user_dialog_button_cancel">キャンセル</string>
     <string name="settings_notifications_min_priority_low">優先度低 およびそれ以上</string>
@@ -412,7 +412,7 @@
     <string name="custom_headers_dialog_error_reserved_name">このヘッダはntfyによって予約・設定されています</string>
     <string name="custom_headers_dialog_error_user_exists">このサーバでユーザが設定されている場合はAuthorizationヘッダを追加できません</string>
     <string name="custom_headers_dialog_error_duplicate">このヘッダ名はこのサーバで既に存在します</string>
-    <string name="custom_headers_dialog_button_add">追加</string>
-    <string name="custom_headers_dialog_button_save">保存</string>
-    <string name="custom_headers_dialog_button_delete">削除</string>
+    <string name="common_button_add">追加</string>
+    <string name="common_button_save">保存</string>
+    <string name="common_button_delete">削除</string>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 9fb6a1b2..ca5e9c22 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -167,7 +167,7 @@
     <string name="settings_advanced_connection_protocol_entry_jsonhttp">JSON stream over HTTP</string>
     <string name="detail_settings_appearance_header">표시 설정</string>
     <string name="channel_notifications_low_name">우선순위 낮음</string>
-    <string name="user_dialog_button_save">저장</string>
+    <string name="common_button_save">저장</string>
     <string name="channel_notifications_min_name">우선순위 최하</string>
     <string name="channel_subscriber_notification_instant_text_two">즉시 전달 주제 2개 구독중</string>
     <string name="channel_subscriber_notification_instant_text_five">즉시 전달 주제 5개 구독중</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 9ae157aa..a72a6a28 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -207,7 +207,7 @@
     <string name="user_dialog_button_add">Legg til bruker</string>
     <string name="user_dialog_button_cancel">Avbryt</string>
     <string name="user_dialog_button_delete">Slett bruker</string>
-    <string name="user_dialog_button_save">Lagre</string>
+    <string name="common_button_save">Lagre</string>
     <string name="channel_subscriber_notification_instant_text_three">Abonnert på tre emner med umiddelbar levering</string>
     <string name="channel_subscriber_notification_noinstant_text_more">Abonnert på %1$d emner</string>
     <string name="main_menu_settings_title">Innstillinger</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 853943f9..bcadcea1 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -28,7 +28,7 @@
     <string name="user_dialog_password_hint_edit">Wachtwoord(ongewijzigd indien leeg gelaten)</string>
     <string name="user_dialog_username_hint">Gebruikersnaam</string>
     <string name="common_service_url">Server URL</string>
-    <string name="user_dialog_button_save">Opslaan</string>
+    <string name="common_button_save">Opslaan</string>
     <string name="detail_delete_dialog_permanently_delete">Permanent verwijderen</string>
     <string name="detail_delete_dialog_cancel">Annuleren</string>
     <string name="detail_clear_dialog_cancel">Annuleren</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 9c5318fd..8b69034b 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -176,7 +176,7 @@
     <string name="user_dialog_password_hint_add">Hasło</string>
     <string name="user_dialog_password_hint_edit">Hasło (niezmienione, jeśli pozostawiono puste)</string>
     <string name="user_dialog_button_delete">Usuń użytkownika</string>
-    <string name="user_dialog_button_save">Zapisz</string>
+    <string name="common_button_save">Zapisz</string>
     <string name="main_menu_notifications_disabled_until">Powiadomienia wyciszone przez %1$s</string>
     <string name="main_action_mode_delete_dialog_cancel">Anuluj</string>
     <string name="main_menu_docs_title">Przeczytaj dokumentację</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index f23f3d83..88e6640e 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -194,7 +194,7 @@
     <string name="user_dialog_button_delete">Apagar usuário</string>
     <string name="channel_notifications_low_name">Prioridade baixa</string>
     <string name="channel_subscriber_notification_instant_text_two">Inscrito em dois tópicos de entrega instantânea</string>
-    <string name="user_dialog_button_save">Salvar</string>
+    <string name="common_button_save">Salvar</string>
     <string name="main_item_status_text_one">%1$d notificação</string>
     <string name="channel_subscriber_notification_noinstant_text_one">Inscrito em um tópico</string>
     <string name="main_menu_notifications_disabled_forever">Notificações silenciadas</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index d2599278..545a2f74 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -323,7 +323,7 @@
     <string name="user_dialog_button_cancel">Cancelar</string>
     <string name="user_dialog_button_add">Adicionar utilizador</string>
     <string name="user_dialog_button_delete">Eliminar utilizador</string>
-    <string name="user_dialog_button_save">Guardar</string>
+    <string name="common_button_save">Guardar</string>
     <string name="settings_notifications_insistent_max_priority_title">Continuar a alertar para a prioridade máxima</string>
     <string name="detail_settings_notifications_insistent_max_priority_list_item_enabled">Continuar a alertar</string>
     <string name="channel_notifications_group_default_name">Padrão</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 007a0464..5b57c6e0 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -135,7 +135,7 @@
     <string name="user_dialog_button_add">Adaugă utilizator</string>
     <string name="user_dialog_button_cancel">Anulează</string>
     <string name="user_dialog_button_delete">Șterge utilizator</string>
-    <string name="user_dialog_button_save">Salvează</string>
+    <string name="common_button_save">Salvează</string>
     <string name="channel_notifications_default_name">Prioritate normală</string>
     <string name="channel_subscriber_notification_title">Ascultând pentru notificări primite</string>
     <string name="channel_notifications_max_name">Prioritate maximă</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 7928c7f2..93a31d3a 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -232,7 +232,7 @@
     <string name="settings_advanced_export_logs_summary">Скопировать журналы в буфер обмена, или загрузить на nopaste.net (под управлением разработчика ntfy). Доменные имена и темы можно скрыть, уведомления - нет.</string>
     <string name="settings_advanced_export_logs_entry_copy_original">Скопировать в буфер обмена</string>
     <string name="user_dialog_username_hint">Имя пользователя</string>
-    <string name="user_dialog_button_save">Сохранить</string>
+    <string name="common_button_save">Сохранить</string>
     <string name="settings_general_default_base_url_message">Введите базовый URL вашего сервера, чтобы использовать его по умолчанию при подписке на новые темы и/или публикацию в темы.</string>
     <string name="settings_general_users_title">Управление пользователями</string>
     <string name="settings_general_users_summary">Добавить/удалить пользователей из защищённых тем</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 8b8fd39f..c3967d80 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -241,7 +241,7 @@
     <string name="detail_settings_appearance_icon_remove_summary">Ikona zobrazená v oznámeniach pre túto tému</string>
     <string name="detail_settings_appearance_icon_error_saving">Ikonu sa nepodarilo uložiť: %1$s</string>
     <string name="user_dialog_button_cancel">Zrušiť</string>
-    <string name="user_dialog_button_save">Uložiť</string>
+    <string name="common_button_save">Uložiť</string>
     <string name="detail_settings_appearance_display_name_default_summary">%1$s (predvolené)</string>
     <string name="detail_settings_about_header">O programe</string>
     <string name="detail_settings_global_setting_title">Použiť globálne nastavenie</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 298d88ec..fbd0792b 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -125,7 +125,7 @@
     <string name="detail_item_cannot_open_apk">Appar kan inte installeras längre. Ladda ned dem via webbläsaren istället. See Problem #531 för detaljer.</string>
     <string name="add_dialog_topic_name_hint">Ämnesnamn, t. ex. phils_alerts</string>
     <string name="detail_item_cannot_open">Kan inte öppna bifogat dokument: %1$s</string>
-    <string name="user_dialog_button_save">Spara</string>
+    <string name="common_button_save">Spara</string>
     <string name="detail_item_tags">Taggar: %1$s</string>
     <string name="detail_item_saved_successfully">Sparad som \"%1$s\" inuti \"Downloads\" mappen</string>
     <string name="detail_item_cannot_download">Kan inte öppna eller ladda ned bifogat dokument. Länken har uphört och ingen lokal fil hittades.</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 80d62bb7..1d6224c1 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -29,7 +29,7 @@
     <string name="share_content_image_text">ஒரு படம் உங்களுடன் பகிரப்பட்டது</string>
     <string name="notification_dialog_30min">30 நிமிடங்கள்</string>
     <string name="settings_advanced_header">மேம்பட்ட</string>
-    <string name="user_dialog_button_save">சேமி</string>
+    <string name="common_button_save">சேமி</string>
     <string name="channel_notifications_group_default_name">இயல்புநிலை</string>
     <string name="channel_subscriber_notification_instant_text_one">ஒரு உடனடி விநியோக தலைப்புக்கு குழுசேர்ந்தது</string>
     <string name="channel_subscriber_notification_instant_text_three">மூன்று உடனடி விநியோக தலைப்புகளுக்கு குழுசேர்ந்தது</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 8676edba..9d742af7 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -190,7 +190,7 @@
     <string name="user_dialog_button_add">Kullanıcı ekle</string>
     <string name="user_dialog_button_cancel">İptal</string>
     <string name="user_dialog_button_delete">Kullanıcı sil</string>
-    <string name="user_dialog_button_save">Kaydet</string>
+    <string name="common_button_save">Kaydet</string>
     <string name="channel_notifications_high_name">Yüksek öncelik</string>
     <string name="channel_subscriber_notification_noinstant_text_three">Üç konuya abone olundu</string>
     <string name="refresh_message_result">%1$d bildirim alındı</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 1c9173cd..4d0d528a 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -202,7 +202,7 @@
     <string name="settings_advanced_export_logs_copied_logs">Журнали скопійовано в буфер обміну</string>
     <string name="settings_advanced_clear_logs_summary">Видаліть раніше записані журнали та почніть спочатку</string>
     <string name="settings_advanced_connection_protocol_summary_ws">Використовуйте WebSockets для підключення до сервера. Це рекомендований метод, але може знадобитися додаткова конфігурація вашого проксі.</string>
-    <string name="user_dialog_button_save">Зберегти</string>
+    <string name="common_button_save">Зберегти</string>
     <string name="detail_settings_appearance_icon_set_title">Значок підписки</string>
     <string name="detail_settings_notifications_instant_summary_on">Сповіщення надходять миттєво. Потрібна служба переднього плану та споживає більше акумулятора.</string>
     <string name="detail_settings_notifications_instant_summary_off">Сповіщення доставляються за допомогою Firebase. Доставка може бути відкладена, але споживає менше акумулятора.</string>
diff --git a/app/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml
index 21f6c040..d7269993 100644
--- a/app/src/main/res/values-uz/strings.xml
+++ b/app/src/main/res/values-uz/strings.xml
@@ -338,5 +338,5 @@
     <string name="detail_settings_about_header">Haqida</string>
     <string name="user_dialog_button_delete">Foydalanuvchini o‘chirish</string>
     <string name="user_dialog_title_add">Foydalanuvchi qo‘shish</string>
-    <string name="user_dialog_button_save">Saqlash</string>
+    <string name="common_button_save">Saqlash</string>
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 054e756f..81992ee3 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -7,7 +7,7 @@
     <string name="user_dialog_button_add">Thêm tài khoản</string>
     <string name="add_dialog_login_error_not_authorized">Đăng nhập thất bại. Tài khoản %1$s không được cấp quyền.</string>
     <string name="user_dialog_description_edit">Bạn có thể chỉnh sửa tên tài khoản hoặc mật khẩu của người dùng này, hoặc xóa người dùng này khỏi hệ thống.</string>
-    <string name="user_dialog_button_save">Lưu</string>
+    <string name="common_button_save">Lưu</string>
     <string name="user_dialog_password_hint_add">Mật khẩu</string>
     <string name="add_dialog_topic_name_hint">Tên chủ đề, ví dụ: phils_alerts</string>
     <string name="user_dialog_button_delete">Xóa tài khoản</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 85fe3eac..7c4eb6c0 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -290,7 +290,7 @@
     <string name="user_dialog_password_hint_edit">密码 (留空不变)</string>
     <string name="user_dialog_button_add">添加用户</string>
     <string name="user_dialog_button_cancel">取消</string>
-    <string name="user_dialog_button_save">保存</string>
+    <string name="common_button_save">保存</string>
     <string name="settings_notifications_channel_prefs_title">频道设置</string>
     <string name="detail_deep_link_subscribed_toast_message">订阅%1$s 主题</string>
     <string name="settings_notifications_priority_min">分钟</string>
@@ -412,7 +412,7 @@
     <string name="custom_headers_dialog_error_reserved_name">此标头由 ntfy 保留并设置</string>
     <string name="custom_headers_dialog_error_user_exists">如果为该服务器配置了用户，则无法添加授权标头</string>
     <string name="custom_headers_dialog_error_duplicate">此服务器上已存在同名标头</string>
-    <string name="custom_headers_dialog_button_add">添加</string>
-    <string name="custom_headers_dialog_button_save">保存</string>
-    <string name="custom_headers_dialog_button_delete">删除</string>
+    <string name="common_button_add">添加</string>
+    <string name="common_button_save">保存</string>
+    <string name="common_button_delete">删除</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index b17fad2e..9edbf832 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -178,7 +178,7 @@
     <string name="settings_advanced_connection_protocol_entry_ws">WebSocket</string>
     <string name="detail_settings_about_topic_url_title">主題 URL</string>
     <string name="user_dialog_password_hint_add">密碼</string>
-    <string name="user_dialog_button_save">儲存</string>
+    <string name="common_button_save">儲存</string>
     <string name="user_dialog_button_add">新增使用者</string>
     <string name="user_dialog_button_cancel">取消</string>
     <string name="user_dialog_username_hint">使用者名稱</string>
@@ -411,8 +411,8 @@
     <string name="custom_headers_dialog_error_reserved_name">此標頭為保留項目，並由 ntfy 設定</string>
     <string name="custom_headers_dialog_error_user_exists">若此伺服器已設定使用者，則無法新增 Authorization 標頭</string>
     <string name="custom_headers_dialog_error_duplicate">此伺服器已存在相同名稱的標頭</string>
-    <string name="custom_headers_dialog_button_add">新增</string>
-    <string name="custom_headers_dialog_button_save">儲存</string>
-    <string name="custom_headers_dialog_button_delete">刪除</string>
+    <string name="common_button_add">新增</string>
+    <string name="common_button_save">儲存</string>
+    <string name="common_button_delete">刪除</string>
     <string name="publish_dialog_docs_text">如需範例與所有發佈功能的詳細說明，請參考 <a href="https://docs.ntfy.sh/publish/">說明文件</a>。</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1f976b5e..f1e0f13a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,10 +2,23 @@
            tools:ignore="MissingTranslation">
 
     <!-- Common strings -->
+    <string name="common_button_next">Next</string>
+    <string name="common_button_add">Add</string>
+    <string name="common_button_save">Save</string>
+    <string name="common_button_delete">Delete</string>
     <string name="common_copied_to_clipboard">Copied to clipboard</string>
     <string name="common_service_url">Service URL</string>
     <string name="common_service_url_placeholder">e.g. https://ntfy.example.com</string>
 
+    <!-- Common certificate strings -->
+    <string name="common_certificate_subject">Subject</string>
+    <string name="common_certificate_issuer">Issuer</string>
+    <string name="common_certificate_fingerprint">SHA-256 fingerprint</string>
+    <string name="common_certificate_valid_from">Valid from</string>
+    <string name="common_certificate_valid_until">Valid until</string>
+    <string name="common_certificate_added_toast">Certificate added</string>
+    <string name="common_certificate_deleted_toast">Certificate deleted</string>
+
     <!-- Notification channels -->
     <string name="channel_notifications_min_name">Min priority</string>
     <string name="channel_notifications_low_name">Low priority</string>
@@ -480,7 +493,6 @@
     <string name="user_dialog_button_add">Add user</string>
     <string name="user_dialog_button_cancel">Cancel</string>
     <string name="user_dialog_button_delete">Delete user</string>
-    <string name="user_dialog_button_save">Save</string>
 
     <!-- Custom headers dialog (CustomHeaderFragment) -->
     <string name="custom_headers_dialog_title_add">Add custom header</string>
@@ -493,9 +505,6 @@
     <string name="custom_headers_dialog_error_reserved_name">This header is reserved and set by ntfy</string>
     <string name="custom_headers_dialog_error_user_exists">Cannot add Authorization header if a user is configured for this server</string>
     <string name="custom_headers_dialog_error_duplicate">A header with this name already exists for this server</string>
-    <string name="custom_headers_dialog_button_add">Add</string>
-    <string name="custom_headers_dialog_button_save">Save</string>
-    <string name="custom_headers_dialog_button_delete">Delete</string>
 
     <!-- Trusted certificate dialog (TrustedCertificateFragment) -->
     <string name="trusted_certificate_dialog_title">Certificate details</string>
@@ -506,20 +515,11 @@
     <string name="trusted_certificate_dialog_security_description">The server certificate is not trusted. Attackers might be trying to steal your information. Do not proceed unless you know why this certificate is not trusted.</string>
     <string name="trusted_certificate_dialog_description_add">You\'ve selected a certificate file. Review the details below before adding it to your trusted certificates.</string>
     <string name="trusted_certificate_dialog_description_page1">Enter the service URL that this certificate should be pinned to. The certificate will only be trusted for this URL.</string>
-    <string name="trusted_certificate_dialog_subject">Subject</string>
-    <string name="trusted_certificate_dialog_issuer">Issuer</string>
-    <string name="trusted_certificate_dialog_fingerprint">SHA-256 fingerprint</string>
-    <string name="trusted_certificate_dialog_valid_from">Valid from</string>
-    <string name="trusted_certificate_dialog_valid_until">Valid until</string>
     <string name="trusted_certificate_dialog_expired_warning">Warning: This certificate has expired.</string>
     <string name="trusted_certificate_dialog_not_yet_valid_warning">Warning: This certificate is not yet valid.</string>
     <string name="trusted_certificate_dialog_error_invalid_url">Invalid URL</string>
     <string name="trusted_certificate_dialog_error_parse">Unable to load certificate: %1$s</string>
-    <string name="trusted_certificate_dialog_button_next">Next</string>
     <string name="trusted_certificate_dialog_button_trust">Trust</string>
-    <string name="trusted_certificate_dialog_button_delete">Delete</string>
-    <string name="trusted_certificate_dialog_added_toast">Certificate added</string>
-    <string name="trusted_certificate_dialog_deleted_toast">Certificate deleted</string>
 
     <!-- Client certificate dialog (ClientCertificateFragment) -->
     <string name="client_certificate_dialog_title">Client certificate</string>
@@ -527,16 +527,6 @@
     <string name="client_certificate_dialog_description_page1">Enter the service URL this certificate should be used for, and the password for the PKCS#12 file.</string>
     <string name="client_certificate_dialog_description_page2">Review the certificate details and save to add this client certificate. This certificate will be used to authenticate with the server.</string>
     <string name="client_certificate_dialog_password_hint">Password</string>
-    <string name="client_certificate_dialog_subject">Subject</string>
-    <string name="client_certificate_dialog_issuer">Issuer</string>
-    <string name="client_certificate_dialog_fingerprint">SHA-256 Fingerprint</string>
-    <string name="client_certificate_dialog_valid_from">Valid from</string>
-    <string name="client_certificate_dialog_valid_until">Valid until</string>
-    <string name="client_certificate_dialog_button_next">Next</string>
-    <string name="client_certificate_dialog_button_save">Save</string>
-    <string name="client_certificate_dialog_button_delete">Delete</string>
-    <string name="client_certificate_dialog_added_toast">Certificate added</string>
-    <string name="client_certificate_dialog_deleted_toast">Certificate deleted</string>
     <string name="client_certificate_dialog_error_wrong_password">Wrong password or invalid PKCS#12 file</string>
     <string name="client_certificate_dialog_error_invalid_p12_password">Invalid password or corrupted PKCS#12 file</string>
     <string name="client_certificate_dialog_error_invalid_url">Invalid service URL</string>