Skip to content

Commit b7f99d7

Browse files
Merge pull request #564 from appdevforall/chore/l10n-consolidate-feature-strings
chore(l10n): fold per-feature string files into strings.xml
2 parents 117922c + c8ab7da commit b7f99d7

103 files changed

Lines changed: 211 additions & 443 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CLAUDE.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,13 @@ two layered migrations from colliding, follow these rules:
116116
- **Per-feature resource files** to avoid `strings.xml` collisions: a feature may
117117
add its own `res/values/strings_<feature>.xml` (Android merges all `<resources>`
118118
files) instead of everyone editing the one shared `strings.xml`. Append, never
119-
reorder existing keys.
119+
reorder existing keys. **This is a temporary device for parallel work, not the
120+
end state.** A `strings_<feature>.xml` is folded back into `strings.xml` (with all
121+
33 locale values) once the feature lands and the collision risk is gone; the
122+
final tree should carry no loose `strings_<feature>.xml`. The one exception is
123+
`strings_untranslated.xml`, the deliberate WIP tracker for strings awaiting
124+
translation (see the l10n conventions). This holds until the policy changes to
125+
keep per-feature string files permanently.
120126
- **Wire dependencies by hand, per feature.** Each feature has its own
121127
`…ViewModelFactory` / small factory. There is no shared DI graph for everyone to
122128
edit (introducing Hilt/Dagger is a separate ADR), so composition roots don't

‎controller/app/src/main/res/values-ar/strings.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1324,4 +1324,10 @@
13241324
<string name="k2go_dash_cancel_confirm_keep">متابعة التحديث</string>
13251325
<string name="k2go_dash_update_site">تحديث الموقع</string>
13261326
<string name="k2go_dash_update_confirm_title">تحديث نواة REST؟</string>
1327+
1328+
<string name="disk_guard_notif_title">مساحة التخزين منخفضة بشكل حرج</string>
1329+
<string name="disk_guard_notif_body">تم إيقاف الخادم لمنع نفاد المساحة على جهازك. انقر لإرسال تقرير.</string>
1330+
<string name="disk_guard_firehose_title">احتوى K2Go نشاطًا غير معتاد</string>
1331+
<string name="disk_guard_firehose_body">تعامل K2Go مع عملية كانت تستخدم مساحة تخزين كبيرة وأبقى نظامك يعمل. انقر لإرسال تقرير.</string>
1332+
<string name="k2go_maps_dl_title">جارٍ تنزيل بيانات الخريطة</string>
13271333
</resources>

‎controller/app/src/main/res/values-ar/strings_diskguard.xml‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎controller/app/src/main/res/values-ar/strings_maps_download.xml‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎controller/app/src/main/res/values-az/strings.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,4 +1344,10 @@
13441344
<string name="k2go_dash_cancel_confirm_keep">Yeniləməyə davam et</string>
13451345
<string name="k2go_dash_update_site">Veb saytı yenilə</string>
13461346
<string name="k2go_dash_update_confirm_title">REST nüvəsi yenilənsin?</string>
1347+
1348+
<string name="disk_guard_notif_title">Yaddaş kritik dərəcədə azdır</string>
1349+
<string name="disk_guard_notif_body">Cihazınızda yer tükənməsin deyə server dayandırıldı. Hesabat göndərmək üçün toxunun.</string>
1350+
<string name="disk_guard_firehose_title">K2Go qeyri-adi fəaliyyəti cilovladı</string>
1351+
<string name="disk_guard_firehose_body">K2Go çox yaddaş istifadə edən prosesi idarə etdi və sisteminizi işlək saxladı. Hesabat göndərmək üçün toxunun.</string>
1352+
<string name="k2go_maps_dl_title">Xəritə məlumatları yüklənir</string>
13471353
</resources>

‎controller/app/src/main/res/values-az/strings_diskguard.xml‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎controller/app/src/main/res/values-az/strings_maps_download.xml‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎controller/app/src/main/res/values-bg/strings.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1331,4 +1331,10 @@
13311331
<string name="k2go_dash_cancel_confirm_keep">Продължи обновяването</string>
13321332
<string name="k2go_dash_update_site">Обновяване на уебсайта</string>
13331333
<string name="k2go_dash_update_confirm_title">Обновяване на REST ядрото?</string>
1334+
1335+
<string name="disk_guard_notif_title">Критично малко хранилище</string>
1336+
<string name="disk_guard_notif_body">Сървърът беше спрян, за да не свърши мястото на устройството ви. Докоснете, за да изпратите отчет.</string>
1337+
<string name="disk_guard_firehose_title">K2Go ограничи необичайна активност</string>
1338+
<string name="disk_guard_firehose_body">K2Go се справи с процес, който използваше твърде много хранилище, и запази системата ви работеща. Докоснете, за да изпратите отчет.</string>
1339+
<string name="k2go_maps_dl_title">Изтегляне на данни за картата</string>
13341340
</resources>

‎controller/app/src/main/res/values-bg/strings_diskguard.xml‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎controller/app/src/main/res/values-bg/strings_maps_download.xml‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)