Merge pull request #16460 from hrydgard/translation-string-fixes

Translation string fixes
hrydgard · Nov 29, 2022 · d34e38c · d34e38c
2 parents b9dc206 + 39e835b
commit d34e38c
Show file tree

Hide file tree

Showing 46 changed files with 467 additions and 131 deletions.
diff --git a/Tools/langtool/src/main.rs b/Tools/langtool/src/main.rs
@@ -11,6 +11,8 @@ use structopt::StructOpt;
 struct Opt {
     #[structopt(subcommand)]
     cmd: Command,
+    #[structopt(short, long)]
+    dry_run: bool,
 }
 
 #[derive(StructOpt, Debug)]
@@ -170,7 +172,9 @@ fn main() {
             }
         }
 
-        target_ini.write().unwrap();
+        if !opt.dry_run {
+            target_ini.write().unwrap();
+        }
     }
 
     println!("Langtool processing {}", reference_ini_filename);
@@ -199,5 +203,7 @@ fn main() {
         _ => {}
     }
 
-    // println!("{:#?}", target_ini);
+    if !opt.dry_run {
+        reference_ini.write().unwrap();
+    }
 }
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
@@ -829,7 +829,7 @@ void GameSettingsScreen::CreateViews() {
 	LinearLayout *systemSettings = AddTab("GameSettingsSystem", ms->T("System"));
 
 	systemSettings->Add(new ItemHeader(sy->T("UI")));
-	systemSettings->Add(new Choice(dev->T("Language", "Language")))->OnClick.Handle(this, &GameSettingsScreen::OnLanguage);
+	systemSettings->Add(new Choice(sy->T("Language")))->OnClick.Handle(this, &GameSettingsScreen::OnLanguage);
 	systemSettings->Add(new CheckBox(&g_Config.bUISound, sy->T("UI Sound")));
 	const Path bgPng = GetSysDirectory(DIRECTORY_SYSTEM) / "background.png";
 	const Path bgJpg = GetSysDirectory(DIRECTORY_SYSTEM) / "background.jpg";
@@ -1592,8 +1592,8 @@ UI::EventReturn GameSettingsScreen::OnChangeMacAddress(UI::EventParams &e) {
 }
 
 UI::EventReturn GameSettingsScreen::OnLanguage(UI::EventParams &e) {
-	auto dev = GetI18NCategory("Developer");
-	auto langScreen = new NewLanguageScreen(dev->T("Language"));
+	auto sy = GetI18NCategory("System");
+	auto langScreen = new NewLanguageScreen(sy->T("Language"));
 	langScreen->OnChoice.Handle(this, &GameSettingsScreen::OnLanguageChange);
 	if (e.v)
 		langScreen->SetPopupOrigin(e.v);
@@ -1756,12 +1756,27 @@ void DeveloperToolsScreen::CreateViews() {
 	list->Add(new Choice(dev->T("Logging Channels")))->OnClick.Handle(this, &DeveloperToolsScreen::OnLogConfig);
 	list->Add(new CheckBox(&g_Config.bLogFrameDrops, dev->T("Log Dropped Frame Statistics")));
 	if (GetGPUBackend() == GPUBackend::VULKAN) {
-		list->Add(new CheckBox(&g_Config.bGpuLogProfiler, gr->T("GPU log profiler")));
+		list->Add(new CheckBox(&g_Config.bGpuLogProfiler, dev->T("GPU log profiler")));
 	}
 	list->Add(new ItemHeader(dev->T("Texture Replacement")));
 	list->Add(new CheckBox(&g_Config.bSaveNewTextures, dev->T("Save new textures")));
 	list->Add(new CheckBox(&g_Config.bReplaceTextures, dev->T("Replace textures")));
 
+	Choice *createTextureIni = list->Add(new Choice(dev->T("Create/Open textures.ini file for current game")));
+	createTextureIni->OnClick.Handle(this, &DeveloperToolsScreen::OnOpenTexturesIniFile);
+	createTextureIni->SetEnabledFunc([&] {
+		if (!PSP_IsInited())
+			return false;
+
+		// Disable the choice to Open/Create if the textures.ini file already exists, and we can't open it due to platform support limitations.
+		if (!System_GetPropertyBool(SYSPROP_SUPPORTS_OPEN_FILE_IN_EDITOR)) {
+			if (hasTexturesIni_ == HasIni::MAYBE)
+				hasTexturesIni_ = TextureReplacer::IniExists(g_paramSFO.GetDiscID()) ? HasIni::YES : HasIni::NO;
+			return hasTexturesIni_ != HasIni::YES;
+		}
+		return true;
+	});
+
 	Draw::DrawContext *draw = screenManager()->getDrawContext();
 
 	// Experimental, will move to main graphics settings later.
@@ -1810,21 +1825,6 @@ void DeveloperToolsScreen::CreateViews() {
 
 	// Reconsider whenever recreating views.
 	hasTexturesIni_ = HasIni::MAYBE;
-
-	Choice *createTextureIni = list->Add(new Choice(dev->T("Create/Open textures.ini file for current game")));
-	createTextureIni->OnClick.Handle(this, &DeveloperToolsScreen::OnOpenTexturesIniFile);
-	createTextureIni->SetEnabledFunc([&] {
-		if (!PSP_IsInited())
-			return false;
-
-		// Disable the choice to Open/Create if the textures.ini file already exists, and we can't open it due to platform support limitations.
-		if (!System_GetPropertyBool(SYSPROP_SUPPORTS_OPEN_FILE_IN_EDITOR)) {
-			if (hasTexturesIni_ == HasIni::MAYBE)
-				hasTexturesIni_ = TextureReplacer::IniExists(g_paramSFO.GetDiscID()) ? HasIni::YES : HasIni::NO;
-			return hasTexturesIni_ != HasIni::YES;
-		}
-		return true;
-	});
 }
 
 void DeveloperToolsScreen::onFinish(DialogResult result) {

diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp
@@ -425,8 +425,8 @@ void HandleCommonMessages(const char *message, const char *value, ScreenManager
 		UpdateUIState(UISTATE_MENU);
 		manager->push(new GameSettingsScreen(Path()));
 	} else if (!strcmp(message, "language screen") && isActiveScreen) {
-		auto dev = GetI18NCategory("Developer");
-		auto langScreen = new NewLanguageScreen(dev->T("Language"));
+		auto sy = GetI18NCategory("System");
+		auto langScreen = new NewLanguageScreen(sy->T("Language"));
 		langScreen->OnChoice.Add([](UI::EventParams &) {
 			NativeMessageReceived("recreateviews", "");
 			if (host) {

diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini
@@ -248,7 +248,7 @@ FPU = FPU
 Framedump tests = Framedump tests
 Frame Profiler = Frame profiler
 GPU Driver Test = GPU driver test
-GPU Log Profiler = GPU Log Profiler
+GPU log profiler = GPU log profiler
 GPU Profile = GPU profile
 Jit Compare = Jit compare
 JIT debug tools = JIT debug tools
@@ -501,7 +501,7 @@ Frame Rate Control = ‎التحكم في معدل الإطارات
 Frame Skipping = ‎تخطي الإطارات
 Frame Skipping Type = Frame skipping type
 FullScreen = ‎الشاشة الكاملة
-GPU log profiler = GPU log profiler
+Geometry shader culling = Geometry shader culling
 GPUReadbackRequired = Warning: This game requires "Skip GPU Readbacks" to be set to Off.
 Hack Settings = Hack settings (may cause glitches)
 Hardware Tessellation = Hardware tessellation
@@ -555,6 +555,8 @@ Software Skinning = ‎طلاء برمجي
 SoftwareSkinning Tip = Combine skinned model draws on the CPU, faster in most games
 Speed = ‎السرعة
 Speed Hacks = Speed Hacks (can cause rendering errors!)
+Stereo display shader = Stereo display shader
+Stereo rendering = Stereo rendering
 Stretch = ‎المط
 Texture Filter = ‎منقي الرسوم
 Texture Filtering = ‎مفلتر الرسوم
@@ -840,11 +842,13 @@ Brightness = Brightness
 Cartoon = ‎كرتوني
 CatmullRom = Bicubic (Catmull-Rom) Upscaler
 ColorCorrection = Color correction
+ColorPreservation = Color preservation
 Contrast = Contrast
 CRT = ‎CRT خطوط الفحص
 FXAA = ‎FXAA منعم الحواف
 Gamma = Gamma
 Grayscale = ‎التدرج الرمادي
+GreenLevel = GreenLevel
 Intensity = Intensity
 InverseColors = ‎عكس الألوان
 MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler
@@ -853,9 +857,11 @@ NaturalA = Natural Colors (no blur)
 Off = ‎مغلق
 Power = Power
 PSPColor = PSP color
+RedBlue = Red/Blue glasses
 Saturation = Saturation
 Scanlines = Scanlines (CRT)
 Sharpen = ‎تنعيم الحواف
+SideBySide = Side by side (SBS)
 SSAA(Gauss) = Supersampling AA (Gauss)
 Tex4xBRZ = 4xBRZ
 TexMMPX = MMPX
@@ -1099,6 +1105,8 @@ Color Tint = Color Tint
 Error: load undo state is from a different game = Error: load undo state is from a different game
 Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system.
 Floating symbols = Floating symbols
+Game crashed = Game crashed
+Language = ‎اللغة
 Memory Stick folder = Memory Stick folder
 Memory Stick size = Memory Stick size
 Change Nickname = ‎تغيير الأسم المستعار

diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini
@@ -240,7 +240,7 @@ FPU = FPU
 Framedump tests = Framedump tests
 Frame Profiler = Frame profiler
 GPU Driver Test = GPU driver test
-GPU Log Profiler = GPU Log Profiler
+GPU log profiler = GPU log profiler
 GPU Profile = GPU profile
 Jit Compare = Jit compare
 JIT debug tools = JIT debug tools
@@ -493,7 +493,7 @@ Frame Rate Control = Framerate control
 Frame Skipping = Kvadrat Keçid et (Sürət)
 Frame Skipping Type = Frame skipping type
 FullScreen = Fullscreen
-GPU log profiler = GPU log profiler
+Geometry shader culling = Geometry shader culling
 GPUReadbackRequired = Warning: This game requires "Skip GPU Readbacks" to be set to Off.
 Hack Settings = Hack settings (may cause glitches)
 Hardware Tessellation = Hardware tessellation
@@ -547,6 +547,8 @@ Software Skinning = Software skinning
 SoftwareSkinning Tip = Combine skinned model draws on the CPU, faster in most games
 Speed = Speed
 Speed Hacks = Speed Hacks (can cause rendering errors!)
+Stereo display shader = Stereo display shader
+Stereo rendering = Stereo rendering
 Stretch = Stretch
 Texture Filter = Texture filtering
 Texture Filtering = Texture filtering
@@ -832,11 +834,13 @@ Brightness = Brightness
 Cartoon = Cartoon
 CatmullRom = Bicubic (Catmull-Rom) Upscaler
 ColorCorrection = Color correction
+ColorPreservation = Color preservation
 Contrast = Contrast
 CRT = CRT scanlines
 FXAA = FXAA Antialiasing
 Gamma = Gamma
 Grayscale = Grayscale
+GreenLevel = GreenLevel
 Intensity = Intensity
 InverseColors = Inverse Colors
 MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler
@@ -845,9 +849,11 @@ NaturalA = Natural Colors (no blur)
 Off = Off
 Power = Power
 PSPColor = PSP color
+RedBlue = Red/Blue glasses
 Saturation = Saturation
 Scanlines = Scanlines (CRT)
 Sharpen = Sharpen
+SideBySide = Side by side (SBS)
 SSAA(Gauss) = Supersampling AA (Gauss)
 Tex4xBRZ = 4xBRZ
 TexMMPX = MMPX
@@ -1091,6 +1097,8 @@ Color Tint = Color Tint
 Error: load undo state is from a different game = Error: load undo state is from a different game
 Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system.
 Floating symbols = Floating symbols
+Game crashed = Game crashed
+Language = Language
 Memory Stick folder = Memory Stick folder
 Memory Stick size = Memory Stick size
 Change Nickname = Change nickname

diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini
@@ -240,7 +240,7 @@ FPU = FPU
 Framedump tests = Framedump tests
 Frame Profiler = Frame profiler
 GPU Driver Test = GPU driver test
-GPU Log Profiler = GPU Log Profiler
+GPU log profiler = GPU log profiler
 GPU Profile = GPU profile
 Jit Compare = Jit compare
 JIT debug tools = JIT debug tools
@@ -493,7 +493,7 @@ Frame Rate Control = Framerate control
 Frame Skipping = Прескачане на кадри
 Frame Skipping Type = Frame skipping type
 FullScreen = Цял екран
-GPU log profiler = GPU log profiler
+Geometry shader culling = Geometry shader culling
 GPUReadbackRequired = Warning: This game requires "Skip GPU Readbacks" to be set to Off.
 Hack Settings = Hack settings (may cause glitches)
 Hardware Tessellation = Hardware tessellation
@@ -547,6 +547,8 @@ Software Skinning = Software skinning
 SoftwareSkinning Tip = Combine skinned model draws on the CPU, faster in most games
 Speed = Скорост
 Speed Hacks = Speed Hacks (can cause rendering errors!)
+Stereo display shader = Stereo display shader
+Stereo rendering = Stereo rendering
 Stretch = Stretch
 Texture Filter = Текстурно филтриране
 Texture Filtering = Текстурно филтриране
@@ -832,11 +834,13 @@ Brightness = Brightness
 Cartoon = Анимация
 CatmullRom = Bicubic (Catmull-Rom) Upscaler
 ColorCorrection = Color correction
+ColorPreservation = Color preservation
 Contrast = Contrast
 CRT = CRT scanlines
 FXAA = FXAA Antialiasing
 Gamma = Gamma
 Grayscale = Сива скала
+GreenLevel = GreenLevel
 Intensity = Intensity
 InverseColors = Противоположни цветове
 MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler
@@ -845,9 +849,11 @@ NaturalA = Natural Colors (no blur)
 Off = Изключено
 Power = Power
 PSPColor = PSP color
+RedBlue = Red/Blue glasses
 Saturation = Saturation
 Scanlines = Scanlines (CRT)
 Sharpen = Изостряне
+SideBySide = Side by side (SBS)
 SSAA(Gauss) = Supersampling AA (Gauss)
 Tex4xBRZ = 4xBRZ
 TexMMPX = MMPX
@@ -1091,6 +1097,8 @@ Color Tint = Color Tint
 Error: load undo state is from a different game = Error: load undo state is from a different game
 Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system.
 Floating symbols = Floating symbols
+Game crashed = Game crashed
+Language = Език
 Memory Stick folder = Memory Stick folder
 Memory Stick size = Memory Stick size
 Change Nickname = Промени прякор

diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini
@@ -240,7 +240,7 @@ FPU = FPU
 Framedump tests = Framedump tests
 Frame Profiler = Amideu el rendiment
 GPU Driver Test = GPU driver test
-GPU Log Profiler = GPU Log Profiler
+GPU log profiler = GPU log profiler
 GPU Profile = GPU profile
 Jit Compare = Comparació Jit
 JIT debug tools = JIT debug tools
@@ -493,7 +493,7 @@ Frame Rate Control = Framerate control
 Frame Skipping = Saltar fotogrames (skip)
 Frame Skipping Type = Frame skipping type
 FullScreen = Fullscreen
-GPU log profiler = GPU log profiler
+Geometry shader culling = Geometry shader culling
 GPUReadbackRequired = Warning: This game requires "Skip GPU Readbacks" to be set to Off.
 Hack Settings = Hack settings (may cause glitches)
 Hardware Tessellation = Hardware tessellation
@@ -547,6 +547,8 @@ Software Skinning = Software skinning
 SoftwareSkinning Tip = Combine skinned model draws on the CPU, faster in most games
 Speed = Speed
 Speed Hacks = Speed Hacks (can cause rendering errors!)
+Stereo display shader = Stereo display shader
+Stereo rendering = Stereo rendering
 Stretch = Stretch
 Texture Filter = Texture filtering
 Texture Filtering = Texture filtering
@@ -832,11 +834,13 @@ Brightness = Brightness
 Cartoon = Cartoon
 CatmullRom = Bicubic (Catmull-Rom) Upscaler
 ColorCorrection = Color correction
+ColorPreservation = Color preservation
 Contrast = Contrast
 CRT = CRT scanlines
 FXAA = FXAA Antialiasing
 Gamma = Gamma
 Grayscale = Grayscale
+GreenLevel = GreenLevel
 Intensity = Intensity
 InverseColors = Inverse Colors
 MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler
@@ -845,9 +849,11 @@ NaturalA = Natural Colors (no blur)
 Off = Off
 Power = Power
 PSPColor = PSP color
+RedBlue = Red/Blue glasses
 Saturation = Saturation
 Scanlines = Scanlines (CRT)
 Sharpen = Sharpen
+SideBySide = Side by side (SBS)
 SSAA(Gauss) = Supersampling AA (Gauss)
 Tex4xBRZ = 4xBRZ
 TexMMPX = MMPX
@@ -1091,6 +1097,8 @@ Color Tint = Color Tint
 Error: load undo state is from a different game = Error: load undo state is from a different game
 Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system.
 Floating symbols = Floating symbols
+Game crashed = Game crashed
+Language = Llengua
 Memory Stick folder = Memory Stick folder
 Memory Stick size = Memory Stick size
 Change Nickname = Change nickname