Merge branch 'master' of https://github.com/olive-editor/olive

app/common/ocioutils.h

@@ -22,7 +22,7 @@
 #define OCIOUTILS_H
 
 #include <OpenColorIO/OpenColorIO.h>
-namespace OCIO = OpenColorIO_v2_0dev;
+namespace OCIO = OCIO_NAMESPACE;
 
 #include "render/videoparams.h"
 

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"));