From ac66deeb25e03e562f17d475c59d9fad2f336e8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 16 Feb 2023 19:01:13 +0100 Subject: [PATCH 1/5] Improve cheats UX --- Common/UI/View.h | 8 +++--- UI/CwCheatScreen.cpp | 64 +++++++++++++++++++++++++++++++++++--------- UI/CwCheatScreen.h | 8 +++++- 3 files changed, 62 insertions(+), 18 deletions(-) diff --git a/Common/UI/View.h b/Common/UI/View.h index c50a33515113..f857d837ae36 100644 --- a/Common/UI/View.h +++ b/Common/UI/View.h @@ -741,10 +741,10 @@ class Choice : public ClickableItem { std::string smallText_; ImageID image_; // Centered if no text, on the left if text. ImageID rightIconImage_ = ImageID::invalid(); // Shows in the right. - float rightIconScale_; - float rightIconRot_; - bool rightIconFlipH_; - bool rightIconKeepColor_; + float rightIconScale_ = 0.0f; + float rightIconRot_ = 0.0f; + bool rightIconFlipH_ = false; + bool rightIconKeepColor_ = false; Padding textPadding_; bool centered_ = false; float imgScale_ = 1.0f; diff --git a/UI/CwCheatScreen.cpp b/UI/CwCheatScreen.cpp index a8f0c9a70fad..184a7233a003 100644 --- a/UI/CwCheatScreen.cpp +++ b/UI/CwCheatScreen.cpp @@ -34,6 +34,10 @@ static const int FILE_CHECK_FRAME_INTERVAL = 53; +static Path GetGlobalCheatFile() { + return GetSysDirectory(DIRECTORY_CHEATS) / "cheat.db"; +} + CwCheatScreen::CwCheatScreen(const Path &gamePath) : UIDialogScreenWithGameBackground(gamePath) { } @@ -53,7 +57,7 @@ void CwCheatScreen::LoadCheatInfo() { gameID = g_paramSFO.GenerateFakeID(gamePath_.ToString()); } - if (engine_ == nullptr || gameID != gameID_) { + if (!engine_ || gameID != gameID_) { gameID_ = gameID; delete engine_; engine_ = new CWCheatEngine(gameID_); @@ -77,6 +81,7 @@ void CwCheatScreen::CreateViews() { using namespace UI; auto cw = GetI18NCategory("CwCheats"); auto di = GetI18NCategory("Dialog"); + auto mm = GetI18NCategory("MainMenu"); root_ = new AnchorLayout(new LayoutParams(FILL_PARENT, FILL_PARENT)); @@ -84,9 +89,15 @@ void CwCheatScreen::CreateViews() { Margins actionMenuMargins(50, -15, 15, 0); LinearLayout *leftColumn = new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(400, FILL_PARENT)); - leftColumn->Add(new ItemHeader(cw->T("Options"))); //leftColumn->Add(new Choice(cw->T("Add Cheat")))->OnClick.Handle(this, &CwCheatScreen::OnAddCheat); - leftColumn->Add(new Choice(cw->T("Import Cheats")))->OnClick.Handle(this, &CwCheatScreen::OnImportCheat); + leftColumn->Add(new ItemHeader(cw->T("Import Cheats"))); + + Path cheatPath = GetGlobalCheatFile(); + + leftColumn->Add(new Choice(cheatPath.ToVisualString()))->OnClick.Handle(this, &CwCheatScreen::OnImportCheat); + leftColumn->Add(new Choice(mm->T("Browse"), ImageID("I_FOLDER_OPEN")))->OnClick.Handle(this, &CwCheatScreen::OnImportBrowse); + + leftColumn->Add(new ItemHeader(cw->T("Options"))); #if !defined(MOBILE_DEVICE) leftColumn->Add(new Choice(cw->T("Edit Cheat File")))->OnClick.Handle(this, &CwCheatScreen::OnEditCheatFile); #endif @@ -141,6 +152,21 @@ void CwCheatScreen::onFinish(DialogResult result) { } } +void CwCheatScreen::sendMessage(const char *message, const char *value) { + // Always call the base class method first to handle the most common messages. + UIDialogScreenWithGameBackground::sendMessage(message, value); + if (!strcmp(message, "browse_fileSelect")) { + Path path(value); + INFO_LOG(SYSTEM, "Attempting to load cheats from: '%s'", path.ToVisualString().c_str()); + if (ImportCheats(path)) { + g_Config.bReloadCheats = true; + } else { + // Show an error message? + } + RecreateViews(); + } +} + UI::EventReturn CwCheatScreen::OnEnableAll(UI::EventParams ¶ms) { enableAllFlag_ = !enableAllFlag_; @@ -193,24 +219,39 @@ static char *GetLineNoNewline(char *temp, int sz, FILE *fp) { return line; } +UI::EventReturn CwCheatScreen::OnImportBrowse(UI::EventParams ¶ms) { + System_SendMessage("browse_file", ""); + return UI::EVENT_DONE; +} + UI::EventReturn CwCheatScreen::OnImportCheat(UI::EventParams ¶ms) { + if (!ImportCheats(GetGlobalCheatFile())) { + // Show an error message? + return UI::EVENT_DONE; + } + + g_Config.bReloadCheats = true; + RecreateViews(); + return UI::EVENT_DONE; +} + +bool CwCheatScreen::ImportCheats(const Path & cheatFile) { if (gameID_.length() != 9 || !engine_) { WARN_LOG(COMMON, "CWCHEAT: Incorrect ID(%s) - can't import cheats.", gameID_.c_str()); - return UI::EVENT_DONE; + return false; } - std::vector title; - std::vector newList; - Path cheatFile = GetSysDirectory(DIRECTORY_CHEATS) / "cheat.db"; std::string gameID = StringFromFormat("_S %s-%s", gameID_.substr(0, 4).c_str(), gameID_.substr(4).c_str()); FILE *in = File::OpenCFile(cheatFile, "rt"); - if (!in) { WARN_LOG(COMMON, "Unable to open %s\n", cheatFile.c_str()); - return UI::EVENT_SKIPPED; + return false; } + std::vector title; + std::vector newList; + char linebuf[2048]{}; bool parseGameEntry = false; bool parseCheatEntry = false; @@ -281,10 +322,7 @@ UI::EventReturn CwCheatScreen::OnImportCheat(UI::EventParams ¶ms) { } } fclose(append); - - g_Config.bReloadCheats = true; - RecreateViews(); - return UI::EVENT_DONE; + return true; } UI::EventReturn CwCheatScreen::OnCheckBox(int index) { diff --git a/UI/CwCheatScreen.h b/UI/CwCheatScreen.h index b343cbd81800..d29961a2e66d 100644 --- a/UI/CwCheatScreen.h +++ b/UI/CwCheatScreen.h @@ -35,9 +35,12 @@ class CwCheatScreen : public UIDialogScreenWithGameBackground { UI::EventReturn OnAddCheat(UI::EventParams ¶ms); UI::EventReturn OnImportCheat(UI::EventParams ¶ms); + UI::EventReturn OnImportBrowse(UI::EventParams ¶ms); UI::EventReturn OnEditCheatFile(UI::EventParams ¶ms); UI::EventReturn OnEnableAll(UI::EventParams ¶ms); + void sendMessage(const char *message, const char *value) override; + void update() override; void onFinish(DialogResult result) override; @@ -48,16 +51,19 @@ class CwCheatScreen : public UIDialogScreenWithGameBackground { private: UI::EventReturn OnCheckBox(int index); + bool ImportCheats(const Path &cheatFile); enum { INDEX_ALL = -1 }; bool HasCheatWithName(const std::string &name); bool RebuildCheatFile(int index); UI::ScrollView *rightScroll_ = nullptr; + UI::TextView *errorMessageView_ = nullptr; + CWCheatEngine *engine_ = nullptr; std::vector fileInfo_; std::string gameID_; int fileCheckCounter_ = 0; - uint64_t fileCheckHash_; + uint64_t fileCheckHash_ = 0; bool enableAllFlag_ = false; }; From e21867315b7a07287aaf12edeaf75d3f5ad207e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 23 Mar 2023 01:16:12 +0100 Subject: [PATCH 2/5] Fix browsing for Cheat DB files. Easy now after the refactor! --- Common/System/Request.h | 1 + Qt/QtMain.cpp | 3 +++ UI/CwCheatScreen.cpp | 28 ++++++++++++---------------- UI/CwCheatScreen.h | 2 -- UWP/PPSSPP_UWPMain.cpp | 3 +++ Windows/main.cpp | 3 +++ 6 files changed, 22 insertions(+), 18 deletions(-) diff --git a/Common/System/Request.h b/Common/System/Request.h index 9972ee42058c..745f4eb555d4 100644 --- a/Common/System/Request.h +++ b/Common/System/Request.h @@ -69,6 +69,7 @@ enum class BrowseFileType { BOOTABLE, IMAGE, INI, + DB, ANY, }; diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp index c165914bba32..02f2e91fc422 100644 --- a/Qt/QtMain.cpp +++ b/Qt/QtMain.cpp @@ -300,6 +300,9 @@ bool MainUI::HandleCustomEvent(QEvent *e) { case BrowseFileType::INI: filter = "INI files (*.ini)"; break; + case BrowseFileType::DB: + filter = "DB files (*.db)"; + break; case BrowseFileType::ANY: break; } diff --git a/UI/CwCheatScreen.cpp b/UI/CwCheatScreen.cpp index 184a7233a003..c84f320ba4bd 100644 --- a/UI/CwCheatScreen.cpp +++ b/UI/CwCheatScreen.cpp @@ -24,6 +24,7 @@ #include "Common/File/FileUtil.h" #include "Common/StringUtils.h" #include "Common/System/System.h" +#include "Common/System/Request.h" #include "Core/Core.h" #include "Core/Config.h" #include "Core/CwCheat.h" @@ -152,21 +153,6 @@ void CwCheatScreen::onFinish(DialogResult result) { } } -void CwCheatScreen::sendMessage(const char *message, const char *value) { - // Always call the base class method first to handle the most common messages. - UIDialogScreenWithGameBackground::sendMessage(message, value); - if (!strcmp(message, "browse_fileSelect")) { - Path path(value); - INFO_LOG(SYSTEM, "Attempting to load cheats from: '%s'", path.ToVisualString().c_str()); - if (ImportCheats(path)) { - g_Config.bReloadCheats = true; - } else { - // Show an error message? - } - RecreateViews(); - } -} - UI::EventReturn CwCheatScreen::OnEnableAll(UI::EventParams ¶ms) { enableAllFlag_ = !enableAllFlag_; @@ -220,7 +206,17 @@ static char *GetLineNoNewline(char *temp, int sz, FILE *fp) { } UI::EventReturn CwCheatScreen::OnImportBrowse(UI::EventParams ¶ms) { - System_SendMessage("browse_file", ""); + System_BrowseForFile("Open cheat DB file", BrowseFileType::DB, [&](const std::string &value, int) { + Path path(value); + INFO_LOG(SYSTEM, "Attempting to load cheats from: '%s'", path.ToVisualString().c_str()); + if (ImportCheats(path)) { + g_Config.bReloadCheats = true; + } else { + // Show an error message? + } + RecreateViews(); + // Chose a cheat file. + }); return UI::EVENT_DONE; } diff --git a/UI/CwCheatScreen.h b/UI/CwCheatScreen.h index d29961a2e66d..fd8204099364 100644 --- a/UI/CwCheatScreen.h +++ b/UI/CwCheatScreen.h @@ -39,8 +39,6 @@ class CwCheatScreen : public UIDialogScreenWithGameBackground { UI::EventReturn OnEditCheatFile(UI::EventParams ¶ms); UI::EventReturn OnEnableAll(UI::EventParams ¶ms); - void sendMessage(const char *message, const char *value) override; - void update() override; void onFinish(DialogResult result) override; diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp index f78a8e07877e..c469029c7658 100644 --- a/UWP/PPSSPP_UWPMain.cpp +++ b/UWP/PPSSPP_UWPMain.cpp @@ -468,6 +468,9 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string case BrowseFileType::INI: picker->FileTypeFilter->Append(".ini"); break; + case BrowseFileType::DB: + picker->FileTypeFilter->Append(".db"); + break; case BrowseFileType::ANY: picker->FileTypeFilter->Append("*"); break; diff --git a/Windows/main.cpp b/Windows/main.cpp index 9b6f19df4f7e..929abafdc86f 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -509,6 +509,9 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string case BrowseFileType::INI: filter = MakeFilter(L"Ini files (*.ini)|*.ini|All files (*.*)|*.*||"); break; + case BrowseFileType::DB: + filter = MakeFilter(L"Cheat db files (*.db)|*.db|All files (*.*)|*.*||"); + break; case BrowseFileType::ANY: filter = MakeFilter(L"All files (*.*)|*.*||"); break; From f5afc91f2312e82687b7652fbe625717340dea31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 23 Mar 2023 10:32:11 +0100 Subject: [PATCH 3/5] Change Enable/Disable All to just a Disable All button. --- Common/File/Path.cpp | 26 ++++++++++++++++++++++++-- Common/File/Path.h | 3 ++- UI/CwCheatScreen.cpp | 26 ++++++++++++++------------ UI/CwCheatScreen.h | 2 +- 4 files changed, 41 insertions(+), 16 deletions(-) diff --git a/Common/File/Path.cpp b/Common/File/Path.cpp index 489ab692b49f..71a795d68314 100644 --- a/Common/File/Path.cpp +++ b/Common/File/Path.cpp @@ -255,12 +255,34 @@ std::wstring Path::ToWString() const { } #endif -std::string Path::ToVisualString() const { +std::string Path::ToVisualString(const char *relativeRoot) const { if (type_ == PathType::CONTENT_URI) { return AndroidContentURI(path_).ToVisualString(); #if PPSSPP_PLATFORM(WINDOWS) } else if (type_ == PathType::NATIVE) { - return ReplaceAll(path_, "/", "\\"); + // It can be useful to show the path as relative to the memstick + if (relativeRoot) { + std::string root = ReplaceAll(relativeRoot, "/", "\\"); + std::string path = ReplaceAll(path_, "/", "\\"); + if (startsWithNoCase(path, root)) { + return path.substr(root.size()); + } else { + return path; + } + } else { + return ReplaceAll(path_, "/", "\\"); + } +#else + if (relativeRoot) { + std::string root = relativeRoot; + if (startsWithNoCase(path_, root)) { + return path_.substr(root.size()); + } else { + return path_; + } + } else { + return path_; + } #endif } else { return path_; diff --git a/Common/File/Path.h b/Common/File/Path.h index b66471c53e79..ac93f9a9b820 100644 --- a/Common/File/Path.h +++ b/Common/File/Path.h @@ -92,7 +92,8 @@ class Path { std::wstring ToWString() const; #endif - std::string ToVisualString() const; + // Pass in a relative root to turn the path into a relative path - if it is one! + std::string ToVisualString(const char *relativeRoot = nullptr) const; bool CanNavigateUp() const; Path NavigateUp() const; diff --git a/UI/CwCheatScreen.cpp b/UI/CwCheatScreen.cpp index c84f320ba4bd..d6d3636bd76e 100644 --- a/UI/CwCheatScreen.cpp +++ b/UI/CwCheatScreen.cpp @@ -35,7 +35,7 @@ static const int FILE_CHECK_FRAME_INTERVAL = 53; -static Path GetGlobalCheatFile() { +static Path GetGlobalCheatFilePath() { return GetSysDirectory(DIRECTORY_CHEATS) / "cheat.db"; } @@ -93,16 +93,20 @@ void CwCheatScreen::CreateViews() { //leftColumn->Add(new Choice(cw->T("Add Cheat")))->OnClick.Handle(this, &CwCheatScreen::OnAddCheat); leftColumn->Add(new ItemHeader(cw->T("Import Cheats"))); - Path cheatPath = GetGlobalCheatFile(); + Path cheatPath = GetGlobalCheatFilePath(); - leftColumn->Add(new Choice(cheatPath.ToVisualString()))->OnClick.Handle(this, &CwCheatScreen::OnImportCheat); + std::string root = GetSysDirectory(DIRECTORY_MEMSTICK_ROOT).ToString(); + + leftColumn->Add(new Choice(cheatPath.ToVisualString(root.c_str())))->OnClick.Handle(this, &CwCheatScreen::OnImportCheat); leftColumn->Add(new Choice(mm->T("Browse"), ImageID("I_FOLDER_OPEN")))->OnClick.Handle(this, &CwCheatScreen::OnImportBrowse); + errorMessageView_ = leftColumn->Add(new TextView(di->T("LoadingFailed"))); + errorMessageView_->SetVisibility(V_GONE); - leftColumn->Add(new ItemHeader(cw->T("Options"))); + leftColumn->Add(new ItemHeader(di->T("Options"))); #if !defined(MOBILE_DEVICE) leftColumn->Add(new Choice(cw->T("Edit Cheat File")))->OnClick.Handle(this, &CwCheatScreen::OnEditCheatFile); #endif - leftColumn->Add(new Choice(cw->T("Enable/Disable All")))->OnClick.Handle(this, &CwCheatScreen::OnEnableAll); + leftColumn->Add(new Choice(di->T("Disable All")))->OnClick.Handle(this, &CwCheatScreen::OnDisableAll); leftColumn->Add(new PopupSliderChoice(&g_Config.iCwCheatRefreshRate, 1, 1000, cw->T("Refresh Rate"), 1, screenManager())); rightScroll_ = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT, 0.5f)); @@ -153,12 +157,10 @@ void CwCheatScreen::onFinish(DialogResult result) { } } -UI::EventReturn CwCheatScreen::OnEnableAll(UI::EventParams ¶ms) { - enableAllFlag_ = !enableAllFlag_; - - // Flip all the switches. +UI::EventReturn CwCheatScreen::OnDisableAll(UI::EventParams ¶ms) { + // Disable all the switches. for (auto &info : fileInfo_) { - info.enabled = enableAllFlag_; + info.enabled = false; } if (!RebuildCheatFile(INDEX_ALL)) { @@ -215,14 +217,14 @@ UI::EventReturn CwCheatScreen::OnImportBrowse(UI::EventParams ¶ms) { // Show an error message? } RecreateViews(); - // Chose a cheat file. }); return UI::EVENT_DONE; } UI::EventReturn CwCheatScreen::OnImportCheat(UI::EventParams ¶ms) { - if (!ImportCheats(GetGlobalCheatFile())) { + if (!ImportCheats(GetGlobalCheatFilePath())) { // Show an error message? + errorMessageView_->SetVisibility(UI::V_VISIBLE); return UI::EVENT_DONE; } diff --git a/UI/CwCheatScreen.h b/UI/CwCheatScreen.h index fd8204099364..7a7578c76e49 100644 --- a/UI/CwCheatScreen.h +++ b/UI/CwCheatScreen.h @@ -37,7 +37,7 @@ class CwCheatScreen : public UIDialogScreenWithGameBackground { UI::EventReturn OnImportCheat(UI::EventParams ¶ms); UI::EventReturn OnImportBrowse(UI::EventParams ¶ms); UI::EventReturn OnEditCheatFile(UI::EventParams ¶ms); - UI::EventReturn OnEnableAll(UI::EventParams ¶ms); + UI::EventReturn OnDisableAll(UI::EventParams ¶ms); void update() override; void onFinish(DialogResult result) override; From 4475533c0b159b05922fc0b3f35d26e1c0c4b198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 23 Mar 2023 10:32:27 +0100 Subject: [PATCH 4/5] Remove redundant translation strings --- assets/lang/ar_AE.ini | 2 -- assets/lang/az_AZ.ini | 2 -- assets/lang/bg_BG.ini | 2 -- assets/lang/ca_ES.ini | 2 -- assets/lang/cz_CZ.ini | 2 -- assets/lang/da_DK.ini | 2 -- assets/lang/de_DE.ini | 2 -- assets/lang/dr_ID.ini | 2 -- assets/lang/en_US.ini | 2 -- assets/lang/es_ES.ini | 2 -- assets/lang/es_LA.ini | 2 -- assets/lang/fa_IR.ini | 2 -- assets/lang/fi_FI.ini | 2 -- assets/lang/fr_FR.ini | 2 -- assets/lang/gl_ES.ini | 2 -- assets/lang/gr_EL.ini | 2 -- assets/lang/he_IL.ini | 2 -- assets/lang/he_IL_invert.ini | 2 -- assets/lang/hr_HR.ini | 2 -- assets/lang/hu_HU.ini | 2 -- assets/lang/id_ID.ini | 2 -- assets/lang/it_IT.ini | 2 -- assets/lang/ja_JP.ini | 2 -- assets/lang/jv_ID.ini | 2 -- assets/lang/ko_KR.ini | 2 -- assets/lang/lo_LA.ini | 2 -- assets/lang/lt-LT.ini | 2 -- assets/lang/ms_MY.ini | 2 -- assets/lang/nl_NL.ini | 2 -- assets/lang/no_NO.ini | 2 -- assets/lang/pl_PL.ini | 2 -- assets/lang/pt_BR.ini | 2 -- assets/lang/pt_PT.ini | 2 -- assets/lang/ro_RO.ini | 2 -- assets/lang/ru_RU.ini | 2 -- assets/lang/sv_SE.ini | 2 -- assets/lang/tg_PH.ini | 2 -- assets/lang/th_TH.ini | 2 -- assets/lang/tr_TR.ini | 2 -- assets/lang/uk_UA.ini | 2 -- assets/lang/vi_VN.ini | 2 -- assets/lang/zh_CN.ini | 2 -- assets/lang/zh_TW.ini | 2 -- 43 files changed, 86 deletions(-) diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini index 461295a85a54..c360e6eb11e5 100644 --- a/assets/lang/ar_AE.ini +++ b/assets/lang/ar_AE.ini @@ -116,9 +116,7 @@ Y = Y [CwCheats] Cheats = ‎الشفرات Edit Cheat File = ‎عدل ملف الشفرة -Enable/Disable All = ‎تمكين/تعطيل كل الشفرات Import Cheats = ‎إستورد من cheat.db -Options = ‎إعدادات Refresh Rate = ‎معدل التحديث [DesktopUI] diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini index e8a197072a31..264867373039 100644 --- a/assets/lang/az_AZ.ini +++ b/assets/lang/az_AZ.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Cheats Edit Cheat File = Edit cheat file -Enable/Disable All = Enable/Disable all Cheats Import Cheats = Import from cheat.db -Options = Options Refresh Rate = Refresh rate [DesktopUI] diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini index 35774afa6430..c68fac507b9f 100644 --- a/assets/lang/bg_BG.ini +++ b/assets/lang/bg_BG.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Чийтове Edit Cheat File = Edit cheat file -Enable/Disable All = Включи/Изключи всички чийтове Import Cheats = Внеси от cheat.db -Options = Опции Refresh Rate = Refresh rate [DesktopUI] diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini index 03bf12572dc6..ebdbcae8b54a 100644 --- a/assets/lang/ca_ES.ini +++ b/assets/lang/ca_ES.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Trucs Edit Cheat File = Editar el fitxer de trucs -Enable/Disable All = Activar/desactivar tots els trucs Import Cheats = Importar «cheat.db» -Options = Opcions Refresh Rate = Freqüència de refrescament [DesktopUI] diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini index 6052de056201..89bd7f46a58e 100644 --- a/assets/lang/cz_CZ.ini +++ b/assets/lang/cz_CZ.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Cheaty Edit Cheat File = Upravit soubor s cheaty -Enable/Disable All = Povolit/Zakázat všechny cheaty Import Cheats = Importovat z cheat.db -Options = Nastavení Refresh Rate = Frekvence obnoveni [DesktopUI] diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini index 6fa8bf2e3447..8a69c7578b3e 100644 --- a/assets/lang/da_DK.ini +++ b/assets/lang/da_DK.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Snyd Edit Cheat File = Editer snydefil -Enable/Disable All = Aktiver/Deaktiver alle snyd Import Cheats = Importer fra cheat.db -Options = Optioner Refresh Rate = Opdateringsrate [DesktopUI] diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini index cf78feb4b94e..5fed08040e9a 100644 --- a/assets/lang/de_DE.ini +++ b/assets/lang/de_DE.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Cheats Edit Cheat File = Cheatdatei ändern -Enable/Disable All = Alle de- oder aktivieren Import Cheats = Cheats importieren (aus cheat.db) -Options = Optionen Refresh Rate = Wiederholfrequenz [DesktopUI] diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini index 4226051826be..848585f5fad1 100644 --- a/assets/lang/dr_ID.ini +++ b/assets/lang/dr_ID.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Cheat Edit Cheat File = Edit cheat file -Enable/Disable All = Pajalan/Bosian nasan Cheat Import Cheats = Patamanni cheat.db -Options = Pangpillean Refresh Rate = Refresh rate [DesktopUI] diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini index 8b2c8715d0f4..2718fbdb3c2c 100644 --- a/assets/lang/en_US.ini +++ b/assets/lang/en_US.ini @@ -132,9 +132,7 @@ Y = Y [CwCheats] Cheats = Cheats Edit Cheat File = Edit cheat file -Enable/Disable All = Enable/Disable all Cheats Import Cheats = Import from cheat.db -Options = Options Refresh Rate = Refresh rate [DesktopUI] diff --git a/assets/lang/es_ES.ini b/assets/lang/es_ES.ini index 7dffaf6552eb..c3212ec6f657 100644 --- a/assets/lang/es_ES.ini +++ b/assets/lang/es_ES.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Trucos Edit Cheat File = Editar archivo de trucos -Enable/Disable All = Activar/desactivar todos los trucos Import Cheats = Importar archivo cheat.db -Options = Opciones Refresh Rate = Frecuencia de actualización [DesktopUI] diff --git a/assets/lang/es_LA.ini b/assets/lang/es_LA.ini index c537e9566c31..129b2e51759b 100644 --- a/assets/lang/es_LA.ini +++ b/assets/lang/es_LA.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = trucos Edit Cheat File = Editar archivo de trucos -Enable/Disable All = Activar/desactivar todos los trucos Import Cheats = Importar archivo cheat.db -Options = Opciones Refresh Rate = Frecuencia de actualización [DesktopUI] diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini index 92ff1b406cd3..16560741141a 100644 --- a/assets/lang/fa_IR.ini +++ b/assets/lang/fa_IR.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = ‎کد های تقلب Edit Cheat File = ‎ویرایش فایل کد ها -Enable/Disable All = ‎فعال/غیرفعال کردن همه ی کدهای تقلب Import Cheats = ‎cheat.db وارد کردن از -Options = ‎تنظیمات Refresh Rate = بازیابی نرخ [DesktopUI] diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini index 5c62718b08cb..15c8360a4fad 100644 --- a/assets/lang/fi_FI.ini +++ b/assets/lang/fi_FI.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Huijaukset Edit Cheat File = Muokkaa huijaus tiedostoa -Enable/Disable All = Ota/Poista käytöstä kaikki huijaukset Import Cheats = Tuo huijauksia -Options = Asetukset Refresh Rate = Ruudunpäivitysnopeus [DesktopUI] diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini index e2eb49f59b83..ccc4ffad562b 100644 --- a/assets/lang/fr_FR.ini +++ b/assets/lang/fr_FR.ini @@ -108,9 +108,7 @@ Y = Axe Y [CwCheats] Cheats = Codes de triche Edit Cheat File = Modifier le fichier de triche -Enable/Disable All = Tout activer/désactiver Import Cheats = Importer des codes de triche -Options = Options Refresh Rate = Taux de rafraîchissement [DesktopUI] diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini index 11ef02432cde..a733b6a84e1d 100644 --- a/assets/lang/gl_ES.ini +++ b/assets/lang/gl_ES.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Trucos Edit Cheat File = Editar arquivo de trucos -Enable/Disable All = Activar/desactivar tódolos trucos Import Cheats = Importar cheat.db -Options = Opcións Refresh Rate = Frecuencia de actualización [DesktopUI] diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini index aa9dde34a730..e7189a93c7ac 100644 --- a/assets/lang/gr_EL.ini +++ b/assets/lang/gr_EL.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Κωδικοί Edit Cheat File = Επεξεργασία αρχείου κωδικών -Enable/Disable All = Ενεργοπ./Απενεργοπ. Όλων Import Cheats = Εισαγωγή από cheat.db -Options = Ρυθμίσεις Refresh Rate = Ρυθμός ανανέωσης [DesktopUI] diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini index 32013364f856..ffc818b43246 100644 --- a/assets/lang/he_IL.ini +++ b/assets/lang/he_IL.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Cheats Edit Cheat File = Edit cheat file -Enable/Disable All = Enable/Disable all Cheats Import Cheats = Import from cheat.db -Options = Options Refresh Rate = Refresh rate [DesktopUI] diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini index 240da1cdd208..33b0ab6189d7 100644 --- a/assets/lang/he_IL_invert.ini +++ b/assets/lang/he_IL_invert.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Cheats Edit Cheat File = Edit cheat file -Enable/Disable All = Enable/Disable all Cheats Import Cheats = Import from cheat.db -Options = Options Refresh Rate = Refresh rate [DesktopUI] diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini index b873743723c8..c28612e300c2 100644 --- a/assets/lang/hr_HR.ini +++ b/assets/lang/hr_HR.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Šifre Edit Cheat File = Izmijeni cheat datoteku -Enable/Disable All = Upali/Izgasi sve Šifre Import Cheats = Uvezi iz cheat.db -Options = Opcije Refresh Rate = Brzina osvježavanja [DesktopUI] diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini index 8920fb5b9abf..ec2ac4b49345 100644 --- a/assets/lang/hu_HU.ini +++ b/assets/lang/hu_HU.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Csalások Edit Cheat File = Csalás fájl szerkesztése -Enable/Disable All = Összes csalás engedélyezése/tiltása Import Cheats = Importálás cheat.db-ből -Options = Beállítások Refresh Rate = Frissítési gyakoriság [DesktopUI] diff --git a/assets/lang/id_ID.ini b/assets/lang/id_ID.ini index 75bc24cc0137..cf52c4f9a47a 100644 --- a/assets/lang/id_ID.ini +++ b/assets/lang/id_ID.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Pengecoh Edit Cheat File = Edit berkas pengecoh -Enable/Disable All = Hidupkan/matikan semua pengecoh Import Cheats = Impor dari cheat.db -Options = Pilihan Refresh Rate = Perbarui penyegaran [DesktopUI] diff --git a/assets/lang/it_IT.ini b/assets/lang/it_IT.ini index ec58a24f2972..dcf507b8ba73 100644 --- a/assets/lang/it_IT.ini +++ b/assets/lang/it_IT.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Trucchi Edit Cheat File = Modifica file Trucchi -Enable/Disable All = Attiva/Disattiva Trucchi Import Cheats = Importa da cheat.db -Options = Opzioni Refresh Rate = Frequenza di Aggiornamento [DesktopUI] diff --git a/assets/lang/ja_JP.ini b/assets/lang/ja_JP.ini index f3e0658528c1..24e677302ff8 100644 --- a/assets/lang/ja_JP.ini +++ b/assets/lang/ja_JP.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = チート Edit Cheat File = チートファイルを編集する -Enable/Disable All = 全て有効/無効にする Import Cheats = cheat.dbからインポートする -Options = オプション Refresh Rate = リフレッシュレート [DesktopUI] diff --git a/assets/lang/jv_ID.ini b/assets/lang/jv_ID.ini index 15f3ae224882..abb2406761f1 100644 --- a/assets/lang/jv_ID.ini +++ b/assets/lang/jv_ID.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Mbeling Edit Cheat File = Sunting berkas mbeling -Enable/Disable All = Ngatifke/Pateni Kabeh mbeling Import Cheats = Njokot soko cheat.db -Options = Pilian Refresh Rate = Restar rate [DesktopUI] diff --git a/assets/lang/ko_KR.ini b/assets/lang/ko_KR.ini index d1e7a53a302e..7001fd30cbab 100644 --- a/assets/lang/ko_KR.ini +++ b/assets/lang/ko_KR.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = 치트 Edit Cheat File = 치트 파일 수정 -Enable/Disable All = 모든 치트 활성화/비활성화 Import Cheats = cheat.db에서 가져오기 -Options = 옵션 Refresh Rate = 주사율 [DesktopUI] diff --git a/assets/lang/lo_LA.ini b/assets/lang/lo_LA.ini index c4fb69568cec..12dc20f7e6db 100644 --- a/assets/lang/lo_LA.ini +++ b/assets/lang/lo_LA.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = ການໃຊ້ສູດໂກງ Edit Cheat File = ປັບແຕ່ງໄຟລ໌ສູດໂກງ -Enable/Disable All = ເປີດ/ປິດ ສູດທັງໝົດ Import Cheats = ນຳເຂົ້າຈາກໄຟລ໌ສູດໂກງ -Options = ໂຕເລືອກ Refresh Rate = ອັດຕາການຟື້ນຟູ [DesktopUI] diff --git a/assets/lang/lt-LT.ini b/assets/lang/lt-LT.ini index 7708f8fdc2cd..f9d6d1d9aaf8 100644 --- a/assets/lang/lt-LT.ini +++ b/assets/lang/lt-LT.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Kodai Edit Cheat File = Redaguoti kodų failą -Enable/Disable All = Įjungti/Išjungti visus Kodus Import Cheats = Importuoti iš cheat.db -Options = Parametrai Refresh Rate = Atsinaujinimo dažnis [DesktopUI] diff --git a/assets/lang/ms_MY.ini b/assets/lang/ms_MY.ini index 072affd87837..91866aee3461 100644 --- a/assets/lang/ms_MY.ini +++ b/assets/lang/ms_MY.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Cheat Edit Cheat File = Ubah cheat file -Enable/Disable All = Upayakan/Lumpuhkan semua Cheat Import Cheats = Import dari cheat.db -Options = Pilihan Refresh Rate = Refresh rate [DesktopUI] diff --git a/assets/lang/nl_NL.ini b/assets/lang/nl_NL.ini index 03730e79fe98..d52070326224 100644 --- a/assets/lang/nl_NL.ini +++ b/assets/lang/nl_NL.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Cheats Edit Cheat File = Cheatbestand bewerken -Enable/Disable All = Alle cheats aan-/uitzetten Import Cheats = Importeren van cheat.db -Options = Opties Refresh Rate = Vernieuwingsfrequentie [DesktopUI] diff --git a/assets/lang/no_NO.ini b/assets/lang/no_NO.ini index 85ad21d76d8c..7075b66bf41e 100644 --- a/assets/lang/no_NO.ini +++ b/assets/lang/no_NO.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Cheats Edit Cheat File = Edit cheat file -Enable/Disable All = Enable/Disable all Cheats Import Cheats = Import from cheat.db -Options = Options Refresh Rate = Refresh rate [DesktopUI] diff --git a/assets/lang/pl_PL.ini b/assets/lang/pl_PL.ini index 5af4c6c8605e..b63b0cc1fea0 100644 --- a/assets/lang/pl_PL.ini +++ b/assets/lang/pl_PL.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Kody Edit Cheat File = Edytuj plik kodów -Enable/Disable All = Wł./wył. wszystkie kody Import Cheats = Importuj z pliku cheat.db -Options = Opcje Refresh Rate = Szybkość odświeżania [DesktopUI] diff --git a/assets/lang/pt_BR.ini b/assets/lang/pt_BR.ini index 25dfb9755a7f..583f4575da8a 100644 --- a/assets/lang/pt_BR.ini +++ b/assets/lang/pt_BR.ini @@ -132,9 +132,7 @@ Y = Y [CwCheats] Cheats = Trapaças Edit Cheat File = Editar arquivo de trapaças -Enable/Disable All = Ativar/Desativar todas as trapaças Import Cheats = Importar do cheat.db -Options = Opções Refresh Rate = Taxa de atualização [DesktopUI] diff --git a/assets/lang/pt_PT.ini b/assets/lang/pt_PT.ini index eccd69ecaea5..80e4aaeadacd 100644 --- a/assets/lang/pt_PT.ini +++ b/assets/lang/pt_PT.ini @@ -132,9 +132,7 @@ Y = Y [CwCheats] Cheats = Cheats Edit Cheat File = Editar ficheiro de Cheats -Enable/Disable All = Ativar/Desativar todas os Cheats Import Cheats = Importar de cheat.db -Options = Opções Refresh Rate = Taxa de refrescamento [DesktopUI] diff --git a/assets/lang/ro_RO.ini b/assets/lang/ro_RO.ini index b262ed7d215b..1e553bdd087b 100644 --- a/assets/lang/ro_RO.ini +++ b/assets/lang/ro_RO.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Trișare Edit Cheat File = Editare fișier trișare -Enable/Disable All = Activează/Dezactivează tot trișatul Import Cheats = Importă din cheat.db -Options = Opțiuni Refresh Rate = Rată de împrospatare [DesktopUI] diff --git a/assets/lang/ru_RU.ini b/assets/lang/ru_RU.ini index b61e7c5fc082..e34f841ff58e 100644 --- a/assets/lang/ru_RU.ini +++ b/assets/lang/ru_RU.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Читы Edit Cheat File = Изменить файл чита -Enable/Disable All = Включить/выключить все Import Cheats = Импортировать из cheat.db -Options = Настройки Refresh Rate = Частота обновления [DesktopUI] diff --git a/assets/lang/sv_SE.ini b/assets/lang/sv_SE.ini index 7570246282a2..d40917596cf4 100644 --- a/assets/lang/sv_SE.ini +++ b/assets/lang/sv_SE.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Fusk Edit Cheat File = Redigera fusk-fil -Enable/Disable All = Slå av eller på alla Import Cheats = Importera från cheat.db -Options = Inställningar Refresh Rate = Uppdateringsfrekvens [DesktopUI] diff --git a/assets/lang/tg_PH.ini b/assets/lang/tg_PH.ini index aa3dcbab93de..14473f78ffcb 100644 --- a/assets/lang/tg_PH.ini +++ b/assets/lang/tg_PH.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Mga Daya Edit Cheat File = Edit Cheat File -Enable/Disable All = Paganahin/Wag paganahin ang mga daya Import Cheats = Import ang mga daya mula sa cheat.db -Options = Ayos Refresh Rate = Refresh rate [DesktopUI] diff --git a/assets/lang/th_TH.ini b/assets/lang/th_TH.ini index 9bb3fdac316b..cd18ed6ba434 100644 --- a/assets/lang/th_TH.ini +++ b/assets/lang/th_TH.ini @@ -108,9 +108,7 @@ Y = แกน Y [CwCheats] Cheats = การใช้สูตรโกง Edit Cheat File = ปรับแต่งไฟล์สูตรโกง -Enable/Disable All = เปิด/ปิด ใช้งานสูตรทั้งหมด Import Cheats = นำเข้าจากไฟล์สูตรโกง -Options = ตัวเลือก Refresh Rate = อัตรารีเฟรช [DesktopUI] diff --git a/assets/lang/tr_TR.ini b/assets/lang/tr_TR.ini index cf9583ace407..e921f961db2c 100644 --- a/assets/lang/tr_TR.ini +++ b/assets/lang/tr_TR.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Hileler Edit Cheat File = Hile dosyasını düzenle -Enable/Disable All = Bütün hileleri Aç/Kapat Import Cheats = cheat.db'den hile al -Options = Ayarlar Refresh Rate = Yenileme Hızı [DesktopUI] diff --git a/assets/lang/uk_UA.ini b/assets/lang/uk_UA.ini index f03c6bd82388..e4cc24f43617 100644 --- a/assets/lang/uk_UA.ini +++ b/assets/lang/uk_UA.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Чит-коди Edit Cheat File = Змінити файл чит-коду -Enable/Disable All = Ввімкнути/Вимкнути все Import Cheats = Імпортувати з cheat.db -Options = Налаштування Refresh Rate = Частота оновлення [DesktopUI] diff --git a/assets/lang/vi_VN.ini b/assets/lang/vi_VN.ini index 1c2d60e97222..eb715014a318 100644 --- a/assets/lang/vi_VN.ini +++ b/assets/lang/vi_VN.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = Cheats Edit Cheat File = Sửa mục cheat -Enable/Disable All = Bật/Tắt tất cả các mã cheat Import Cheats = Nhập mã từ cheat.db -Options = Thiết lập Refresh Rate = Tần số làm mới [DesktopUI] diff --git a/assets/lang/zh_CN.ini b/assets/lang/zh_CN.ini index 91d76768abfd..2a1c7b180fc1 100644 --- a/assets/lang/zh_CN.ini +++ b/assets/lang/zh_CN.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = 金手指 Edit Cheat File = 编辑金手指文件 -Enable/Disable All = 启用/禁用全部 Import Cheats = 从cheat.db导入 -Options = 选项 Refresh Rate = 刷新率 [DesktopUI] diff --git a/assets/lang/zh_TW.ini b/assets/lang/zh_TW.ini index 5e165dbe8b3f..c0810c024cf1 100644 --- a/assets/lang/zh_TW.ini +++ b/assets/lang/zh_TW.ini @@ -108,9 +108,7 @@ Y = Y [CwCheats] Cheats = 密技 Edit Cheat File = 編輯密技檔案 -Enable/Disable All = 啟用/停用所有密技 Import Cheats = 從 cheat.db 匯入 -Options = 選項 Refresh Rate = 重新整理速率 [DesktopUI] From 84f33d9346ed811c1bb15f0afc9b7594e4365812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 23 Mar 2023 13:46:07 +0100 Subject: [PATCH 5/5] Button text fix, required adding a new translation line. --- UI/CwCheatScreen.cpp | 4 +++- assets/lang/ar_AE.ini | 1 + assets/lang/az_AZ.ini | 1 + assets/lang/bg_BG.ini | 1 + assets/lang/ca_ES.ini | 1 + assets/lang/cz_CZ.ini | 1 + assets/lang/da_DK.ini | 2 +- assets/lang/dr_ID.ini | 1 + assets/lang/en_US.ini | 1 + assets/lang/fi_FI.ini | 1 + assets/lang/fr_FR.ini | 1 + assets/lang/gl_ES.ini | 1 + assets/lang/gr_EL.ini | 1 + assets/lang/he_IL.ini | 1 + assets/lang/he_IL_invert.ini | 1 + assets/lang/hr_HR.ini | 1 + assets/lang/hu_HU.ini | 1 + assets/lang/id_ID.ini | 1 + assets/lang/it_IT.ini | 1 + assets/lang/ja_JP.ini | 1 + assets/lang/jv_ID.ini | 2 +- assets/lang/lo_LA.ini | 2 +- assets/lang/lt-LT.ini | 1 + assets/lang/ms_MY.ini | 1 + assets/lang/nl_NL.ini | 1 + assets/lang/no_NO.ini | 1 + assets/lang/pl_PL.ini | 1 + assets/lang/pt_BR.ini | 11 ++++++----- assets/lang/pt_PT.ini | 1 + assets/lang/ro_RO.ini | 1 + assets/lang/ru_RU.ini | 1 + assets/lang/sv_SE.ini | 1 + assets/lang/tg_PH.ini | 2 +- assets/lang/tr_TR.ini | 1 + assets/lang/uk_UA.ini | 1 + assets/lang/vi_VN.ini | 1 + assets/lang/zh_CN.ini | 1 + assets/lang/zh_TW.ini | 1 + 38 files changed, 45 insertions(+), 10 deletions(-) diff --git a/UI/CwCheatScreen.cpp b/UI/CwCheatScreen.cpp index d6d3636bd76e..15e45207f867 100644 --- a/UI/CwCheatScreen.cpp +++ b/UI/CwCheatScreen.cpp @@ -97,7 +97,9 @@ void CwCheatScreen::CreateViews() { std::string root = GetSysDirectory(DIRECTORY_MEMSTICK_ROOT).ToString(); - leftColumn->Add(new Choice(cheatPath.ToVisualString(root.c_str())))->OnClick.Handle(this, &CwCheatScreen::OnImportCheat); + std::string title = StringFromFormat(cw->T("Import from %s"), "PSP/Cheats/cheat.db"); + + leftColumn->Add(new Choice(title.c_str()))->OnClick.Handle(this, &CwCheatScreen::OnImportCheat); leftColumn->Add(new Choice(mm->T("Browse"), ImageID("I_FOLDER_OPEN")))->OnClick.Handle(this, &CwCheatScreen::OnImportBrowse); errorMessageView_ = leftColumn->Add(new TextView(di->T("LoadingFailed"))); errorMessageView_->SetVisibility(V_GONE); diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini index c360e6eb11e5..03851d36941e 100644 --- a/assets/lang/ar_AE.ini +++ b/assets/lang/ar_AE.ini @@ -117,6 +117,7 @@ Y = Y Cheats = ‎الشفرات Edit Cheat File = ‎عدل ملف الشفرة Import Cheats = ‎إستورد من cheat.db +Import from %s = ‎إستورد من %s Refresh Rate = ‎معدل التحديث [DesktopUI] diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini index 264867373039..ca7c57a8a72a 100644 --- a/assets/lang/az_AZ.ini +++ b/assets/lang/az_AZ.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Cheats Edit Cheat File = Edit cheat file Import Cheats = Import from cheat.db +Import from %s = Import from %s Refresh Rate = Refresh rate [DesktopUI] diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini index c68fac507b9f..0ee29c2fa171 100644 --- a/assets/lang/bg_BG.ini +++ b/assets/lang/bg_BG.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Чийтове Edit Cheat File = Edit cheat file Import Cheats = Внеси от cheat.db +Import from %s = Внеси от %s Refresh Rate = Refresh rate [DesktopUI] diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini index ebdbcae8b54a..fc0eff76bdc3 100644 --- a/assets/lang/ca_ES.ini +++ b/assets/lang/ca_ES.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Trucs Edit Cheat File = Editar el fitxer de trucs Import Cheats = Importar «cheat.db» +Import from %s = Importar %s Refresh Rate = Freqüència de refrescament [DesktopUI] diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini index 89bd7f46a58e..0850a50a8206 100644 --- a/assets/lang/cz_CZ.ini +++ b/assets/lang/cz_CZ.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Cheaty Edit Cheat File = Upravit soubor s cheaty Import Cheats = Importovat z cheat.db +Import from %s = Importovat z %s Refresh Rate = Frekvence obnoveni [DesktopUI] diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini index 8a69c7578b3e..0deb860f5e4f 100644 --- a/assets/lang/da_DK.ini +++ b/assets/lang/da_DK.ini @@ -108,7 +108,7 @@ Y = Y [CwCheats] Cheats = Snyd Edit Cheat File = Editer snydefil -Import Cheats = Importer fra cheat.db +Import from %s = Importer fra %s Refresh Rate = Opdateringsrate [DesktopUI] diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini index 848585f5fad1..95041f345cde 100644 --- a/assets/lang/dr_ID.ini +++ b/assets/lang/dr_ID.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Cheat Edit Cheat File = Edit cheat file Import Cheats = Patamanni cheat.db +Import from %s = Patamanni %s Refresh Rate = Refresh rate [DesktopUI] diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini index 2718fbdb3c2c..cb75ad622726 100644 --- a/assets/lang/en_US.ini +++ b/assets/lang/en_US.ini @@ -133,6 +133,7 @@ Y = Y Cheats = Cheats Edit Cheat File = Edit cheat file Import Cheats = Import from cheat.db +Import from %s = Import from %s Refresh Rate = Refresh rate [DesktopUI] diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini index 15c8360a4fad..68991bc328a7 100644 --- a/assets/lang/fi_FI.ini +++ b/assets/lang/fi_FI.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Huijaukset Edit Cheat File = Muokkaa huijaus tiedostoa Import Cheats = Tuo huijauksia +Import from %s = %s Refresh Rate = Ruudunpäivitysnopeus [DesktopUI] diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini index ccc4ffad562b..49a72887708e 100644 --- a/assets/lang/fr_FR.ini +++ b/assets/lang/fr_FR.ini @@ -109,6 +109,7 @@ Y = Axe Y Cheats = Codes de triche Edit Cheat File = Modifier le fichier de triche Import Cheats = Importer des codes de triche +Import from %s = Importer de %s Refresh Rate = Taux de rafraîchissement [DesktopUI] diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini index a733b6a84e1d..911e94a099e6 100644 --- a/assets/lang/gl_ES.ini +++ b/assets/lang/gl_ES.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Trucos Edit Cheat File = Editar arquivo de trucos Import Cheats = Importar cheat.db +Import from %s = Importar %s Refresh Rate = Frecuencia de actualización [DesktopUI] diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini index e7189a93c7ac..5abcded47cd8 100644 --- a/assets/lang/gr_EL.ini +++ b/assets/lang/gr_EL.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Κωδικοί Edit Cheat File = Επεξεργασία αρχείου κωδικών Import Cheats = Εισαγωγή από cheat.db +Import from %s = Εισαγωγή από %s Refresh Rate = Ρυθμός ανανέωσης [DesktopUI] diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini index ffc818b43246..b53230ac96bc 100644 --- a/assets/lang/he_IL.ini +++ b/assets/lang/he_IL.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Cheats Edit Cheat File = Edit cheat file Import Cheats = Import from cheat.db +Import from %s = Import from %s Refresh Rate = Refresh rate [DesktopUI] diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini index 33b0ab6189d7..498dcdad0d60 100644 --- a/assets/lang/he_IL_invert.ini +++ b/assets/lang/he_IL_invert.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Cheats Edit Cheat File = Edit cheat file Import Cheats = Import from cheat.db +Import from %s = Import from %s Refresh Rate = Refresh rate [DesktopUI] diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini index c28612e300c2..0b04b2866173 100644 --- a/assets/lang/hr_HR.ini +++ b/assets/lang/hr_HR.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Šifre Edit Cheat File = Izmijeni cheat datoteku Import Cheats = Uvezi iz cheat.db +Import from %s = Uvezi iz %s Refresh Rate = Brzina osvježavanja [DesktopUI] diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini index ec2ac4b49345..70126bd913ea 100644 --- a/assets/lang/hu_HU.ini +++ b/assets/lang/hu_HU.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Csalások Edit Cheat File = Csalás fájl szerkesztése Import Cheats = Importálás cheat.db-ből +Import from %s = Importálás %s-ből Refresh Rate = Frissítési gyakoriság [DesktopUI] diff --git a/assets/lang/id_ID.ini b/assets/lang/id_ID.ini index cf52c4f9a47a..d43ba497a073 100644 --- a/assets/lang/id_ID.ini +++ b/assets/lang/id_ID.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Pengecoh Edit Cheat File = Edit berkas pengecoh Import Cheats = Impor dari cheat.db +Import from %s = Impor dari %s Refresh Rate = Perbarui penyegaran [DesktopUI] diff --git a/assets/lang/it_IT.ini b/assets/lang/it_IT.ini index dcf507b8ba73..e78f9b209232 100644 --- a/assets/lang/it_IT.ini +++ b/assets/lang/it_IT.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Trucchi Edit Cheat File = Modifica file Trucchi Import Cheats = Importa da cheat.db +Import from %s = Importa da %s Refresh Rate = Frequenza di Aggiornamento [DesktopUI] diff --git a/assets/lang/ja_JP.ini b/assets/lang/ja_JP.ini index 24e677302ff8..affe890a4be8 100644 --- a/assets/lang/ja_JP.ini +++ b/assets/lang/ja_JP.ini @@ -109,6 +109,7 @@ Y = Y Cheats = チート Edit Cheat File = チートファイルを編集する Import Cheats = cheat.dbからインポートする +Import from %s = %sからインポートする Refresh Rate = リフレッシュレート [DesktopUI] diff --git a/assets/lang/jv_ID.ini b/assets/lang/jv_ID.ini index abb2406761f1..8931f65f45db 100644 --- a/assets/lang/jv_ID.ini +++ b/assets/lang/jv_ID.ini @@ -108,7 +108,7 @@ Y = Y [CwCheats] Cheats = Mbeling Edit Cheat File = Sunting berkas mbeling -Import Cheats = Njokot soko cheat.db +Import from %s = Njokot soko %s Refresh Rate = Restar rate [DesktopUI] diff --git a/assets/lang/lo_LA.ini b/assets/lang/lo_LA.ini index 12dc20f7e6db..2bf159d9bc98 100644 --- a/assets/lang/lo_LA.ini +++ b/assets/lang/lo_LA.ini @@ -108,7 +108,7 @@ Y = Y [CwCheats] Cheats = ການໃຊ້ສູດໂກງ Edit Cheat File = ປັບແຕ່ງໄຟລ໌ສູດໂກງ -Import Cheats = ນຳເຂົ້າຈາກໄຟລ໌ສູດໂກງ +Import from %s = ນຳເຂົ້າຈາກໄຟລ໌ສູດໂກງ %s Refresh Rate = ອັດຕາການຟື້ນຟູ [DesktopUI] diff --git a/assets/lang/lt-LT.ini b/assets/lang/lt-LT.ini index f9d6d1d9aaf8..d5e1f78adbaa 100644 --- a/assets/lang/lt-LT.ini +++ b/assets/lang/lt-LT.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Kodai Edit Cheat File = Redaguoti kodų failą Import Cheats = Importuoti iš cheat.db +Import from %s = Importuoti iš %s Refresh Rate = Atsinaujinimo dažnis [DesktopUI] diff --git a/assets/lang/ms_MY.ini b/assets/lang/ms_MY.ini index 91866aee3461..ed9e286f6282 100644 --- a/assets/lang/ms_MY.ini +++ b/assets/lang/ms_MY.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Cheat Edit Cheat File = Ubah cheat file Import Cheats = Import dari cheat.db +Import from %s = Import dari %s Refresh Rate = Refresh rate [DesktopUI] diff --git a/assets/lang/nl_NL.ini b/assets/lang/nl_NL.ini index d52070326224..73f3bfd96451 100644 --- a/assets/lang/nl_NL.ini +++ b/assets/lang/nl_NL.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Cheats Edit Cheat File = Cheatbestand bewerken Import Cheats = Importeren van cheat.db +Import from %s = Importeren van %s Refresh Rate = Vernieuwingsfrequentie [DesktopUI] diff --git a/assets/lang/no_NO.ini b/assets/lang/no_NO.ini index 7075b66bf41e..715516d89314 100644 --- a/assets/lang/no_NO.ini +++ b/assets/lang/no_NO.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Cheats Edit Cheat File = Edit cheat file Import Cheats = Import from cheat.db +Import from %s = Import from %s Refresh Rate = Refresh rate [DesktopUI] diff --git a/assets/lang/pl_PL.ini b/assets/lang/pl_PL.ini index b63b0cc1fea0..93230b473e95 100644 --- a/assets/lang/pl_PL.ini +++ b/assets/lang/pl_PL.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Kody Edit Cheat File = Edytuj plik kodów Import Cheats = Importuj z pliku cheat.db +Import from %s = Importuj z pliku %s Refresh Rate = Szybkość odświeżania [DesktopUI] diff --git a/assets/lang/pt_BR.ini b/assets/lang/pt_BR.ini index 583f4575da8a..c93a14a39bb9 100644 --- a/assets/lang/pt_BR.ini +++ b/assets/lang/pt_BR.ini @@ -133,6 +133,7 @@ Y = Y Cheats = Trapaças Edit Cheat File = Editar arquivo de trapaças Import Cheats = Importar do cheat.db +Import from %s = Importar do %s Refresh Rate = Taxa de atualização [DesktopUI] @@ -515,7 +516,7 @@ Frame Skipping = Pulo dos frames Frame Skipping Type = Tipo de pulo dos frames FullScreen = Tela cheia Geometry shader culling = Abate do shader da geometria -Hack Settings = Configurações dos hacks (pode causar erros gráficos) +Hack Settings = Configurações dos hacks (pode causar erros gráficos) Hardware Tessellation = Tesselação por hardware Hardware Transform = Transformação por hardware hardware transform error - falling back to software = Erro de transformação pelo hardware, retrocedendo pro software. @@ -884,10 +885,10 @@ tools = Ferramentas grátis usadas: # Leave extra lines blank. 4 contributors per line seems to look best. translators1 = Papel, gabrielmop, Efraim Lopes, AkiraJkr translators2 = Felipe -translators3 = -translators4 = -translators5 = -translators6 = +translators3 = +translators4 = +translators5 = +translators6 = Twitter @PPSSPP_emu = Twitter @PPSSPP_emu website = Verifique o site da web: written = Escrito em C++ pela velocidade e portabilidade diff --git a/assets/lang/pt_PT.ini b/assets/lang/pt_PT.ini index 80e4aaeadacd..d88325d86e9c 100644 --- a/assets/lang/pt_PT.ini +++ b/assets/lang/pt_PT.ini @@ -133,6 +133,7 @@ Y = Y Cheats = Cheats Edit Cheat File = Editar ficheiro de Cheats Import Cheats = Importar de cheat.db +Import from %s = Importar de %s Refresh Rate = Taxa de refrescamento [DesktopUI] diff --git a/assets/lang/ro_RO.ini b/assets/lang/ro_RO.ini index 1e553bdd087b..bc30e4bed207 100644 --- a/assets/lang/ro_RO.ini +++ b/assets/lang/ro_RO.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Trișare Edit Cheat File = Editare fișier trișare Import Cheats = Importă din cheat.db +Import %s = Importă din %s Refresh Rate = Rată de împrospatare [DesktopUI] diff --git a/assets/lang/ru_RU.ini b/assets/lang/ru_RU.ini index e34f841ff58e..3f4f820d666b 100644 --- a/assets/lang/ru_RU.ini +++ b/assets/lang/ru_RU.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Читы Edit Cheat File = Изменить файл чита Import Cheats = Импортировать из cheat.db +Import from %s = Импортировать из %s Refresh Rate = Частота обновления [DesktopUI] diff --git a/assets/lang/sv_SE.ini b/assets/lang/sv_SE.ini index d40917596cf4..9bc12b9f16ff 100644 --- a/assets/lang/sv_SE.ini +++ b/assets/lang/sv_SE.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Fusk Edit Cheat File = Redigera fusk-fil Import Cheats = Importera från cheat.db +Import from %s = Importera från %s Refresh Rate = Uppdateringsfrekvens [DesktopUI] diff --git a/assets/lang/tg_PH.ini b/assets/lang/tg_PH.ini index 14473f78ffcb..207a5ad4bcd1 100644 --- a/assets/lang/tg_PH.ini +++ b/assets/lang/tg_PH.ini @@ -108,7 +108,7 @@ Y = Y [CwCheats] Cheats = Mga Daya Edit Cheat File = Edit Cheat File -Import Cheats = Import ang mga daya mula sa cheat.db +Import from %s = Import ang mga daya mula sa %s Refresh Rate = Refresh rate [DesktopUI] diff --git a/assets/lang/tr_TR.ini b/assets/lang/tr_TR.ini index e921f961db2c..c7d2ad7a9014 100644 --- a/assets/lang/tr_TR.ini +++ b/assets/lang/tr_TR.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Hileler Edit Cheat File = Hile dosyasını düzenle Import Cheats = cheat.db'den hile al +Import from %s = %s'den hile al Refresh Rate = Yenileme Hızı [DesktopUI] diff --git a/assets/lang/uk_UA.ini b/assets/lang/uk_UA.ini index e4cc24f43617..d4420858a0ed 100644 --- a/assets/lang/uk_UA.ini +++ b/assets/lang/uk_UA.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Чит-коди Edit Cheat File = Змінити файл чит-коду Import Cheats = Імпортувати з cheat.db +Import from %s = Імпортувати з %s Refresh Rate = Частота оновлення [DesktopUI] diff --git a/assets/lang/vi_VN.ini b/assets/lang/vi_VN.ini index eb715014a318..a4a89a1734be 100644 --- a/assets/lang/vi_VN.ini +++ b/assets/lang/vi_VN.ini @@ -109,6 +109,7 @@ Y = Y Cheats = Cheats Edit Cheat File = Sửa mục cheat Import Cheats = Nhập mã từ cheat.db +Import from %s = Nhập mã từ %s Refresh Rate = Tần số làm mới [DesktopUI] diff --git a/assets/lang/zh_CN.ini b/assets/lang/zh_CN.ini index 2a1c7b180fc1..9816ad007647 100644 --- a/assets/lang/zh_CN.ini +++ b/assets/lang/zh_CN.ini @@ -109,6 +109,7 @@ Y = Y Cheats = 金手指 Edit Cheat File = 编辑金手指文件 Import Cheats = 从cheat.db导入 +Import from %s = 从%s导入 Refresh Rate = 刷新率 [DesktopUI] diff --git a/assets/lang/zh_TW.ini b/assets/lang/zh_TW.ini index c0810c024cf1..f91808f8649b 100644 --- a/assets/lang/zh_TW.ini +++ b/assets/lang/zh_TW.ini @@ -109,6 +109,7 @@ Y = Y Cheats = 密技 Edit Cheat File = 編輯密技檔案 Import Cheats = 從 cheat.db 匯入 +Import Cheats = 從 %s 匯入 Refresh Rate = 重新整理速率 [DesktopUI]