Merge branch 'master' into staging-next

Fixed trivial conflicts caused by removing rec.
This commit is contained in:
Jan Tojnar
2019-09-06 03:20:09 +02:00
247 changed files with 3153 additions and 2159 deletions
@@ -49,9 +49,9 @@ stdenv.mkDerivation {
configureFlags = [ "--disable-debug" ];
meta = {
description = "GTK+3 application to edit video subtitles";
description = "GTK 3 application to edit video subtitles";
longDescription = ''
Subtitle Editor is a GTK+3 tool to edit subtitles for GNU/Linux/*BSD. It
Subtitle Editor is a GTK 3 tool to edit subtitles for GNU/Linux/*BSD. It
can be used for new subtitles or as a tool to transform, edit, correct
and refine existing subtitle. This program also shows sound waves, which
makes it easier to synchronise subtitles to voices.