From 266f24eb61dd4eb12d3a2739d8f997cabd06c71e Mon Sep 17 00:00:00 2001 From: Apaczer <94932128+Apaczer@users.noreply.github.com> Date: Sat, 23 Dec 2023 21:12:41 +0100 Subject: [PATCH] Replace "favourite" with U.S. "favorite" https://github.com/MiyooCFW/gmenu2x/issues/50 --- README.md | 2 +- assets/translations/Chinese(CN) | 4 ++-- assets/translations/Chinese(TW) | 4 ++-- assets/translations/Polish | 4 ++-- assets/translations/Portuguese(Brazil) | 4 ++-- assets/translations/Russian | 4 ++-- dictionary.txt | 2 +- sections.txt | 2 +- src/selector.cpp | 8 ++++---- src/selector.h | 2 +- translate.txt | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 13a36843..31f37205 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ cd dist/linux ## Translations The list of available translations with examples are stored in `gmenu2x/translations/` dir of your GMenu2X distribution package. -The current in use messages from US English language can be read from: [translate.txt](https://github.com/MiyooCFW/gmenu2x/blob/master/translate.txt). This does not include appLinks' Title&Description which can be added freely by user. +The current in use messages from U.S. English language can be read from: [translate.txt](https://github.com/MiyooCFW/gmenu2x/blob/master/translate.txt). This does not include appLinks' Title&Description which can be added freely by user. You can run `tools/gen_translate.sh` to generate above list providing argument in form of txt file with list of #define for your platform. Otherwise you can rebuild GMenu2X with `-DCHECK_TRANSLATION` CFLAG in Makefile. Then after running binary with selected language you will find `untraslated.txt`file with list of missing translation strings which failed to be generated at the time of using GMenu2X. ### Dictionary diff --git a/assets/translations/Chinese(CN) b/assets/translations/Chinese(CN) index e4fdf265..eec9c678 100644 --- a/assets/translations/Chinese(CN) +++ b/assets/translations/Chinese(CN) @@ -1,7 +1,7 @@ About=关于 Add link=新增程序链接 Add section=新建分组 -Add to Favourites=添加到收藏夹 +Add to Favorites=添加到收藏夹 Aliases=别名 Allow the selector to change directory=允许选择程序浏览器改变目录 Alt Font Outline=备选字轮廓色彩 @@ -71,7 +71,7 @@ Edit=编辑 emus=模拟器 Exit=退出 Explorer=文件管理器 -favourites= +favorites= File containing a list of aliases for the selector=包含选择器别名列表的文件 File Filter=文件过滤 File Selector=文件选择器 diff --git a/assets/translations/Chinese(TW) b/assets/translations/Chinese(TW) index 14cec791..f86cceab 100644 --- a/assets/translations/Chinese(TW) +++ b/assets/translations/Chinese(TW) @@ -1,7 +1,7 @@ About=關於 Add link=新增程式鏈接 Add section=新建分組 -Add to Favourites= +Add to Favorites= Aliases=別名 Allow the selector to change directory=允許選擇程式瀏覽器改變目錄 Alt Font Outline=備選字輪廓色彩 @@ -71,7 +71,7 @@ Edit=編輯 emus= Exit=退出 Explorer=文件管理器 -favourites= +favorites= File containing a list of aliases for the selector=包含選擇器別名列表的文件 File Filter=ROM文件過濾 File Selector=文件選擇器 diff --git a/assets/translations/Polish b/assets/translations/Polish index e09f8a3a..f2916801 100644 --- a/assets/translations/Polish +++ b/assets/translations/Polish @@ -1,7 +1,7 @@ About=O systemie Add link=Dodaj skrót Add section=Dodaj sekcję -Add to Favourites=Dodaj do Ulubionych +Add to Favorites=Dodaj do Ulubionych Aliases=Aliasy Allow the selector to change directory=Pozwól selektorowi na zmianę ścieżki Alt Font Outline=Granica czcionki alter. @@ -71,7 +71,7 @@ Edit=Edytuj emus=emusy Exit=Wyjdź Explorer=Eksplorator -favourites=ulubione +favorites=ulubione File containing a list of aliases for the selector=Plik zawierający listę aliasów selektora File Filter=Filtr plików File Selector=Selektor plików diff --git a/assets/translations/Portuguese(Brazil) b/assets/translations/Portuguese(Brazil) index 98d7cfee..25d8458d 100644 --- a/assets/translations/Portuguese(Brazil) +++ b/assets/translations/Portuguese(Brazil) @@ -1,7 +1,7 @@ About=Sobre Add link=Adicionar link Add section=Adicionar Seção -Add to Favourites=Adicionar aos Favoritos +Add to Favorites=Adicionar aos Favoritos Aliases=Nomes alternativos Allow the selector to change directory=Permitir ao seletor que mude de diretório Alt Font Outline=Contorno da fonte alternativa @@ -71,7 +71,7 @@ Edit=Editar emus=emus Exit=Sair Explorer=Explorador -favourites=favoritos +favorites=favoritos File containing a list of aliases for the selector=Arquivo que contém a lista de nomes alternativos para o seletor File Filter=Filtro de arquivo File Selector=Seletor de arquivos diff --git a/assets/translations/Russian b/assets/translations/Russian index fb74728a..f4567574 100644 --- a/assets/translations/Russian +++ b/assets/translations/Russian @@ -1,7 +1,7 @@ About=Информация Add link=Добавить ярлык Add section=Добавить раздел -Add to Favourites=Добавить в избранное +Add to Favorites=Добавить в избранное Aliases=Псевдонимы Allow the selector to change directory=Разрешить селектору выходить из каталога Alt Font Outline=Контур альт. шрифта @@ -71,7 +71,7 @@ Edit=Изменить emus=эмуляторы Exit=Выход Explorer=Обозреватель -favourites=избранное +favorites=избранное File containing a list of aliases for the selector=Файл со списком псевдонимов для селектора File Filter=Файловый фильтр File Selector=Файловый селектор diff --git a/dictionary.txt b/dictionary.txt index 63bdb5ca..1f6a7185 100644 --- a/dictionary.txt +++ b/dictionary.txt @@ -3,7 +3,7 @@ Activate USB on NAND= Activate USB on SD= Add link= Add section= -Add to Favourites= +Add to Favorites= Aliases= Allow FTP to be started at boot time= Allow telnet to be started at boot time= diff --git a/sections.txt b/sections.txt index 9f979175..e8703a92 100644 --- a/sections.txt +++ b/sections.txt @@ -1,6 +1,6 @@ apps= cores= emus= -favourites= +favorites= games= settings= \ No newline at end of file diff --git a/src/selector.cpp b/src/selector.cpp index c6c3a24e..e6fcb206 100644 --- a/src/selector.cpp +++ b/src/selector.cpp @@ -150,17 +150,17 @@ const std::string Selector::getParams(uint32_t i) { void Selector::customOptions(vector &options) { if (isFile(selected)) { - options.push_back((MenuOption){gmenu2x->tr["Add to Favourites"], MakeDelegate(this, &Selector::addFavourite)}); + options.push_back((MenuOption){gmenu2x->tr["Add to Favorites"], MakeDelegate(this, &Selector::addFavorite)}); } } -void Selector::addFavourite() { +void Selector::addFavorite() { string favicon = getPreview(selected); if (favicon.empty() || favicon == "#") favicon = this->icon; - gmenu2x->menu->addSection("favourites"); + gmenu2x->menu->addSection("favorites"); string title = base_name(getFileName(selected), true); - string linkpath = "sections/favourites/" + title + "." + base_name(link->getExec(), true) + ".lnk"; + string linkpath = "sections/favorites/" + title + "." + base_name(link->getExec(), true) + ".lnk"; LinkApp *fav = new LinkApp(gmenu2x, linkpath.c_str()); diff --git a/src/selector.h b/src/selector.h index ffa4d813..8d8d8da3 100644 --- a/src/selector.h +++ b/src/selector.h @@ -43,7 +43,7 @@ class Selector : public BrowseDialog { Selector(GMenu2X *gmenu2x, const string &title, const string &description, const string &icon, LinkApp *link); const std::string getFileName(uint32_t i = 0); const std::string getParams(uint32_t i = 0); - void addFavourite(); + void addFavorite(); void customOptions(vector &options); }; diff --git a/translate.txt b/translate.txt index 37638bc8..8dc93b7d 100644 --- a/translate.txt +++ b/translate.txt @@ -1,7 +1,7 @@ About= Add link= Add section= -Add to Favourites= +Add to Favorites= Aliases= Allow the selector to change directory= Alt Font Outline= @@ -71,7 +71,7 @@ Edit= emus= Exit= Explorer= -favourites= +favorites= File containing a list of aliases for the selector= File Filter= File Selector=