diff --git a/assets/romfs/i18n/de.json b/assets/romfs/i18n/de.json index 9c77f72..dc1ec5a 100644 --- a/assets/romfs/i18n/de.json +++ b/assets/romfs/i18n/de.json @@ -53,7 +53,7 @@ "Alphabetical (Star)": "Alphabetisch (Favoriten)", "Likes": "Likes", "ID": "ID", - "Decending": "Absteigend", + "Descending": "Absteigend", "Descending (down)": "Absteigend", "Desc": "Abst.", "Ascending": "Aufsteigend", diff --git a/assets/romfs/i18n/en.json b/assets/romfs/i18n/en.json index 23ca1e3..4b8b58b 100644 --- a/assets/romfs/i18n/en.json +++ b/assets/romfs/i18n/en.json @@ -53,7 +53,7 @@ "Alphabetical (Star)": "Alphabetical (Star)", "Likes": "Likes", "ID": "ID", - "Decending": "Decending", + "Descending": "Descending", "Descending (down)": "Descending (down)", "Desc": "Desc", "Ascending": "Ascending", diff --git a/assets/romfs/i18n/es.json b/assets/romfs/i18n/es.json index 3f60886..e2ca355 100644 --- a/assets/romfs/i18n/es.json +++ b/assets/romfs/i18n/es.json @@ -53,7 +53,7 @@ "Alphabetical (Star)": "Alfabético (favorito)", "Likes": "Me Gusta", "ID": "ID", - "Decending": "Descendente", + "Descending": "Descendente", "Descending (down)": "Descendente (abajo)", "Desc": "Descendente", "Ascending": "Ascendente", diff --git a/assets/romfs/i18n/fr.json b/assets/romfs/i18n/fr.json index 2a7bcc4..6f64ccf 100644 --- a/assets/romfs/i18n/fr.json +++ b/assets/romfs/i18n/fr.json @@ -53,7 +53,7 @@ "Alphabetical (Star)": "Alphabétique (Favories)", "Likes": "Likes", "ID": "ID", - "Decending": "Décroissant", + "Descending": "Décroissant", "Descending (down)": "Décroissant", "Desc": "Décroissant", "Ascending": "Croissant", diff --git a/assets/romfs/i18n/it.json b/assets/romfs/i18n/it.json index 5fc6b05..ce2ce1a 100644 --- a/assets/romfs/i18n/it.json +++ b/assets/romfs/i18n/it.json @@ -53,7 +53,7 @@ "Alphabetical (Star)": "Alfabetico (Preferiti)", "Likes": "Mi Piace", "ID": "ID", - "Decending": "Decrescente", + "Descending": "Decrescente", "Descending (down)": "Decrescente", "Desc": "Decrescente", "Ascending": "Crescente", diff --git a/assets/romfs/i18n/ja.json b/assets/romfs/i18n/ja.json index 070e195..3ad1651 100644 --- a/assets/romfs/i18n/ja.json +++ b/assets/romfs/i18n/ja.json @@ -53,7 +53,7 @@ "Alphabetical (Star)": "アルファベット順(お気に入り)", "Likes": "いいね順", "ID": "デベロッパー順", - "Decending": "降順", + "Descending": "降順", "Descending (down)": "降順", "Desc": "降順", "Ascending": "上昇", diff --git a/assets/romfs/i18n/ko.json b/assets/romfs/i18n/ko.json index 5c367a9..abe1cc8 100644 --- a/assets/romfs/i18n/ko.json +++ b/assets/romfs/i18n/ko.json @@ -53,7 +53,7 @@ "Alphabetical (Star)": "알파벳순 (즐겨찾기)", "Likes": "좋아요순", "ID": "ID순", - "Decending": "내림차순", + "Descending": "내림차순", "Descending (down)": "내림차순", "Desc": "내림차순", "Ascending": "오름차순", diff --git a/assets/romfs/i18n/nl.json b/assets/romfs/i18n/nl.json index a55a570..19d0c54 100644 --- a/assets/romfs/i18n/nl.json +++ b/assets/romfs/i18n/nl.json @@ -53,7 +53,7 @@ "Alphabetical (Star)": "", "Likes": "", "ID": "", - "Decending": "Aflopend", + "Descending": "Aflopend", "Descending (down)": "Aflopend", "Desc": "Aflopend", "Ascending": "Oplopend", diff --git a/assets/romfs/i18n/pt.json b/assets/romfs/i18n/pt.json index 59d0f12..8e21081 100644 --- a/assets/romfs/i18n/pt.json +++ b/assets/romfs/i18n/pt.json @@ -53,7 +53,7 @@ "Alphabetical (Star)": "Ordem alfabética (favoritos)", "Likes": "Nº de curtidas", "ID": "ID", - "Decending": "Decrescente", + "Descending": "Decrescente", "Descending (down)": "Decrescente (baixo)", "Desc": "Decr.", "Ascending": "Ascendente", diff --git a/assets/romfs/i18n/ru.json b/assets/romfs/i18n/ru.json index b08cdad..8d86363 100644 --- a/assets/romfs/i18n/ru.json +++ b/assets/romfs/i18n/ru.json @@ -53,7 +53,7 @@ "Alphabetical (Star)": "", "Likes": "", "ID": "", - "Decending": "По убыванию", + "Descending": "По убыванию", "Descending (down)": "По убыванию", "Desc": "По убыванию", "Ascending": "По возрастанию", diff --git a/assets/romfs/i18n/se.json b/assets/romfs/i18n/se.json index 350f94e..b87928c 100644 --- a/assets/romfs/i18n/se.json +++ b/assets/romfs/i18n/se.json @@ -53,7 +53,7 @@ "Alphabetical (Star)": "Alfabetisk (Stjärna)", "Likes": "Gillar", "ID": "ID", - "Decending": "Fallande", + "Descending": "Fallande", "Descending (down)": "Fallande (nedåt)", "Desc": "Fall", "Ascending": "Stigande", diff --git a/assets/romfs/i18n/vi.json b/assets/romfs/i18n/vi.json index 455212f..bbc0ef8 100644 --- a/assets/romfs/i18n/vi.json +++ b/assets/romfs/i18n/vi.json @@ -53,7 +53,7 @@ "Alphabetical (Star)": "A-Z (Yêu thích)", "Likes": "Thích", "ID": "ID", - "Decending": "Giảm dần", + "Descending": "Giảm dần", "Descending (down)": "Giảm dần (xuống)", "Desc": "Giảm", "Ascending": "Tăng dần", diff --git a/assets/romfs/i18n/zh.json b/assets/romfs/i18n/zh.json index 7165187..3aa378b 100644 --- a/assets/romfs/i18n/zh.json +++ b/assets/romfs/i18n/zh.json @@ -53,7 +53,7 @@ "Alphabetical (Star)": "按字母顺序(星标优先)", "Likes": "点赞量", "ID": "ID", - "Decending": "降序", + "Descending": "降序", "Descending (down)": "降序", "Desc": "降序", "Ascending": "升序", diff --git a/sphaira/include/ui/menus/appstore.hpp b/sphaira/include/ui/menus/appstore.hpp index 9e179c1..a5dcb6d 100644 --- a/sphaira/include/ui/menus/appstore.hpp +++ b/sphaira/include/ui/menus/appstore.hpp @@ -130,7 +130,7 @@ enum SortType { }; enum OrderType { - OrderType_Decending, + OrderType_Descending, OrderType_Ascending, }; @@ -199,7 +199,7 @@ private: Filter m_filter{Filter::Filter_All}; SortType m_sort{SortType::SortType_Updated}; - OrderType m_order{OrderType::OrderType_Decending}; + OrderType m_order{OrderType::OrderType_Descending}; s64 m_index{}; // where i am in the array LazyImage m_default_image; diff --git a/sphaira/include/ui/menus/filebrowser.hpp b/sphaira/include/ui/menus/filebrowser.hpp index f687826..fd0f2d6 100644 --- a/sphaira/include/ui/menus/filebrowser.hpp +++ b/sphaira/include/ui/menus/filebrowser.hpp @@ -29,7 +29,7 @@ enum SortType { }; enum OrderType { - OrderType_Decending, + OrderType_Descending, OrderType_Ascending, }; @@ -262,7 +262,7 @@ private: SelectedType m_selected_type{SelectedType::None}; option::OptionLong m_sort{INI_SECTION, "sort", SortType::SortType_Alphabetical}; - option::OptionLong m_order{INI_SECTION, "order", OrderType::OrderType_Decending}; + option::OptionLong m_order{INI_SECTION, "order", OrderType::OrderType_Descending}; option::OptionBool m_show_hidden{INI_SECTION, "show_hidden", false}; option::OptionBool m_folders_first{INI_SECTION, "folders_first", true}; option::OptionBool m_hidden_last{INI_SECTION, "hidden_last", false}; diff --git a/sphaira/include/ui/menus/homebrew.hpp b/sphaira/include/ui/menus/homebrew.hpp index 16c90b6..7f8607f 100644 --- a/sphaira/include/ui/menus/homebrew.hpp +++ b/sphaira/include/ui/menus/homebrew.hpp @@ -18,7 +18,7 @@ enum SortType { }; enum OrderType { - OrderType_Decending, + OrderType_Descending, OrderType_Ascending, }; @@ -55,7 +55,7 @@ private: std::unique_ptr m_list; option::OptionLong m_sort{INI_SECTION, "sort", SortType::SortType_AlphabeticalStar}; - option::OptionLong m_order{INI_SECTION, "order", OrderType::OrderType_Decending}; + option::OptionLong m_order{INI_SECTION, "order", OrderType::OrderType_Descending}; option::OptionBool m_hide_sphaira{INI_SECTION, "hide_sphaira", false}; }; diff --git a/sphaira/source/ui/menus/appstore.cpp b/sphaira/source/ui/menus/appstore.cpp index 74016e3..30848db 100644 --- a/sphaira/source/ui/menus/appstore.cpp +++ b/sphaira/source/ui/menus/appstore.cpp @@ -962,7 +962,7 @@ Menu::Menu(const std::vector& nro_entries) : MenuBase{"AppStore"_i18n} sort_items.push_back("Alphabetical"_i18n); SidebarEntryArray::Items order_items; - order_items.push_back("Decending"_i18n); + order_items.push_back("Descending"_i18n); order_items.push_back("Ascending"_i18n); options->Add(std::make_shared("Filter"_i18n, filter_items, [this, filter_items](s64& index_out){ @@ -1298,7 +1298,7 @@ void Menu::Sort() { case SortType_Updated: { if (lhs.updated_num == rhs.updated_num) { return strcasecmp(lhs.name.c_str(), rhs.name.c_str()) < 0; - } else if (m_order == OrderType_Decending) { + } else if (m_order == OrderType_Descending) { return lhs.updated_num > rhs.updated_num; } else { return lhs.updated_num < rhs.updated_num; @@ -1307,7 +1307,7 @@ void Menu::Sort() { case SortType_Downloads: { if (lhs.app_dls == rhs.app_dls) { return strcasecmp(lhs.name.c_str(), rhs.name.c_str()) < 0; - } else if (m_order == OrderType_Decending) { + } else if (m_order == OrderType_Descending) { return lhs.app_dls > rhs.app_dls; } else { return lhs.app_dls < rhs.app_dls; @@ -1316,14 +1316,14 @@ void Menu::Sort() { case SortType_Size: { if (lhs.extracted == rhs.extracted) { return strcasecmp(lhs.name.c_str(), rhs.name.c_str()) < 0; - } else if (m_order == OrderType_Decending) { + } else if (m_order == OrderType_Descending) { return lhs.extracted > rhs.extracted; } else { return lhs.extracted < rhs.extracted; } } break; case SortType_Alphabetical: { - if (m_order == OrderType_Decending) { + if (m_order == OrderType_Descending) { return strcasecmp(lhs.name.c_str(), rhs.name.c_str()) < 0; } else { return strcasecmp(lhs.name.c_str(), rhs.name.c_str()) > 0; diff --git a/sphaira/source/ui/menus/filebrowser.cpp b/sphaira/source/ui/menus/filebrowser.cpp index 7bde01c..15bccc9 100644 --- a/sphaira/source/ui/menus/filebrowser.cpp +++ b/sphaira/source/ui/menus/filebrowser.cpp @@ -352,7 +352,7 @@ Menu::Menu(const std::vector& nro_entries) : MenuBase{"FileBrowser"_i1 sort_items.push_back("Alphabetical"_i18n); SidebarEntryArray::Items order_items; - order_items.push_back("Decending"_i18n); + order_items.push_back("Descending"_i18n); order_items.push_back("Ascending"_i18n); options->Add(std::make_shared("Sort"_i18n, sort_items, [this](s64& index_out){ @@ -1034,14 +1034,14 @@ void Menu::Sort() { case SortType_Size: { if (lhs.file_size == rhs.file_size) { return strncasecmp(lhs.name, rhs.name, sizeof(lhs.name)) < 0; - } else if (order == OrderType_Decending) { + } else if (order == OrderType_Descending) { return lhs.file_size > rhs.file_size; } else { return lhs.file_size < rhs.file_size; } } break; case SortType_Alphabetical: { - if (order == OrderType_Decending) { + if (order == OrderType_Descending) { return strncasecmp(lhs.name, rhs.name, sizeof(lhs.name)) < 0; } else { return strncasecmp(lhs.name, rhs.name, sizeof(lhs.name)) > 0; diff --git a/sphaira/source/ui/menus/homebrew.cpp b/sphaira/source/ui/menus/homebrew.cpp index 53d5b2e..fe52d96 100644 --- a/sphaira/source/ui/menus/homebrew.cpp +++ b/sphaira/source/ui/menus/homebrew.cpp @@ -83,7 +83,7 @@ Menu::Menu() : MenuBase{"Homebrew"_i18n} { sort_items.push_back("Size (Star)"_i18n); SidebarEntryArray::Items order_items; - order_items.push_back("Decending"_i18n); + order_items.push_back("Descending"_i18n); order_items.push_back("Ascending"_i18n); options->Add(std::make_shared("Sort"_i18n, sort_items, [this, sort_items](s64& index_out){ @@ -337,7 +337,7 @@ void Menu::Sort() { } } - if (order == OrderType_Decending) { + if (order == OrderType_Descending) { return r < 0; } else { return r > 0; @@ -363,7 +363,7 @@ void Menu::Sort() { if (lhs_timestamp == rhs_timestamp) { return name_cmp(lhs, rhs); - } else if (order == OrderType_Decending) { + } else if (order == OrderType_Descending) { return lhs_timestamp > rhs_timestamp; } else { return lhs_timestamp < rhs_timestamp; @@ -379,7 +379,7 @@ void Menu::Sort() { case SortType_Size: { if (lhs.size == rhs.size) { return name_cmp(lhs, rhs); - } else if (order == OrderType_Decending) { + } else if (order == OrderType_Descending) { return lhs.size > rhs.size; } else { return lhs.size < rhs.size;