From 9d41793a43b767bc4227ed0001daef79286ef1d9 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Thu, 25 Jun 2026 17:38:10 +0000
Subject: [PATCH] fix: correct XML escaping and type mismatches in locale
 string resources
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Escape unescaped `?` in calendar_rsvp_maybe_prefixed (it, ru, ru-rRU,
  ru-rUA) — Android treats `?` at string start as a theme-attr reference
- Escape unescaped `@` in my_name (fi, tr, tr-rTR) and
  quick_action_copy_user_id (zh) — same issue with `@` references
- Convert <plurals> to <string> for accounts_found, num_selected,
  follow_accounts in ru/ru-rRU/ru-rUA — English source uses <string>,
  so type-mismatched <plurals> were silently removed by AAPT2
- Fix orphaned key in el-rGR: error_parsing_json_from_lightning_
  address_check_the_user_s_lightning_address_with_user renamed to
  correct _setup_with_user suffix matching the English source

All locale files now build without errors or warnings.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Hfm5Lf3FfwDgPn5oiMVqUo
---
 .../src/main/res/values-el-rGR/strings.xml    |  2 +-
 .../src/main/res/values-fi-rFI/strings.xml    |  2 +-
 .../src/main/res/values-it-rIT/strings.xml    |  2 +-
 .../src/main/res/values-ru-rRU/strings.xml    | 23 ++++---------------
 .../src/main/res/values-ru-rUA/strings.xml    | 23 ++++---------------
 amethyst/src/main/res/values-ru/strings.xml   | 23 ++++---------------
 .../src/main/res/values-tr-rTR/strings.xml    |  2 +-
 amethyst/src/main/res/values-tr/strings.xml   |  2 +-
 amethyst/src/main/res/values-zh/strings.xml   |  2 +-
 9 files changed, 18 insertions(+), 63 deletions(-)

diff --git a/amethyst/src/main/res/values-el-rGR/strings.xml b/amethyst/src/main/res/values-el-rGR/strings.xml
index 1c6224c4cd..f5531d0741 100644
--- a/amethyst/src/main/res/values-el-rGR/strings.xml
+++ b/amethyst/src/main/res/values-el-rGR/strings.xml
@@ -1533,7 +1533,7 @@
     
     <string name="could_not_fetch_invoice_from_details">Δεν ήταν δυνατή η λήψη τιμολογίου από %1$s: %2$s</string>
     
-    <string name="error_parsing_json_from_lightning_address_check_the_user_s_lightning_address_with_user">Σφάλμα ανάλυσης JSON από %1$s. Ελέγξτε τις ρυθμίσεις Lightning του χρήστη</string>
+    <string name="error_parsing_json_from_lightning_address_check_the_user_s_lightning_setup_with_user">Σφάλμα ανάλυσης JSON από %1$s. Ελέγξτε τις ρυθμίσεις Lightning του χρήστη</string>
     
     <string name="callback_url_not_found_in_the_user_s_lightning_address_server_configuration_with_user">Η διεύθυνση URL επανάκλησης δεν βρέθηκε στην απόκριση του %1$s</string>
     
diff --git a/amethyst/src/main/res/values-fi-rFI/strings.xml b/amethyst/src/main/res/values-fi-rFI/strings.xml
index 90edbf4c82..e6ee712d5f 100644
--- a/amethyst/src/main/res/values-fi-rFI/strings.xml
+++ b/amethyst/src/main/res/values-fi-rFI/strings.xml
@@ -4596,7 +4596,7 @@
 
     <string name="search_and_add_a_user">Etsi ja lisää käyttäjä</string>
 
-    <string name="my_name">@-tunnukseni</string>
+    <string name="my_name">\@-tunnukseni</string>
 
     <string name="my_awesome_name">Ostrich McAwesome</string>
 
diff --git a/amethyst/src/main/res/values-it-rIT/strings.xml b/amethyst/src/main/res/values-it-rIT/strings.xml
index 70053a16b2..dfb641101f 100644
--- a/amethyst/src/main/res/values-it-rIT/strings.xml
+++ b/amethyst/src/main/res/values-it-rIT/strings.xml
@@ -2311,7 +2311,7 @@
     
     <string name="calendar_rsvp_going_prefixed">✓ Partecipo</string>
     
