From e66e7f7c61de0868589da7a3f7a0cddd072de86b Mon Sep 17 00:00:00 2001
From: sspanak <doftor.livain@gmail.com>
Date: Tue, 3 Jun 2025 11:09:12 +0300
Subject: [PATCH] better wording on the Punctuation Order screen

---
 .../punctuation/ItemPunctuationOrderSave.java    | 11 +++++++++++
 .../ItemRestoreDefaultPunctuation.java           |  4 ++++
 .../screens/punctuation/PunctuationScreen.java   | 16 ++++++++++------
 app/src/main/res/values-bg/strings.xml           |  5 +++--
 app/src/main/res/values-de/strings.xml           |  5 +++--
 app/src/main/res/values-es/strings.xml           |  5 +++--
 app/src/main/res/values-fr/strings.xml           |  5 +++--
 app/src/main/res/values-it/strings.xml           |  5 +++--
 app/src/main/res/values-iw/strings.xml           |  5 +++--
 app/src/main/res/values-lt/strings.xml           |  5 +++--
 app/src/main/res/values-nl/strings.xml           |  5 +++--
 app/src/main/res/values-pt-rBR/strings.xml       |  5 +++--
 app/src/main/res/values-ru/strings.xml           |  5 +++--
 app/src/main/res/values-tr/strings.xml           |  5 +++--
 app/src/main/res/values-uk/strings.xml           |  5 +++--
 app/src/main/res/values/strings.xml              |  5 +++--
 .../main/res/xml/prefs_screen_fn_key_order.xml   |  2 +-
 .../main/res/xml/prefs_screen_punctuation.xml    |  2 +-
 18 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/punctuation/ItemPunctuationOrderSave.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/punctuation/ItemPunctuationOrderSave.java
index 749e19bc..4c963d40 100644
--- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/punctuation/ItemPunctuationOrderSave.java
+++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/punctuation/ItemPunctuationOrderSave.java
@@ -2,17 +2,28 @@ package io.github.sspanak.tt9.preferences.screens.punctuation;
 
 import androidx.preference.Preference;
 
