diff --git a/CMakeLists.txt b/CMakeLists.txt index 28acf2879..f23b8eed6 100644 --- a/CMakeLists.txt +++ b/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" diff --git a/README.md b/README.md index 7e10917f7..8fd45236e 100644 --- a/README.md +++ b/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. diff --git a/app/packaging/linux/org.olivevideoeditor.Olive.appdata.xml.in b/app/packaging/linux/org.olivevideoeditor.Olive.appdata.xml.in index b09bfdd2f..0d7a2d8e8 100644 --- a/app/packaging/linux/org.olivevideoeditor.Olive.appdata.xml.in +++ b/app/packaging/linux/org.olivevideoeditor.Olive.appdata.xml.in @@ -14,6 +14,7 @@ Нелінійний відеоредактор Нелінійний відеоредактор Aplikasi edit video non-linier + Éditeur vidéo non-linéaire

Olive is a free non-linear video editor aiming to provide a fully-featured alternative to high-end professional video editing software.

Olive ist ein freies nicht-lineares Videoschnittprogramm, welches eine vollwertige Alternative zu High-End Videoschnittprogrammen darstellen soll.

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.

@@ -23,6 +24,7 @@

Olive — вільний нелінійний відеоредактор, задуманий як повноцінна заміна закритим комерційним продуктам.

Olive — вільний нелінійний відеоредактор, задуманий як повноцінна заміна закритим комерційним продуктам.

Olive adalah aplikasi edit video bersifat non-linier yang bebas dan gratis, bertujuan untuk memberikan alternatif yang lengkap untuk aplikasi edit video profesional.

+

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.

https://www.olivevideoeditor.org https://www.patreon.com/olivevideoeditor https://github.com/olive-editor/olive/issues diff --git a/app/packaging/linux/org.olivevideoeditor.Olive.desktop b/app/packaging/linux/org.olivevideoeditor.Olive.desktop index 4ada20d93..ec5fa2edd 100644 --- a/app/packaging/linux/org.olivevideoeditor.Olive.desktop +++ b/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