-    <string name="calendar_rsvp_maybe_prefixed">? Forse</string>
+    <string name="calendar_rsvp_maybe_prefixed">\? Forse</string>
     
     <string name="calendar_rsvp_not_going_prefixed">✗ Non posso</string>
     
diff --git a/amethyst/src/main/res/values-ru-rRU/strings.xml b/amethyst/src/main/res/values-ru-rRU/strings.xml
index 25f49eb7fb..7a39ccd3b9 100644
--- a/amethyst/src/main/res/values-ru-rRU/strings.xml
+++ b/amethyst/src/main/res/values-ru-rRU/strings.xml
@@ -2243,7 +2243,7 @@
     
     <string name="calendar_rsvp_going_prefixed">✓ Пойду</string>
     
-    <string name="calendar_rsvp_maybe_prefixed">? Возможно</string>
+    <string name="calendar_rsvp_maybe_prefixed">\? Возможно</string>
     
     <string name="calendar_rsvp_not_going_prefixed">✗ Не смогу</string>
 
@@ -3430,26 +3430,11 @@
     
     <string name="tip">Подсказка</string>
     
-    <plurals name="accounts_found">
-    <item quantity="one">%1$d аккаунт найден</item>
-    <item quantity="few">%1$d аккаунта найдено</item>
-    <item quantity="many">%1$d аккаунтов найдено</item>
-    <item quantity="other">%1$d аккаунта найдено</item>
-</plurals>
+    <string name="accounts_found">%1$d аккаунтов найдено</string>
     
-    <plurals name="num_selected">
-    <item quantity="one">%1$d выбран</item>
-    <item quantity="few">%1$d выбрано</item>
-    <item quantity="many">%1$d выбрано</item>
-    <item quantity="other">%1$d выбрано</item>
-</plurals>
+    <string name="num_selected">%1$d выбрано</string>
     
-    <plurals name="follow_accounts">
-    <item quantity="one">Подписаться на %1$d аккаунт</item>
-    <item quantity="few">Подписаться на %1$d аккаунта</item>
-    <item quantity="many">Подписаться на %1$d аккаунтов</item>
-    <item quantity="other">Подписаться на %1$d аккаунта</item>
-</plurals>
+    <string name="follow_accounts">Подписаться на %1$d аккаунтов</string>
     
     <string name="skip_for_now">Пропустить пока</string>
     
diff --git a/amethyst/src/main/res/values-ru-rUA/strings.xml b/amethyst/src/main/res/values-ru-rUA/strings.xml
index 4f822b45ad..0993ed5a9f 100644
--- a/amethyst/src/main/res/values-ru-rUA/strings.xml
+++ b/amethyst/src/main/res/values-ru-rUA/strings.xml
@@ -1767,7 +1767,7 @@
     
     <string name="calendar_rsvp_going_prefixed">✓ Пойду</string>
     
-    <string name="calendar_rsvp_maybe_prefixed">? Возможно</string>
+    <string name="calendar_rsvp_maybe_prefixed">\? Возможно</string>
     
     <string name="calendar_rsvp_not_going_prefixed">✗ Не смогу</string>
 
@@ -2954,26 +2954,11 @@
     
     <string name="tip">Подсказка</string>
     
-    <plurals name="accounts_found">
-    <item quantity="one">%1$d аккаунт найден</item>
-    <item quantity="few">%1$d аккаунта найдено</item>
-    <item quantity="many">%1$d аккаунтов найдено</item>
-    <item quantity="other">%1$d аккаунта найдено</item>
-</plurals>
+    <string name="accounts_found">%1$d аккаунтов найдено</string>
     
-    <plurals name="num_selected">
-    <item quantity="one">%1$d выбран</item>
-    <item quantity="few">%1$d выбрано</item>
-    <item quantity="many">%1$d выбрано</item>
-    <item quantity="other">%1$d выбрано</item>
-</plurals>
+    <string name="num_selected">%1$d выбрано</string>
     
-    <plurals name="follow_accounts">
-    <item quantity="one">Подписаться на %1$d аккаунт</item>
-    <item quantity="few">Подписаться на %1$d аккаунта</item>
-    <item quantity="many">Подписаться на %1$d аккаунтов</item>
-    <item quantity="other">Подписаться на %1$d аккаунта</item>
-</plurals>
+    <string name="follow_accounts">Подписаться на %1$d аккаунтов</string>
     
     <string name="skip_for_now">Пропустить пока</string>
     