+import io.github.sspanak.tt9.R;
+import io.github.sspanak.tt9.languages.Language;
 import io.github.sspanak.tt9.preferences.items.ItemClickable;
 
 public class ItemPunctuationOrderSave extends ItemClickable {
 	public static final String NAME = "punctuation_order_save";
 	private final Runnable clickHandler;
+	private Language language;
 
 	public ItemPunctuationOrderSave(Preference item, Runnable clickHandler) {
 		super(item);
 		this.clickHandler = clickHandler;
 	}
 
+	ItemPunctuationOrderSave setLanguage(Language language) {
+		this.language = language;
+		if (item != null) {
+			item.setTitle(item.getContext().getString(R.string.punctuation_order_save, language.getName()));
+		}
+		return this;
+	}
+
 	@Override
 	protected boolean onClick(Preference p) {
 		if (clickHandler == null) {
diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/punctuation/ItemRestoreDefaultPunctuation.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/punctuation/ItemRestoreDefaultPunctuation.java
index 1c41ab24..026bd336 100644
--- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/punctuation/ItemRestoreDefaultPunctuation.java
+++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/punctuation/ItemRestoreDefaultPunctuation.java
@@ -3,6 +3,7 @@ package io.github.sspanak.tt9.preferences.screens.punctuation;
 import androidx.annotation.NonNull;
 import androidx.preference.Preference;
 
+import io.github.sspanak.tt9.R;
 import io.github.sspanak.tt9.languages.Language;
 import io.github.sspanak.tt9.preferences.items.ItemClickable;
 import io.github.sspanak.tt9.preferences.settings.SettingsStore;
@@ -23,6 +24,9 @@ class ItemRestoreDefaultPunctuation extends ItemClickable {
 
 	ItemRestoreDefaultPunctuation setLanguage(Language language) {
 		this.language = language;
+		if (item != null) {
+			item.setTitle(item.getContext().getString(R.string.punctuation_order_restore_default_for, language.getName()));
+		}
 		return this;
 	}
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/punctuation/PunctuationScreen.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/punctuation/PunctuationScreen.java
index ac597abe..f57146b5 100644
--- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/punctuation/PunctuationScreen.java
+++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/punctuation/PunctuationScreen.java
@@ -16,6 +16,7 @@ public class PunctuationScreen extends BaseScreenFragment {
 	public static final String NAME = "Punctuation";
 	private ItemPunctuationOrderLanguage languageList;
 	private ItemRestoreDefaultPunctuation restoreDefaults;
+	private ItemPunctuationOrderSave saveOrder;
 	private final ArrayList<AbstractPreferenceCharList> charLists = new ArrayList<>();
 
 	public PunctuationScreen() { init(); }
@@ -52,8 +53,9 @@ public class PunctuationScreen extends BaseScreenFragment {
 		}
 
 		initLanguageList();
-		initResetDefaults();
-		initSaveButton();
+		Language initalLanguage = LanguageCollection.getLanguage(languageList.getValue());
+		initResetDefaults(initalLanguage);
+		initSaveButton(initalLanguage);
 		loadCharLists();
 		resetFontSize(false);
 	}
@@ -69,15 +71,16 @@ public class PunctuationScreen extends BaseScreenFragment {
 	}
 
 
-	private void initSaveButton() {
+	private void initSaveButton(Language initialLanguage) {
 		Preference item = findPreference(ItemPunctuationOrderSave.NAME);
 		if (item != null) {
-			new ItemPunctuationOrderSave(item, this::onSaveOrdering).enableClickHandler();
+			saveOrder = new ItemPunctuationOrderSave(item, this::onSaveOrdering).setLanguage(initialLanguage);
+			saveOrder.enableClickHandler();
 		}
 	}
 
 
-	private void initResetDefaults() {
+	private void initResetDefaults(Language initialLanguage) {
 		Preference item = findPreference(ItemRestoreDefaultPunctuation.NAME);
 		if (item == null) {
 			return;
@@ -85,7 +88,7 @@ public class PunctuationScreen extends BaseScreenFragment {
 
 		restoreDefaults = new ItemRestoreDefaultPunctuation(activity.getSettings(), item, this::onLanguageChanged);
 		restoreDefaults
-			.setLanguage(LanguageCollection.getLanguage(languageList.getValue()))
+			.setLanguage(initialLanguage)
 			.enableClickHandler();
 	}
 
@@ -108,6 +111,7 @@ public class PunctuationScreen extends BaseScreenFragment {
 		Language language = LanguageCollection.getLanguage(newLanguageId);
 
 		restoreDefaults.setLanguage(language);
+		saveOrder.setLanguage(language);
 
 		for (AbstractPreferenceCharList list : charLists) {
 			if (list != null) {
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 811be95d..e5fd39c3 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -204,9 +204,10 @@
 	<string name="punctuation_order_save_error">Неуспешно запазване на реда на знаците.</string>
 	<string name="punctuation_order_key_1">Ред на символите на клавиш 1</string>
 	<string name="punctuation_order_key_0">Ред на символите на клавиш 0</string>
-	<string name="restore_default_order">Възстанови реда по подразбиране</string>
+	<string name="fn_key_order_restore_default">Възстанови реда по подразбиране</string>
 	<string name="language">Език</string>
-	<string name="punctuation_order_save">Запази подредбата</string>
+	<string name="punctuation_order_restore_default_for">Възстанови стандартната подредба за %1$s</string>
+	<string name="punctuation_order_save">Запази подредбата за %1$s</string>
 	<string name="punctuation_order_forbidden_char">Забранен символ:%1$s</string>
 	<string name="punctuation_order_forbidden_chars">Забранени символи:%1$s</string>
 	<string name="pref_category_geometry">Геометрия</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 7a17f9bc..f61e91ef 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -192,9 +192,10 @@
 	<string name="punctuation_order_save_error">Zeichenreihenfolge konnte nicht gespeichert werden.</string>
 	<string name="punctuation_order_key_1">Zeichenreihenfolge der 1-Taste</string>
 	<string name="punctuation_order_key_0">Zeichenreihenfolge der 0-Taste</string>
-	<string name="restore_default_order">Standardreihenfolge wiederherstellen</string>
+	<string name="fn_key_order_restore_default">Standardreihenfolge wiederherstellen</string>
 	<string name="language">Sprache</string>
-	<string name="punctuation_order_save">Reihenfolge speichern</string>
+	<string name="punctuation_order_restore_default_for">Standardreihenfolge für %1$s wiederherstellen</string>
+	<string name="punctuation_order_save">Reihenfolge für %1$s speichern</string>
 	<string name="punctuation_order_forbidden_char">Verbotenes Zeichen:%1$s</string>
 	<string name="punctuation_order_forbidden_chars">Verbotene Zeichen:%1$s</string>
 	<string name="function_edit_text">Text bearbeiten</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3b5ec8cf..8bdb4934 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -203,9 +203,10 @@
 	<string name="punctuation_order_save_error">Error al guardar el orden de los caracteres.</string>
 	<string name="punctuation_order_key_1">Orden de caracteres de la tecla 1</string>
 	<string name="punctuation_order_key_0">Orden de caracteres de la tecla 0</string>
-	<string name="restore_default_order">Restaurar el orden predeterminado</string>
+	<string name="fn_key_order_restore_default">Restaurar el orden predeterminado</string>
 	<string name="language">Idioma</string>
-	<string name="punctuation_order_save">Guardar orden</string>
+	<string name="punctuation_order_restore_default_for">Restaurar el orden predeterminado para %1$s</string>
+	<string name="punctuation_order_save">Guardar el orden para %1$s</string>
 	<string name="punctuation_order_forbidden_char">Carácter prohibido:%1$s</string>
 	<string name="punctuation_order_forbidden_chars">Caracteres prohibidos:%1$s</string>
 	<string name="pref_category_geometry">Geometría</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 881bec0c..9c3ebb63 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -201,9 +201,10 @@
 	<string name="punctuation_order_save_error">Échec de l’enregistrement de l’ordre des caractères.</string>
 	<string name="punctuation_order_key_1">Ordre des caractères de la touche 1</string>
 	<string name="punctuation_order_key_0">Ordre des caractères de la touche 0</string>
-	<string name="restore_default_order">Restaurer l’ordre par défaut</string>
+	<string name="fn_key_order_restore_default">Restaurer l’ordre par défaut</string>
 	<string name="language">Langue</string>
-	<string name="punctuation_order_save">Enregistrer l’ordre</string>
+	<string name="punctuation_order_restore_default_for">Restaurer l’ordre par défaut pour %1$s</string>
+	<string name="punctuation_order_save">Enregistrer l’ordre pour %1$s</string>
 	<string name="punctuation_order_forbidden_char">Caractère interdit:%1$s</string>
 	<string name="punctuation_order_forbidden_chars">Caractères interdits:%1$s</string>
 	<string name="pref_category_geometry">Géométrie</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index aab6346d..141f62fa 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -190,9 +190,10 @@
 	<string name="punctuation_order_save_error">Salvataggio dell’ordine dei caratteri non riuscito.</string>
 	<string name="punctuation_order_key_1">Ordine dei caratteri del tasto 1</string>
 	<string name="punctuation_order_key_0">Ordine dei caratteri del tasto 0</string>
-	<string name="restore_default_order">Ripristina ordine predefinito</string>
+	<string name="fn_key_order_restore_default">Ripristina ordine predefinito</string>
 	<string name="language">Lingua</string>
-	<string name="punctuation_order_save">Salvare l\'ordine</string>
+	<string name="punctuation_order_restore_default_for">Ripristina l’ordine predefinito per %1$s</string>
+	<string name="punctuation_order_save">Salva l’ordine per %1$s</string>
 	<string name="punctuation_order_forbidden_char">Carattere vietato:%1$s</string>
 	<string name="punctuation_order_forbidden_chars">Caratteri vietati:%1$s</string>
 	<string name="function_edit_text">Modifica testo</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 3d51530b..fda14d99 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -204,9 +204,10 @@
 	<string name="punctuation_order_save_error">שמירת סדר התווים נכשלה.</string>
 	<string name="punctuation_order_key_1">סדר התווים של מקש 1</string>
 	<string name="punctuation_order_key_0">סדר התווים של מקש 0</string>
-	<string name="restore_default_order">שחזר את הסדר המוגדר כברירת מחדל</string>
+	<string name="fn_key_order_restore_default">שחזר את הסדר המוגדר כברירת מחדל</string>
 	<string name="language">שפה</string>
-	<string name="punctuation_order_save">שמור את הסדר</string>
+	<string name="punctuation_order_restore_default_for">שחזר את הסדר המוגדר כברירת מחדל עבור ‎%1$s</string>
+	<string name="punctuation_order_save">שמור את הסדר עבור ‎%1$s</string>
 	<string name="punctuation_order_forbidden_char">תו אסור:%1$s</string>
 	<string name="punctuation_order_forbidden_chars">תווים אסורים:%1$s</string>
 	<string name="function_filter_suggestions">סינון הצעות</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 41311b05..418c7842 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -212,9 +212,10 @@
 	<string name="punctuation_order_save_error">Nepavyko išsaugoti simbolių tvarkos.</string>
 	<string name="punctuation_order_key_1">Simbolių tvarka ant klavišo 1</string>
 	<string name="punctuation_order_key_0">Simbolių tvarka ant klavišo 0</string>
-	<string name="restore_default_order">Atkurti numatytąją tvarką</string>
+	<string name="fn_key_order_restore_default">Atkurti numatytąją tvarką</string>
 	<string name="language">Kalba</string>
-	<string name="punctuation_order_save">Išsaugoti tvarką</string>
+	<string name="punctuation_order_restore_default_for">Atkurti numatytąją tvarką %1$s</string>
+	<string name="punctuation_order_save">Išsaugoti tvarką %1$s</string>
 	<string name="punctuation_order_forbidden_char">Draudžiamas simbolis:%1$s</string>
 	<string name="punctuation_order_forbidden_chars">Draudžiami simboliai:%1$s</string>
 	<string name="pref_category_geometry">Geometrija</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 7b9de258..447f4ef6 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -192,9 +192,10 @@
 	<string name="punctuation_order_save_error">Opslaan van de tekenvolgorde mislukt.</string>
 	<string name="punctuation_order_key_1">Tekenvolgorde van de 1-toets</string>
 	<string name="punctuation_order_key_0">Tekenvolgorde van de 0-toets</string>
-	<string name="restore_default_order">Standaardvolgorde herstellen</string>
+	<string name="fn_key_order_restore_default">Standaardvolgorde herstellen</string>
 	<string name="language">Taal</string>
-	<string name="punctuation_order_save">Volgorde opslaan</string>
+	<string name="punctuation_order_restore_default_for">Standaardvolgorde herstellen voor %1$s</string>
+	<string name="punctuation_order_save">Volgorde opslaan voor %1$s</string>
 	<string name="punctuation_order_forbidden_char">Verboden teken:%1$s</string>
 	<string name="punctuation_order_forbidden_chars">Verboden tekens:%1$s</string>
 	<string name="function_edit_text">Tekst bewerken</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 5c6e20b1..f7d246c0 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -205,9 +205,10 @@
 	<string name="punctuation_order_save_error">Falha ao salvar a ordem dos caracteres.</string>
 	<string name="punctuation_order_key_1">Ordem de caracteres da tecla 1</string>
 	<string name="punctuation_order_key_0">Ordem de caracteres da tecla 0</string>
-	<string name="restore_default_order">Restaurar ordem padrão</string>
+	<string name="fn_key_order_restore_default">Restaurar ordem padrão</string>
 	<string name="language">Idioma</string>
-	<string name="punctuation_order_save">Salvar ordem</string>
+	<string name="punctuation_order_restore_default_for">Restaurar a ordem padrão para %1$s</string>
+	<string name="punctuation_order_save">Salvar a ordem para %1$s</string>
 	<string name="punctuation_order_forbidden_char">Caractere proibido:%1$s</string>
 	<string name="punctuation_order_forbidden_chars">Caracteres proibidos:%1$s</string>
 	<string name="function_filter_suggestions">Filtrar de Sugestões</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 09221334..8b101f67 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -203,9 +203,10 @@
 	<string name="punctuation_order_save_error">е удалось сохранить порядок символов.</string>
 	<string name="punctuation_order_key_1">Порядок символов на клавише 1</string>
 	<string name="punctuation_order_key_0">Порядок символов на клавише 0</string>
-	<string name="restore_default_order">Восстановить порядок по умолчанию</string>
+	<string name="fn_key_order_restore_default">Восстановить порядок по умолчанию</string>
 	<string name="language">Язык</string>
-	<string name="punctuation_order_save">Сохранить порядок</string>
+	<string name="punctuation_order_restore_default_for">Восстановить порядок по умолчанию для %1$s</string>
+	<string name="punctuation_order_save">Сохранить порядок для %1$s</string>
 	<string name="punctuation_order_forbidden_char">Запрещённый символ:%1$s</string>
 	<string name="punctuation_order_forbidden_chars">Запрещённые символы:%1$s</string>
 	<string name="pref_category_geometry">Геометрия</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index fcebf544..4793e90e 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -205,9 +205,10 @@
 	<string name="punctuation_order_save_error">Karakter sırası kaydedilemedi.</string>
 	<string name="punctuation_order_key_1">1 tuşunun karakter sırası</string>
 	<string name="punctuation_order_key_0">0 tuşunun karakter sırası</string>
-	<string name="restore_default_order">Varsayılan sırayı geri yükle</string>
+	<string name="fn_key_order_restore_default">Varsayılan sırayı geri yükle</string>
 	<string name="language">Dil</string>
-	<string name="punctuation_order_save">Sıralamayı kaydet</string>
+	<string name="punctuation_order_restore_default_for">%1$s için varsayılan sırayı geri yükle</string>
+	<string name="punctuation_order_save">%1$s için sırayı kaydet</string>
 	<string name="punctuation_order_forbidden_char">Yasaklı karakter:%1$s</string>
 	<string name="punctuation_order_forbidden_chars">Yasaklı karakterler:%1$s</string>
 	<string name="pref_category_geometry">Geometri</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index ab969e89..034e069b 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -214,9 +214,10 @@
 	<string name="punctuation_order_save_error">Не вдалося зберегти порядок символів.</string>
 	<string name="punctuation_order_key_1">Порядок символів на клавіші 1</string>
 	<string name="punctuation_order_key_0">Порядок символів на клавіші 0</string>
-	<string name="restore_default_order">Відновити початковий порядок</string>
+	<string name="fn_key_order_restore_default">Відновити початковий порядок</string>
 	<string name="language">Мова</string>
-	<string name="punctuation_order_save">Зберегти порядок</string>
+	<string name="punctuation_order_restore_default_for">Відновити порядок за замовчуванням для %1$s</string>
+	<string name="punctuation_order_save">Зберегти порядок для %1$s</string>
 	<string name="punctuation_order_forbidden_char">Заборонений символ:%1$s</string>
 	<string name="punctuation_order_forbidden_chars">Заборонені символи:%1$s</string>
 	<string name="pref_category_geometry">Геометрія</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 15dedf31..b5813c4e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,7 +8,6 @@
 	<string name="english_only" translatable="false">English only</string>
 	<string name="loading">Loading…</string>
 	<string name="language">Language</string>
-	<string name="restore_default_order">Restore Default Order</string>
 	<string name="search_results">Search Results</string>
 	<string name="search_results_void">No results.</string>
 
@@ -171,6 +170,7 @@
 	<string name="fn_key_order_error_duplicate_key">No duplicate keys allowed.</string>
 	<string name="fn_key_order_legend">Legend:</string>
 	<string name="fn_key_order_preview_tip">Hint: After reordering the keys in column 1, tap on column 2 to see the result immediately (or vice versa).</string>
+	<string name="fn_key_order_restore_default">Restore Default Order</string>
 
 	<string name="function_already_assigned">Key \"%1$s\" is already assigned to function \"%2$s\". Do you want to assign it to \"%3$s\"?</string>
 	<string name="function_assign_instructions">* Press or hold a key to assign it to the \"%1$s\" function.\n\n* Press 0 to cancel.\n\n* Press 2 to disable the function.</string>
@@ -210,7 +210,8 @@
 	<string name="punctuation_order_mandatory_chars_missing">Missing mandatory characters:%1$s</string>
 	<string name="punctuation_order_forbidden_char">Forbidden character:%1$s</string>
 	<string name="punctuation_order_forbidden_chars">Forbidden characters:%1$s</string>
-	<string name="punctuation_order_save">Save Order</string>
+	<string name="punctuation_order_restore_default_for">Restore Default Order for %1$s</string>
+	<string name="punctuation_order_save">Save Order for %1$s</string>
 	<string name="punctuation_order_save_error">Failed saving the character order.</string>
 	<string name="punctuation_order_key_1">1-key Character Order</string>
 	<string name="punctuation_order_key_0">0-key Character Order</string>
diff --git a/app/src/main/res/xml/prefs_screen_fn_key_order.xml b/app/src/main/res/xml/prefs_screen_fn_key_order.xml
index 5b4673a9..67358771 100644
--- a/app/src/main/res/xml/prefs_screen_fn_key_order.xml
+++ b/app/src/main/res/xml/prefs_screen_fn_key_order.xml
@@ -8,6 +8,6 @@
 		app:key="pref_rfn_key_order"
 		app:title="@string/fn_key_order_column_2"
 		/>
-	<Preference app:key="pref_reset_fn_key_order" app:title="@string/restore_default_order" />
+	<Preference app:key="pref_reset_fn_key_order" app:title="@string/fn_key_order_restore_default" />
 	<io.github.sspanak.tt9.preferences.screens.fnKeyOrder.FnKeyOrderLegendPreference />
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/prefs_screen_punctuation.xml b/app/src/main/res/xml/prefs_screen_punctuation.xml
index 65675061..37d2ff67 100644
--- a/app/src/main/res/xml/prefs_screen_punctuation.xml
+++ b/app/src/main/res/xml/prefs_screen_punctuation.xml
@@ -40,7 +40,7 @@
 	<PreferenceCategory>
 		<Preference
 			android:key="punctuation_order_reset_defaults"
-			android:title="@string/restore_default_order" />
+			android:title="@string/punctuation_order_restore_default_for" />
 
 		<Preference
 			android:key="punctuation_order_save"