From 9920f06b091cc41f7a318c0e7aab268aae5dcb23 Mon Sep 17 00:00:00 2001 From: Alexandre Prokoudine Date: Fri, 20 Nov 2020 02:39:12 +0300 Subject: [PATCH 1/2] Mark Window menu for translation --- app/window/mainwindow/mainmenu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/window/mainwindow/mainmenu.cpp b/app/window/mainwindow/mainmenu.cpp index 21de51cb7..c9fef2ec0 100644 --- a/app/window/mainwindow/mainmenu.cpp +++ b/app/window/mainwindow/mainmenu.cpp @@ -665,7 +665,7 @@ void MainMenu::Retranslate() sequence_cache_in_to_out_item_->setText(tr("Cache Sequence In/Out")); // Window menu - window_menu_->setTitle("&Window"); + window_menu_->setTitle(tr("&Window")); window_maximize_panel_item_->setText(tr("Maximize Panel")); window_lock_layout_item_->setText(tr("Lock Panels")); window_reset_layout_item_->setText(tr("Reset to Default Layout")); From bc2f203d422cc257777c1ecac4e06690bf31d952 Mon Sep 17 00:00:00 2001 From: Thomas Wilshaw Date: Fri, 20 Nov 2020 00:52:44 +0000 Subject: [PATCH 2/2] ocioutils: Use OCIO_NAMESPACE for our namespace --- app/common/ocioutils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/ocioutils.h b/app/common/ocioutils.h index d7fb0c977..ea906839f 100644 --- a/app/common/ocioutils.h +++ b/app/common/ocioutils.h @@ -22,7 +22,7 @@ #define OCIOUTILS_H #include -namespace OCIO = OpenColorIO_v2_0dev; +namespace OCIO = OCIO_NAMESPACE; #include "render/videoparams.h"