A fork of https://github.com/crosspoint-reader/crosspoint-reader
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

fix: clarity issue with ambiguous string `SET` (#1169)

## Summary

* **What is the goal of this PR?** (e.g., Implements the new feature for
file uploading.)

Fixes a clarity issue regarding the translation string `STR_SET`. The
issue lies in the fact that the english word can have different
meanings.

The only time the string is used is in the language selectio screen,
where it has the meaning of _selected_. (As in _The language has been
**set** to French_).

Another meaning can be _configured_. (As in _The KOReader username has
been __set__). This is the meaning many of the translations have taken.
The reason that the string is right above `STR_NOT_SET` (which is meant
as _not configured_).

With this PR I propose to explicitly use the term "_Selected_". There
are two good reasons for this:
+ it removes the confusion and the misleading translations
+ it is consistent with the button label `Select`, communicating the
link between the two (the row will be marked `Selected` if you press the
buttpn `Select`. Much clearer than now)

* **What changes are included?**

Removed the unused strings and added translations for the new string
`STR_SELECTED` for the languages I know.

tagging the translators for feedback:
fr: @Spigaw @CaptainFrito
de: @DavidOrtmann
cs: @brbla
pt: @yagofarias
it: @andreaturchet @fargolinux
ru: @madebykir @mrtnvgr
es: @yeyeto2788 @Skrzakk @pablohc
sv: @dawiik
ca: @angeldenom
uj: @mirus-ua
be: @dexif

## Additional Context

* Add any other information that might be helpful for the reviewer
(e.g., performance implications, potential risks,
specific areas to focus on).

the Issue was introduced in #1020. Previously, if a language was
selected it was marked with `[ON]` (`STR_ON_MARKER`). I considered
reverting it back to that, but the solution I described above seemed
superior.

---

### AI Usage

While CrossPoint doesn't have restrictions on AI tools in contributing,
please be transparent about their usage as it
helps set the right context for reviewers.

Did you use AI tools to help write this code? _**< NO >**_

---------

Co-authored-by: Егор Мартынов <martynovegorOF@yandex.ru>
Co-authored-by: Mirus <mirusim@gmail.com>

authored by

ariel-lindemann
Егор Мартынов
Mirus
and committed by
GitHub
09cef707 4fb785af

+7 -27
-2
lib/I18n/translations/belarusian.yaml
··· 237 237 STR_NO: "Не" 238 238 STR_STATE_ON: "УКЛ" 239 239 STR_STATE_OFF: "ВЫКЛ" 240 - STR_SET: "Устаноўлена" 241 240 STR_NOT_SET: "Не ўстаноўлена" 242 241 STR_DIR_LEFT: "Улева" 243 242 STR_DIR_RIGHT: "Управа" ··· 246 245 STR_CAPS_ON: "CAPS" 247 246 STR_CAPS_OFF: "caps" 248 247 STR_OK_BUTTON: "OK" 249 - STR_ON_MARKER: "[УКЛ]" 250 248 STR_SLEEP_COVER_FILTER: "Фільтр экрана сну" 251 249 STR_FILTER_CONTRAST: "Кантраст" 252 250 STR_STATUS_BAR_FULL_PERCENT: "Поўная + %"
-2
lib/I18n/translations/catalan.yaml
··· 237 237 STR_NO: "No" 238 238 STR_STATE_ON: "ON" 239 239 STR_STATE_OFF: "OFF" 240 - STR_SET: "Establert" 241 240 STR_NOT_SET: "No establert" 242 241 STR_DIR_LEFT: "Esquerra" 243 242 STR_DIR_RIGHT: "Dreta" ··· 246 245 STR_CAPS_ON: "MAJS" 247 246 STR_CAPS_OFF: "majs" 248 247 STR_OK_BUTTON: "OK" 249 - STR_ON_MARKER: "[ON]" 250 248 STR_SLEEP_COVER_FILTER: "Filtre de pantalla de repòs" 251 249 STR_FILTER_CONTRAST: "Contrast" 252 250 STR_UI_THEME: "Tema de la interfície"
-2
lib/I18n/translations/czech.yaml
··· 237 237 STR_NO: "Ne" 238 238 STR_STATE_ON: "ZAP" 239 239 STR_STATE_OFF: "VYP" 240 - STR_SET: "Nastavit" 241 240 STR_NOT_SET: "Nenastaveno" 242 241 STR_DIR_LEFT: "Vlevo" 243 242 STR_DIR_RIGHT: "Vpravo" ··· 246 245 STR_CAPS_ON: "PÍSMO" 247 246 STR_CAPS_OFF: "písmo" 248 247 STR_OK_BUTTON: "OK" 249 - STR_ON_MARKER: "[ZAP]" 250 248 STR_SLEEP_COVER_FILTER: "Filtr obrazovky spánku" 251 249 STR_FILTER_CONTRAST: "Kontrast" 252 250 STR_UI_THEME: "Šablona rozhraní"
+1 -2
lib/I18n/translations/english.yaml
··· 226 226 STR_HOME: "« Home" 227 227 STR_SAVE: "« Save" 228 228 STR_SELECT: "Select" 229 + STR_SELECTED: "Selected" 229 230 STR_TOGGLE: "Toggle" 230 231 STR_CONFIRM: "Confirm" 231 232 STR_CANCEL: "Cancel" ··· 239 240 STR_HIDE: "Hide" 240 241 STR_STATE_ON: "ON" 241 242 STR_STATE_OFF: "OFF" 242 - STR_SET: "Set" 243 243 STR_NOT_SET: "Not Set" 244 244 STR_DIR_LEFT: "Left" 245 245 STR_DIR_RIGHT: "Right" ··· 248 248 STR_CAPS_ON: "CAPS" 249 249 STR_CAPS_OFF: "caps" 250 250 STR_OK_BUTTON: "OK" 251 - STR_ON_MARKER: "[ON]" 252 251 STR_SLEEP_COVER_FILTER: "Sleep Screen Cover Filter" 253 252 STR_FILTER_CONTRAST: "Contrast" 254 253 STR_CUSTOMISE_STATUS_BAR: "Customise Status Bar"
-2
lib/I18n/translations/french.yaml
··· 237 237 STR_NO: "Non" 238 238 STR_STATE_ON: "ON" 239 239 STR_STATE_OFF: "OFF" 240 - STR_SET: "Défini" 241 240 STR_NOT_SET: "Non défini" 242 241 STR_DIR_LEFT: "Gauche" 243 242 STR_DIR_RIGHT: "Droite" ··· 246 245 STR_CAPS_ON: "MAJ" 247 246 STR_CAPS_OFF: "min" 248 247 STR_OK_BUTTON: "OK" 249 - STR_ON_MARKER: "[ON]" 250 248 STR_SLEEP_COVER_FILTER: "Filtre écran de veille" 251 249 STR_FILTER_CONTRAST: "Contraste" 252 250 STR_UI_THEME: "Thème interface"
+1 -2
lib/I18n/translations/german.yaml
··· 226 226 STR_HOME: "« Start" 227 227 STR_SAVE: "« Speichern" 228 228 STR_SELECT: "Auswahl" 229 + STR_SELECTED: "Ausgewählt" 229 230 STR_TOGGLE: "Ändern" 230 231 STR_CONFIRM: "Bestätigen" 231 232 STR_CANCEL: "Abbrechen" ··· 237 238 STR_NO: "Nein" 238 239 STR_STATE_ON: "An" 239 240 STR_STATE_OFF: "Aus" 240 - STR_SET: "Gesetzt" 241 241 STR_NOT_SET: "Leer" 242 242 STR_DIR_LEFT: "Links" 243 243 STR_DIR_RIGHT: "Rechts" ··· 246 246 STR_CAPS_ON: "UMSCH" 247 247 STR_CAPS_OFF: "umsch" 248 248 STR_OK_BUTTON: "OK" 249 - STR_ON_MARKER: "[AN]" 250 249 STR_SLEEP_COVER_FILTER: "Standby-Coverfilter" 251 250 STR_FILTER_CONTRAST: "Kontrast" 252 251 STR_UI_THEME: "System-Design"
+1 -2
lib/I18n/translations/italian.yaml
··· 226 226 STR_HOME: "« Home" 227 227 STR_SAVE: "« Salva" 228 228 STR_SELECT: "Seleziona" 229 + STR_SELECTED: "Selezionato" 229 230 STR_TOGGLE: "Attiva/Disattiva" 230 231 STR_CONFIRM: "Conferma" 231 232 STR_CANCEL: "Annulla" ··· 237 238 STR_NO: "No" 238 239 STR_STATE_ON: "ON" 239 240 STR_STATE_OFF: "OFF" 240 - STR_SET: "Imposta" 241 241 STR_NOT_SET: "Non impostato" 242 242 STR_DIR_LEFT: "Sinist." 243 243 STR_DIR_RIGHT: "Dest." ··· 246 246 STR_CAPS_ON: "MAIUSC" 247 247 STR_CAPS_OFF: "maiusc" 248 248 STR_OK_BUTTON: "OK" 249 - STR_ON_MARKER: "[ON]" 250 249 STR_SLEEP_COVER_FILTER: "Filtro copertina modalità sleep" 251 250 STR_FILTER_CONTRAST: "Contrasto" 252 251 STR_STATUS_BAR_FULL_PERCENT: "Completa con Percentuale"
-2
lib/I18n/translations/portuguese.yaml
··· 237 237 STR_NO: "Não" 238 238 STR_STATE_ON: "LIG." 239 239 STR_STATE_OFF: "DESL." 240 - STR_SET: "Definir" 241 240 STR_NOT_SET: "Não definido" 242 241 STR_DIR_LEFT: "Esquerda" 243 242 STR_DIR_RIGHT: "Direita" ··· 246 245 STR_CAPS_ON: "CAPS" 247 246 STR_CAPS_OFF: "caps" 248 247 STR_OK_BUTTON: "OK" 249 - STR_ON_MARKER: "[LIGADO]" 250 248 STR_SLEEP_COVER_FILTER: "Filtro capa tela repouso" 251 249 STR_FILTER_CONTRAST: "Contraste" 252 250 STR_UI_THEME: "Tema da interface"
+1 -2
lib/I18n/translations/romanian.yaml
··· 226 226 STR_HOME: "« Acasă" 227 227 STR_SAVE: "« Salvare" 228 228 STR_SELECT: "Selectează" 229 + STR_SELECTED: "Selectat" 229 230 STR_TOGGLE: "Schimbă" 230 231 STR_CONFIRM: "Confirmă" 231 232 STR_CANCEL: "Anulare" ··· 239 240 STR_HIDE: "Ascunde" 240 241 STR_STATE_ON: "Pornit" 241 242 STR_STATE_OFF: "Oprit" 242 - STR_SET: "Setare" 243 243 STR_NOT_SET: "Neconfigurat" 244 244 STR_DIR_LEFT: "Stânga" 245 245 STR_DIR_RIGHT: "Dreapta" ··· 248 248 STR_CAPS_ON: "CAPS" 249 249 STR_CAPS_OFF: "caps" 250 250 STR_OK_BUTTON: "OK" 251 - STR_ON_MARKER: "[ON]" 252 251 STR_SLEEP_COVER_FILTER: "Filtru ecran de repaus" 253 252 STR_FILTER_CONTRAST: "Contrast" 254 253 STR_CUSTOMISE_STATUS_BAR: "Customizaţi bara de stare"
+1 -2
lib/I18n/translations/russian.yaml
··· 226 226 STR_HOME: "« Главная" 227 227 STR_SAVE: "« Сохранить" 228 228 STR_SELECT: "Выбрать" 229 + STR_SELECTED: "Выбран" 229 230 STR_TOGGLE: "Выбор" 230 231 STR_CONFIRM: "Подтв." 231 232 STR_CANCEL: "Отмена" ··· 239 240 STR_HIDE: "Скрыть" 240 241 STR_STATE_ON: "ВКЛ" 241 242 STR_STATE_OFF: "ВЫКЛ" 242 - STR_SET: "Установлено" 243 243 STR_NOT_SET: "Не установлено" 244 244 STR_DIR_LEFT: "Влево" 245 245 STR_DIR_RIGHT: "Вправо" ··· 248 248 STR_CAPS_ON: "CAPS" 249 249 STR_CAPS_OFF: "caps" 250 250 STR_OK_BUTTON: "OK" 251 - STR_ON_MARKER: "[ВКЛ]" 252 251 STR_SLEEP_COVER_FILTER: "Фильтр экрана сна" 253 252 STR_FILTER_CONTRAST: "Контраст" 254 253 STR_CUSTOMISE_STATUS_BAR: "Настройка строки состояния"
-2
lib/I18n/translations/spanish.yaml
··· 237 237 STR_NO: "No" 238 238 STR_STATE_ON: "Activado" 239 239 STR_STATE_OFF: "Desactivado" 240 - STR_SET: "Configurar" 241 240 STR_NOT_SET: "No configurado" 242 241 STR_DIR_LEFT: "Izq." 243 242 STR_DIR_RIGHT: "Der." ··· 246 245 STR_CAPS_ON: "MAYÚSCULAS" 247 246 STR_CAPS_OFF: "minúsculas" 248 247 STR_OK_BUTTON: "OK" 249 - STR_ON_MARKER: "[Activo]" 250 248 STR_SLEEP_COVER_FILTER: "Filtro de pantalla de suspensión" 251 249 STR_FILTER_CONTRAST: "Contraste" 252 250 STR_UI_THEME: "Interfaz"
-2
lib/I18n/translations/swedish.yaml
··· 237 237 STR_NO: "Nej" 238 238 STR_STATE_ON: "PÅ" 239 239 STR_STATE_OFF: "AV" 240 - STR_SET: "Inställd" 241 240 STR_NOT_SET: "Inte inställd" 242 241 STR_DIR_LEFT: "Vänster" 243 242 STR_DIR_RIGHT: "Höger" ··· 246 245 STR_CAPS_ON: "VERSALER" 247 246 STR_CAPS_OFF: "versaler" 248 247 STR_OK_BUTTON: "Okej" 249 - STR_ON_MARKER: "[PÅ]" 250 248 STR_SLEEP_COVER_FILTER: "Viloskärmens omslagsfilter" 251 249 STR_FILTER_CONTRAST: "Kontrast" 252 250 STR_UI_THEME: "Användargränssnittstema"
+1 -2
lib/I18n/translations/ukrainian.yaml
··· 226 226 STR_HOME: "« Додому" 227 227 STR_SAVE: "« Зберегти" 228 228 STR_SELECT: "Вибрати" 229 + STR_SELECTED: "Вибрано" 229 230 STR_TOGGLE: "Обрати" 230 231 STR_CONFIRM: "Підтвердити" 231 232 STR_CANCEL: "Скасувати" ··· 239 240 STR_NO: "Ні" 240 241 STR_STATE_ON: "УВІМК" 241 242 STR_STATE_OFF: "ВИМК" 242 - STR_SET: "Встановити" 243 243 STR_NOT_SET: "Не встановлено" 244 244 STR_DIR_LEFT: "Ліво" 245 245 STR_DIR_RIGHT: "Право" ··· 248 248 STR_CAPS_ON: "ВЕЛИКІ" 249 249 STR_CAPS_OFF: "малі" 250 250 STR_OK_BUTTON: "OK" 251 - STR_ON_MARKER: "[УВІМК]" 252 251 STR_SLEEP_COVER_FILTER: "Фільтр обкладинки екрана сну" 253 252 STR_FILTER_CONTRAST: "Контраст" 254 253 STR_CUSTOMISE_STATUS_BAR: "Налаштувати рядок стану"
+1 -1
src/activities/settings/LanguageSelectActivity.cpp
··· 75 75 renderer, Rect{0, contentTop, pageWidth, contentHeight}, totalItems, selectedIndex, 76 76 [this](int index) { return I18N.getLanguageName(static_cast<Language>(SORTED_LANGUAGE_INDICES[index])); }, 77 77 nullptr, nullptr, 78 - [this, currentLang](int index) { return SORTED_LANGUAGE_INDICES[index] == currentLang ? tr(STR_SET) : ""; }, 78 + [this, currentLang](int index) { return SORTED_LANGUAGE_INDICES[index] == currentLang ? tr(STR_SELECTED) : ""; }, 79 79 true); 80 80 81 81 // Button hints