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

main.cpp

@@ -116,7 +116,7 @@ int main(int argc, char *argv[]) {
   a.setWindowIcon(QIcon(":/icons/olive64.png"));
 
   // start media icon service (uses QPixmaps which require a QGuiApplication to have been created)
-  olive::media_icon_service = std::make_unique<MediaIconService>();
+  olive::media_icon_service = std::unique_ptr<MediaIconService>(new MediaIconService());
 
   // set app name data
   QCoreApplication::setOrganizationName("olivevideoeditor.org");

olive.pro

@@ -314,6 +314,7 @@ TRANSLATIONS += \
     ts/olive_cs.ts \
     ts/olive_ar.ts \
     ts/olive_ru.ts \
+    ts/olive_uk.ts \
     ts/olive_bs.ts \
     ts/olive_sr.ts