diff --git a/amethyst/src/main/res/values-ru/strings.xml b/amethyst/src/main/res/values-ru/strings.xml
index 55de668402..6a2ebdcdfe 100644
--- a/amethyst/src/main/res/values-ru/strings.xml
+++ b/amethyst/src/main/res/values-ru/strings.xml
@@ -2069,7 +2069,7 @@
     
     <string name="calendar_rsvp_going_prefixed">✓ Пойду</string>
     
-    <string name="calendar_rsvp_maybe_prefixed">? Возможно</string>
+    <string name="calendar_rsvp_maybe_prefixed">\? Возможно</string>
     
     <string name="calendar_rsvp_not_going_prefixed">✗ Не смогу</string>
 
@@ -3256,26 +3256,11 @@
     
     <string name="tip">Подсказка</string>
     
-    <plurals name="accounts_found">
-    <item quantity="one">%1$d аккаунт найден</item>
-    <item quantity="few">%1$d аккаунта найдено</item>
-    <item quantity="many">%1$d аккаунтов найдено</item>
-    <item quantity="other">%1$d аккаунта найдено</item>
-</plurals>
+    <string name="accounts_found">%1$d аккаунтов найдено</string>
     
-    <plurals name="num_selected">
-    <item quantity="one">%1$d выбран</item>
-    <item quantity="few">%1$d выбрано</item>
-    <item quantity="many">%1$d выбрано</item>
-    <item quantity="other">%1$d выбрано</item>
-</plurals>
+    <string name="num_selected">%1$d выбрано</string>
     
-    <plurals name="follow_accounts">
-    <item quantity="one">Подписаться на %1$d аккаунт</item>
-    <item quantity="few">Подписаться на %1$d аккаунта</item>
-    <item quantity="many">Подписаться на %1$d аккаунтов</item>
-    <item quantity="other">Подписаться на %1$d аккаунта</item>
-</plurals>
+    <string name="follow_accounts">Подписаться на %1$d аккаунтов</string>
     
     <string name="skip_for_now">Пропустить пока</string>
     
diff --git a/amethyst/src/main/res/values-tr-rTR/strings.xml b/amethyst/src/main/res/values-tr-rTR/strings.xml
index 137e197c44..49b896cfd3 100644
--- a/amethyst/src/main/res/values-tr-rTR/strings.xml
+++ b/amethyst/src/main/res/values-tr-rTR/strings.xml
@@ -4907,7 +4907,7 @@
     
     <string name="search_and_add_a_user">Kullanıcı ara ve ekle</string>
     
-    <string name="my_name">@etiket adım</string>
+    <string name="my_name">\@etiket adım</string>
     
     <string name="my_awesome_name">Ostrich McAwesome</string>
     
diff --git a/amethyst/src/main/res/values-tr/strings.xml b/amethyst/src/main/res/values-tr/strings.xml
index 45367dc0a4..00d20314c6 100644
--- a/amethyst/src/main/res/values-tr/strings.xml
+++ b/amethyst/src/main/res/values-tr/strings.xml
@@ -4884,7 +4884,7 @@
     
     <string name="search_and_add_a_user">Kullanıcı ara ve ekle</string>
     
-    <string name="my_name">@etiket adım</string>
+    <string name="my_name">\@etiket adım</string>
     
     <string name="my_awesome_name">Ostrich McAwesome</string>
     
diff --git a/amethyst/src/main/res/values-zh/strings.xml b/amethyst/src/main/res/values-zh/strings.xml
index ef612106b5..0b33d1f557 100644
--- a/amethyst/src/main/res/values-zh/strings.xml
+++ b/amethyst/src/main/res/values-zh/strings.xml
@@ -161,7 +161,7 @@
     <string name="quick_action_select">选择</string>
     <string name="quick_action_share_browser_link">分享浏览网址</string>
     <string name="quick_action_share">分享</string>
-    <string name="quick_action_copy_user_id">@提及</string>
+    <string name="quick_action_copy_user_id">\@提及</string>
     <string name="quick_action_copy_note_id">引用</string>
     <string name="quick_action_copy_text">复制</string>
     <string name="quick_action_delete">删除</string>