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

CMakeLists.txt

@@ -71,7 +71,7 @@ if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
       OUTPUT_STRIP_TRAILING_WHITESPACE
     )
   endif()
-elseif(UNIX AND NOT APPLE)
+elseif(UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
   # 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 -c "grep -Po '(?<=-)(([a-z0-9])\\w+)(?=\\+)' -m 1 changelog"

README.md

@@ -10,6 +10,8 @@ Please consider supporting Olive:
 
 [![Become a Patron](https://olivevideoeditor.org/img/become_a_patron_button.png)](https://www.patreon.com/olivevideoeditor)
 
+**NOTE: It is strongly discouraged to use or compile the `master` branch in its current state as it's under heavy restructuring. Please use the 0.1.x code from the "Releases" tab instead.**
+
 Compiling instructions for Windows, macOS, and Linux can be found [on the main site](https://olivevideoeditor.org/compile.php).
 
 Olive has Doxygen-compatible documentation hosted at http://olivevideoeditor.org/doxygen/. You can also run `doxygen` in the source root directory to generate a local copy.

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

@@ -14,6 +14,7 @@
   <summary xml:lang="uk">Нелінійний відеоредактор</summary>
   <summary xml:lang="uk_UA">Нелінійний відеоредактор</summary>
   <summary xml:lang="id">Aplikasi edit video non-linier</summary>
+  <summary xml:lang="fr">Éditeur vidéo non-linéaire</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>
@@ -23,6 +24,7 @@
   <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>
+  <description xml:lang="fr"><p>Olive est un éditeur vidéo non linéaire libre visant à fournir une alternative complète aux logiciels de montage vidéo professionnels haut de gamme.</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>

app/packaging/linux/org.olivevideoeditor.Olive.desktop

@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Olive
 Comment=Professional open-source non-linear video editor
+Comment[fr]=Éditeur vidéo non-linéaire open-source professionnel
 Comment[it]=Programma di montaggio video professionale open-source
 Comment[id]=Aplikasi edit video yang non-linier, profesional serta sumbernya terbuka.
 Exec=olive-editor