mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-21 13:24:32 +01:00
Merge pull request #3589 from vnctdj/patch-4
Move some translations (papel's work updated)
This commit is contained in:
commit
4091efc71d
5 files changed
+35
-33
No files matched your search
@@ -183,7 +183,7 @@ void ControlMappingScreen::CreateViews() {
|
||||
using namespace UI;
|
||||
|
||||
I18NCategory *k = GetI18NCategory("KeyMapping");
|
||||
I18NCategory *g = GetI18NCategory("General");
|
||||
I18NCategory *d = GetI18NCategory("Dialog");
|
||||
|
||||
root_ = new LinearLayout(ORIENT_HORIZONTAL);
|
||||
|
||||
@@ -191,7 +191,7 @@ void ControlMappingScreen::CreateViews() {
|
||||
leftColumn->Add(new Choice(k->T("Clear All")))->OnClick.Handle(this, &ControlMappingScreen::OnClearMapping);
|
||||
leftColumn->Add(new Choice(k->T("Default All")))->OnClick.Handle(this, &ControlMappingScreen::OnDefaultMapping);
|
||||
leftColumn->Add(new Spacer(new LinearLayoutParams(1.0f)));
|
||||
leftColumn->Add(new Choice(g->T("Back")))->OnClick.Handle<UIScreen>(this, &UIScreen::OnBack);
|
||||
leftColumn->Add(new Choice(d->T("Back")))->OnClick.Handle<UIScreen>(this, &UIScreen::OnBack);
|
||||
|
||||
/*
|
||||
ChoiceStrip *mode = leftColumn->Add(new ChoiceStrip(ORIENT_VERTICAL));
|
||||
|
||||
+4
-4
@@ -34,7 +34,7 @@
|
||||
void GameScreen::CreateViews() {
|
||||
GameInfo *info = g_gameInfoCache.GetInfo(gamePath_, true);
|
||||
|
||||
I18NCategory *g = GetI18NCategory("General");
|
||||
I18NCategory *d = GetI18NCategory("Dialog");
|
||||
I18NCategory *ga = GetI18NCategory("Game");
|
||||
|
||||
// Information in the top left.
|
||||
@@ -49,7 +49,7 @@ void GameScreen::CreateViews() {
|
||||
ViewGroup *leftColumn = new AnchorLayout(new LinearLayoutParams(1.0f));
|
||||
root_->Add(leftColumn);
|
||||
|
||||
leftColumn->Add(new Choice(g->T("Back"), "", false, new AnchorLayoutParams(150, WRAP_CONTENT, 10, NONE, NONE, 10)))->OnClick.Handle(this, &GameScreen::OnSwitchBack);
|
||||
leftColumn->Add(new Choice(d->T("Back"), "", false, new AnchorLayoutParams(150, WRAP_CONTENT, 10, NONE, NONE, 10)))->OnClick.Handle(this, &GameScreen::OnSwitchBack);
|
||||
if (info) {
|
||||
texvGameIcon_ = leftColumn->Add(new TextureView(0, IS_DEFAULT, new AnchorLayoutParams(144 * 2, 80 * 2, 10, 10, NONE, NONE)));
|
||||
tvTitle_ = leftColumn->Add(new TextView(info->title, ALIGN_LEFT, 1.0f, new AnchorLayoutParams(10, 200, NONE, NONE)));
|
||||
@@ -152,7 +152,7 @@ UI::EventReturn GameScreen::OnDeleteSaveData(UI::EventParams &e) {
|
||||
GameInfo *info = g_gameInfoCache.GetInfo(gamePath_, true);
|
||||
if (info) {
|
||||
screenManager()->push(
|
||||
new PromptScreen(d->T("DeleteConfirmAll", "Do you really want to delete all\nyour save data for this game?"), ga->T("DeleteSaveData"), ga->T("Cancel"),
|
||||
new PromptScreen(d->T("DeleteConfirmAll", "Do you really want to delete all\nyour save data for this game?"), ga->T("DeleteSaveData"), d->T("Cancel"),
|
||||
std::bind(&GameScreen::CallbackDeleteSaveData, this, placeholder::_1)));
|
||||
}
|
||||
|
||||
@@ -173,7 +173,7 @@ UI::EventReturn GameScreen::OnDeleteGame(UI::EventParams &e) {
|
||||
GameInfo *info = g_gameInfoCache.GetInfo(gamePath_, true);
|
||||
if (info) {
|
||||
screenManager()->push(
|
||||
new PromptScreen(d->T("DeleteConfirmGame", "Do you really want to delete this game\nfrom your device? You can't undo this."), ga->T("DeleteGame"), ga->T("Cancel"),
|
||||
new PromptScreen(d->T("DeleteConfirmGame", "Do you really want to delete this game\nfrom your device? You can't undo this."), ga->T("DeleteGame"), d->T("Cancel"),
|
||||
std::bind(&GameScreen::CallbackDeleteGame, this, placeholder::_1)));
|
||||
}
|
||||
|
||||
|
||||
+17
-17
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2013- PPSSPP Project.
|
||||
// Copyright (c) 2013- PPSSPP Project.
|
||||
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
@@ -211,7 +211,7 @@ void GameSettingsScreen::CreateViews() {
|
||||
// Scrolling action menu to the right.
|
||||
using namespace UI;
|
||||
|
||||
I18NCategory *g = GetI18NCategory("General");
|
||||
I18NCategory *d = GetI18NCategory("Dialog");
|
||||
I18NCategory *gs = GetI18NCategory("Graphics");
|
||||
I18NCategory *c = GetI18NCategory("Controls");
|
||||
I18NCategory *a = GetI18NCategory("Audio");
|
||||
@@ -223,7 +223,7 @@ void GameSettingsScreen::CreateViews() {
|
||||
ViewGroup *leftColumn = new AnchorLayout(new LinearLayoutParams(1.0f));
|
||||
root_->Add(leftColumn);
|
||||
|
||||
root_->Add(new Choice(g->T("Back"), "", false, new AnchorLayoutParams(150, WRAP_CONTENT, 10, NONE, NONE, 10)))->OnClick.Handle(this, &GameSettingsScreen::OnBack);
|
||||
root_->Add(new Choice(d->T("Back"), "", false, new AnchorLayoutParams(150, WRAP_CONTENT, 10, NONE, NONE, 10)))->OnClick.Handle(this, &GameSettingsScreen::OnBack);
|
||||
|
||||
TabHolder *tabHolder = new TabHolder(ORIENT_VERTICAL, 200, new AnchorLayoutParams(10, 0, 10, 0, false));
|
||||
|
||||
@@ -514,8 +514,8 @@ UI::EventReturn GameSettingsScreen::OnFactoryReset(UI::EventParams &e) {
|
||||
}
|
||||
|
||||
UI::EventReturn GameSettingsScreen::OnLanguage(UI::EventParams &e) {
|
||||
I18NCategory *d = GetI18NCategory("Developer");
|
||||
auto langScreen = new NewLanguageScreen(d->T("Language"));
|
||||
I18NCategory *de = GetI18NCategory("Developer");
|
||||
auto langScreen = new NewLanguageScreen(de->T("Language"));
|
||||
langScreen->OnChoice.Handle(this, &GameSettingsScreen::OnLanguageChange);
|
||||
screenManager()->push(langScreen);
|
||||
return UI::EVENT_DONE;
|
||||
@@ -543,8 +543,8 @@ void DeveloperToolsScreen::CreateViews() {
|
||||
|
||||
enableLogging_ = g_Config.bEnableLogging;
|
||||
|
||||
I18NCategory *g = GetI18NCategory("General");
|
||||
I18NCategory *d = GetI18NCategory("Developer");
|
||||
I18NCategory *d = GetI18NCategory("Dialog");
|
||||
I18NCategory *de = GetI18NCategory("Developer");
|
||||
I18NCategory *gs = GetI18NCategory("Graphics");
|
||||
I18NCategory *a = GetI18NCategory("Audio");
|
||||
I18NCategory *s = GetI18NCategory("System");
|
||||
@@ -552,17 +552,17 @@ void DeveloperToolsScreen::CreateViews() {
|
||||
LinearLayout *list = root_->Add(new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(1.0f)));
|
||||
list->SetSpacing(0);
|
||||
list->Add(new ItemHeader(s->T("General")));
|
||||
list->Add(new Choice(d->T("System Information")))->OnClick.Handle(this, &DeveloperToolsScreen::OnSysInfo);
|
||||
list->Add(new Choice(d->T("Run CPU Tests")))->OnClick.Handle(this, &DeveloperToolsScreen::OnRunCPUTests);
|
||||
list->Add(new Choice(d->T("Restore Default Settings")))->OnClick.Handle(this, &DeveloperToolsScreen::OnRestoreDefaultSettings);
|
||||
list->Add(new Choice(de->T("System Information")))->OnClick.Handle(this, &DeveloperToolsScreen::OnSysInfo);
|
||||
list->Add(new Choice(de->T("Run CPU Tests")))->OnClick.Handle(this, &DeveloperToolsScreen::OnRunCPUTests);
|
||||
list->Add(new Choice(de->T("Restore Default Settings")))->OnClick.Handle(this, &DeveloperToolsScreen::OnRestoreDefaultSettings);
|
||||
#ifndef __SYMBIAN32__
|
||||
list->Add(new CheckBox(&g_Config.bSoftwareRendering, gs->T("Software Rendering", "Software Rendering (experimental)")));
|
||||
#endif
|
||||
list->Add(new CheckBox(&enableLogging_, d->T("Enable Logging")))->OnClick.Handle(this, &DeveloperToolsScreen::OnLoggingChanged);
|
||||
list->Add(new ItemHeader(d->T("Language")));
|
||||
list->Add(new Choice(d->T("Load language ini")))->OnClick.Handle(this, &DeveloperToolsScreen::OnLoadLanguageIni);
|
||||
list->Add(new Choice(d->T("Save language ini")))->OnClick.Handle(this, &DeveloperToolsScreen::OnSaveLanguageIni);
|
||||
list->Add(new Choice(g->T("Back")))->OnClick.Handle(this, &DeveloperToolsScreen::OnBack);
|
||||
list->Add(new CheckBox(&enableLogging_, de->T("Enable Logging")))->OnClick.Handle(this, &DeveloperToolsScreen::OnLoggingChanged);
|
||||
list->Add(new ItemHeader(de->T("Language")));
|
||||
list->Add(new Choice(de->T("Load language ini")))->OnClick.Handle(this, &DeveloperToolsScreen::OnLoadLanguageIni);
|
||||
list->Add(new Choice(de->T("Save language ini")))->OnClick.Handle(this, &DeveloperToolsScreen::OnSaveLanguageIni);
|
||||
list->Add(new Choice(d->T("Back")))->OnClick.Handle(this, &DeveloperToolsScreen::OnBack);
|
||||
}
|
||||
|
||||
UI::EventReturn DeveloperToolsScreen::OnBack(UI::EventParams &e) {
|
||||
@@ -583,10 +583,10 @@ void DeveloperToolsScreen::CallbackRestoreDefaults(bool yes) {
|
||||
}
|
||||
|
||||
UI::EventReturn DeveloperToolsScreen::OnRestoreDefaultSettings(UI::EventParams &e) {
|
||||
I18NCategory *de = GetI18NCategory("Developer");
|
||||
I18NCategory *d = GetI18NCategory("Dialog");
|
||||
I18NCategory *g = GetI18NCategory("General");
|
||||
screenManager()->push(
|
||||
new PromptScreen(d->T("RestoreDefaultSettings", "Are you sure you want to restore all settings(except control mapping)\nback to their defaults?\nYou can't undo this.\nPlease restart PPSSPP after restoring settings."), g->T("OK"), g->T("Cancel"),
|
||||
new PromptScreen(de->T("RestoreDefaultSettings", "Are you sure you want to restore all settings(except control mapping)\nback to their defaults?\nYou can't undo this.\nPlease restart PPSSPP after restoring settings."), d->T("OK"), d->T("Cancel"),
|
||||
std::bind(&DeveloperToolsScreen::CallbackRestoreDefaults, this, placeholder::_1)));
|
||||
|
||||
return UI::EVENT_DONE;
|
||||
|
||||
+10
-9
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2013- PPSSPP Project.
|
||||
// Copyright (c) 2013- PPSSPP Project.
|
||||
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
@@ -320,7 +320,7 @@ void LogoScreen::render() {
|
||||
|
||||
void SystemInfoScreen::CreateViews() {
|
||||
// NOTE: Do not translate this section. It will change a lot and will be impossible to keep up.
|
||||
I18NCategory *g = GetI18NCategory("General");
|
||||
I18NCategory *d = GetI18NCategory("Dialog");
|
||||
|
||||
using namespace UI;
|
||||
root_ = new ScrollView(ORIENT_VERTICAL, new LayoutParams(FILL_PARENT, FILL_PARENT));
|
||||
@@ -333,7 +333,7 @@ void SystemInfoScreen::CreateViews() {
|
||||
scroll->Add(new InfoItem("GPU Vendor", (char *)glGetString(GL_VENDOR)));
|
||||
scroll->Add(new InfoItem("GPU Model", (char *)glGetString(GL_RENDERER)));
|
||||
scroll->Add(new InfoItem("OpenGL Version Supported", (char *)glGetString(GL_VERSION)));
|
||||
scroll->Add(new Button(g->T("Back"), new LayoutParams(260, 64)))->OnClick.Handle<UIScreen>(this, &UIScreen::OnBack);
|
||||
scroll->Add(new Button(d->T("Back"), new LayoutParams(260, 64)))->OnClick.Handle<UIScreen>(this, &UIScreen::OnBack);
|
||||
|
||||
#ifdef _WIN32
|
||||
scroll->Add(new ItemHeader("OpenGL Extensions"));
|
||||
@@ -356,11 +356,11 @@ void SystemInfoScreen::CreateViews() {
|
||||
|
||||
void CreditsScreen::CreateViews() {
|
||||
using namespace UI;
|
||||
I18NCategory *g = GetI18NCategory("General");
|
||||
I18NCategory *d = GetI18NCategory("Dialog");
|
||||
I18NCategory *c = GetI18NCategory("PSPCredits");
|
||||
|
||||
root_ = new AnchorLayout(new LayoutParams(FILL_PARENT, FILL_PARENT));
|
||||
root_->Add(new Button(g->T("Back"), new AnchorLayoutParams(260, 64, NONE, NONE, 10, 10, false)))->OnClick.Handle(this, &CreditsScreen::OnOK);
|
||||
root_->Add(new Button(d->T("Back"), new AnchorLayoutParams(260, 64, NONE, NONE, 10, 10, false)))->OnClick.Handle(this, &CreditsScreen::OnOK);
|
||||
#ifndef GOLD
|
||||
root_->Add(new Button(c->T("Buy Gold"), new AnchorLayoutParams(260, 64, 10, NONE, NONE, 10, false)))->OnClick.Handle(this, &CreditsScreen::OnSupport);
|
||||
#endif
|
||||
@@ -543,21 +543,22 @@ void CreditsScreen::render() {
|
||||
}
|
||||
|
||||
/*
|
||||
I18NCategory *g = GetI18NCategory("General");
|
||||
I18NCategory *c = GetI18NCategory("PSPCredits");
|
||||
I18NCategory *d = GetI18NCategory("Dialog");
|
||||
|
||||
if (UIButton(GEN_ID, Pos(dp_xres - 10, dp_yres - 10), 200, 0, g->T("Back"), ALIGN_BOTTOMRIGHT)) {
|
||||
if (UIButton(GEN_ID, Pos(dp_xres - 10, dp_yres - 10), 200, 0, d->T("Back"), ALIGN_BOTTOMRIGHT)) {
|
||||
screenManager()->finishDialog(this, DR_OK);
|
||||
}
|
||||
|
||||
#ifdef ANDROID
|
||||
#ifndef GOLD
|
||||
if (UIButton(GEN_ID, Pos(10, dp_yres - 10), 300, 0, g->T("Buy PPSSPP Gold"), ALIGN_BOTTOMLEFT)) {
|
||||
if (UIButton(GEN_ID, Pos(10, dp_yres - 10), 300, 0, c->T("Buy PPSSPP Gold"), ALIGN_BOTTOMLEFT)) {
|
||||
LaunchBrowser("market://details?id=org.ppsspp.ppssppgold");
|
||||
}
|
||||
#endif
|
||||
#else
|
||||
#ifndef GOLD
|
||||
if (UIButton(GEN_ID, Pos(10, dp_yres - 10), 300, 0, g->T("Buy PPSSPP Gold"), ALIGN_BOTTOMLEFT)) {
|
||||
if (UIButton(GEN_ID, Pos(10, dp_yres - 10), 300, 0, c->T("Buy PPSSPP Gold"), ALIGN_BOTTOMLEFT)) {
|
||||
LaunchBrowser("http://central.ppsspp.org/buygold");
|
||||
}
|
||||
#endif
|
||||
|
||||
+2
-1
@@ -39,6 +39,7 @@ PluginScreen::PluginScreen() {
|
||||
|
||||
void PluginScreen::CreateViews() {
|
||||
I18NCategory *p = GetI18NCategory("Plugin");
|
||||
I18NCategory *d = GetI18NCategory("Dialog");
|
||||
// Build the UI.
|
||||
|
||||
using namespace UI;
|
||||
@@ -71,7 +72,7 @@ void PluginScreen::CreateViews() {
|
||||
ViewGroup *buttonBar = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(buttonMargins));
|
||||
root_->Add(buttonBar);
|
||||
|
||||
buttonBack_ = new Button(p->T("Back"), new LinearLayoutParams(1.0));
|
||||
buttonBack_ = new Button(d->T("Back"), new LinearLayoutParams(1.0));
|
||||
buttonBar->Add(buttonBack_)->OnClick.Handle<UIScreen>(this, &UIScreen::OnBack);
|
||||
buttonDownload_ = new Button(p->T("Download and install"), new LinearLayoutParams(1.0));
|
||||
buttonDownload_->SetEnabled(false);
|
||||
|
||||
Reference in new issue
Block a user