Uh oh!
There was an error while loading. Please reload this page.
ADFA-5309 chore(strings): dead-string cleanup + one-pass re-localization - #489
Merged
Merged
Conversation
25 Clone/Connect strings whose English changed in ADFA-5304, re-translated into the 33 locales (machine, flagged for native review: bn/gu/ta/sw/az/yo/sr). Glyph-only strings were already handled in 5304.
22 module/get-more strings whose English changed in ADFA-5304, re-translated into the 33 locales (machine, flagged for native review: bn/gu/ta/sw/az/yo/sr).
…ve 4) 24 maps/backup-restore strings whose English changed in ADFA-5304, re-translated into the 33 locales (machine, flagged for native review: bn/gu/ta/sw/az/yo/sr).
…(wave 5) 15 setup/wizard/permission/language strings whose English changed in ADFA-5304, re-translated into the 33 locales (machine, flagged for native review: bn/gu/ta/sw/az/yo/sr).
…e 6) 25 auth/settings/busy/home/install/dashboard strings whose English changed in ADFA-5304, re-translated into the 33 locales (machine, flagged for native review: bn/gu/ta/sw/az/yo/sr). Completes the one-pass re-localization.
Move all k2go_* strings into the base strings.xml (default + 33 locales) and delete strings_k2go.xml. String names are unchanged, so R.string references and the merged resource table are unaffected; this is purely a file consolidation. No name collisions with the existing strings.xml.
Kolibri is stable, so its strings fold into the base strings.xml (default + 33 locales) and strings_kolibri.xml is deleted. Only the <string> elements are merged (the feature file's header comment is dropped). Names unchanged; no collisions; XML validated. Per policy, strings_<feature>.xml is a temporary staging file for early/unstable features and returns to strings.xml once stable.
Uh oh!
There was an error while loading. Please reload this page.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part of the K2Go string cleanup/unification (ADFA-5309). Two things, landed in
waves to keep each step reviewable:
Dead-string cleanup. Removed 81 strings that nothing references — found by a
two-pass check (no R.string. in any .java, no @string/ in any
layout/menu/xml/drawable/values file; no getIdentifier() in the module, so the
list is authoritative). These are old-UI leftovers, variants superseded by the
live UI (e.g. maps_choose_cta -> live maps_choose_title, zim_lang_sub -> live
zim_lang_state_system), and stale "coming soon" placeholders. Removed from the
default and all 33 locales; catalog 817 -> 736.
One-pass re-localization. The English copy updated in ADFA-5304 was English-only
at merge; this PR brings the 33 locales back in sync for the ~121 changed
strings, committed in waves by area (clone/connect, modules + get more, maps +
backup/restore, setup/wizard/permissions, auth/settings + misc). Locale strings
are machine-translated, flagged for native review (bn/gu/ta/sw/az/yo/sr).
Strings only — no code or layout changes. XML validated across default + 33 locales
after each wave.
Deferred (not in this PR):
settles, to avoid mass conflicts with in-flight feature branches.
dead-branch removal — separate review.