Apply fixes

Author: zlomzlom

src/dialog_dummy_video.cpp

@@ -68,18 +68,18 @@ struct ResolutionShortcut {
 };
 
 static ResolutionShortcut resolutions[] = {
-	{_(L"640\u00D7480 (SD fullscreen)"), 640, 480},        // U+00D7 multiplication sign
-	{_(L"704\u00D7480 (SD anamorphic)"), 704, 480},
-	{_(L"640\u00D7360 (SD widescreen)"), 640, 360},
-	{_(L"704\u00D7396 (SD widescreen)"), 704, 396},
-	{_(L"640\u00D7352 (SD widescreen MOD16)"), 640, 352},
-	{_(L"704\u00D7400 (SD widescreen MOD16)"), 704, 400},
-	{_(L"1024\u00D7576 (SuperPAL widescreen)"), 1024, 576},
-	{_(L"1280\u00D7720 (HD 720p)"), 1280, 720},
-	{_(L"1920\u00D71080 (FHD 1080p)"), 1920, 1080},
-	{_(L"2560\u00D71440 (QHD 1440p)"), 2560, 1440},
-	{_(L"3840\u00D72160 (4K UHD 2160p)"), 3840, 2160},
-    {_(L"1080\u00D71920 (FHD vertical)"), 1080, 1920},
+	{wxGetTranslation(L"640\u00D7480 (SD fullscreen)"), 640, 480},        // U+00D7 multiplication sign
+	{wxGetTranslation(L"704\u00D7480 (SD anamorphic)"), 704, 480},
+	{wxGetTranslation(L"640\u00D7360 (SD widescreen)"), 640, 360},
+	{wxGetTranslation(L"704\u00D7396 (SD widescreen)"), 704, 396},
+	{wxGetTranslation(L"640\u00D7352 (SD widescreen MOD16)"), 640, 352},
+	{wxGetTranslation(L"704\u00D7400 (SD widescreen MOD16)"), 704, 400},
+	{wxGetTranslation(L"1024\u00D7576 (SuperPAL widescreen)"), 1024, 576},
+	{wxGetTranslation(L"1280\u00D7720 (HD 720p)"), 1280, 720},
+	{wxGetTranslation(L"1920\u00D71080 (FHD 1080p)"), 1920, 1080},
+	{wxGetTranslation(L"2560\u00D71440 (QHD 1440p)"), 2560, 1440},
+	{wxGetTranslation(L"3840\u00D72160 (4K UHD 2160p)"), 3840, 2160},
+    {wxGetTranslation(L"1080\u00D71920 (FHD vertical)"), 1080, 1920},
 };
 
 wxSpinCtrl *spin_ctrl(wxWindow *parent, int min, int max, int *value) {
@@ -92,7 +92,7 @@ wxComboBox *resolution_shortcuts(wxWindow *parent, int width, int height) {
 	wxComboBox *ctrl = new wxComboBox(parent, -1, "", wxDefaultPosition, wxDefaultSize, 0, nullptr, wxCB_READONLY);
 
 	for (auto const& res : resolutions) {
-		ctrl->Append(_(res.name));
+		ctrl->Append(wxGetTranslation(res.name));
 		if (res.width == width && res.height == height)
 			ctrl->SetSelection(ctrl->GetCount() - 1);
 	}

src/project.cpp

@@ -108,7 +108,7 @@ bool Project::DoLoadSubtitles(agi::fs::path const& path, std::string encoding, P
 	}
 	catch (agi::fs::FileNotFound const&) {
 		config::mru->Remove("Subtitle", path);
-		ShowError(path.string() + _(" not found."));
+		ShowError(fmt_tl("%s not found.", path.string()));
 		return false;
 	}
 
@@ -127,7 +127,7 @@ bool Project::DoLoadSubtitles(agi::fs::path const& path, std::string encoding, P
 	catch (agi::UserCancelException const&) { return false; }
 	catch (agi::fs::FileNotFound const&) {
 		config::mru->Remove("Subtitle", path);
-		ShowError(path.string() + _(" not found."));
+		ShowError(fmt_tl("%s not found.", path.string()));
 		return false;
 	}
 	catch (agi::Exception const& e) {

src/video_provider_manager.cpp

@@ -25,7 +25,7 @@
 #include <libaegisub/log.h>
 #include <libaegisub/string.h>
 
-#include "wx/translation.h"
+#include "<wx/translation.h>"
 
 std::unique_ptr<VideoProvider> CreateDummyVideoProvider(agi::fs::path const&, std::string_view, agi::BackgroundRunner *);
 std::unique_ptr<VideoProvider> CreateYUV4MPEGVideoProvider(agi::fs::path const&, std::string_view, agi::BackgroundRunner *);