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

.travis/install.sh

@@ -8,11 +8,11 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
 
 	if [ "$ARCH" == "x86_64" ]; then
-		sudo apt-get -y install qt59base qt59multimedia qt59svg libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev frei0r-plugins-dev frei0r-plugins fuse curl
+		sudo apt-get -y install qt59base qt59multimedia qt59svg libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev frei0r-plugins-dev fuse curl
 	fi
 
 	if [ "$ARCH" == "i386" ]; then
-		sudo apt-get -y install gcc-multilib g++-multilib qt59base:i386 qt59multimedia:i386 qt59svg:i386 libavformat-dev:i386 libavcodec-dev:i386 libavfilter-dev:i386 libavutil-dev:i386 libswscale-dev:i386 libswresample-dev:i386 frei0r-plugins-dev:i386 frei0r-plugins:i386 pkg-config:i386 libgl1-mesa-dev:i386 fuse:i386 curl
+		sudo apt-get -y install gcc-multilib g++-multilib qt59base:i386 qt59multimedia:i386 qt59svg:i386 libavformat-dev:i386 libavcodec-dev:i386 libavfilter-dev:i386 libavutil-dev:i386 libswscale-dev:i386 libswresample-dev:i386 frei0r-plugins-dev:i386 pkg-config:i386 libgl1-mesa-dev:i386 fuse:i386 curl
 	fi
 	source /opt/qt*/bin/qt*-env.sh
 

CMakeLists.txt

@@ -15,7 +15,7 @@ set(OLIVE_DEFINITIONS -DQT_DEPRECATED_WARNINGS)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 if(UNIX AND NOT APPLE AND NOT DEFINED OpenGL_GL_PREFERENCE)
-  set(OpenGL_GL_PREFERENCE GLVND)
+  set(OpenGL_GL_PREFERENCE LEGACY)
 endif()
 find_package(OpenGL REQUIRED)
 
@@ -64,8 +64,8 @@ if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
 elseif(UNIX AND NOT APPLE)
   # Fallback for Ubuntu/Launchpad (extracts Git hash from debian/changelog rather than Git repo)
   # (see https://answers.launchpad.net/launchpad/+question/678556)
-  execute_process(COMMAND sh debian/gitfromlog.sh debian/changelog
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  execute_process(COMMAND sh -c "grep -Po '(?<=-)(([a-z0-9])\\w+)(?=\\+)' -m 1 changelog"
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/debian
     OUTPUT_VARIABLE GIT_HASH
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
@@ -423,6 +423,7 @@ qt5_add_translation(OLIVE_QM_FILES
   ts/olive_it.ts
   ts/olive_ru.ts
   ts/olive_sr.ts
+  ts/olive_id.ts
 )
 
 set(OLIVE_TARGET "olive-editor")

debian/control

@@ -2,7 +2,7 @@ Source: olive-editor
 Section: video
 Priority: optional
 Maintainer: Olive Team <itsmattkc@gmail.com>
-Build-Depends: debhelper (>=9), build-essential, qt5-default, qtmultimedia5-dev, libqt5opengl5-dev, libqt5svg5-dev, libqt5multimedia5-plugins, libavformat-dev, libavcodec-dev, libavutil-dev, libswscale-dev, libswresample-dev, libavfilter-dev, libpostproc-dev, git, frei0r-plugins-dev, qttools5-dev-tools
+Build-Depends: debhelper (>=9), build-essential, qt5-default, qtmultimedia5-dev, libqt5opengl5-dev, libqt5svg5-dev, libqt5multimedia5-plugins, libavformat-dev, libavcodec-dev, libavutil-dev, libswscale-dev, libswresample-dev, libavfilter-dev, libpostproc-dev, git, frei0r-plugins-dev, qttools5-dev-tools, cmake
 Standards-Version: 3.9.6
 Homepage: https://olivevideoeditor.org/
 

packaging/linux/org.olivevideoeditor.Olive.appdata.xml

@@ -13,6 +13,7 @@
   <summary xml:lang="ru">Нелинейный видеоредактор</summary>
   <summary xml:lang="uk">Нелінійний відеоредактор</summary>
   <summary xml:lang="uk_UA">Нелінійний відеоредактор</summary>
+  <summary xml:lang="id">Aplikasi edit video non-linier</summary>
   <description><p>Olive is a free non-linear video editor aiming to provide a fully-featured alternative to high-end professional video editing software.</p></description>
   <description xml:lang="de_DE">Olive ist ein freies nicht-lineares Videoschnittprogramm, welches eine vollwertige Alternative zu High-End Videoschnittprogrammen darstellen soll.</description>
   <description xml:lang="pt_BR"><p>Olive é um editor de vídeo não-linear com o objetivo de fornecer uma alternativa completa para softwares profissionais de edição de vídeo.</p></description>
@@ -21,6 +22,7 @@
   <description xml:lang="ru"><p>Olive — свободный нелинейный видеоредактор, задуманный как полноценная замена закрытым коммерческим продуктам.</p></description>
   <description xml:lang="uk"><p>Olive — вільний нелінійний відеоредактор, задуманий як повноцінна заміна закритим комерційним продуктам.</p></description>
   <description xml:lang="uk_UA"><p>Olive — вільний нелінійний відеоредактор, задуманий як повноцінна заміна закритим комерційним продуктам.</p></description>
+  <description xml:lang="id"><p>Olive adalah aplikasi edit video bersifat non-linier yang bebas dan gratis, bertujuan untuk memberikan alternatif yang lengkap untuk aplikasi edit video profesional.</p></description>
   <url type="homepage">https://www.olivevideoeditor.org</url>
   <url type="donation">https://www.patreon.com/olivevideoeditor</url>
   <url type="bugtracker">https://github.com/olive-editor/olive/issues</url>

packaging/linux/org.olivevideoeditor.Olive.desktop

@@ -2,6 +2,7 @@
 Name=Olive
 Comment=Professional open-source non-linear video editor
 Comment[it]=Programma di montaggio video professionale open-source
+Comment[id]=Aplikasi edit video yang non-linier, profesional serta sumbernya terbuka.
 Exec=olive-editor
 Icon=org.olivevideoeditor.Olive
 Terminal=false

ts/olive_id.ts

@@ -2604,12 +2604,12 @@ Tampilkan frame dengan cepat (dapat menampilkan frame yang salah ketika menggese
     <message>
         <location filename="../dialogs/replaceclipmediadialog.cpp" line="37"/>
         <source>Replace clips using &quot;%1&quot;</source>
-        <translation>Ganti klip dengan &quot;%1&quot;</translation>
+        <translation>Ganti klip yang menggunakan &quot;%1&quot;</translation>
     </message>
     <message>
         <location filename="../dialogs/replaceclipmediadialog.cpp" line="43"/>
         <source>Select which media you want to replace this media&apos;s clips with:</source>
-        <translation>Pilih media pengganti media dari klip:</translation>
+        <translation>Pilih media pengganti:</translation>
     </message>
     <message>
         <location filename="../dialogs/replaceclipmediadialog.cpp" line="49"/>
@@ -2891,7 +2891,7 @@ Tampilkan frame dengan cepat (dapat menampilkan frame yang salah ketika menggese
     <message>
         <location filename="../project/sourcescommon.cpp" line="129"/>
         <source>Replace Clips Using This Media</source>
-        <translation>Ganti Klip dengan Media Ini</translation>
+        <translation>Ganti Semua Klip yang Menggunakan Media Ini</translation>
     </message>
     <message>
         <location filename="../project/sourcescommon.cpp" line="152"/>