Packman Build Service PMBS

avidemux3.changes Changed

@@ -1,4 +1,61 @@
 -------------------------------------------------------------------
+Tue Jul 07 17:59:43 UTC 2020 - enzokiel@kabelmail.de
+
+- Update to version 2.7.6
+  + New Feature:Detect and warn when cut points in HEVC video
+    streams may result in grave playback issues despite being on
+    keyframes
+  + New Video Decoder:Add libaom-based AV1 decoder
+  + New Video Encoder:Add libvpx-based VP9 encoder
+  + New Video Filter:Add hardware accelerated deinterlacer and
+    resizer based on VA-API (Linux only)
+  + FFmpeg:Update to the 4.2.3 release
+  + Core:Increase maximum supported resolution to 4096x4096
+  + Core:Fix crash on macOS with HW accel. decoding enabled and
+    H.264 video streams containing both frame- and field-encoded
+    slices
+  + Encoder:Extend configuration options for NVENC-based H.264 and
+    HEVC encoders, add 2-pass mode
+  + Demuxer:Support MPEG-TS files with duration in excess of
+    13:15:36
+  + Demuxer:Use DTS core from DTS XLL audio in MPEG-TS files
+    instead of rejecting the track
+  + Demuxer:Fix mono MP3 audio tracks in MP4 files misdetected as
+    stereo
+  + Demuxer:Try to correct timestamp jitter in MP4 files produced
+    by older Avidemux versions
+  + Muxer:Fix timestamp rounding which caused pseudo-VFR output
+    from CFR sources
+  + Muxer:Fix saving to network shares on Windows using the Mp4
+    muxer when index should be moved to the start of the file
+  + Muxer:Support LPCM audio in the Mp4 muxer by silently
+    switching to the MOV muxing mode
+  + Muxer:Add support for Vorbis audio to the Mp4 muxer
+  + Filter:Fix "Fade" and "Fade to black", broken on macOS
+  + Filter:Allow to toggle rubber band visibility in "Crop" and
+    "Blacken Borders" video filters
+  + Filter:Fix keyboard input in "Resize" video filter by
+    recalculating values only on moving focus to another field or
+    on accepting dialog
+  + Audio:Add HE-AAC and HE-AACv2 profiles to the FDK AAC encoder
+    plugin
+  + Audio:Support external audio tracks in DTS format
+  + UI:Fix navigation slider with RTL locales
+  + UI:Restore the shutdown option in encoding dialog on Windows
+  + Scripting:Add PTS query and keyframe seek methods to Python
+    interface
+  + Miscellaneous:Allow user-defined fragment size for auto-append
+    of chunked MPEG-TS files
+  + Miscellaneous:Improve handling of field-encoded video streams
+    throughout the chain
+  + Miscellaneous:Improve handling of H.264 video streams with
+    parameter sets changing on the fly
+  + Miscellaneous:Try to keep track of video time base throughout
+    the chain
+  + Miscellaneous:Numerous other fixes and polish
+- Removed avidemux-cpu-detection-fix.patch, fixed upstream.
+
+-------------------------------------------------------------------
 Tue Nov 12 10:34:59 UTC 2019 - Jiri Slaby <jslaby@suse.cz>
 
 - add avidemux-cpu-detection-fix.patch (build fix)

avidemux3.spec Changed

@@ -22,7 +22,7 @@
 
 Name:           avidemux3
 Summary:        Graphical video editing and transcoding tool
-Version:        2.7.4
+Version:        2.7.6
 Release:        1
 Url:            http://avidemux.sourceforge.net/
 ExclusiveArch:  %ix86 x86_64
@@ -35,8 +35,7 @@
 Patch5:         avidemux-bootStrap.patch
 Patch7:         avidemux-desktop-file.patch
 Patch8:         avidemux-backport_Fix_threads_setup.patch
-Patch9:         avidemux-cpu-detection-fix.patch
-Patch10:        avidemux-ivtcDupeRemover-return-true-from-ivtcDupeRemover-get.patch
+Patch9:        avidemux-ivtcDupeRemover-return-true-from-ivtcDupeRemover-get.patch
 License:        GPL-2.0
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 
@@ -187,15 +186,14 @@
   find . -name \*.$i -print0 | xargs -0 dos2unix -q
 done
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 %patch4 -p1
 %patch5 -p0
-%patch7 -p0
+%patch7 -p1
 %patch8 -p0 -R
-%patch9 -p1
-%patch10 -p1
+#%patch9 -p1
 chmod 755 bootStrap.bash
 chmod 644 AUTHORS COPYING README
 
@@ -361,6 +359,7 @@
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_jpeg.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_libva.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_null.so
+%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_vp9.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_xvid4.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_yv12.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_ascii.so
@@ -368,6 +367,7 @@
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_addBorders.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_admIvtc.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_black.so
+%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_blend.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_changeFps.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_colorYuv.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_denoise3d.so
@@ -401,6 +401,7 @@
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_telecide.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_unstackField.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vaapiFilter.so
+%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vaapiFilterDeint.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vdpauFilter.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vflip.so

avidemux-cpu-detection-fix.patch Deleted

@@ -1,52 +0,0 @@
-From: Jiri Slaby <jslaby@suse.cz>
-Date: Tue, 12 Nov 2019 11:28:37 +0100
-Subject: cmake: fix detection of CPUs
-Patch-mainline: yes
-Git-commit: 82ab993cbbe17c71ca20c4af7b1a4b6f9fa95c45
-References: build fix
-
-The code defines a function foo returning int, but contains no return.
-So the detection fails with "CPU not supported". As new gccs warng abotu
-missing return, it causes the detaction to fail. Switch foo to return
-void.
-
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
----
- cmake/cmake_compile_check/cpu_armel_check.cpp  | 2 +-
- cmake/cmake_compile_check/cpu_x86-64_check.cpp | 2 +-
- cmake/cmake_compile_check/cpu_x86_check.cpp    | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/cmake_compile_check/cpu_armel_check.cpp b/cmake/cmake_compile_check/cpu_armel_check.cpp
-index 429661add08c..02f779c71b7b 100644
---- a/cmake/cmake_compile_check/cpu_armel_check.cpp
-+++ b/cmake/cmake_compile_check/cpu_armel_check.cpp
-@@ -1,4 +1,4 @@
--int foo(void)
-+void foo(void)
- {
- 
- 	asm volatile ("mov lr,pc " : : );
-diff --git a/cmake/cmake_compile_check/cpu_x86-64_check.cpp b/cmake/cmake_compile_check/cpu_x86-64_check.cpp
-index 49c751b6fbe8..4f493bc5cdaf 100644
---- a/cmake/cmake_compile_check/cpu_x86-64_check.cpp
-+++ b/cmake/cmake_compile_check/cpu_x86-64_check.cpp
-@@ -1,4 +1,4 @@
--int foo(void)
-+void foo(void)
- {
- 	asm volatile ("movdqa %xmm8, 0");
- }
-diff --git a/cmake/cmake_compile_check/cpu_x86_check.cpp b/cmake/cmake_compile_check/cpu_x86_check.cpp
-index c4e8f7f432a5..cd00b66c0524 100644
---- a/cmake/cmake_compile_check/cpu_x86_check.cpp
-+++ b/cmake/cmake_compile_check/cpu_x86_check.cpp
-@@ -1,4 +1,4 @@
--int foo(void)
-+void foo(void)
- {
- 	asm volatile ("movdqa %xmm7, 0");
- }
--- 
-2.24.0
-

avidemux-desktop-file.patch Changed

@@ -1,17 +1,9 @@
---- avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop.orig	2019-03-16 13:53:16.346573397 +0100
-+++ avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop	2019-03-16 13:53:16.350573314 +0100
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Name=Avidemux
-+Name=Avidemux3
- GenericName=Video Editor
- Comment=Multiplatform video editor
- Exec=avidemux3_qt5
-@@ -7,4 +7,6 @@
- Icon=org.avidemux.Avidemux
- Terminal=false
+diff -uNr avidemux2-2.7.6/avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop avidemux2-2.7.6.new/avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop
+--- avidemux2-2.7.6/avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop	2020-07-05 15:29:02.000000000 +0200
++++ avidemux2-2.7.6.new/avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop	2020-07-07 18:40:34.236068158 +0200
+@@ -8,3 +8,5 @@
  Type=Application
--Categories=AudioVideo
-+Categories=AudioVideo;AudioVideoEditing;
+ Categories=AudioVideo;AudioVideoEditing;Video;
+ MimeType=video/mpeg;video/x-mpeg;video/mp4;video/x-m4v;video/quicktime;video/3gp;video/mkv;video/x-matroska;video/webm;video/flv;video/x-flv;video/dv;video/x-msvideo;video/x-ms-wmv;video/x-ms-asf;video/x-anim;
 +X-KDE-StartupNotify=true
 +X-SuSE-translate=true

avidemux-ivtcDupeRemover-return-true-from-ivtcDupeRemover-get.patch Changed

@@ -1,22 +1,7 @@
-From: Jiri Slaby <jslaby@suse.cz>
-Date: Tue, 12 Nov 2019 11:47:21 +0100
-Subject: [ivtcDupeRemover] return true from ivtcDupeRemover::getNextFrame
-Patch-mainline: submitted as PR#182
-References: build fix
-
-It is declared as returning a bool, but returns nothing. But the callers
-expect something to be returned: true in case it succeeded.
-
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
----
- .../ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp   | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp b/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp
-index 754fd3ad3807..4ba1eae90c9a 100644
---- a/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp
-+++ b/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp
-@@ -375,6 +375,8 @@ bool ivtcDupeRemover::getNextFrame(uint32_t *fn,ADMImage *image)
+diff -uNr avidemux2-2.7.6/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp avidemux2-2.7.6.new/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp
+--- avidemux2-2.7.6/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp	2020-07-07 18:17:30.964650246 +0200
++++ avidemux2-2.7.6.new/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp	2020-07-07 18:50:38.201333556 +0200
+@@ -375,6 +375,8 @@
                break;
  
        }
@@ -25,6 +10,3 @@
  }
  /**
      \fn getCoupledConf
--- 
-2.24.0
-

avidemux-linking.patch Changed

@@ -1,5 +1,6 @@
---- avidemux/cli/CMakeLists.txt.orig	2019-03-16 11:52:18.201947710 +0100
-+++ avidemux/cli/CMakeLists.txt	2019-03-16 11:52:18.173948283 +0100
+diff -uNr avidemux2-2.7.6/avidemux/cli/CMakeLists.txt avidemux2-2.7.6.new/avidemux/cli/CMakeLists.txt
+--- avidemux2-2.7.6/avidemux/cli/CMakeLists.txt	2020-07-07 18:17:32.192628426 +0200
++++ avidemux2-2.7.6.new/avidemux/cli/CMakeLists.txt	2020-07-07 18:56:56.422604385 +0200
 @@ -110,6 +110,10 @@
  	ADM_gui2Cli6
  	ADM_toolkitCli6
@@ -11,21 +12,9 @@
  )
  
  ###########################################
---- avidemux/qt4/CMakeLists.txt.orig	2019-03-16 11:52:18.201947710 +0100
-+++ avidemux/qt4/CMakeLists.txt	2019-03-16 11:52:18.173948283 +0100
-@@ -183,6 +183,10 @@
- 	ADM_coreAudio6
- 	ADM_coreAudioDevice6
- 	ADM_osSupport6
-+	ADM_coreSqlLight3
-+	ADM_libswscale
-+	ADM_libpostproc
-+	ADM_libavformat
- )
- 
- ###########################################
---- avidemux/qt4/ADM_jobs/src/CMakeLists.txt.orig	2019-03-16 11:52:18.201947710 +0100
-+++ avidemux/qt4/ADM_jobs/src/CMakeLists.txt	2019-03-16 11:52:18.173948283 +0100
+diff -uNr avidemux2-2.7.6/avidemux/qt4/ADM_jobs/src/CMakeLists.txt avidemux2-2.7.6.new/avidemux/qt4/ADM_jobs/src/CMakeLists.txt
+--- avidemux2-2.7.6/avidemux/qt4/ADM_jobs/src/CMakeLists.txt	2020-07-07 18:17:32.552622028 +0200
++++ avidemux2-2.7.6.new/avidemux/qt4/ADM_jobs/src/CMakeLists.txt	2020-07-07 18:58:28.652963131 +0200
 @@ -86,6 +86,10 @@
  TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreJobs)
  TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreUtils6)
@@ -37,3 +26,17 @@
  #
  target_link_libraries(avidemux3_jobs_${QT_EXTENSION} "-lm -lstdc++")
  #
+diff -uNr avidemux2-2.7.6/avidemux/qt4/CMakeLists.txt avidemux2-2.7.6.new/avidemux/qt4/CMakeLists.txt
+--- avidemux2-2.7.6/avidemux/qt4/CMakeLists.txt	2020-07-07 18:17:32.648620323 +0200
++++ avidemux2-2.7.6.new/avidemux/qt4/CMakeLists.txt	2020-07-07 18:56:20.383245712 +0200
+@@ -184,6 +184,10 @@
+ 	ADM_coreAudioDevice6
+ 	ADM_coreVideoEncoder6
+ 	ADM_osSupport6
++	ADM_coreSqlLight3
++	ADM_libswscale
++	ADM_libpostproc
++	ADM_libavformat
+ )
+ 
+ ###########################################

avidemux-package_version.patch Changed

@@ -1,6 +1,18 @@
-diff -uNr avidemux_2.7.4/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp avidemux_2.7.4.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp
---- avidemux_2.7.4/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2019-08-18 16:55:06.191443864 +0200
-+++ avidemux_2.7.4.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2019-08-18 17:02:34.575044048 +0200
+diff -uNr avidemux_2.7.6/avidemux/osxInstaller/CMakeLists.txt avidemux_2.7.6.new/avidemux/osxInstaller/CMakeLists.txt
+--- avidemux_2.7.6/avidemux/osxInstaller/CMakeLists.txt	2020-07-07 21:09:46.344578674 +0200
++++ avidemux_2.7.6.new/avidemux/osxInstaller/CMakeLists.txt	2020-07-07 21:10:47.459492742 +0200
+@@ -127,7 +127,7 @@
+ FILE(COPY "${ORIGINAL}/Contents/Resources/avidemux.icns" DESTINATION "${RESOURCES}") 
+ 
+ # Entice macOS to return correct system language (QTBUG-72491)
+-FILE(GLOB ListOfTranslationFiles "${RESOURCES}/share/avidemux6/qt5/i18n/avidemux_*.qm")
++FILE(GLOB ListOfTranslationFiles "${RESOURCES}/share/avidemux3/qt5/i18n/avidemux_*.qm")
+ FOREACH(lang ${ListOfTranslationFiles})
+     STRING(REGEX REPLACE ".*avidemux_" "" lang "${lang}")
+     STRING(REPLACE ".qm" "" lang "${lang}")
+diff -uNr avidemux_2.7.6/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp avidemux_2.7.6.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp
+--- avidemux_2.7.6/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2020-07-07 21:09:45.948585710 +0200
++++ avidemux_2.7.6.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2020-07-07 21:10:47.107498996 +0200
 @@ -143,7 +143,7 @@
      QString referenceFile = QCoreApplication::applicationDirPath() + "/help/" + ((FileAction*)sender())->filePath();
  #else
@@ -10,10 +22,22 @@
  #endif
  
      QDesktopServices::openUrl(QUrl("file:///" + referenceFile, QUrl::TolerantMode));
-diff -uNr avidemux_2.7.4/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.7.4.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp
---- avidemux_2.7.4/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2019-08-18 16:55:06.139443411 +0200
-+++ avidemux_2.7.4.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2019-08-18 17:02:31.303019793 +0200
-@@ -103,14 +103,14 @@
+diff -uNr avidemux_2.7.6/avidemux/qt4/i18n/Ts.cmake avidemux_2.7.6.new/avidemux/qt4/i18n/Ts.cmake
+--- avidemux_2.7.6/avidemux/qt4/i18n/Ts.cmake	2020-07-07 21:09:45.532593101 +0200
++++ avidemux_2.7.6.new/avidemux/qt4/i18n/Ts.cmake	2020-07-07 21:10:46.671506743 +0200
+@@ -28,7 +28,7 @@
+         IF(WIN32)
+                 SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")
+         ELSE(WIN32)
+-                SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux6/${QT_EXTENSION}/i18n")
++                SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/${QT_EXTENSION}/i18n")
+         ENDIF(WIN32)
+         INSTALL(FILES ${ARGN} DESTINATION "${i18dir}" COMPONENT runtime)
+ ENDMACRO(INSTALL_I18N _files)
+diff -uNr avidemux_2.7.6/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.7.6.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp
+--- avidemux_2.7.6/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2020-07-07 21:09:46.264580095 +0200
++++ avidemux_2.7.6.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2020-07-07 21:10:48.919466800 +0200
+@@ -124,14 +124,14 @@
      if(isPortable)
      {
          std::string i18n=pluginDir;
@@ -30,7 +54,7 @@
          ADM_i18nDir=std::string(ppath);
          delete [] ppath;
          ppath=NULL;
-@@ -142,7 +142,7 @@
+@@ -163,7 +163,7 @@
      strcpy(ADM_basedir, homeEnv);
      AddSeparator(ADM_basedir);
  
@@ -39,10 +63,10 @@
  
      strcat(ADM_basedir, ADM_DIR_NAME);
      strcat(ADM_basedir, ADM_SEPARATOR);
-diff -uNr avidemux_2.7.4/avidemux_core/ADM_core/src/ADM_folder_mac.cpp avidemux_2.7.4.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp
---- avidemux_2.7.4/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2019-08-18 16:55:06.139443411 +0200
-+++ avidemux_2.7.4.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2019-08-18 17:02:31.307019824 +0200
-@@ -124,7 +124,7 @@
+diff -uNr avidemux_2.7.6/avidemux_core/ADM_core/src/ADM_folder_mac.cpp avidemux_2.7.6.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp
+--- avidemux_2.7.6/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2020-07-07 21:09:46.260580166 +0200
++++ avidemux_2.7.6.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2020-07-07 21:10:48.903467083 +0200
+@@ -132,7 +132,7 @@
      strcpy(ADM_basedir, homeEnv);
      AddSeparator(ADM_basedir);
  
@@ -51,7 +75,7 @@
  
      strcat(ADM_basedir, ADM_DIR_NAME);
      strcat(ADM_basedir, ADM_SEPARATOR);
-@@ -146,9 +146,9 @@
+@@ -154,9 +154,9 @@
      
      std::string partialPath=flavor+std::string("/i18n");
  #ifdef CREATE_BUNDLE
@@ -63,9 +87,9 @@
  #endif
      std::string r=std::string(ppath);
      delete [] ppath;
-diff -uNr avidemux_2.7.4/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp avidemux_2.7.4.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp
---- avidemux_2.7.4/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2019-08-18 16:55:05.887441210 +0200
-+++ avidemux_2.7.4.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2019-08-18 17:02:27.818993969 +0200
+diff -uNr avidemux_2.7.6/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp avidemux_2.7.6.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp
+--- avidemux_2.7.6/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2020-07-07 21:09:45.612591680 +0200
++++ avidemux_2.7.6.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2020-07-07 21:10:39.679630980 +0200
 @@ -265,7 +265,7 @@
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1,
  			(string("Executing ") + string(name) + string("...")).c_str());
@@ -75,9 +99,9 @@
  
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1, "Done");
  
-diff -uNr avidemux_2.7.4/cmake/se_plugin.cmake avidemux_2.7.4.new/cmake/se_plugin.cmake
---- avidemux_2.7.4/cmake/se_plugin.cmake	2019-08-18 16:55:05.295436042 +0200
-+++ avidemux_2.7.4.new/cmake/se_plugin.cmake	2019-08-18 17:02:36.735060059 +0200
+diff -uNr avidemux_2.7.6/cmake/se_plugin.cmake avidemux_2.7.6.new/cmake/se_plugin.cmake
+--- avidemux_2.7.6/cmake/se_plugin.cmake	2020-07-07 21:09:45.540592960 +0200
++++ avidemux_2.7.6.new/cmake/se_plugin.cmake	2020-07-07 21:10:50.103445762 +0200
 @@ -16,7 +16,7 @@
  if (WIN32)
      set(helpDir "${CMAKE_INSTALL_PREFIX}/help/${_engineName}")
@@ -87,23 +111,11 @@
  endif (WIN32)
  
      install(DIRECTORY "${_sourceDirectory}" DESTINATION "${helpDir}" COMPONENT plugins)
-diff -uNr avidemux_2.7.4/cmake/sql/update.sh avidemux_2.7.4.new/cmake/sql/update.sh
---- avidemux_2.7.4/cmake/sql/update.sh	2019-08-18 16:55:06.235444248 +0200
-+++ avidemux_2.7.4.new/cmake/sql/update.sh	2019-08-18 17:02:36.499058309 +0200
+diff -uNr avidemux_2.7.6/cmake/sql/update.sh avidemux_2.7.6.new/cmake/sql/update.sh
+--- avidemux_2.7.6/cmake/sql/update.sh	2020-07-07 21:09:46.300579456 +0200
++++ avidemux_2.7.6.new/cmake/sql/update.sh	2020-07-07 21:10:49.887449600 +0200
 @@ -1,3 +1,3 @@
 -sqlite3 ~/.avidemux6/jobs.sql .d > dump
 +sqlite3 ~/.avidemux3/jobs.sql .d > dump
  #sql2class -sqlite -global -license -wrapped  -lib $PWD dump
  sql2class -sqlite -build -global -prefix $PWD -lib sqlJobs -namespace db -overwrite dump
-diff -uNr avidemux_2.7.4/cmake/Ts.cmake avidemux_2.7.4.new/cmake/Ts.cmake
---- avidemux_2.7.4/cmake/Ts.cmake	2019-08-18 16:55:05.283435938 +0200
-+++ avidemux_2.7.4.new/cmake/Ts.cmake	2019-08-18 17:02:36.523058487 +0200
-@@ -28,7 +28,7 @@
-         IF(WIN32)
-                 SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")
-         ELSE(WIN32)
--                SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux6/${QT_EXTENSION}/i18n")
-+                SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/${QT_EXTENSION}/i18n")
-         ENDIF(WIN32)
-         INSTALL(FILES ${ARGN} DESTINATION "${i18dir}" COMPONENT runtime)
- ENDMACRO(INSTALL_I18N _files)

avidemux-x264_plugins.patch Changed

avidemux-x265_plugins.patch Changed

avidemux_2.7.4.tar.gz/avidemux/cli/admWin32.rc.in Deleted

avidemux_2.7.4.tar.gz/avidemux/common/xpm/build/.Makefile.swp Deleted

avidemux_2.7.4.tar.gz/avidemux/qt4/admWin32.rc.in Deleted

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreMuxer/include/.ADM_muxer.h.swp Deleted

avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/ffmpeg-4.1.4.tar.bz2 Deleted

avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/upstream Deleted

avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/upstream/0001-avutil-mem-gcc9.patch Deleted

@@ -1,30 +0,0 @@
-From 4361293fcf59edb56879c36edcd25f0a91e0edf8 Mon Sep 17 00:00:00 2001
-From: Mark Harris <mark.hsj@gmail.com>
-Date: Sat, 24 Nov 2018 13:02:02 -0800
-Subject: [PATCH] avutil/mem: Fix invalid use of av_alloc_size
-
-The alloc_size attribute is valid only on functions that return a
-pointer.  GCC 9 (not yet released) warns about invalid usage:
-
-./libavutil/mem.h:342:1: warning: 'alloc_size' attribute ignored on a function returning int' [-Wattributes]
-  342 | av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
-      | ^~~~~~~~~~~~~
-
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
----
- libavutil/mem.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavutil/mem.h b/libavutil/mem.h
-index 55ae573ac9a..5fb1a02dd9c 100644
---- a/libavutil/mem.h
-+++ b/libavutil/mem.h
-@@ -339,7 +339,7 @@ av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size)
-  * @warning Unlike av_malloc(), the allocated memory is not guaranteed to be
-  *          correctly aligned.
-  */
--av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
-+int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
- 
- /**
-  * Reallocate the given buffer if it is not large enough, otherwise do nothing.

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeTo/fade_json.cpp Deleted

avidemux_2.7.4.tar.gz/.gitignore -> avidemux_2.7.6.tar.gz/.gitignore Changed

avidemux_2.7.6.tar.gz/.gitmodules Added

avidemux_2.7.4.tar.gz/appImage/AppRun -> avidemux_2.7.6.tar.gz/appImage/AppRun Changed

avidemux_2.7.4.tar.gz/appImage/avidemux.desktop -> avidemux_2.7.6.tar.gz/appImage/avidemux.desktop Changed

avidemux_2.7.6.tar.gz/appImage/deployBuster.sh Added

@@ -0,0 +1,166 @@
+#!/bin/bash
+# look here https://github.com/probonopd/AppImages/blob/master/recipes/scribus/Recipe
+# export QT_DEBUG_PLUGINS=1 
+# export LD_DEBUG=amm LD_DEBUG_OUTPUT=/tmp/somefile
+
+fail()
+{
+        echo "************************* $* FAILED"
+        echo "************************* $* FAILED"
+        echo "************************* $* FAILED"
+        echo "************************* $* FAILED"
+        echo "************************* $* FAILED"
+        echo "************************* $* FAILED"
+        echo "************************* $* FAILED"
+        exit 1
+
+}
+cpyX86()
+{
+        cp -t ../lib  /usr/lib/x86_64-linux-gnu/$1 || fail copy_x86lib $1
+
+}
+cpyX86Optional()
+{
+        cp -t ../../opt/lib  /usr/lib/x86_64-linux-gnu/$1 || fail copy_x86lib $1
+
+}
+cpyX86Rename()
+{
+        cp -t ../lib/$2  /usr/lib/x86_64-linux-gnu/$1 || fail copy_x86lib $1
+}
+cpyLib()
+{
+        cp -t ../lib  /usr/lib/$1 || fail copy_lib $i
+
+}
+cpyRootLib()
+{
+        cp -t ../lib  /lib/$1 || fail copy_lib $i
+
+}
+cpyRootx86Lib()
+{
+        cp -t ../lib  /lib/x86_64-linux-gnu/$1 || fail copy_lib $i
+
+}
+
+
+
+echo " ** Creating AppImage file **"
+
+if [ "${QT_HOME}" = "" ] ; then
+  echo "QT_HOME not set, cancelling"
+  exit 1
+fi
+export LD_LIBRARY_PATH=$QT_HOME/lib:$LD_LIBRARY_PATH
+export ORG=$PWD
+export APP_NAME=app
+rm -f $APP_NAME
+cd install/usr/bin
+cp avidemux3_qt5 avidemux3_portable
+mkdir -p ../lib/qt5
+mkdir -p ../lib/qt5/plugins
+mkdir -p ../../opt/lib
+# libz
+#cpyRootx86Lib libz.so.1
+
+# qt5
+ldd avidemux3_portable | grep libQ | sed 's/^.*=>//g' | sed 's/ (.*$//g' | xargs cp -t ../lib/qt5/ || fail qt5
+ldd avidemux3_portable | grep icu | sed 's/^.*=>//g' | sed 's/ (.*$//g' | xargs cp -t ../lib/qt5 || fail icu
+cp ${QT_HOME}/lib/libQt5DBus.so.5 ../lib/qt5 || fail QtDbus
+cp ${QT_HOME}/lib/libQt5XcbQpa.so.5  ../lib/qt5 || fail QtXcb
+
+#cpyRootx86Lib libdbus-1.so.3
+
+cp -Rap -t ../lib/qt5/plugins ${QT_HOME}/plugins/platforms  || fail qtplugins
+cp -Rap -t ../lib/qt5/plugins ${QT_HOME}/plugins/xcbglintegrations || fail qxcbglintegrations
+# Support libs
+for i in libffi.so.6  libsqlite3.so.0 libpng16.so.16 libgobject-2.0.so.0 libgthread-2.0.so.0 
+do
+        cpyX86 $i
+done
+
+cp -t ../lib /lib/x86_64-linux-gnu/libpcre.so.3 || fail pcre
+cp -t ../lib /lib/x86_64-linux-gnu/libglib-2.0.so.0 || fail glib
+#cp -t ../lib /lib/x86_64-linux-gnu/libjson.so.0 || fail json
+cp -t ../lib /lib/x86_64-linux-gnu/libjson-c.so.3 || fail json
+cpyRootx86Lib libudev.so.1
+
+# audio plugins
+for i in libfaad.so.2 libfaac.so.0 libmp3lame.so.0 libvorbis.so.0 libvorbisenc.so.2 libogg.so.0
+	#libaften.so.0 
+do
+        cpyX86 $i
+done
+
+cpyX86 libopus.so.0 
+# Audio device
+cpyX86 libpulse-simple.so.0
+cpyX86 libpulse.so.0
+cpyX86 libfdk-aac.so.1
+cp -Rap /usr/lib/x86_64-linux-gnu/pulseaudio ../lib/ || fail pulsecommon_folder
+cp -t ../lib /usr/lib/x86_64-linux-gnu/pulseaudio/libpulsecommon-12.2.so || fail pulsecommon
+ 
+# subtitles
+for i in libfreetype.so.6 libfribidi.so.0 libfontconfig.so.1 
+do 
+        cpyX86Optional $i
+done
+cpyRootx86Lib libexpat.so.1
+# Misc
+for i in libFLAC.so.8 libbsd.so.0 libcap.so.2 libgcc_s.so.1 libgcrypt.so.20 liblz4.so.1 liblzma.so.5 libstdc++.so.6 libwrap.so.0 libz.so.1 libasyncns.so.0 libdbus-1.so.3 libdl.so.2 libdrm.so.2 libdrm_intel.so.1 libm.so.6 libsndfile.so.1 libdouble-conversion.so.1 libfontconfig.so.1 libfreetype.so.6 libharfbuzz.so.0
+  do
+     cpyRootx86Lib $i   
+  done
+
+# x264
+#cpyLib libx264.so.152
+# 
+#cpyLib libx265.so.146
+# Display lib
+cpyX86 libvdpau.so.1
+cpyX86 libXv.so.1
+cpyX86 libva.so.2
+cpyX86 libva-x11.so.2
+
+cp -t ../lib /usr/lib/x86_64-linux-gnu/dri/nvidia_drv_video.so || fail nvidia_drv_video
+cp -t ../lib /usr/lib/x86_64-linux-gnu/dri/i965_drv_video.so  || fail intel_drv_video
+# patch
+sed -i -e 's|/usr/lib/x86_64-linux-gnu/dri|././/././lib|g'   ../lib/libva.so.2
+sed -i -e 's|/usr/lib/x86_64-linux-gnu/dri|././././././/./././././/./lib|g'  ../lib/libva.so.2
+
+#intel, not sure it works
+
+# Fixup link
+cd ../lib
+cd ../bin
+# Qt path
+echo "[Paths]" > qt.conf
+echo "Prefix=../lib/qt5" >> qt.conf
+
+
+cd ..
+#find . -type f -exec sed -i -e 's|/usr|../lib/|g' {} \; ; cd -
+find . -type f -exec sed -i -e 's|/usr/lib/x86_64-linux-gnu|./././././././././././lib|g' {} \; ; cd ..
+find . -type f -exec sed -i -e 's|/usr/lib|././/lib|g' {} \; ; cd ..
+#
+cd $ORG
+cp appImage/AppRun install
+cp appImage/avidemux.png install
+cp appImage/avidemux.desktop install
+
+FT_PROBE_EXE_NAME="freetype_probe"
+FT_PROBE_LOCATION="buildPluginsCommon/ADM_videoFilters6/ass"
+if [ -e "${FT_PROBE_LOCATION}/${FT_PROBE_EXE_NAME}" ]; then
+    cp "${FT_PROBE_LOCATION}/${FT_PROBE_EXE_NAME}" install
+    chmod +x "install/${FT_PROBE_EXE_NAME}"
+fi
+
+cd $ORG
+#AppImageAssistant  install $APP_NAME
+# Patch desktop file
+cp  install/avidemux.desktop /tmp
+cat /tmp/avidemux.desktop | sed 's/avidemux.png/avidemux/g' > install/avidemux.desktop
+appimagetool install
+

avidemux_2.7.4.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_dialog/DIA_working.cpp -> avidemux_2.7.6.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_dialog/DIA_working.cpp Changed

@@ -31,112 +31,105 @@
 class DIA_workingNone : public DIA_workingBase
 {
 protected:
-        virtual void 	    postCtor( void );
+    virtual void        postCtor( void );
 public:
-                            DIA_workingNone( const char *title=NULL );
-        virtual		        ~DIA_workingNone();
-            // If returns 1 -> Means aborted
-        virtual uint8_t  	update(uint32_t percent);
-        virtual uint8_t 	update(uint32_t current,uint32_t total);
-        virtual uint8_t  	isAlive (void );
-        
+                        DIA_workingNone( const char *title=NULL );
+    virtual             ~DIA_workingNone();
+    // If returns 1 -> Means aborted
+    virtual uint8_t     update(uint32_t percent);
+    virtual uint8_t     update(uint32_t current,uint32_t total);
+    virtual uint8_t     isAlive (void );
+
 };
 //**********************************
 DIA_workingNone::DIA_workingNone( const char *title ) : DIA_workingBase(title)
 {
-	this->postCtor();
+    this->postCtor();
 }
 
 void DIA_workingNone :: postCtor( void )
 {
-	lastper=0;
-	_nextUpdate=0;
+    lastper=0;
+    _nextUpdate=0;
 }
 
 uint8_t DIA_workingNone::update(uint32_t percent)
 {
-                if(!_priv) return 1;
-                if(!percent) return 0;
-
-                if(percent==lastper)
-                {
-                   return 0;
-                }
-
-				lastper=percent;
-                aprintf("DIA_working::update(%lu) called\n", percent);
-                elapsed=_clock.getElapsedMS();
-                if(elapsed<_nextUpdate) 
-                {
-
-                  return 0;
-                }
-                _nextUpdate=elapsed+1000;
-        
-		//
+    if(!percent || percent==lastper)
+        return 0;
+
+    lastper=percent;
+    //aprintf("DIA_working::update(%lu) called\n", percent);
+    elapsed=_clock.getElapsedMS();
+    if(elapsed==_nextUpdate)
+        return 0;
+
+    if(elapsed<1000)
+    {
+        printf("%u%% done, elapsed: %u ms\n",percent,elapsed);
+        _nextUpdate=elapsed;
+        return 0;
+    }
+    if(elapsed<_nextUpdate)
+        return 0;
+    _nextUpdate=elapsed+1000;
+
 		// 100/totalMS=percent/elapsed
 		// totalM=100*elapsed/percent
 
-		double f;
-		f=100.;
-		f*=elapsed;
-		f/=percent;
-
-		f-=elapsed;
-		f/=1000;
+    double f;
+    f=100.;
+    f*=elapsed;
+    f/=percent;
 
-		uint32_t sectogo=(uint32_t)floor(f);
+    f-=elapsed;
+    f/=1000;
 
-	char b[300];
-   		int  mm,ss;
-    			mm=sectogo/60;
-      			ss=sectogo%60;
-    			printf(" %d m %d s left ", mm,ss);
+    uint32_t sectogo=(uint32_t)floor(f);
 
-		double p;
-			p=percent;
-			p=p/100.;
-                        printf("%% done : %f\n",p);
-		return 0;
+    char b[300];
+    int  mm,ss;
+    mm=sectogo/60;
+    ss=sectogo%60;
+    printf("%u%% done, %d m %d s left\n",percent,mm,ss);
 
+    return 0;
 
 }
+
 uint8_t DIA_workingNone::update(uint32_t cur, uint32_t total)
 {
-		double d,n;
-		uint32_t percent;
-		if(!_priv) return 1;
+    double d,n;
+    uint32_t percent;
 
-		//aprintf("DIA_working::update(uint32_t %lu,uint32_t %lu) called\n", cur, total);
-		if(!total) return 0;
+    //aprintf("DIA_working::update(uint32_t %lu,uint32_t %lu) called\n", cur, total);
+    if(!total) return 0;
 
-		d=total;
-		n=cur;
-		n=n*100.;
+    d=total;
+    n=cur;
+    n=n*100.;
 
-		n=n/d;
+    n=n/d;
 
-		percent=(uint32_t )floor(n);
-		return update(percent);
+    percent=(uint32_t )floor(n);
+    return update(percent);
 
 }
 
 uint8_t DIA_workingNone::isAlive (void )
 {
-	if(!_priv) return 0;
-	return 1;
+    return 1;
 }
 
 DIA_workingNone::~DIA_workingNone()
 {
-	
-        
+
 }
 namespace ADM_CliCoreUIToolkit
 {
 DIA_workingBase *createWorking(const char *title)
 {
-        return new DIA_workingNone(title);
+    return new DIA_workingNone(title);
 
 }
 }

avidemux_2.7.4.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_gui2/gui_none.cpp -> avidemux_2.7.6.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_gui2/gui_none.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/cli/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux/cli/CMakeLists.txt Changed

avidemux_2.7.4.tar.gz/avidemux/common/ADM_audioFilter/src/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_audioFilter/src/CMakeLists.txt Changed

avidemux_2.7.4.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_encoder.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_encoder.cpp Changed

@@ -38,12 +38,16 @@
     protected:
                         ADM_audioStream *son;
                         ADM_audioAccess *access;
+                        WAVHeader       wav;
         public:
                         ADM_audioStream_autoDelete(ADM_audioStream *s,ADM_audioAccess *access)
                         :    ADM_audioStream(s->getInfo(),access)
                         {
                                 this->access=access;
                                 son=s;
+                                wav=*(son->getInfo());
+                                if(wav.encoding==WAV_AAC_HE) // catch the dummy ID for AAC with SBR here
+                                    wav.encoding=WAV_AAC;
                         }
                         virtual ~ADM_audioStream_autoDelete()
                         {
@@ -54,13 +58,23 @@
                                 delete access;
                                 access=NULL;
                         }
-virtual                 WAVHeader                *getInfo(void) {return son->getInfo();}
+virtual WAVHeader       *getInfo(void) {return &wav;}
 virtual uint8_t         getPacket(uint8_t *buffer,uint32_t *size, uint32_t sizeMax,uint32_t *nbSample,uint64_t *dts)
                         {
                                 return son->getPacket(buffer,size,sizeMax,nbSample,dts);
                         }
 virtual bool            goToTime(uint64_t nbUs) {return son->goToTime(nbUs);};
 virtual bool            getExtraData(uint32_t *l, uint8_t **d) {return son->getExtraData(l,d);};
+virtual uint32_t        getSamplesPerPacket(void)
+                        {
+                                uint32_t samples=0;
+                                WAVHeader *hdr=son->getInfo();
+                                if(hdr->encoding==WAV_AAC)
+                                    samples=son->getSamplesPerPacket();
+                                if(hdr->encoding==WAV_AAC_HE)
+                                    samples=AAC_DEFAULT_FRAME_LENGTH<<1;
+                                return samples;
+                        }
         uint64_t        getDurationInUs(void) {return son->getDurationInUs();}
         const std::string &getLanguage() {return son->getLanguage();}
         void              setLanguage(const std::string &lan) {son->setLanguage(lan);}

avidemux_2.7.4.tar.gz/avidemux/common/ADM_commonUI/DIA_audioFilter.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_commonUI/DIA_audioFilter.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/common/ADM_commonUI/DIA_prefs.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_commonUI/DIA_prefs.cpp Changed

@@ -63,13 +63,15 @@
 char     *alsaDevice=NULL;
 
 bool     lastReadDirAsTarget=false;
-bool     copyModeSanitizeDts=false;
 bool     altKeyboardShortcuts=false;
 bool     swapUpDown=false;
 
 uint32_t pp_type=3;
 uint32_t pp_value=5;
 
+bool     useCustomFragmentSize=false;
+uint32_t customFragmentSize=4000;
+
 uint32_t editor_cache_size=16;
 
 #ifdef USE_DXVA2
@@ -148,6 +150,11 @@
         if( prefs->get(DEVICE_AUDIO_ALSA_DEVICE, &alsaDevice) != RC_OK )
                 alsaDevice = ADM_strdup("plughw:0,0");
 #endif
+        // Auto-append
+        if(!prefs->get(DEFAULT_MULTILOAD_USE_CUSTOM_SIZE,&useCustomFragmentSize))
+            useCustomFragmentSize=false;
+        if(!prefs->get(DEFAULT_MULTILOAD_CUSTOM_SIZE_M,&customFragmentSize))
+            customFragmentSize=4000;
         // Video cache
         prefs->get(FEATURES_CACHE_SIZE,&editor_cache_size);
 #ifdef USE_DXVA2
@@ -183,11 +190,6 @@
         // Make users happy who prefer the output dir to be the same as the input dir
         prefs->get(FEATURES_USE_LAST_READ_DIR_AS_TARGET,&lastReadDirAsTarget);
 
-        // Some muxers may bail with irregular DTS and some devices may fail to play such videos.
-        // Don't let DTS get too close to each other by delaying frames, drop frames if necessary.
-        // This results in more videos that can't be saved in copy mode.
-        prefs->get(FEATURES_COPY_MODE_SANITIZE_DTS,&copyModeSanitizeDts);
-
         // PgUp and PgDown are cumbersome to reach on some laptops, offer alternative kbd shortcuts
         prefs->get(KEYBOARD_SHORTCUTS_USE_ALTERNATE_KBD_SHORTCUTS,&altKeyboardShortcuts);
 
@@ -303,7 +305,13 @@
         framePriority.swallow(&menuPlaybackPriority);
 
         diaElemToggle useLastReadAsTarget(&lastReadDirAsTarget,QT_TRANSLATE_NOOP("adm","_Default to the directory of the last read file for saving"));
-        diaElemToggle sanitizeDtsInCopyMode(&copyModeSanitizeDts,QT_TRANSLATE_NOOP("adm","_Sanitize decode time stamps (DTS) in copy mode"));
+
+        diaElemFrame frameMultiLoad(QT_TRANSLATE_NOOP("adm","Auto-Append Settings"));
+        diaElemToggle multiLoadUseCustomFragmentSize(&useCustomFragmentSize,QT_TRANSLATE_NOOP("adm","_Use custom fragment size for auto-append of MPEG-TS files"));
+        diaElemUInteger multiLoadCustomFragmentSize(&customFragmentSize,QT_TRANSLATE_NOOP("adm","_Fragment size:"),250,8196);
+        frameMultiLoad.swallow(&multiLoadUseCustomFragmentSize);
+        frameMultiLoad.swallow(&multiLoadCustomFragmentSize);
+        multiLoadUseCustomFragmentSize.link(1,&multiLoadCustomFragmentSize);
 
         diaElemFrame frameCache(QT_TRANSLATE_NOOP("adm","Caching of decoded pictures"));
         diaElemUInteger cacheSize(&editor_cache_size,QT_TRANSLATE_NOOP("adm","_Cache size:"),8,16);
@@ -454,7 +462,7 @@
 
 
         /* Output */
-        diaElem *diaOutput[]={&allowAnyMpeg,&sanitizeDtsInCopyMode,&useLastReadAsTarget,&frameCache};
+        diaElem *diaOutput[]={&allowAnyMpeg,&useLastReadAsTarget,&frameMultiLoad,&frameCache};
         diaElemTabs tabOutput(QT_TRANSLATE_NOOP("adm","Output"),4,(diaElem **)diaOutput);
 
         /* Audio */
@@ -612,6 +620,9 @@
             prefs->set(UPDATE_ENABLED,doAutoUpdate);
             // Video render
             prefs->set(VIDEODEVICE,render);
+            // Auto-append
+            prefs->set(DEFAULT_MULTILOAD_USE_CUSTOM_SIZE, useCustomFragmentSize);
+            prefs->set(DEFAULT_MULTILOAD_CUSTOM_SIZE_M, customFragmentSize);
             // Video cache
             prefs->set(FEATURES_CACHE_SIZE, editor_cache_size);
             // number of threads
@@ -649,8 +660,6 @@
 #endif
             // Make users happy who prefer the output dir to be the same as the input dir
             prefs->set(FEATURES_USE_LAST_READ_DIR_AS_TARGET,lastReadDirAsTarget);
-            // Don't let DTS get too close to each other by delaying frames, drop frames if necessary.
-            prefs->set(FEATURES_COPY_MODE_SANITIZE_DTS,copyModeSanitizeDts);
             // Enable alternate keyboard shortcuts
             prefs->set(KEYBOARD_SHORTCUTS_USE_ALTERNATE_KBD_SHORTCUTS,altKeyboardShortcuts);
             // Allow to use the UP key to navigate back, DOWN to navigate forward

avidemux_2.7.4.tar.gz/avidemux/common/ADM_commonUI/GUI_ui.h -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_commonUI/GUI_ui.h Changed

avidemux_2.7.4.tar.gz/avidemux/common/ADM_commonUI/myOwnMenu.h -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_commonUI/myOwnMenu.h Changed

@@ -44,7 +44,7 @@
             {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Save Selection as JPEG"),NULL,ACT_SAVE_BUNCH_OF_JPG,NULL,NULL,0},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Close"),              NULL,ACT_CLOSE,         NULL,"Ctrl+W",0},
             {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Information"),        NULL,ACT_VIDEO_PROPERTIES, MKICON(info),NULL,0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Information"),        NULL,ACT_VIDEO_PROPERTIES, MKICON(info),"Alt+Return",0},
             {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Connect to avsproxy"),NULL,ACT_AVS_PROXY,NULL,0},
             {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
@@ -83,7 +83,11 @@
             {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Pr&eferences"),       NULL,ACT_PREFERENCES,   NULL,NULL,0},
             {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
+#ifdef __APPLE__
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Save current settings as default"), NULL,ACT_SaveAsDefault,NULL,"Ctrl+Shift+D",0},
+#else
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Save current settings as default"), NULL,ACT_SaveAsDefault,NULL,"Ctrl+Alt+D",0},
+#endif
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Load saved settings"),              NULL,ACT_LoadDefault,  NULL,"Ctrl+R",0}
         };
 
@@ -142,10 +146,13 @@
 std::vector<MenuEntry> myMenuGo(_myMenuGo, _myMenuGo + sizeof(_myMenuGo) / sizeof(_myMenuGo[0]));
 
 static const MenuEntry _myMenuView[] = {
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 1:4"),   NULL,ACT_ZOOM_1_4,    NULL,"4",0},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 1:2"),   NULL,ACT_ZOOM_1_2,    NULL,"3",0},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 1:1"),   NULL,ACT_ZOOM_1_1,    NULL,"2",0},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 2:1"),   NULL,ACT_ZOOM_2_1,    NULL,"1",0}
+            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 1:4"),       NULL,ACT_ZOOM_1_4,    NULL,"4",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 1:2"),       NULL,ACT_ZOOM_1_2,    NULL,"3",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 1:1"),       NULL,ACT_ZOOM_1_1,    NULL,"2",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 2:1"),       NULL,ACT_ZOOM_2_1,    NULL,"1",0},
+            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Fit to window"),  NULL,ACT_ZOOM_FIT_IN, NULL,"0",0},
         };
 
 std::vector<MenuEntry> myMenuView(_myMenuView, _myMenuView + sizeof(_myMenuView) / sizeof(_myMenuView[0]));

avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/include/ADM_edit.hxx -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_editor/include/ADM_edit.hxx Changed

@@ -69,9 +69,9 @@
 */
 typedef enum
 {
-    ADM_EDITOR_CUT_POINT_IDR,
-    ADM_EDITOR_CUT_POINT_NON_IDR,
-    ADM_EDITOR_CUT_POINT_RECOVERY,
+    ADM_EDITOR_CUT_POINT_KEY,
+    ADM_EDITOR_CUT_POINT_NON_KEY,
+    ADM_EDITOR_CUT_POINT_BAD_POC,
     ADM_EDITOR_CUT_POINT_MISMATCH,
     ADM_EDITOR_CUT_POINT_UNCHECKED
 }ADM_cutPointType;
@@ -231,18 +231,18 @@
                     bool        setMarkerAPts(uint64_t pts);
                     bool        setMarkerBPts(uint64_t pts);
 /*********************************** Undo Queue ****************************/
-struct undoQueueElem
+private:
+
+typedef struct
 {
     ListOfSegments segm;
     uint64_t markerA;
     uint64_t markerB;
-};
+}undoQueueElem;
 
 typedef std::vector <undoQueueElem> ListOfUndoQueueElements;
 
-protected:
                     ListOfUndoQueueElements undoQueue;
-                    static const uint8_t maxUndoSteps=50;
                     uint32_t    _undo_counter; // track the nb of performed undo steps for redo
 public:
                     bool        addToUndoQueue(void);
@@ -265,7 +265,8 @@
                     bool        rewind(void);
 // Used for stream copy
                     bool        GoToIntraTime_noDecoding(uint64_t time,uint32_t *toframe=NULL);
-                    bool        getCompressedPicture(uint64_t start,uint64_t delay,bool sanitizeDts,ADMCompressedImage *img); //COPYMODE
+                    bool        getCompressedPicture(uint64_t start,uint64_t delay,ADMCompressedImage *img); //COPYMODE
+                    bool        getDirectKeyFrameImageAtPts(uint64_t time,ADMCompressedImage *img); // source of extradata in AnnexB to ISO conversion
                     // Use only for debug purpose !!!
                     bool        getDirectImageForDebug(uint32_t frameNum,ADMCompressedImage *img);
                     ADM_cutPointType checkCutsAreOnIntra(void);
@@ -273,27 +274,29 @@
                     ADM_cutPointType checkCutIsOnIntra(uint64_t time);
 private:
                     ADM_cutPointType checkSegmentStartsOnIntra(uint32_t seg);
-                    uint64_t    totalExtraDelay;
-                    int64_t     desyncScore;
+                    bool        findLastFrameBeforeSwitch(uint32_t segNo, uint32_t *lastFrame, uint32_t *maxPtsFrame, uint64_t *maxPts);
+                    bool        getOpenGopDelayForSegment(uint32_t segNo, uint64_t segTime, uint32_t *delay, int *frameNo=NULL);
 public:
                     uint8_t	    updateVideoInfo(aviInfo *info);
                     uint32_t 	getSpecificMpeg4Info( void );
                     bool        getNonClosedGopDelay(uint64_t time,uint32_t *delay);
+                    bool        getUserDataUnregistered(uint64_t start,uint8_t *buffer,uint32_t max,uint32_t *length);
 /************************************ /audioStream ******************************/
                     bool            getAudioStreamsInfo(uint64_t xtime,uint32_t *nbStreams, audioInfo **infos);
                     bool            changeAudioStream(uint64_t xtime,uint32_t newstream);
                     uint32_t        getCurrentAudioStreamNumber(uint64_t xframe);
                     bool            setDecodeParam( uint64_t frameTime );
 /**************************************** Video Info **************************/
-                    AVIStreamHeader 	*getVideoStreamHeader(void ) ;
-                    MainAVIHeader 		*getMainHeader(void );
-                    ADM_BITMAPINFOHEADER 	*getBIH(void ) ;
+                    AVIStreamHeader *getVideoStreamHeader(void ) ;
+                    MainAVIHeader   *getMainHeader(void );
+                    ADM_BITMAPINFOHEADER *getBIH(void ) ;
 
-                    uint8_t			getVideoInfo(aviInfo *info);
-                    _VIDEOS* 		getRefVideo(int videoIndex);
-                    uint64_t        getVideoDuration(void);
-                    uint64_t        getFrameIncrement(void); /// Returns the # of us between 2 frames or the smaller value of them
-					int				getVideoCount(void);
+                    uint8_t     getVideoInfo(aviInfo *info); // for common timebase, call getTimeBase afterwards
+                    _VIDEOS*    getRefVideo(int videoIndex);
+                    uint64_t    getVideoDuration(void);
+                    uint64_t    getFrameIncrement(bool forCopyMode=false); /// Returns the # of us between 2 frames or the smaller value of them
+                    int         getVideoCount(void);
+                    bool        getTimeBase(uint32_t *scale, uint32_t *rate, bool forCopyMode=false); // common timebase or an approximation for all videos within the selection
 
 /**************************************** /Video Info **************************/
 /***************************************** Project Handling ********************/

avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/include/ADM_segment.h -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_editor/include/ADM_segment.h Changed

@@ -61,14 +61,17 @@
       decoders *decoder; /// Video codec
       ADMColorScalerSimple *color; /// Color conversion if needed
       bool              dontTrustBFramePts;
+      bool              fieldEncoded;
       /* Audio part */
       uint32_t currentAudioStream;
       std::vector <ADM_audioStreamTrack *>  audioTracks;
       
 
       uint32_t _nb_video_frames; /// Really needed ?
+      uint32_t infoCacheSize;
+      uint8_t *infoCache; /// Reuse decoded SPS and friends
       uint32_t paramCacheSize;
-      uint8_t *paramCache; /// Reuse decoded SPS and friends
+      uint8_t *paramCache; /// Raw SPS to speed up cut check
       EditorCache *_videoCache; /// Decoded video cache
 
       /* Timeing info */
@@ -83,11 +86,15 @@
 
     _VIDEOS()
     {
+        dontTrustBFramePts=false;
+        fieldEncoded=false;
         currentAudioStream=0;
         _aviheader=NULL;
         decoder=NULL;
         color=NULL;
         _nb_video_frames=0;
+        infoCacheSize=0;
+        infoCache=NULL;
         paramCacheSize=0;
         paramCache=NULL;
         _videoCache=NULL;
@@ -124,6 +131,7 @@
         uint64_t _durationUs; ///
         SegState _dropBframes; /// Internal state machine to know is we should drop bframe that are orphean
         uint64_t _refStartDts;
+        uint64_t _refMinimumPts; /// The PTS in reference of the earliest non-droppable B-frame after given offset
         void clear(void) 
         {
             _reference=0;
@@ -132,6 +140,7 @@
             _durationUs=0;
             _dropBframes=ADM_NO_DROP;
             _refStartDts=0;
+            _refMinimumPts=0;
         }
         _SEGMENT() {clear();}
 };

avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/include/IEditor.h -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_editor/include/IEditor.h Changed

@@ -48,19 +48,21 @@
     virtual void getCurrentFrameFlags(uint32_t *flags, uint32_t *quantiser) = 0;
     virtual uint64_t getCurrentFramePts(void) = 0;
     virtual bool getDirectImageForDebug(uint32_t frameNum, ADMCompressedImage *img) = 0;
-    virtual uint64_t getFrameIncrement(void) = 0;
+    virtual uint64_t getFrameIncrement(bool copy=false) = 0;
     virtual uint64_t getMarkerAPts() = 0;
     virtual uint64_t getMarkerBPts() = 0;
     virtual uint32_t getNbSegment(void) = 0;
     virtual uint32_t getPARWidth(void) = 0;
     virtual uint32_t getPARHeight(void) = 0;
     virtual bool getPKFramePTS(uint64_t *frameTime) = 0;
+    virtual bool getNKFramePTS(uint64_t *frameTime) = 0;
     virtual uint8_t getPostProc(uint32_t *type, uint32_t *strength, bool *swapuv) = 0;
     virtual _SEGMENT* getSegment(int i) = 0;
     virtual char *getVideoCodec(void) = 0;
     virtual int getVideoCount(void) = 0;
     virtual uint64_t getVideoDuration(void) = 0;
     virtual uint8_t getVideoInfo(aviInfo *info) = 0;
+    virtual bool getTimeBase(uint32_t *scale, uint32_t *rate, bool copy=false) = 0;
     virtual _VIDEOS* getRefVideo(int videoIndex) = 0;
     virtual bool getVideoPtsDts(uint32_t frame, uint32_t *flags, uint64_t *pts, uint64_t *dts) = 0;
     virtual bool goToIntraTimeVideo(uint64_t time) = 0;

avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/ADM_edRender.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_editor/src/ADM_edRender.cpp Changed

@@ -191,11 +191,8 @@
     uint64_t to=segTime+s->_refStartTimeUs;
     if(false==seektoTime(s->_reference,to))
     {
-        if(false==seektoTime(s->_reference,to)) // try twice because the first attempt may fail with VDPAU
-        {
-            ADM_warning("Cannot seek to beginning of segment %" PRIu32" at  %" PRIu64" ms\n",seg,to/1000);
-            return false;
-        }
+        ADM_warning("Cannot seek to beginning of segment %" PRIu32" at %s\n",seg,ADM_us2plain(to));
+        return false;
     }
     _currentSegment=seg;
     int64_t newTime=(int64_t)v->lastDecodedPts+(int64_t)s->_startTimeUs-(int64_t)s->_refStartTimeUs;
@@ -234,10 +231,8 @@
                 goto np_nextSeg;
         }else 
         { // Not in cache, decode next one
-          // but don't go past the end of the last segment
-            uint64_t maxPts=0;
-            if(_currentSegment+1 == _segments.getNbSegments())
-                maxPts=seg->_refStartTimeUs+seg->_durationUs;
+          // but don't go past the end of the segment
+            uint64_t maxPts=seg->_refStartTimeUs+seg->_durationUs;
             if(false== nextPictureInternal(seg->_reference,image,maxPts))
             {
                 if(flags & 2)

avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/ADM_edRenderInternal.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_editor/src/ADM_edRenderInternal.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/ADM_edSearch.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_editor/src/ADM_edSearch.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/ADM_edVideoCopy.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_editor/src/ADM_edVideoCopy.cpp Changed

@@ -17,6 +17,7 @@
  ***************************************************************************/
 #include "ADM_cpp.h"
 #include <math.h>
+#include <climits>
 #include "ADM_default.h"
 #include "ADM_edit.hxx"
 #include "ADM_vidMisc.h"
@@ -29,8 +30,6 @@
 #define aprintf(...) {}// printf
 #endif
 
-static int warn_cnt=0;
-
 static bool checkCodec(aviInfo *first,aviInfo *second)
 {
     bool match=false;
@@ -50,6 +49,224 @@
     return match;
 }
 
+static bool getH264SPSInfo(_VIDEOS *vid,ADM_SPSInfo *sps)
+{
+    if(!vid)
+        return false;
+    vidHeader *demuxer=vid->_aviheader;
+    if(!demuxer)
+        return false;
+    if(!sps)
+        return false;
+
+    // Do we have a cached copy?
+    if(vid->infoCacheSize==sizeof(ADM_SPSInfo) && vid->infoCache)
+    {
+        memcpy(sps,vid->infoCache,sizeof(ADM_SPSInfo));
+        return true;
+    }
+
+    bool gotSps=false;
+    uint8_t *buffer=NULL;
+    uint8_t *extra;
+    uint32_t extraLen=0;
+    demuxer->getExtraHeaderData(&extraLen,&extra);
+    if(!extraLen) // AnnexB
+    {
+        // Allocate memory to hold compressed frame
+        ADMCompressedImage img;
+#define MAX_FRAME_LENGTH (1920*1080*3) // ~7 MiB, should be enough even for 4K
+        buffer=new uint8_t[MAX_FRAME_LENGTH];
+        img.data=buffer;
+        if(!demuxer->getFrame(0,&img))
+        {
+            ADM_warning("Unable to get the first frame of video");
+            goto _the_end;
+        }
+#define MAX_NALU_TO_CHECK 4
+        static NALU_descriptor desc[MAX_NALU_TO_CHECK];
+
+        int nbNalu=ADM_splitNalu(img.data, img.data+img.dataLength, MAX_NALU_TO_CHECK, desc);
+        int spsIndex=ADM_findNalu(NAL_SPS,nbNalu,desc);
+
+        NALU_descriptor *d=desc;
+        if(spsIndex<0)
+            goto _the_end;
+        d+=spsIndex;
+        if(extractSPSInfo(d->start, d->size, sps))
+        { // Cache raw SPS data
+            if(vid->paramCache)
+                delete [] vid->paramCache;
+            vid->paramCacheSize=d->size+1;
+            vid->paramCache=new uint8_t[vid->paramCacheSize];
+            uint8_t *p=vid->paramCache;
+            p[0]=d->nalu;
+            memcpy(p+1, d->start, d->size);
+            gotSps=true;
+        }
+    }else
+    {
+        gotSps=extractSPSInfo(extra,extraLen,sps);
+        if(gotSps && extra[5] == 0xe1 /* We support only a single one SPS */ )
+        { // Cache raw SPS data
+            vid->paramCacheSize=(extra[6] << 8) + extra[7];
+            if(vid->paramCacheSize && vid->paramCacheSize+8<=extraLen) // 8 bytes AVCC header + SPS
+            {
+                vid->paramCache=new uint8_t[vid->paramCacheSize];
+                memcpy(vid->paramCache, extra+8, vid->paramCacheSize);
+            }
+        }
+    }
+    if(!gotSps)
+        goto _the_end;
+    // Store the decoded SPS info in the cache
+    vid->infoCacheSize=sizeof(ADM_SPSInfo);
+    vid->infoCache=new uint8_t[vid->infoCacheSize]; // will be destroyed with the video
+    memcpy(vid->infoCache,sps,sizeof(ADM_SPSInfo));
+_the_end:
+    if(buffer) delete [] buffer;
+    buffer=NULL;
+    return gotSps;
+}
+
+/**
+    \fn getH265SPSInfo
+*/
+static bool getH265SPSInfo(_VIDEOS *vid, ADM_SPSinfoH265 *sps)
+{
+    if(!vid)
+        return false;
+    vidHeader *demuxer=vid->_aviheader;
+    if(!demuxer)
+        return false;
+    if(!sps)
+        return false;
+
+    // Do we have a cached copy?
+    uint32_t spsSize=sizeof(ADM_SPSinfoH265);
+    if(vid->infoCacheSize==spsSize && vid->infoCache)
+    {
+        memcpy(sps,vid->infoCache,spsSize);
+        return true;
+    }
+    // Nope, determine stream type
+    bool gotSps=false;
+    uint8_t *buffer=NULL;
+    uint8_t *extra;
+    uint32_t extraLen=0;
+    demuxer->getExtraHeaderData(&extraLen,&extra);
+    if(!extraLen) // AnnexB
+    {
+        // Allocate memory to hold compressed frame
+        ADMCompressedImage img;
+        buffer=new uint8_t[MAX_FRAME_LENGTH];
+        img.data=buffer;
+        if(!demuxer->getFrame(0,&img))
+        {
+            ADM_warning("Unable to get the first frame of video");
+            goto _the_end_hevc;
+        }
+        gotSps=extractSPSInfoH265(img.data,img.dataLength,sps);
+    }else
+    {
+        gotSps=extractSPSInfoH265(extra,extraLen,sps);
+    }
+    if(!gotSps)
+        goto _the_end_hevc;
+    // Store the decoded SPS info in the cache
+    vid->infoCacheSize=spsSize;
+    vid->infoCache=new uint8_t[vid->infoCacheSize]; // will be destroyed with the video
+    memcpy(vid->infoCache,sps,vid->infoCacheSize);
+_the_end_hevc:
+    if(buffer) delete [] buffer;
+    buffer=NULL;
+    return gotSps;
+}
+
+/**
+    \fn findLastFrameBeforeSwitch
+    \brief Identify the last frame in stream order and last displayed frame before segment switch
+*/
+bool ADM_Composer::findLastFrameBeforeSwitch(uint32_t segNo, uint32_t *lastFrame, uint32_t *maxPtsFrame, uint64_t *maxPts)
+{
+    if(segNo>=_segments.getNbSegments())
+    {
+        ADM_error("Requested segment number %d out of range!\n",segNo);
+        return false;
+    }
+
+    _SEGMENT *seg=_segments.getSegment(segNo);
+    ADM_assert(seg);
+    _VIDEOS *vid=_segments.getRefVideo(seg->_reference);
+    ADM_assert(vid);
+    vidHeader *demuxer=vid->_aviheader;
+    ADM_assert(demuxer);
+
+    // Identify the last frame before segment switch
+    int frame=0;
+    uint64_t tail = seg->_refStartTimeUs + seg->_durationUs;
+    if(false==getFrameNumFromPtsOrBefore(vid,tail-1,frame))
+    {
+        ADM_warning("Cannot identify the last frame in display order for segment %d\n",segNo);
+        return false;
+    }
+    // Check restrictions imposed by PTS delay and early B-frames in the next segment
+    uint64_t limitDts,limitPts;
+    limitDts=limitPts=tail;
+    if(segNo+1 < _segments.getNbSegments())
+    {
+        _SEGMENT *nextSeg=_segments.getSegment(segNo+1);
+        ADM_assert(nextSeg);
+        uint64_t delta=0;
+        if(nextSeg->_refStartTimeUs > nextSeg->_refStartDts)
+            delta = nextSeg->_refStartTimeUs - nextSeg->_refStartDts;
+        if(delta<limitDts)
+            limitDts-=delta;
+        uint32_t dlay=0;
+        if(getOpenGopDelayForSegment(segNo+1,0,&dlay) && (uint64_t)dlay < limitPts)
+            limitPts-=dlay;
+    }
+    int maxFrame=frame;
+#define MAX_REF_FRAMES_FIELDS 32 // the highest possible nb of references in a field-encoded H.264 stream
+    // FIXME In theory, 32 may be not enough as we may encounter an unknown number of early B-frames
+    // while maxFrame may be far past the first frame of the next segment if it uses the same ref video.
+    frame = (frame > MAX_REF_FRAMES_FIELDS)? frame - MAX_REF_FRAMES_FIELDS : 0;
+    // Now search the frame with max pts before segment switch
+    *maxPts=0;
+    *maxPtsFrame=-1;
+    uint64_t lastPts=0, lastDts=ADM_NO_PTS;
+    while(frame<=maxFrame)
+    {
+        *lastFrame=frame;
+        uint64_t pts,dts;
+        if(!demuxer->getPtsDts(frame,&pts,&dts))
+            break;
+        if(pts!=ADM_NO_PTS && pts >= limitPts)
+            break;
+        if(dts!=ADM_NO_PTS)
+        {
+            if(lastDts!=ADM_NO_PTS && lastDts>=dts)
+                ADM_warning("Frame %d DTS delta %" PRId64" ms\n",frame,
+                        ((int64_t)lastDts-(int64_t)dts)/1000); // Should we rather bail out?
+            lastDts=dts;
+        }
+        else if(lastDts!=ADM_NO_PTS)
+            lastDts+=vid->timeIncrementInUs;
+        if(lastDts!=ADM_NO_PTS && lastDts >= limitDts)
+            break;
+        if(pts!=ADM_NO_PTS)
+            lastPts=pts;
+        if(lastPts>*maxPts)
+        {
+            *maxPts=lastPts;
+            *maxPtsFrame=frame;
+        }
+        frame++;
+    }
+
+    return true;
+}
+
 /**
     \fn checkSegmentStartsOnIntra
     \brief In copy mode, if the cuts are not on intra we will run into trouble :
@@ -61,7 +278,7 @@
     if(segNo>=_segments.getNbSegments())
     {
         ADM_error("Requested segment number %d out of range!\n",segNo);
-        return ADM_EDITOR_CUT_POINT_IDR;
+        return ADM_EDITOR_CUT_POINT_KEY;
     }
 
     _SEGMENT *seg=_segments.getSegment(segNo);
@@ -74,10 +291,15 @@
     uint64_t refstart=(seg->_refStartTimeUs > vid->firstFramePts)? seg->_refStartTimeUs : vid->firstFramePts;
     int frame=0;
     uint8_t *buffer=NULL;
+    uint8_t *spsBuf1=NULL;
+    uint8_t *spsBuf2=NULL;
     ADM_cutPointType cut=ADM_EDITOR_CUT_POINT_UNCHECKED;
 
 #define BOWOUT if(buffer) { delete [] buffer; buffer=NULL; } \
-    _currentSegment=oldSeg; vid->lastSentFrame=oldFrame; return cut;
+               if(spsBuf1) { delete [] spsBuf1; spsBuf1=NULL; } \
+               if(spsBuf2) { delete [] spsBuf2; spsBuf2=NULL; } \
+               _currentSegment=oldSeg; vid->lastSentFrame=oldFrame; \
+               return cut;
 
     if(false==switchToSegment(segNo,true))
     {
@@ -118,7 +340,7 @@
     {
         ADM_warning("Segment %d does not start on a known DTS (%" PRIu64" us = %s)\n",segNo,dts,ADM_us2plain(dts));
         ADM_warning("expected: %" PRIu64" us = %s\n",seg->_refStartDts,ADM_us2plain(seg->_refStartDts));
-        cut=ADM_EDITOR_CUT_POINT_NON_IDR; // ??
+        cut=ADM_EDITOR_CUT_POINT_NON_KEY; // ??
         BOWOUT
     }
     // DTS check passed, now check flags
@@ -126,95 +348,135 @@
     if(!(flags & AVI_KEY_FRAME))
     {
         ADM_warning("Segment %d does not start on a keyframe (time in ref %s)\n",segNo,ADM_us2plain(pts));
-        cut=ADM_EDITOR_CUT_POINT_NON_IDR;
+        cut=ADM_EDITOR_CUT_POINT_NON_KEY;
         BOWOUT
     }
     // The frame is marked as keyframe
     if(!segNo) // Not a cut point
     {
-        cut=ADM_EDITOR_CUT_POINT_IDR;
+        cut=ADM_EDITOR_CUT_POINT_KEY;
         BOWOUT
     }
 
     // It is a cut, perform codec-specific checks
 
-#define MAX_NALU_TO_CHECK 4
-    static NALU_descriptor desc[MAX_NALU_TO_CHECK];
-
     if(isH264Compatible(info.fcc))
     {
+        int poc1,maxpoc1,poc2,minpoc2;
         // It is H.264, check deeper. The keyframe may be a non-IDR random access point.
         // If picture order count after a cut is going back, at least FFmpeg-based players
-        // like VLC and mpv may get stuck until the next recovery point is reached.
-        // First determine stream type
+        // like VLC and mpv may get stuck until POC is greater than before the cut point.
+        // Get SPS to be able to decode the slice header
+        ADM_SPSInfo sps;
+        if(!getH264SPSInfo(vid,&sps))
+        {
+            ADM_warning("Cannot retrieve SPS info.\n");
+            BOWOUT
+        }
+        // Determine stream type
         bool AnnexB=false;
         uint8_t *extra;
         uint32_t extraLen=0;
+        uint32_t nalSize=0;
         demuxer->getExtraHeaderData(&extraLen,&extra);
         if(!extraLen)
             AnnexB=true;
+        else
+            nalSize=ADM_getNalSizeH264(extra,extraLen);
         // Allocate memory to hold compressed frame
         ADMCompressedImage img;
-#define MAX_FRAME_LENGTH (1920*1080*3) // ~7 MiB, should be enough even for 4K
         buffer=new uint8_t[MAX_FRAME_LENGTH];
         img.data=buffer;
-        // Get SPS to be able to decode the slice header
-        ADM_SPSInfo sps;
-        bool gotSps=false;
-        // Do we have a cached copy?
-        if(vid->paramCacheSize==sizeof(ADM_SPSInfo) && vid->paramCache)
-        {
-            memcpy(&sps,vid->paramCache,sizeof(ADM_SPSInfo));
-            gotSps=true;
-        }else
-        {
-            if(AnnexB)
-            {
-                if(!demuxer->getFrame(0,&img))
-                {
-                    ADM_warning("Unable to get the first frame in ref %d, segment %d\n",seg->_reference,segNo);
-                    BOWOUT
-                }
-                int nbNalu=ADM_splitNalu(img.data, img.data+img.dataLength, MAX_NALU_TO_CHECK, desc);
-                int spsIndex=ADM_findNalu(NAL_SPS,nbNalu,desc);
-                if(spsIndex!=-1)
-                    gotSps=extractSPSInfo(desc[spsIndex].start, desc[spsIndex].size, &sps);
-            }else
-            {
-                gotSps=extractSPSInfo(extra,extraLen,&sps);
-            }
-            if(!gotSps)
-            {
-                ADM_warning("Cannot retrieve SPS info.\n");
-                BOWOUT
-            }
-            // Store the decoded SPS info in the cache
-            vid->paramCacheSize=sizeof(ADM_SPSInfo);
-            vid->paramCache=new uint8_t[vid->paramCacheSize]; // will be destroyed with the video
-            memcpy(vid->paramCache,&sps,sizeof(ADM_SPSInfo));
-        }
         // We have SPS, now get the frame we are interested in.
         if(!demuxer->getFrame(frame,&img))
         {
             ADM_warning("Unable to get frame %d in ref %d, segment %d\n",frame,seg->_reference,segNo);
             BOWOUT
         }
-        int poc=-1;
+        // Do we have in-band SPS?
+        ADM_info("Checking for in-band SPS...\n");
+        bool match=true;
+        uint32_t spsLen1,spsLen2=0;
+        // Allocate memory to hold copy of raw SPS data
+        if(!spsBuf2)
+            spsBuf2=new uint8_t[MAX_H264_SPS_SIZE];
+        memset(spsBuf2,0,MAX_H264_SPS_SIZE);
+        if(AnnexB)
+            spsLen2=getRawH264SPS_startCode(img.data, img.dataLength, spsBuf2, MAX_H264_SPS_SIZE);
+        else
+            spsLen2=getRawH264SPS(img.data, img.dataLength, nalSize, spsBuf2, MAX_H264_SPS_SIZE);
+        // If we have in-band SPS, the global one doesn't matter. The check below is purely informative.
+        if(spsLen2)
+        {
+            //mixDump(vid->paramCache, vid->paramCacheSize);
+            //mixDump(spsBuf, spsLen);
+            if(memcmp(vid->paramCache, spsBuf2, (spsLen2 > vid->paramCacheSize)? vid->paramCacheSize : spsLen2))
+            {
+                ADM_warning("SPS mismatch? Checking deeper...\n");
+                ADM_SPSInfo tmpinfo;
+                if(extractSPSInfoFromData(spsBuf2, spsLen2, &tmpinfo))
+                { // Update SPS info
+#define MATCH(x) if(sps.x != tmpinfo.x) { ADM_warning("%s value does not match.\n",#x); sps.x = tmpinfo.x; match=false; }
+                    MATCH(width)
+                    MATCH(height)
+                    MATCH(hasPocInfo)
+                    MATCH(log2MaxFrameNum)
+                    MATCH(log2MaxPocLsb)
+                    MATCH(frameMbsOnlyFlag)
+                    MATCH(refFrames)
+                    if(!match)
+                        ADM_warning("Codec parameters at frame %d don't match initial ones, expect problems.\n",frame);
+                }
+            }
+        }
+
+        poc2=-1; // POC of the first frame after the cut
 #define NO_RECOVERY_INFO 0xFF
         uint32_t recoveryDistance=NO_RECOVERY_INFO;
         bool outcome=false;
         if(AnnexB)
-            outcome=extractH264FrameType_startCode(img.data, img.dataLength, &(img.flags), &poc, &sps, &recoveryDistance);
+            outcome=extractH264FrameType_startCode(img.data, img.dataLength, &(img.flags), &poc2, &sps, &recoveryDistance);
         else
-            outcome=extractH264FrameType(img.data, img.dataLength, &(img.flags), &poc, &sps, &recoveryDistance);
+            outcome=extractH264FrameType(img.data, img.dataLength, nalSize, &(img.flags), &poc2, &sps, &recoveryDistance);
         if(!outcome)
         {
             ADM_warning("Cannot get H.264 frame type and Picture Order Count Least Significant Bits value.\n");
             BOWOUT
         }
+
+        /* Now we need to calculate the minimum POC among the early B-frames
+        following the first frame of the segment. While not relevant for
+        the effect of being "stuck", a POC smaller than the maximum POC
+        before the cut point at an non-IDR frame will result in considerable
+        artifacts, dropped frames, stutter, flicker and such. */
+
+        minpoc2=-1;
+        uint32_t delay;
+        int earliest;
+        if(getOpenGopDelayForSegment(segNo,0,&delay,&earliest) && earliest>0)
+        {
+            if(demuxer->getFrame(earliest,&img))
+            {
+                outcome=false;
+                if(AnnexB)
+                    outcome=extractH264FrameType_startCode(img.data, img.dataLength, &(img.flags), &minpoc2, &sps, NULL);
+                else
+                    outcome=extractH264FrameType(img.data, img.dataLength, nalSize, &(img.flags), &minpoc2, &sps, NULL);
+                if(!outcome)
+                    ADM_warning("Cannot get H.264 frame type and Picture Order Count Least Significant Bits value.\n");
+            }else
+            {
+                ADM_warning("Unable to get frame %d in ref %d, segment %d\n",earliest,seg->_reference,segNo);
+            }
+        }
+        if(minpoc2!=-1)
+            ADM_info("Segment %u minimum POC LSB = %d at frame %d\n",segNo,minpoc2,earliest);
         // We are done with this segment, restore the last sent frame
         vid->lastSentFrame=oldFrame;
 
+        uint8_t *nextSegParamCache=vid->paramCache;
+        uint32_t nextSegParamCacheSize=vid->paramCacheSize;
+
         // Check the preceding segment
         ADM_info("Getting previous segment, current segment number: %d\n",segNo);
         ADM_assert(segNo>0);
@@ -229,23 +491,87 @@
             ADM_warning("Cannot check the previous segment %d\n",segNo);
             BOWOUT
         }
+        ADM_info("Switched to segment %d\n",segNo);
         // Same ref video?
         if(seg->_reference==refNo)
         {
-            // Not a recovery point and marked as keyframe?
-            if(recoveryDistance==NO_RECOVERY_INFO && (img.flags & AVI_FRAME_TYPE_MASK)==AVI_KEY_FRAME)
+            // Marked as IDR? Ignore recovery.
+            if((img.flags & AVI_KEY_FRAME) && (img.flags & AVI_IDR_FRAME))
             {
                 ADM_info("IDR verified and same ref video, the cut point is fine.\n");
-                cut=ADM_EDITOR_CUT_POINT_IDR;
+                cut=ADM_EDITOR_CUT_POINT_KEY;
                 BOWOUT
             }
             // Recovery point and no POC? Don't bother to perform further checks.
-            if(!recoveryDistance && poc==-1)
+            if(!recoveryDistance && poc2==-1)
             {
                 ADM_warning("No POC to compare with, only POC explicitely set in the slice header is supported.\n");
-                cut=ADM_EDITOR_CUT_POINT_IDR; // ??
+                cut=ADM_EDITOR_CUT_POINT_KEY; // ??
                 BOWOUT
             }
+            // Check for in-band SPS
+            // Identify the last keyframe of the segment. If in-band SPS is present, it will be there.
+            if(false==getFrameNumFromPtsOrBefore(vid, seg->_refStartTimeUs+seg->_durationUs-1, frame))
+            {
+                ADM_warning("Cannot identify the last frame in display order for segment %d\n",segNo);
+                BOWOUT
+            }
+            flags=0;
+            demuxer->getFlags(frame,&flags);
+            while(frame>0)
+            {
+                if(flags & AVI_KEY_FRAME) break;
+                demuxer->getFlags(--frame,&flags);
+            }
+            // Retrieve this keyframe
+            if(!demuxer->getFrame(frame,&img))
+            {
+                ADM_warning("Unable to get frame %d in ref %d, segment %d\n",frame,seg->_reference,segNo);
+                BOWOUT
+            }
+            spsLen1=0;
+            // Allocate another buffer to hold copy of raw SPS data
+            if(!spsBuf1)
+                spsBuf1=new uint8_t[MAX_H264_SPS_SIZE];
+            memset(spsBuf1,0,MAX_H264_SPS_SIZE);
+            if(AnnexB)
+                spsLen1=getRawH264SPS_startCode(img.data, img.dataLength, spsBuf1, MAX_H264_SPS_SIZE);
+            else
+                spsLen1=getRawH264SPS(img.data, img.dataLength, nalSize, spsBuf1, MAX_H264_SPS_SIZE);
+            if(spsLen1)
+            {   /* If the next segment doesn't have in-band SPS but this one does,
+                we are in trouble as we can't be sure that we parsed the slice header
+                using a valid SPS info. The least harmful thing to do is to check that
+                in-band SPS matches the global one and to bail out if it does not. */
+                uint8_t *sbuf=vid->paramCache;
+                uint32_t slen=vid->paramCacheSize;
+                if(spsLen2 && spsBuf2)
+                {
+                    sbuf=spsBuf2;
+                    slen=spsLen2;
+                }
+                if(memcmp(spsBuf1, sbuf, (spsLen1 > slen)? slen : spsLen1))
+                {
+                    ADM_warning("In-band SPS does not match the global one? Checking deeper...\n");
+                    ADM_SPSInfo tmpinfo;
+                    if(extractSPSInfoFromData(spsBuf1, spsLen1, &tmpinfo))
+                    { // Update SPS info used to parse slice header later
+                        match=true;
+                        MATCH(width)
+                        MATCH(height)
+                        MATCH(hasPocInfo)
+                        MATCH(log2MaxFrameNum)
+                        MATCH(log2MaxPocLsb)
+                        MATCH(frameMbsOnlyFlag)
+                        MATCH(refFrames)
+                        if(!match && !spsLen2)
+                        {
+                            ADM_warning("Appended incompatible streams possible, aborting check.\n");
+                            BOWOUT
+                        }
+                    }
+                }
+            }
         }else
         {
             // Not the same video. Does the codec match?
@@ -265,126 +591,436 @@
                 cut=ADM_EDITOR_CUT_POINT_MISMATCH;
                 BOWOUT
             }
-            // Get SPS info
-            gotSps=false;
-            ADM_SPSInfo sps2;
-            if(vid->paramCacheSize==sizeof(ADM_SPSInfo) && vid->paramCache)
-            {
-                memcpy(&sps2,vid->paramCache,sizeof(ADM_SPSInfo));
-                gotSps=true;
-            }else
+            // For AVCC, check that NALU length is coded on the same number of bytes
+            if(extraLen)
+            {
+                uint32_t nalSize2=ADM_getNalSizeH264(extra,extraLen);
+                if(nalSize2 != nalSize)
+                {
+                    ADM_warning("NAL unit length size mismatch: %u vs %u\n",nalSize2,nalSize);
+                    cut=ADM_EDITOR_CUT_POINT_MISMATCH;
+                    BOWOUT
+                }
+            }
+            // Get SPS info
+            // Check for in-band SPS first
+            // Identify the last keyframe of the segment. If in-band SPS is present, it will be there.
+            if(false==getFrameNumFromPtsOrBefore(vid, seg->_refStartTimeUs+seg->_durationUs-1, frame))
+            {
+                ADM_warning("Cannot identify the last frame in display order for segment %d\n",segNo);
+                BOWOUT
+            }
+            flags=0;
+            demuxer->getFlags(frame,&flags);
+            while(frame>0)
+            {
+                if(flags & AVI_KEY_FRAME) break;
+                demuxer->getFlags(--frame,&flags);
+            }
+            // Retrieve this keyframe
+            if(!demuxer->getFrame(frame,&img))
+            {
+                ADM_warning("Unable to get frame %d in ref %d, segment %d\n",frame,seg->_reference,segNo);
+                BOWOUT
+            }
+            spsLen1=0;
+            // Allocate buffer to hold copy of raw SPS data
+            if(!spsBuf1)
+                spsBuf1=new uint8_t[MAX_H264_SPS_SIZE];
+            memset(spsBuf1,0,MAX_H264_SPS_SIZE);
+            if(AnnexB)
+                spsLen1=getRawH264SPS_startCode(img.data, img.dataLength, spsBuf1, MAX_H264_SPS_SIZE);
+            else
+                spsLen1=getRawH264SPS(img.data, img.dataLength, nalSize, spsBuf1, MAX_H264_SPS_SIZE);
+            if(spsLen1)
+            {   /* If the next segment's ref video doesn't have in-band SPS
+                but this one does, we must check that the SPS matches
+                the global header. */
+                if(memcmp(spsBuf1, nextSegParamCache, (spsLen1 > nextSegParamCacheSize)? nextSegParamCacheSize : spsLen1))
+                {
+                    ADM_warning("In-band SPS before and after the cut point does not match? Checking deeper...\n");
+                    ADM_SPSInfo tmpinfo;
+                    if(!extractSPSInfoFromData(spsBuf1, spsLen1, &tmpinfo) || !getH264SPSInfo(vid,&tmpinfo))
+                    {
+                        ADM_warning("Cannot retrieve H.264 SPS info for segment %u\n",segNo);
+                        BOWOUT
+                    }
+                    // Update SPS info used to parse slice header later
+                    match=true;
+                    MATCH(width)
+                    MATCH(height)
+                    MATCH(hasPocInfo)
+                    MATCH(log2MaxFrameNum)
+                    MATCH(log2MaxPocLsb)
+                    MATCH(frameMbsOnlyFlag)
+                    MATCH(refFrames)
+                    if(!match && !spsLen2)
+                    {
+                        ADM_warning("SPS mismatch, saved video will be broken.\n");
+                        cut=ADM_EDITOR_CUT_POINT_MISMATCH;
+                        BOWOUT
+                    }
+#undef MATCH
+                }
+            }
+        }
+
+        ADM_info("Recovery distance: %u\n",recoveryDistance);
+        if(!recoveryDistance) // recovery point, check POC
+        {
+            if(poc2==-1)
+            {
+                ADM_warning("No POC to compare, only POC explicitely set in the slice header is supported.\n");
+                cut=ADM_EDITOR_CUT_POINT_KEY; // ??
+                BOWOUT
+            }
+            /* Get the POC of the last frame in stream order before the cut,
+            this is not necessarily the last displayed frame of the segment.
+            We need to start earlier and identify the cut point. */
+            uint32_t maxFrame,maxPtsFrame;
+            uint64_t maxPts;
+            if(false==findLastFrameBeforeSwitch(segNo,&maxFrame,&maxPtsFrame,&maxPts))
+            {
+                ADM_warning("Cannot identify the last frame before segment switch for segment %d\n",segNo);
+                BOWOUT
+            }
+            // maxFrame is now the last frame before segment switch.
+            // We need poc_lsb of this frame to get poc_msb right.
+            if(!demuxer->getFrame(maxFrame,&img))
+            {
+                ADM_warning("Unable to get frame %d in ref %d, segment %d\n",frame,seg->_reference,segNo);
+                BOWOUT
+            }
+            // Try to get POC, recovery distance doesn't matter here
+            poc1 = -1; // POC of the last frame before the cut
+            outcome=false;
+            if(AnnexB)
+                outcome=extractH264FrameType_startCode(img.data, img.dataLength, &(img.flags), &poc1, &sps, NULL);
+            else
+                outcome=extractH264FrameType(img.data, img.dataLength, nalSize, &(img.flags), &poc1, &sps, NULL);
+            if(!outcome)
+            {
+                ADM_warning("Cannot get H.264 frame type and Picture Order Count Least Significant Bits value.\n");
+                BOWOUT
+            }
+            if(poc1==-1)
+            {
+                ADM_warning("Cannot get POC, only POC explicitely set in the slice header is supported.\n");
+                BOWOUT
+            }
+            /* Calculate poc_msb, the discontinuity of poc_lsb at the cut point
+            may easily result in poc_msb incrementing or decrementing across the cut
+            due to poc_lsb wrapping around. */
+            const int maxPocLsb = 1 << sps.log2MaxPocLsb;
+            int pocMsb = 0;
+            if(poc1 > poc2 && poc1 - poc2 >= maxPocLsb/2)
+                pocMsb += maxPocLsb;
+            else if(poc2 > poc1 && poc2 - poc1 > maxPocLsb/2)
+                pocMsb -= maxPocLsb;
+
+            ADM_info("POC of the last frame %d in stream order of the previous seg: %d + %d = %d\n",
+                    frame, pocMsb, poc1, pocMsb + poc1);
+
+            int delta = poc1 - pocMsb - poc2;
+
+            /* If delta is positive, the cut is bad and we don't need to check POC of other frames.
+            If delta is negative (POC increasese across the cut), playback won't get stuck, but we
+            need to check whether POC ranges overlap which may result in pictures from both segments
+            displayed interleaved. */
+            if(delta>0)
+            {
+                ADM_warning("Saved video won't be smoothly playable in FFmpeg-based players (POC going back by %d)\n",delta);
+                cut=ADM_EDITOR_CUT_POINT_BAD_POC;
+                BOWOUT
+            }
+
+            cut=ADM_EDITOR_CUT_POINT_KEY;
+
+            if(!maxPts || maxPtsFrame==-1)
+            {
+                ADM_warning("Cannot identify the last frame in display order before the cut for segment %d\n",segNo);
+                BOWOUT
+            }
+            if(!demuxer->getFrame(maxPtsFrame,&img))
+            {
+                ADM_warning("Unable to get frame %d in ref %d, segment %d\n",frame,seg->_reference,segNo);
+                BOWOUT
+            }
+            // Got our frame, get poc_lsb of the slice
+            maxpoc1=-1;
+            outcome=false;
+            if(AnnexB)
+                outcome=extractH264FrameType_startCode(img.data, img.dataLength, &(img.flags), &maxpoc1, &sps, NULL);
+            else
+                outcome=extractH264FrameType(img.data, img.dataLength, nalSize, &(img.flags), &maxpoc1, &sps, NULL);
+            if(!outcome)
+            {
+                ADM_warning("Cannot get H.264 frame type and Picture Order Count Least Significant Bits value.\n");
+                BOWOUT
+            }
+
+            if(maxpoc1==-1)
+            {
+                ADM_warning("Cannot get POC, only POC explicitely set in the slice header is supported.\n");
+                BOWOUT // or should the check fail instead?
+            }
+
+            /* Check that POC doesn't go back, i.e. max POC before the cut is less
+            than min POC after segment switch. First check that poc_msb is still valid. */
+            int prevPocMsb=0;
+            if(maxpoc1 > poc1 && maxpoc1 - poc1 >= maxPocLsb/2)
+                prevPocMsb += maxPocLsb;
+            else if(poc1 > maxpoc1 && poc1 - maxpoc1 > maxPocLsb/2)
+                prevPocMsb -= maxPocLsb;
+
+            ADM_info("POC of the last frame %d in display order of the previous seg: %d + %d = %d\n",
+                    frame, prevPocMsb, maxpoc1, prevPocMsb + maxpoc1);
+
+            poc1 += prevPocMsb;
+
+            if(poc2 > minpoc2 && poc2 - minpoc2 >= maxPocLsb/2)
+                pocMsb += maxPocLsb;
+            else if(minpoc2 > poc2 && minpoc2 - poc2 > maxPocLsb/2)
+                pocMsb -= maxPocLsb;
+
+            ADM_info("POC of the earliest frame %d in display order of the current seg: %d + %d = %d\n",
+                    frame, pocMsb, poc2, pocMsb + poc2);
+
+            poc2 += pocMsb;
+
+            delta=poc1-poc2;
+            if(delta>0)
+            {
+                ADM_warning("Saved video will exhibit flicker at cut point in FFmpeg-based players (POC overlap by %d)\n",delta);
+                cut=ADM_EDITOR_CUT_POINT_BAD_POC;
+                BOWOUT
+            }
+        }
+    }
+
+    if(isH265Compatible(info.fcc))
+    {
+        int poc1,maxpoc1,poc2,minpoc2;
+        // In HEVC, we check only for POC going back.
+        // Get SPS to be able to decode the slice header
+        ADM_SPSinfoH265 sps;
+        if(!getH265SPSInfo(vid,&sps))
+        {
+            ADM_warning("Cannot retrieve SPS info.\n");
+            BOWOUT
+        }
+        // Determine stream type
+        bool AnnexB=false;
+        uint8_t *extra;
+        uint32_t extraLen=0;
+        uint32_t nalSize=0;
+        demuxer->getExtraHeaderData(&extraLen,&extra);
+        if(!extraLen)
+            AnnexB=true;
+        else
+            nalSize=ADM_getNalSizeH265(extra,extraLen);
+        // Allocate memory to hold compressed frame
+        ADMCompressedImage img;
+        buffer=new uint8_t[MAX_FRAME_LENGTH];
+        img.data=buffer;
+        // With HEVC we need to check the preceding segment first
+        ADM_info("Getting previous segment, current segment number: %d\n",segNo);
+        ADM_assert(segNo>0);
+        segNo--;
+        seg=_segments.getSegment(segNo);
+        vid=_segments.getRefVideo(seg->_reference);
+        demuxer=vid->_aviheader;
+        oldFrame=vid->lastSentFrame;
+        uint32_t rememberCurrent=frame;
+        uint32_t rememberLastSent=oldFrame;
+
+        if(false==switchToSegment(segNo,true))
+        {
+            ADM_warning("Cannot check the previous segment %d\n",segNo);
+            BOWOUT
+        }
+        // Not the same ref video?
+        if(seg->_reference!=refNo)
+        {
+            // Does the codec match?
+            demuxer->getVideoInfo(&info);
+            if(!isH265Compatible(info.fcc))
+            {
+                ADM_error("Codec mismatch!\n");
+                cut=ADM_EDITOR_CUT_POINT_MISMATCH;
+                BOWOUT
+            }
+            // Check that stream types match
+            extraLen=0;
+            demuxer->getExtraHeaderData(&extraLen,&extra);
+            if(!extraLen != AnnexB) // FIXME stream filter setup should be per segment
+            {
+                ADM_warning("Combining AVCC and AnnexB type HEVC streams is currently not supported.\n");
+                cut=ADM_EDITOR_CUT_POINT_MISMATCH;
+                BOWOUT
+            }
+            // For HVCC, check that NALU length is coded on the same number of bytes
+            if(extraLen)
             {
-                gotSps=false;
-                if(AnnexB)
-                {
-                    if(!demuxer->getFrame(0,&img))
-                    {
-                        ADM_warning("Unable to get the first frame in ref %d, segment %d\n",seg->_reference,segNo);
-                        BOWOUT
-                    }
-                    int nbNalu=ADM_splitNalu(img.data, img.data+img.dataLength, MAX_NALU_TO_CHECK, desc);
-                    int spsIndex=ADM_findNalu(NAL_SPS,nbNalu,desc);
-                    if(spsIndex!=-1)
-                        gotSps=extractSPSInfo(desc[spsIndex].start, desc[spsIndex].size, &sps2);
-                }else
+                uint32_t nalSize2=ADM_getNalSizeH265(extra,extraLen);
+                if(nalSize2 != nalSize)
                 {
-                    gotSps=extractSPSInfo(extra,extraLen,&sps2);
-                }
-                if(!gotSps)
-                {
-                    ADM_warning("Cannot retrieve SPS info for H.264 ref video in segment %d\n",segNo);
+                    ADM_warning("NAL unit length size mismatch: %u vs %u\n",nalSize2,nalSize);
+                    cut=ADM_EDITOR_CUT_POINT_MISMATCH;
                     BOWOUT
                 }
-                // Store the decoded SPS info in the cache
-                vid->paramCacheSize=sizeof(ADM_SPSInfo);
-                vid->paramCache=new uint8_t[vid->paramCacheSize]; // will be destroyed with the video
-                memcpy(vid->paramCache,&sps2,sizeof(ADM_SPSInfo));
+            }
+            // Get SPS info
+            ADM_SPSinfoH265 sps2;
+            if(!getH265SPSInfo(vid,&sps2))
+            {
+                ADM_warning("Cannot retrieve SPS info for HEVC ref video in segment %d\n",segNo);
+                BOWOUT
             }
             // We have SPS, does it match the one from the next segment?
-            // Check at least the fields we use here.
+            // Width and height match for sure, check remaining fields.
 #define MATCH(x) if(sps.x != sps2.x) { ADM_warning("%s value does not match.\n",#x); match=false; }
             bool match=true;
-            MATCH(hasPocInfo)
-            MATCH(log2MaxFrameNum)
-            MATCH(log2MaxPocLsb)
-            MATCH(frameMbsOnlyFlag)
-            MATCH(refFrames)
+            MATCH(fps1000)
+            MATCH(log2_max_poc_lsb)
+            MATCH(separate_colour_plane_flag)
+            MATCH(num_extra_slice_header_bits)
+            MATCH(dependent_slice_segments_enabled_flag)
+            MATCH(output_flag_present_flag)
+            MATCH(field_info_present)
+            MATCH(address_coding_length)
             if(!match)
             {
                 ADM_warning("SPS mismatch, saved video will be broken.\n");
                 cut=ADM_EDITOR_CUT_POINT_MISMATCH;
                 BOWOUT
             }
-            // Not a recovery point and marked as keyframe?
-            if(recoveryDistance==NO_RECOVERY_INFO && (img.flags & AVI_FRAME_TYPE_MASK)==AVI_KEY_FRAME)
-            {
-                ADM_info("IDR verified, the cut point should be fine.\n");
-                cut=ADM_EDITOR_CUT_POINT_IDR;
-                BOWOUT
-            }
         }
 
-        ADM_info("Recovery distance: %u\n",recoveryDistance);
-        if(!recoveryDistance) // recovery point, check POC
+        // Get the POC of the last frame in stream order before the cut,
+        uint32_t maxFrame,maxPtsFrame;
+        uint64_t maxPts=0;
+        if(false==findLastFrameBeforeSwitch(segNo,&maxFrame,&maxPtsFrame,&maxPts) ||
+            (int)maxFrame==-1 || (int)maxPtsFrame==-1 || !maxPts)
         {
-            if(poc==-1)
-            {
-                ADM_warning("No POC to compare, only POC explicitely set in the slice header is supported.\n");
-                cut=ADM_EDITOR_CUT_POINT_IDR; // ??
-                BOWOUT
-            }
-            ADM_info("poc_lsb for frame %d: %d\n",frame,poc);
-            // Get the POC of the last frame in display order
-            if(false==getFrameNumFromPtsOrBefore(vid, seg->_refStartTimeUs+seg->_durationUs-1, frame))
-            {
-                ADM_warning("Cannot identify the last frame in display order for segment %d\n",segNo);
-                BOWOUT
-            }
-            if(!demuxer->getFrame(frame,&img))
+            ADM_warning("Cannot identify the last frame before segment switch for segment %d\n",segNo);
+            BOWOUT
+        }
+        // maxFrame is now the last frame before segment switch.
+        // If maxPts happens earlier, we must start there.
+        if(maxFrame>maxPtsFrame && maxFrame-maxPtsFrame>16)
+            maxPtsFrame=maxFrame; // invalidate maxPtsFrame
+        frame=(maxPtsFrame < maxFrame && maxFrame-maxPtsFrame < 16)? maxPtsFrame : maxFrame;
+
+        // Try to get POC, we start either at the last frame in display order
+        // or in stream order before the cut, whichever comes first.
+        poc1 = INT_MIN;
+        maxpoc1 = poc1;
+        bool outcome=false;
+        for(int i=frame; i<=maxFrame; i++)
+        {
+            if(!demuxer->getFrame(i,&img))
             {
-                ADM_warning("Unable to get frame %d in ref %d, segment %d\n",frame,seg->_reference,segNo);
+                ADM_warning("Unable to get frame %d in ref %d, segment %d\n",i,seg->_reference,segNo);
                 BOWOUT
             }
-            // Try to get POC, recovery distance doesn't matter here
-            int poc2 = -1;
-            outcome=false;
             if(AnnexB)
-                outcome=extractH264FrameType_startCode(img.data, img.dataLength, &(img.flags), &poc2, &sps, NULL);
+                outcome=extractH265FrameType_startCode(img.data, img.dataLength, &sps, &(img.flags), &poc1);
             else
-                outcome=extractH264FrameType(img.data, img.dataLength, &(img.flags), &poc2, &sps, NULL);
+                outcome=extractH265FrameType(img.data, img.dataLength, nalSize, &sps, &(img.flags), &poc1);
             if(!outcome)
             {
-                ADM_warning("Cannot get H.264 frame type and Picture Order Count Least Significant Bits value.\n");
+                ADM_warning("Cannot get HEVC frame type and Picture Order Count value.\n");
                 BOWOUT
             }
+            if(poc1 > maxpoc1)
+                maxpoc1 = poc1;
+        }
+        // We are done with this segment, restore the last sent frame
+        vid->lastSentFrame=oldFrame;
+        // Switch back to the segment after the cutpoint
+        segNo++;
+        if(false==switchToSegment(segNo,true))
+        {
+            ADM_warning("Cannot return to the current segment %d\n",segNo);
+            BOWOUT
+        }
+        // Restore
+        frame=rememberCurrent;
+        vid->lastSentFrame=rememberLastSent;
+        // Get the frame we are interested in.
+        if(!demuxer->getFrame(frame,&img))
+        {
+            ADM_warning("Unable to get frame %d in ref %d, segment %d\n",frame,seg->_reference,segNo);
+            BOWOUT
+        }
+        poc2=poc1; // POC of the first frame after the cut
+        outcome=false;
+        if(AnnexB)
+            outcome=extractH265FrameType_startCode(img.data, img.dataLength, &sps, &(img.flags), &poc2);
+        else
+            outcome=extractH265FrameType(img.data, img.dataLength, nalSize, &sps, &(img.flags), &poc2);
+        if(!outcome)
+        {
+            ADM_warning("Cannot get HEVC frame type and Picture Order Count value.\n");
+            BOWOUT
+        }
 
-            cut=ADM_EDITOR_CUT_POINT_IDR;
+        if((img.flags & AVI_KEY_FRAME) && (img.flags &AVI_IDR_FRAME)) // IDR verified, POC doesn't matter
+        {
+            cut=ADM_EDITOR_CUT_POINT_KEY;
+            BOWOUT
+        }
 
-            if(poc2==-1)
-            {
-                ADM_warning("Cannot get POC, only POC explicitely set in the slice header is supported.\n");
-                BOWOUT // or should the check fail instead?
-            }
-            ADM_info("poc_lsb of the last frame in display order of the previous seg = %d\n",poc2);
-            // Check that POC doesn't go back
-            int maxPocLsb = 1 << sps.log2MaxPocLsb;
-            int pocMsb = 0;
-            if(poc2 > poc && poc2 - poc >= maxPocLsb/2)
-                pocMsb += maxPocLsb;
-            else if(poc > poc2 && poc - poc2 > maxPocLsb/2)
-                pocMsb -= maxPocLsb;
-            int delta = poc2 - pocMsb - poc;
-            delta += 2*sps.refFrames; // unsure
-            if(delta>0)
+        int delta = poc1 - poc2;
+        if(delta>0)
+        {
+            ADM_warning("Saved video won't be smoothly playable in FFmpeg-based players (POC going back by %d)\n",delta);
+            cut=ADM_EDITOR_CUT_POINT_BAD_POC;
+            BOWOUT
+        }
+
+        /* Calculate the minimum POC among the early B-frames following
+        the first frame of the segment. Overlapping POC ranges may result
+        in dropped pictures, considerable artifacts and stutter. */
+
+        minpoc2 = INT_MAX;
+        uint32_t delay;
+        int earliest;
+
+        if(getOpenGopDelayForSegment(segNo,0,&delay,&earliest) && earliest>frame)
+        {
+            for(int i=frame+1; i<=earliest; i++)
             {
-                ADM_warning("Saved video won't be smoothly playable in FFmpeg-based players (POC going back by %d)\n",delta);
-                cut=ADM_EDITOR_CUT_POINT_RECOVERY;
-                BOWOUT
+                if(!demuxer->getFrame(i,&img))
+                {
+                    ADM_warning("Unable to get frame %d in ref %d, segment %d\n",i,seg->_reference,segNo);
+                    BOWOUT
+                }
+                if(AnnexB)
+                    outcome=extractH265FrameType_startCode(img.data, img.dataLength, &sps, &(img.flags), &poc2);
+                else
+                    outcome=extractH265FrameType(img.data, img.dataLength, nalSize, &sps, &(img.flags), &poc2);
+                if(!outcome)
+                {
+                    ADM_warning("Cannot get HEVC frame type and Picture Order Count value.\n");
+                    BOWOUT
+                }
+                if(poc2 < minpoc2)
+                    minpoc2 = poc2;
             }
         }
+        delta=0;
+        if(minpoc2 != INT_MAX)
+            delta = maxpoc1 - minpoc2;
+        if(delta>0)
+        {
+            ADM_warning("Saved video will exhibit flicker at cut point in FFmpeg-based players (POC overlap by %d)\n",delta);
+            cut=ADM_EDITOR_CUT_POINT_BAD_POC;
+            BOWOUT
+        }
     }
-    // TODO: check HEVC
-    cut=ADM_EDITOR_CUT_POINT_IDR;
+    cut=ADM_EDITOR_CUT_POINT_KEY;
     BOWOUT
 }
 /**
@@ -399,7 +1035,7 @@
     for(int i=0;i<nbSeg;i++)
     {
         success=checkSegmentStartsOnIntra(i);
-        if(success!=ADM_EDITOR_CUT_POINT_IDR)
+        if(success!=ADM_EDITOR_CUT_POINT_KEY)
             break;
     }
     return success;
@@ -434,12 +1070,12 @@
         vid->_aviheader->getVideoInfo(&here);
         if(!checkCodec(&here,&first))
             return ADM_EDITOR_CUT_POINT_MISMATCH;
-        return ADM_EDITOR_CUT_POINT_IDR;
+        return ADM_EDITOR_CUT_POINT_KEY;
     }
     for(int i=startSeg;i<segNo;i++)
     {
         success=checkSegmentStartsOnIntra(i+1);
-        if(success!=ADM_EDITOR_CUT_POINT_IDR)
+        if(success!=ADM_EDITOR_CUT_POINT_KEY)
             break;
     }
     return success;
@@ -464,26 +1100,31 @@
 /**
      \fn bFrameDroppable
 */
-static bool bFrameDroppable(uint32_t fcc,vidHeader *hdr,ADMCompressedImage *img=NULL)
+static bool bFrameDroppable(uint32_t fcc,_VIDEOS *vid,ADMCompressedImage *img=NULL)
 {
     if(isH264Compatible(fcc))
     {
         if(!img)
             return false;
+        if(img->flags & (AVI_STRUCTURE_TYPE_MASK+AVI_FIELD_STRUCTURE))
+            return false; // don't drop fields
         if(img->flags & AVI_NON_REF_FRAME)
             return true; // the demuxer has done the job for us
         uint32_t maxSize=img->dataLength;
         maxSize+=512; // arbitrary safety margin
         uint32_t size=maxSize;
+        uint32_t nalSize=0;
         notStackAllocator buf(maxSize);
         bool AnnexB=false;
-        if(hdr)
+        if(vid && vid->_aviheader)
         {
             uint8_t *extra;
             uint32_t extraLen=0;
-            hdr->getExtraHeaderData(&extraLen,&extra);
+            vid->_aviheader->getExtraHeaderData(&extraLen,&extra);
             if(!extraLen)
                 AnnexB=true;
+            else
+                nalSize=ADM_getNalSizeH264(extra,extraLen);
         }
         if(AnnexB)
             size=ADM_convertFromAnnexBToMP4(img->data,img->dataLength,buf.data,maxSize);
@@ -491,7 +1132,13 @@
             memcpy(buf.data,img->data,img->dataLength);
         if(size)
         {
-            if(extractH264FrameType(buf.data,size,&(img->flags),NULL,NULL) && (img->flags & AVI_NON_REF_FRAME))
+            ADM_SPSInfo sps;
+            bool gotSps=getH264SPSInfo(vid,&sps);
+            if(!gotSps)
+                ADM_warning("No SPS info available to check fields.\n");
+            if(extractH264FrameType(buf.data, size, nalSize, &(img->flags), NULL, gotSps? &sps : NULL,NULL) &&
+                    (img->flags & AVI_NON_REF_FRAME) &&
+                    !(img->flags & (AVI_STRUCTURE_TYPE_MASK+AVI_FIELD_STRUCTURE)))
                 return true;
         }
         return false;
@@ -500,6 +1147,102 @@
       return false;    
     return true;
 }
+
+/**
+ *  \fn getOpenGopDelayForSegment
+ */
+bool ADM_Composer::getOpenGopDelayForSegment(uint32_t segNo, uint64_t segTime, uint32_t *delay, int *frameNo)
+{
+    _SEGMENT *seg=_segments.getSegment(segNo);
+    ADM_assert(seg);
+    _VIDEOS *vid=_segments.getRefVideo(seg->_reference);
+    ADM_assert(vid);
+    vidHeader *demuxer=vid->_aviheader;
+    ADM_assert(demuxer);
+    uint64_t pts,dts;
+
+    // Look ahead to see if we have some late bframe in the past
+    int found=-1;
+    int nb=demuxer->getMainHeader()->dwTotalFrames;
+    uint64_t refTime=segTime+seg->_refStartTimeUs;
+    if(!refTime)
+    {
+        found=0;
+        demuxer->getPtsDts(0,&pts,&dts);
+    }else
+    {
+        for(int i=0;i<nb;i++)
+        {
+            demuxer->getPtsDts(i,&pts,&dts);
+            if(pts==refTime)
+            {
+                found=i;
+                break;
+            }
+        }
+    }
+    if(found==-1)
+    {
+        ADM_warning("Cannot find the frame for segment %" PRIu32"\n",segNo);
+        return false;
+    }
+
+    bool trustDemuxer=false;
+    int frame=-1;
+    aviInfo info;
+    demuxer->getVideoInfo(&info);
+
+    for(int i=found+1; i < found + MAX_REF_FRAMES_FIELDS; i++)
+    {
+        uint32_t flags;
+        demuxer->getFlags(i,&flags);
+        if(!trustDemuxer && (flags & AVI_B_FRAME))
+            trustDemuxer=true;
+        if((trustDemuxer && !(flags & AVI_B_FRAME)) || (flags & AVI_KEY_FRAME))
+        {
+            ADM_info("Not a bframe, stopping (%d)\n",i-found);
+            break;
+        }
+        demuxer->getPtsDts(i,&pts,&dts);
+        if(pts==ADM_NO_PTS) continue;
+        if(pts<refTime)
+        {
+            ADM_info("frame %d is early \n",i);
+            ADMCompressedImage img;
+#define ROUNDUP(x,y) (x+y-1)&~(y-1)
+            uint32_t len=ROUNDUP(info.width,16);
+            len*=ROUNDUP(info.height,16);
+            len*=3;
+            notStackAllocator buf(len);
+            img.flags=0;
+            img.data=buf.data;
+            img.dataLength=len;
+            if(demuxer->getFrame(i,&img))
+            {
+                if(bFrameDroppable(info.fcc,vid,&img))
+                    continue; // this frame will be dropped, no need to add delay
+            }
+            uint32_t delta=refTime-pts;
+            if(delta>*delay)
+            {
+                *delay=delta;
+                frame=i;
+            }
+        }else
+        {
+            ADM_info("Pts delta = %d\n",(int)(pts-refTime));
+        }
+    }
+    if(frameNo)
+        *frameNo=frame;
+    if(!segTime && refTime>*delay) // irrelevant for the first segment in range
+        seg->_refMinimumPts=refTime-*delay;
+ /* printf("Segment %u, start in ref at %s ",segNo,ADM_us2plain(seg->_refStartTimeUs));
+    printf("with offset %s ",ADM_us2plain(segTime));
+    printf("minimum PTS %s\n",(seg->_refMinimumPts!=ADM_NO_PTS)? ADM_us2plain(seg->_refMinimumPts) : "unset"); */
+    return true;
+}
+
 /**
  * 
  * @param time
@@ -517,7 +1260,6 @@
 bool        ADM_Composer::getNonClosedGopDelay(uint64_t time,uint32_t *delay)
 {
     aviInfo info;
-    int found=-1;
     uint32_t startSegNo;
     uint64_t segTime;
     *delay=0;
@@ -527,81 +1269,30 @@
         return false;
     }
 
+    _SEGMENT *seg=_segments.getSegment(startSegNo);
+    ADM_assert(seg);
+    _VIDEOS *vid=_segments.getRefVideo(seg->_reference);
+    ADM_assert(vid);
+    vidHeader *demuxer=vid->_aviheader;
+    ADM_assert(demuxer);
+    demuxer->getVideoInfo(&info);
+    if(bFrameDroppable(info.fcc,NULL))
+        return true; // no need to add extra delay
+
+    bool found=false;
+
     for(uint32_t segNo=startSegNo; segNo < _segments.getNbSegments(); segNo++)
     {
-        _SEGMENT *seg=_segments.getSegment(segNo);
-        ADM_assert(seg);
-        _VIDEOS *vid=_segments.getRefVideo(seg->_reference);
-        uint64_t pts,dts;
-
-        vid->_aviheader->getVideoInfo (&info);
-        if(bFrameDroppable(info.fcc,NULL))
-        {
-            return true; // no need to add extra delay
-        }
-        // Look ahead to see if we have some late bframe in the past
-        int nb=vid->_aviheader->getMainHeader ()->dwTotalFrames;
         if(segNo > startSegNo)
             segTime=0;
-        uint64_t refTime=segTime+seg->_refStartTimeUs;
-        found=-1;
-        if(!refTime)
-        {
-            found=0;
-            vid->_aviheader->getPtsDts(0,&pts,&dts);
-        }else
-        {
-            for(int i=0;i<nb;i++)
-            {
-                vid->_aviheader->getPtsDts (i,&pts,&dts);
-                if(pts==refTime)
-                {
-                    found=i;
-                    break;
-                }
-            }
-        }
-        if(found==-1)
-        {
-            ADM_warning("Cannot find the frame for segment %" PRIu32"\n");
+        uint32_t segDelay=0;
+        if(false == getOpenGopDelayForSegment(segNo,segTime,&segDelay))
             continue;
-        }
-        for(int i=found+1;i<found+16;i++)
-        {
-            uint32_t flags;
-            vid->_aviheader->getFlags(i,&flags);
-            if(!(flags & AVI_B_FRAME))
-            {
-                ADM_info("Not a bframe, stopping (%d)\n",i-found);
-                break;
-            }
-            vid->_aviheader->getPtsDts(i,&pts,&dts);
-            if(pts<refTime)
-            {
-                ADM_info("frame %d is early \n",i);
-                ADMCompressedImage img;
-#define ROUNDUP(x,y) (x+y-1)&~(y-1)
-                uint32_t len=ROUNDUP(info.width,16);
-                len*=ROUNDUP(info.height,16);
-                len*=3;
-                notStackAllocator buf(len);
-                img.flags=0;
-                img.data=buf.data;
-                img.dataLength=len;
-                if(vid->_aviheader->getFrame(i,&img))
-                {
-                    if(bFrameDroppable(info.fcc,vid->_aviheader,&img))
-                        break; // this frame will be dropped, no need to add delay
-                }
-                uint32_t delta=refTime-pts;
-                if(delta>*delay) *delay=delta;
-            }else
-            {
-                ADM_info("Pts delta = %d\n",(int)(pts-refTime));
-            }
-        }
+        if(segDelay>*delay)
+            *delay=segDelay;
+        found=true;
     }
-    if(found==-1)
+    if(!found)
         return false;
     ADM_info("Found maximum non closed gop delay = %d\n",*delay);
     return true;
@@ -618,24 +1309,15 @@
 
 
 */
-bool        ADM_Composer::getCompressedPicture(uint64_t start,uint64_t videoDelay,bool sanitize,ADMCompressedImage *img)
+bool        ADM_Composer::getCompressedPicture(uint64_t start,uint64_t videoDelay,ADMCompressedImage *img)
 {
     uint64_t tail;
     //
     int64_t signedPts;
     int64_t signedDts;
 
-#define MAX_EXTRA_DELAY 100000
-#define CATCH_UP_RATE 5000
-#define MAX_DESYNC_SCORE 20*100000
-#define DESYNC_THRESHOLD 20000
-#define ENOUGH 4
-
-    if(totalExtraDelay>=CATCH_UP_RATE)
-        totalExtraDelay-=CATCH_UP_RATE; // gradually reduce extra delay, CATCH_UP_RATE/1000 ms at a time
-
 againGet:
-    static uint32_t fn;
+    static uint32_t fn=0;
     fn++;
     _SEGMENT *seg=_segments.getSegment(_currentSegment);
     ADM_assert(seg);
@@ -650,16 +1332,13 @@
     {
         startFromPtsInRef=segTme+seg->_refStartTimeUs;
     }
-
-    // Prepare to deal with field-encoded streams
-    uint64_t timeIncrement=vid->timeIncrementInUs;
     // Get next pic?
     if(false==demuxer->getFrame (vid->lastSentFrame,img))
     {
         ADM_info("Failed to get next frame for ref %" PRIu32"\n",seg->_reference);
         goto nextSeg;
     }
-    aprintf("Got frame %d, PTS=%s ",vid->lastSentFrame,ADM_us2plain(img->demuxerPts));
+    aprintf("Got frame %d, flags=0x%04x PTS=%s ",vid->lastSentFrame,img->flags,ADM_us2plain(img->demuxerPts));
     aprintf("DTS=%s\n",ADM_us2plain(img->demuxerDts));
     vid->lastSentFrame++;
     //
@@ -708,7 +1387,7 @@
         {
             printf("[getCompressedPicture] Frame %d PTS is in the past vs segment start: %s /",vid->lastSentFrame,ADM_us2plain(img->demuxerPts));
             printf(" %s\n",ADM_us2plain(reftime));
-            if(bFrameDroppable(info.fcc,demuxer,img))
+            if(bFrameDroppable(info.fcc,vid,img))
             {
                 ADM_warning("Dropping frame %d\n",vid->lastSentFrame);
                 goto againGet;
@@ -745,7 +1424,6 @@
     }else
     {
             signedDts=(int64_t)img->demuxerDts;
-            signedDts+=totalExtraDelay;
             recalibrateSigned(&(signedDts),seg);
             aprintf("Signed Dts=%s ",ADM_us2plain(signedDts));
     }
@@ -757,13 +1435,9 @@
     }else
     {
             signedPts=(int64_t)img->demuxerPts;
-            signedPts+=totalExtraDelay;
             recalibrateSigned(&(signedPts),seg);
             aprintf("Signed Pts=%s\n",ADM_us2plain(signedPts));
     }
-    // Halve timeIncrement for field-encoded MPEG-2 streams...
-    if(isMpeg12Compatible(info.fcc) && img->flags & (AVI_STRUCTURE_TYPE_MASK+AVI_FIELD_STRUCTURE))
-        timeIncrement/=2;
     // From here we are in linear time, guess DTS if missing...
     if(signedDts==ADM_NO_PTS)
     {
@@ -780,95 +1454,50 @@
 	}
     }else
     {
-// It means that the incoming image is earlier than the expected time.
-// we add a bit of timeIncrement to compensate for rounding
-        if(sanitize && _nextFrameDts!=ADM_NO_PTS)
-        {
-            if(_nextFrameDts>(signedDts+(int64_t)(timeIncrement/3)))
-            {
-                double delta=_nextFrameDts-signedDts;
-                delta=fabs(delta);
-                if((uint64_t)delta<MAX_EXTRA_DELAY && totalExtraDelay<MAX_EXTRA_DELAY)
-                {
-                    ADM_warning("Frame %d DTS is going back in time, delaying it for %" PRIu64" us\n",(int)vid->lastSentFrame,(uint64_t)delta);
-                    signedDts=_nextFrameDts;
-                    totalExtraDelay+=(uint64_t)delta;
-                    ADM_info("total extra delay = %" PRIu64" us\n",totalExtraDelay);
-                    signedPts+=totalExtraDelay;
-                }else
-                {
-                    ADM_error("Frame %d DTS is going back in time: expected: %s : %d\n",
-                          (int)vid->lastSentFrame,
-                          ADM_us2plain(_nextFrameDts),
-                          (_nextFrameDts));
-                    ADM_error("and got %s : %d, timeIncrement=%d us, delta=%d\n",
-                          ADM_us2plain(signedDts),
-                          signedDts,(int)timeIncrement,
-                          (int)delta);
-                    uint64_t linearTime=img->demuxerPts-seg->_refStartTimeUs+seg->_startTimeUs;
-                    char msg[512+1];
-                    if(img->flags & AVI_KEY_FRAME)
-                    {
-                        snprintf(msg,512,QT_TRANSLATE_NOOP("adm",
-                            "Decode time stamp (DTS) collision affecting a keyframe at %s detected.\n"
-                            "Dropping a keyframe will result in severely corrupted video.\n"
-                            "Proceed anyway?"),ADM_us2plain(linearTime));
-                    }else
-                    {
-                        snprintf(msg,512,QT_TRANSLATE_NOOP("adm",
-                            "Decode time stamp (DTS) collision affecting a frame at %s detected.\n"
-                            "Dropping a frame may result in some video corruption.\n"
-                            "Proceed anyway?"),ADM_us2plain(linearTime));
-                    }
-                    if(warn_cnt>=0)
-                    {
-                        if(!GUI_Question(msg))
-                        {
-                            warn_cnt=0;
-                            desyncScore=0;
-                            totalExtraDelay=0;
-                            return false;
-                        }else
-                        {
-                            warn_cnt++;
-                        }
-                    }
-                    if(warn_cnt>ENOUGH)
-                    { // warn ENOUGH+1 times in a row then suggest going silent
-                        if(GUI_Question(QT_TRANSLATE_NOOP("adm","Do not warn again and drop frames silently while saving this video?")))
-                            warn_cnt=-1; // Yes: don't warn
-                        else
-                            warn_cnt=0; // No: ask again after ENOUGH+1 more warnings
-                    }
-
-                    goto againGet;
-                }
-            }
-        }
         _nextFrameDts=signedDts;
     }
     // Increase for next one
     if(ADM_NO_PTS!=_nextFrameDts)
-        _nextFrameDts+=timeIncrement;
-    // Check the DTS is not too late compared to next seg beginning...
-    if(_currentSegment+1<_segments.getNbSegments() && img->demuxerDts!=ADM_NO_PTS)
+        _nextFrameDts+=vid->timeIncrementInUs;
+    if(_currentSegment+1<_segments.getNbSegments())
     {
         _SEGMENT *nextSeg=_segments.getSegment(_currentSegment+1);
-        int64_t nextDts=nextSeg->_startTimeUs+nextSeg->_refStartDts;
-        if(nextDts<nextSeg->_refStartTimeUs)
+        ADM_assert(nextSeg);
+        // Check the DTS is not too late compared to next seg beginning...
+        if(signedDts!=ADM_NO_PTS)
         {
-            ADM_warning("%" PRIu32" next DTS is negative %" PRIu64" %" PRIu64" ms\n",fn,nextDts,nextSeg->_refStartTimeUs);
-        }else       
+            int64_t nextDts=nextSeg->_startTimeUs+nextSeg->_refStartDts;
+            if(nextDts<nextSeg->_refStartTimeUs)
+            {
+                ADM_warning("Frame %" PRIu32", next DTS is negative %" PRIu64" %" PRIu64" ms\n",fn,nextDts,nextSeg->_refStartTimeUs);
+            }else
+            {
+                nextDts-=nextSeg->_refStartTimeUs;
+                if(signedDts>=nextDts)
+                {
+                    ADM_warning("Frame %" PRIu32", have to switch segment, DTS limit reached %" PRIu64" %" PRIu64" ms\n",fn,signedDts/1000,nextDts/1000);
+                    goto nextSeg;
+                }
+            }
+        }
+        // Check that PTS does not collide with early B-frames,
+        // _refMinimumPts must be recalculated on every segment layout change!
+        if(signedPts!=ADM_NO_PTS)
         {
-            nextDts-=nextSeg->_refStartTimeUs;
-            if(signedDts>=nextDts)
+            int64_t nextPts=nextSeg->_startTimeUs+nextSeg->_refMinimumPts;
+            if(nextPts<nextSeg->_refStartTimeUs)
+            {
+                ADM_warning("Frame %" PRIu32", next PTS is negative %" PRIu64" %" PRIu64" ms\n",fn,nextPts,nextSeg->_refStartTimeUs);
+            }else
             {
-                ADM_warning("%" PRIu32" have to switch segment, DTS limit reached %" PRIu64" %" PRIu64"\n",fn,img->demuxerDts/1000,nextDts/1000);
-                goto nextSeg;
+                nextPts-=nextSeg->_refStartTimeUs;
+                if(signedPts>=nextPts)
+                {
+                    ADM_warning("Frame %" PRIu32", have to switch segment, PTS limit reached %" PRIu64" %" PRIu64" ms\n",fn,signedPts/1000,nextPts/1000);
+                    goto nextSeg;
+                }
             }
         }
-
-
     }
 // **
    // ADM_info("Frame after RECAL: Flags :%X, DTS:%"PRId64" PTS=%"PRId64" tail=%"PRId64"\n",img->flags,img->demuxerDts/1000,img->demuxerPts/1000,tail);
@@ -902,44 +1531,19 @@
     printf("Frame %" PRIu32", DTS=%s, PTS=%s, type: %s\n",vid->lastSentFrame-1,dtsAsString.c_str(),ptsAsString.c_str(),frameTypeAsString.c_str());
     }
 #endif
-    if(MAX_EXTRA_DELAY && totalExtraDelay>DESYNC_THRESHOLD && desyncScore>=0)
-    {
-        desyncScore+=(vid->timeIncrementInUs)*totalExtraDelay/MAX_EXTRA_DELAY;
-        aprintf("Desync score = %" PRId64"\n",desyncScore);
-    }
-    if(desyncScore>MAX_DESYNC_SCORE)
-    {
-        uint64_t linearTime=img->demuxerPts-seg->_refStartTimeUs+seg->_startTimeUs;
-        char msg[512+1];
-        snprintf(msg,512,QT_TRANSLATE_NOOP("adm",
-        "While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. "
-        "Would you like to continue nevertheless?"),ADM_us2plain(linearTime));
-        if(!GUI_Question(msg))
-        {
-            desyncScore=0;
-            totalExtraDelay=0;
-            warn_cnt=0;
-            return false;
-        }
-        desyncScore=-1; // ignore future desync
-    }
     return true;
 
 nextSeg:
     if(false==switchToNextSegment(true))
     {
         ADM_warning("Cannot update to new segment\n");
-        totalExtraDelay=0;
-        ADM_info("Accumulated desync score = %" PRId64"\n",desyncScore);
-        desyncScore=0;
-        warn_cnt=0;
         return false;
     }
     // Mark it as drop b frames...
     _SEGMENT *thisseg=_segments.getSegment(_currentSegment);
     thisseg->_dropBframes=_SEGMENT::ADM_DROP_MAYBE_AFER_SWITCH;
     ADM_info("Retrying for next segment\n");
-    return getCompressedPicture(start,videoDelay,sanitize,img);
+    return getCompressedPicture(start,videoDelay,img);
 }
 
 /**
@@ -965,3 +1569,76 @@
     }
    return true;
 }
+
+/**
+    \fn getDirectKeyFrameImageAtPts
+    \brief Find and retrieve compressed keyframe image at or just before given time,
+           needed to create global header from in-band parameter sets.
+*/
+bool ADM_Composer::getDirectKeyFrameImageAtPts(uint64_t time, ADMCompressedImage *img)
+{
+    uint32_t segNo;
+    uint64_t segTime;
+
+    if(false==_segments.convertLinearTimeToSeg(time,&segNo,&segTime))
+        return false;
+    _SEGMENT *seg=_segments.getSegment(segNo);
+    ADM_assert(seg);
+    _VIDEOS *vid=_segments.getRefVideo(seg->_reference);
+    ADM_assert(vid);
+    vidHeader *demuxer=vid->_aviheader;
+    ADM_assert(demuxer);
+
+    uint64_t refTime=segTime+seg->_refStartTimeUs;
+    if(refTime<=vid->firstFramePts)
+        return demuxer->getFrame(0,img);
+
+    int frame=0;
+    if(false==getFrameNumFromPtsOrBefore(vid,refTime,frame))
+        return false;
+    uint32_t flags=0;
+    demuxer->getFlags(frame,&flags);
+    while(frame>0 && !(flags & AVI_KEY_FRAME))
+        demuxer->getFlags(--frame,&flags);
+    return demuxer->getFrame(frame,img);
+}
+
+/**
+    \fn getUserDataUnregistered
+    \brief For H.264, libavcodec parses SEI messages of type user data unregistered to retrieve x264
+           version number to apply version-specific quirks. This function copies the NALU containing
+           this SEI message to buffer allocated by the caller.
+*/
+bool ADM_Composer::getUserDataUnregistered(uint64_t start, uint8_t *buffer, uint32_t max, uint32_t *length)
+{
+    uint32_t segNo;
+    uint64_t segTime;
+
+    if(false==_segments.convertLinearTimeToSeg(start,&segNo,&segTime))
+        return false;
+    _SEGMENT *seg=_segments.getSegment(segNo);
+    _VIDEOS *vid=_segments.getRefVideo(seg->_reference);
+    vidHeader *demuxer=vid->_aviheader;
+    aviInfo info;
+    demuxer->getVideoInfo(&info);
+    if(!isH264Compatible(info.fcc))
+        return false;
+    uint8_t *extra;
+    uint32_t extraLen=0;
+    demuxer->getExtraHeaderData(&extraLen,&extra);
+    if(!extraLen) // AnnexB
+        return false;
+    uint32_t nalSize=ADM_getNalSizeH264(extra,extraLen);
+    ADMCompressedImage img;
+    uint8_t *space=new uint8_t[MAX_FRAME_LENGTH];
+    img.data=space;
+    if(!demuxer->getFrame(0,&img))
+        return false;
+
+    bool r=extractH264SEI(img.data,img.dataLength,nalSize,buffer,max,length);
+
+    delete [] space;
+    space=NULL;
+    return r;
+}
+// EOF

avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/ADM_edit.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_editor/src/ADM_edit.cpp Changed

@@ -18,10 +18,7 @@
 #include "ADM_default.h"
 #include "A_functions.h"
 #include "ADM_audioFilterInterface.h"
-#include "audioEncoderApi.h"
-#include "ADM_muxerProto.h"
 #include "GUI_ui.h"
-#include "ADM_coreVideoFilterFunc.h"
 
 #include <fcntl.h>
 #include <errno.h>
@@ -33,15 +30,14 @@
 #include "DIA_coreToolkit.h"
 #include "prefs.h"
 
-//#include "ADM_outputfmt.h"
 #include "ADM_edPtsDts.h"
 #include "ADM_vidMisc.h"
 #include "ADM_confCouple.h"
 #include "ADM_videoFilters.h"
-#include "ADM_videoEncoderApi.h"
-#include "ADM_videoFilterApi.h"
 #include "ADM_coreVideoFilterFunc.h"
+#include "ADM_coreVideoEncoder.h"
 #include "ADM_coreDemuxer.h"
+#include "ADM_aacinfo.h"
 
 //#define TEST_MPEG2DEC
 /**
@@ -62,9 +58,6 @@
   markerAPts = 0;
   markerBPts = 0;
   stats.reset();
-
-    totalExtraDelay=0;
-    desyncScore=0;
 }
 /**
 	Remap 1:1 video to segments
@@ -153,6 +146,244 @@
     currentProjectName=pj;
     return true;
 }
+
+/**
+    \fn checkStdTimeBase
+    \brief Try to replace timebase denominator with a standard value.
+*/
+static bool checkStdTimeBase(uint32_t &num, uint32_t &den)
+{
+    if(!num || !den)
+        return false;
+    if(den>num && !(den%num))
+    {
+        switch(den/num)
+        {
+            case 24: case 25: case 30: case 50: case 60:
+                den/=num;
+                num=1000;
+                den*=1000;
+                return true;
+            default:break;
+        }
+    }
+#define MAX_STD_CLOCK_FREQ 90000
+    switch(den)
+    {
+        case 24000: case 25000: case 30000: case 50000:
+            return true; // nothing to do
+        case 48000:
+            if(num>1 && !(num&1))
+            {
+                num>>=1;
+                den>>=1;
+                return true;
+            }
+            break;
+        case 90000:
+            if(num>=18 && !(num%18))
+            {
+                num/=18;
+                num*=5;
+                den=25000;
+                break;
+            }
+            if(num>=3 && !(num%3))
+            {
+                num/=3;
+                den=30000;
+            }
+            break;
+        case 180000:
+            if(num>1 && !(num&1))
+            {
+                num>>=1;
+                den=90000;
+                return checkStdTimeBase(num,den);
+            }
+            break;
+        case 10000000:
+            {
+                den/=10;
+                num/=10;
+                if(!num) num=1;
+                return checkStdTimeBase(num,den);
+            }
+            break;
+        case 1000000:
+            {
+                int n,d;
+                usSecondsToFrac(num,&n,&d,MAX_STD_CLOCK_FREQ);
+                num=n;
+                den=d;
+            }
+            break;
+        case 600: // libavformat doesn't like low timebase clocks
+            num*=50;
+            den=30000;
+            break;
+        case 1200:
+            num*=25;
+            den=30000;
+            return true;
+        case 2400:
+            num*=10;
+            den=24000;
+            return true;
+        default: break;
+    }
+    /* some old AVI samples clock insanely high */
+    if(den>=1000000)
+    {
+        double us=num;
+        us*=1000.;
+        us/=den;
+        us*=1000.;
+        us+=0.49;
+        int n,d;
+        usSecondsToFrac((uint64_t)us,&n,&d,MAX_STD_CLOCK_FREQ);
+        num=n;
+        den=d;
+    }
+    return true;
+}
+
+/**
+    \fn getTimeBase
+*/
+bool ADM_Composer::getTimeBase(uint32_t *scale, uint32_t *rate, bool copyMode)
+{
+    /* Using MPEG timescale as fallback */
+    *scale=1;
+    *rate=MAX_STD_CLOCK_FREQ;
+    /* Which segments does the selection span? */
+    uint64_t segTime,start,end;
+    start=getMarkerAPts();
+    end=getMarkerBPts();
+    if(start>end)
+    {
+        uint64_t tmp=end;
+        end=start;
+        start=tmp;
+    }
+    uint32_t firstSeg,lastSeg;
+    if(false==_segments.convertLinearTimeToSeg(start,&firstSeg,&segTime))
+        return false;
+    if(false==_segments.convertLinearTimeToSeg(end,&lastSeg,&segTime))
+        return false;
+
+    /* Which unique ref videos do we need to check for timebase compatibility? */
+    std::vector <uint32_t> ListOfRefs;
+
+    for(uint32_t i=firstSeg; i<=lastSeg; i++)
+    {
+        _SEGMENT *s=_segments.getSegment(i);
+        ADM_assert(s);
+        bool skip=false;
+        for(int i=0;i<ListOfRefs.size();i++)
+        {
+            if(ListOfRefs.at(i)==s->_reference)
+                skip=true;
+        }
+        if(skip) continue;
+        ListOfRefs.push_back(s->_reference);
+    }
+    if(ListOfRefs.empty())
+        return false;
+    uint32_t myscale,myrate;
+    for(int i=0;i<ListOfRefs.size();i++)
+    {
+        _VIDEOS *vid=_segments.getRefVideo(ListOfRefs.at(i));
+        ADM_assert(vid);
+        ADM_info("Ref video %u is %s-encoded, copy mode: %d\n",ListOfRefs.at(i),vid->fieldEncoded? "field" : "frame",copyMode);
+        vidHeader *demuxer=vid->_aviheader;
+        ADM_assert(demuxer);
+        aviInfo info;
+        demuxer->getVideoInfo(&info);
+        if(!i)
+        {
+            myscale=info.timebase_num;
+            myrate=info.timebase_den;
+            if(false==checkStdTimeBase(myscale,myrate))
+                return false;
+            if(vid->fieldEncoded && !copyMode)
+            {
+                switch(myrate)
+                {
+                    case 60000:
+                    case 50000:
+                    case 48000:
+                        ADM_info("Halving timebase denominator %u for field-encoded ref video.\n",myrate);
+                        myrate/=2;
+                        break;
+                    default:
+                        ADM_info("Doubling timebase numerator %u for field-encoded ref video.\n",myscale);
+                        myscale*=2;
+                        break;
+                }
+            }
+            continue;
+        }
+        /* FIXME properly reduce fractions when checking timebase */
+        if(false==checkStdTimeBase(info.timebase_num,info.timebase_den))
+            return false;
+        if(vid->fieldEncoded && !copyMode)
+        {
+            switch(info.timebase_den)
+            {
+                case 60000:
+                case 50000:
+                case 48000:
+                    ADM_info("Halving timebase denominator %u for appended field-encoded ref video.\n",info.timebase_den);
+                    info.timebase_den/=2;
+                    break;
+                default:
+                    ADM_info("Doubling timebase numerator %u for appended field-encoded video.\n",info.timebase_num);
+                    info.timebase_num*=2;
+                    break;
+            }
+        }
+        if(info.timebase_den == myrate)
+        {
+            if(info.timebase_num < myscale)
+            {
+                if(info.timebase_num > 1 && !(myscale % info.timebase_num))
+                    myscale = info.timebase_num;
+                else
+                    myscale = 1;
+            }
+        }else if(info.timebase_den > myrate)
+        {
+            if(!(info.timebase_den % myrate))
+            {
+                uint32_t mult = info.timebase_den / myrate;
+                myrate = info.timebase_den;
+                myscale *= mult;
+            }else
+            {
+                ADM_warning("Timebase mismatch: %u / %u (new) %u / %u (old)\n",info.timebase_num,info.timebase_den,myscale,myrate);
+                myrate = MAX_STD_CLOCK_FREQ;
+                myscale = 1;
+                break;
+            }
+        }else
+        {
+            if(myrate % info.timebase_den)
+            {
+                ADM_warning("Timebase mismatch: %u / %u (new) %u / %u (old)\n",info.timebase_num,info.timebase_den,myscale,myrate);
+                myrate = MAX_STD_CLOCK_FREQ;
+                myscale = 1;
+                break;
+            }
+        }
+    }
+    ADM_info("Timebase set to %u / %u\n",myscale,myrate);
+    *scale=myscale;
+    *rate=myrate;
+
+    return true;
+}
+
 /**
     \fn addFile
     \brief	Load or append a file.	The file type is determined automatically and the ad-hoc video decoder is spawned
@@ -335,7 +566,7 @@
   else
     {
         // Read and construct the audio tracks for that videos
-      uint32_t extraLen;
+      uint32_t extraLen=0;
       uint8_t  *extraData;
       ADM_audioStream *stream;
       WAVHeader *header;
@@ -386,7 +617,14 @@
             }
 
             if((track->wavheader).encoding==WAV_AAC)
+            {
+                uint32_t samples=AAC_DEFAULT_FRAME_LENGTH;
+                AacAudioInfo aac;
                 track->isbr=checkSamplingFrequency(track);
+                if(track->isbr || (ADM_getAacInfoFromConfig(extraLen,extraData,aac) && aac.sbr))
+                    samples<<=1;
+                stream->setSamplesPerPacket(samples);
+            }
 
             thisVid->audioTracks.push_back(track);
             if(!_segments.getNbRefVideos()) // 1st video..
@@ -567,10 +805,26 @@
 /**
     \fn getFrameIncrement
 */
-uint64_t ADM_Composer::getFrameIncrement(void)
+uint64_t ADM_Composer::getFrameIncrement(bool copyMode)
 {
-    if (!_segments.getNbSegments()) return 0;
-    return _segments.getRefVideo(0)->timeIncrementInUs;
+    int nb = _segments.getNbRefVideos();
+    if(!nb) return 0;
+    uint64_t minIncrement = 0;
+    for(int i=0; i<nb; i++)
+    {
+        _VIDEOS *vid = _segments.getRefVideo(i);
+        ADM_assert(vid);
+        uint64_t inc = vid->timeIncrementInUs;
+        if(!inc) continue;
+        if(!copyMode && vid->fieldEncoded)
+        {
+            ADM_info("Doubling frame increment for field-encoded ref video %d\n",i);
+            inc *= 2;
+        }
+        if(!minIncrement | (inc < minIncrement))
+            minIncrement = inc;
+    }
+    return minIncrement;
 }
 /**
 	Set decoder settings (post process/swap u&v...)

avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/ADM_segment.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_editor/src/ADM_segment.cpp Changed

@@ -98,105 +98,122 @@
 */
 bool        ADM_EditorSegment::addReferenceVideo(_VIDEOS *ref)
 {
-  uint32_t    	l;
-  uint8_t 	    *d;
-  aviInfo       info;
-  _SEGMENT      seg;
-  uint32_t      cacheSize;
-
-  if(false==prefs->get(FEATURES_CACHE_SIZE,&cacheSize))
-      cacheSize = EDITOR_CACHE_MAX_SIZE;
-  if(cacheSize > EDITOR_CACHE_MAX_SIZE) cacheSize = EDITOR_CACHE_MAX_SIZE;
-  if(cacheSize < EDITOR_CACHE_MIN_SIZE) cacheSize = EDITOR_CACHE_MIN_SIZE;
-
-  ref->dontTrustBFramePts=ref->_aviheader->unreliableBFramePts();
-  ref->_aviheader->getVideoInfo (&info);
-  ref->_aviheader->getExtraHeaderData (&l, &d);
-  ref->decoder = ADM_getDecoder (info.fcc,  info.width, info.height, l, d,info.bpp);
-  ref->_videoCache = new EditorCache(cacheSize,info.width,info.height);
-
-  // discard implausibly high fps, hardcode the value to 25 fps
-  if (info.fps1000 > 2000 * 1000)
-      info.fps1000 = 25 * 1000;
-
-  float frameD=info.fps1000;
-  frameD=frameD/1000;
-  frameD=1/frameD;
-  frameD*=1000000;
-  ref->timeIncrementInUs=(uint64_t)frameD;
-
-  // Probe the real time increment as the value determined from FPS may be incorrect due to interlace
-  uint64_t firstNonZeroDts=ADM_NO_PTS,pts,dts;
-  int firstNonZeroDtsFrame;
-  ADM_info("Original frame increment %s = %" PRIu64" us\n",ADM_us2plain(ref->timeIncrementInUs),ref->timeIncrementInUs);
-  uint64_t minDelta=100000;
-  uint64_t maxDelta=0;
-  uint32_t fmin=0,fmax=0;
-  for (uint32_t frame=0; frame<info.nb_frames; frame++)
-  {
-      if (ref->_aviheader->getPtsDts(frame,&pts,&dts) && dts!=ADM_NO_PTS && dts!=0)
-      {
-          if (firstNonZeroDts==ADM_NO_PTS)
-          {
-              firstNonZeroDts=dts;
-              firstNonZeroDtsFrame=frame;
-              continue;
-          }
-
-          uint64_t probedTimeIncrement=(dts-firstNonZeroDts)/(frame-firstNonZeroDtsFrame);
-          if(probedTimeIncrement<minDelta) { minDelta=probedTimeIncrement; fmin=frame; }
-          if(probedTimeIncrement>maxDelta) { maxDelta=probedTimeIncrement; fmax=frame; }
-          firstNonZeroDts=dts;
-          firstNonZeroDtsFrame=frame;
-      }
-  }
-  if(maxDelta>=minDelta)
-  {
-      ADM_info("min increment %s = %" PRIu64" us for frame %d\n",ADM_us2plain(minDelta),minDelta,fmin);
-      ADM_info("max increment %s = %" PRIu64" us for frame %d\n",ADM_us2plain(maxDelta),maxDelta,fmax);
-  }else
-  {
-      ADM_warning("DTS missing, cannot probe time increment.\n");
-  }
+    uint32_t l, cacheSize;
+    uint8_t *d;
+    aviInfo info;
+    _SEGMENT seg;
+
+    vidHeader *demuxer=ref->_aviheader;
+    ref->dontTrustBFramePts=demuxer->unreliableBFramePts();
+    demuxer->getVideoInfo (&info);
+    demuxer->getExtraHeaderData (&l, &d);
+    ref->decoder = ADM_getDecoder (info.fcc, info.width, info.height, l, d, info.bpp);
+
+    if(false==prefs->get(FEATURES_CACHE_SIZE,&cacheSize))
+        cacheSize = EDITOR_CACHE_MAX_SIZE;
+    if(cacheSize > EDITOR_CACHE_MAX_SIZE) cacheSize = EDITOR_CACHE_MAX_SIZE;
+    if(cacheSize < EDITOR_CACHE_MIN_SIZE) cacheSize = EDITOR_CACHE_MIN_SIZE;
+    // For extremely short videos like individual image files, reduce cache size to the bare minimum.
+    if(info.nb_frames && info.nb_frames < cacheSize) // should we be paranoid and check the fcc?
+        cacheSize = info.nb_frames + 1;
+    ref->_videoCache = new EditorCache(cacheSize,info.width,info.height);
+
+    // discard implausibly high fps, hardcode the value to 25 fps
+    if (info.fps1000 > 2000 * 1000)
+        info.fps1000 = 25 * 1000;
+
+    float frameD=info.fps1000;
+    frameD=frameD/1000;
+    frameD=1/frameD;
+    frameD*=1000000;
+    ref->timeIncrementInUs=(uint64_t)frameD;
+
+    // Probe the real time increment as the value determined from FPS may be incorrect due to interlace
+    uint64_t firstNonZeroDts=ADM_NO_PTS,pts,dts;
+    int firstNonZeroDtsFrame;
+    ADM_info("Original frame increment %s = %" PRIu64" us\n",ADM_us2plain(ref->timeIncrementInUs),ref->timeIncrementInUs);
+    uint64_t minDelta=100000;
+    uint64_t maxDelta=0;
+    uint32_t flags,fmin=0,fmax=0;
+    for (uint32_t frame=0; frame<info.nb_frames; frame++)
+    {
+        if(!ref->fieldEncoded)
+        {
+            demuxer->getFlags(frame,&flags);
+            if(flags & AVI_FIELD_STRUCTURE)
+            {
+                ADM_info("Ref video is field-encoded.\n");
+                ref->fieldEncoded=true;
+            }
+        }
+        if (demuxer->getPtsDts(frame,&pts,&dts) && dts!=ADM_NO_PTS && dts!=0)
+        {
+            if (firstNonZeroDts==ADM_NO_PTS)
+            {
+                firstNonZeroDts=dts;
+                firstNonZeroDtsFrame=frame;
+                continue;
+            }
+            if(dts>firstNonZeroDts)
+            {
+                uint64_t probedTimeIncrement=(dts-firstNonZeroDts)/(frame-firstNonZeroDtsFrame);
+                if(probedTimeIncrement<minDelta) { minDelta=probedTimeIncrement; fmin=frame; }
+                if(probedTimeIncrement>maxDelta) { maxDelta=probedTimeIncrement; fmax=frame; }
+            }else if(dts==firstNonZeroDts)
+            {
+                ADM_warning("Duplicate DTS %s at frame %d\n",ADM_us2plain(dts),frame);
+            }else
+            {
+                ADM_warning("DTS going back by %" PRIu64" at frame %d\n",firstNonZeroDts-dts,frame);
+            }
+            firstNonZeroDts=dts;
+            firstNonZeroDtsFrame=frame;
+        }
+    }
+    if(maxDelta>=minDelta)
+    {
+        ADM_info("min increment %s = %" PRIu64" us for frame %d\n",ADM_us2plain(minDelta),minDelta,fmin);
+        ADM_info("max increment %s = %" PRIu64" us for frame %d\n",ADM_us2plain(maxDelta),maxDelta,fmax);
+    }else
+    {
+        ADM_warning("DTS missing, cannot probe time increment.\n");
+    }
   //if (minDelta==ref->timeIncrementInUs*2)
               //ref->timeIncrementInUs=minDelta;
 
-  
-  ADM_info("About %" PRIu64" microseconds per frame\n",ref->timeIncrementInUs);
-  ref->_nb_video_frames = info.nb_frames;
-  //
-  //  And automatically create the segment
-  //
-  seg._reference=videos.size();
-  if(!videos.size())
-  {
+    ADM_info("About %" PRIu64" microseconds per frame, %" PRIu32" frames\n",ref->timeIncrementInUs,info.nb_frames);
+    ref->_nb_video_frames = info.nb_frames;
+    //
+    //  And automatically create the segment
+    //
+    seg._reference=videos.size();
+    if(!videos.size())
+    {
         seg._startTimeUs=0;
-  }else
-  {
+    }else
+    {
 //      #warning todo compute cumulative time
-   }
-   seg._durationUs=ref->_aviheader->getVideoDuration();
+    }
+    seg._durationUs=demuxer->getVideoDuration();
 
     // Set the default startTime to the pts of first Pic
-    vidHeader *demuxer=	ref->_aviheader;
-    uint32_t flags;
-        demuxer->getFlags(0,&flags);
-        demuxer->getPtsDts(0,&pts,&dts);
-        ref->firstFramePts=0;
-        if(pts==ADM_NO_PTS) ADM_warning("First frame has unknown PTS\n");
-        if(dts==ADM_NO_PTS) ADM_warning("The first frame DTS is not set\n");
-        else ADM_info("The first frame DTS = %" PRIu64" ms\n",dts/1000);
-        if(pts!=ADM_NO_PTS &&pts)
-        {
-            ADM_warning("The first frame has a PTS > 0, adjusting to %" PRIu64" %s\n",
+    demuxer->getFlags(0,&flags);
+    demuxer->getPtsDts(0,&pts,&dts);
+    ref->firstFramePts=0;
+    if(pts==ADM_NO_PTS) ADM_warning("First frame has unknown PTS\n");
+    if(dts==ADM_NO_PTS) ADM_warning("The first frame DTS is not set\n");
+    else ADM_info("The first frame DTS = %" PRIu64" ms\n",dts/1000);
+    if(pts!=ADM_NO_PTS &&pts)
+    {
+        ADM_warning("The first frame has a PTS > 0, adjusting to %" PRIu64" %s\n",
                 (pts>=1000)? pts/1000 : pts,
                 (pts>=1000)? "ms" : "us");
-            ref->firstFramePts=pts;
+        ref->firstFramePts=pts;
 #ifdef ADM_ZERO_OFFSET
-            seg._refStartTimeUs=pts;
-            seg._durationUs-=pts;
+        seg._refStartTimeUs=pts;
+        seg._durationUs-=pts;
 #endif
-        }
+    }
 
     segments.push_back(seg);
     videos.push_back(*ref);
@@ -249,12 +266,15 @@
           v->_aviheader->close ();
           delete v->_aviheader;
       }
+      if(v->infoCache)
+          delete [] v->infoCache;
       if(v->paramCache)
           delete [] v->paramCache;
       v->_videoCache=NULL;
       v->color=NULL;
       v->decoder=NULL;
       v->_aviheader=NULL;
+      v->infoCache=NULL;
       v->paramCache=NULL;
      // Delete audio codec too
      // audioStream will be deleted by the demuxer
@@ -681,9 +701,8 @@
 
     _SEGMENT *first=getSegment(startSeg);
     _VIDEOS *vid=getRefVideo(first->_reference);
-    uint64_t padding=vid->timeIncrementInUs/2;
     // shorten the start segment
-    first->_durationUs=startOffset+padding;
+    first->_durationUs=startOffset+vid->timeIncrementInUs;
     // remove following segments
     int n=segments.size();
     for(int i=startSeg+1;i<n;i++)
@@ -812,7 +831,14 @@
         return false;
     }
     deltaFrame=frame-deltaFrame;
-    *dts=d+deltaFrame*vid->timeIncrementInUs;
+    d+=deltaFrame*vid->timeIncrementInUs;
+    if(d>pts)
+    {
+        ADM_warning("Calculated DTS=%" PRIu64" > PTS=%" PRIu64"\n",d,pts);
+        *dts=pts;
+        return false;
+    }
+    *dts=d;
     return true;
 }
 /**

avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackExternal.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackExternal.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp Changed

@@ -54,33 +54,55 @@
     uint64_t inc=vid->timeIncrementInUs;
 
     stats.reset();
-    ADM_info("Checking file for broken PTS...\n");
-    ADM_info("Checking %d frames out of %d.\n",checkRange,totalFrames);
-    DIA_workingBase *working=createWorking(QT_TRANSLATE_NOOP("ADM_Composer","Checking if timestamps are valid.."));
-    for(int i=0;i<checkRange;i++)
+
+    bool bFramesPresent=false;
+    for(int i=0;i<totalFrames;i++)
     {
-        DecodeNextPicture(seg->_reference);
-        working->update(i,checkRange);
+        uint32_t flags;
+        if(!hdr->getFlags(i,&flags))
+            break;
+        if(flags & AVI_B_FRAME)
+        {
+            bFramesPresent=true;
+            break;
+        }
     }
-    goToTimeVideo(from);
-    delete working;
-    ADM_info("-------- Stats :----------\n");
+
+    /* If the demuxer knows that B-frames are present but cannot provide
+    valid pts, we may proceed with pts reconstruction right away. */
+    if(!bFramesPresent || hdr->providePts())
+    {
+        ADM_info("Checking file for broken PTS...\n");
+        ADM_info("Checking %d frames out of %d.\n",checkRange,totalFrames);
+        DIA_workingBase *working=createWorking(QT_TRANSLATE_NOOP("ADM_Composer","Checking if timestamps are valid.."));
+        for(int i=0;i<checkRange;i++)
+        {
+            DecodeNextPicture(seg->_reference);
+            working->update(i,checkRange);
+        }
+        goToTimeVideo(from);
+        delete working;
+        ADM_info("-------- Stats :----------\n");
 #define INFO(x) ADM_info(#x":%d\n",stats.x);
-    INFO(  nbBFrames);
-    INFO(  nbPFrames);
-    INFO(  nbIFrames);
-    INFO(  nbNoImage);
-    INFO(  nbPtsgoingBack);
-    ADM_info("-------- /Stats ----------\n");
+        INFO(  nbBFrames)
+        INFO(  nbPFrames)
+        INFO(  nbIFrames)
+        INFO(  nbNoImage)
+        INFO(  nbPtsgoingBack)
+        ADM_info("-------- /Stats ----------\n");
 
-    if(!stats.nbBFrames && hdr->providePts()==false)
+        if(stats.nbBFrames)
+            bFramesPresent=true;
+    }
+
+    if(!bFramesPresent && hdr->providePts()==false)
     {
         ADM_info("No B-frames and no PTS, setting PTS equal DTS\n");
         return setPtsEqualDts(hdr,inc);
     }
     // check whether DTS are completely missing, ignore the first frame
     bool noDts=true;
-    for(uint32_t i=1;i<totalFrames;i++)
+    for(int i=1;i<totalFrames;i++)
     {
         uint64_t pts,dts;
         hdr->getPtsDts(i,&pts,&dts);
@@ -96,7 +118,7 @@
         return setPtsEqualDts(hdr,inc);
     }
 
-    if(stats.nbPtsgoingBack>1 || (stats.nbBFrames && hdr->providePts()==false))
+    if(stats.nbPtsgoingBack>1 || (bFramesPresent && hdr->providePts()==false))
     {
 #ifdef WORK_AROUND_BAD_PTS
         if(!GUI_Question(QT_TRANSLATE_NOOP("ADM_Composer",
@@ -112,7 +134,7 @@
             goToTimeVideo(from);
             vid->lastSentFrame=0;
             uint64_t bfdelay=2*inc; // FIXME B-frame delay
-            for(uint32_t i=0;i<totalFrames;i++)
+            for(int i=0;i<totalFrames;i++)
             {
                 uint64_t pts,dts;
                 hdr->getPtsDts(i,&pts,&dts);
@@ -131,7 +153,7 @@
             }
 
             DIA_workingBase *decoding=createWorking(QT_TRANSLATE_NOOP("ADM_Composer","Decoding video..."));
-            for(uint32_t i=0;i<totalFrames;i++)
+            for(int i=0;i<totalFrames;i++)
             {
                 if(false==decoding->isAlive())
                 {
@@ -318,65 +340,82 @@
     int totalFrames=hdr->getVideoStreamHeader()->dwLength;
     uint64_t dtsCeil= (timeIncrementUs*18)/10;
     std::vector<uint64_t> dtsList,ptsList;
-    std::vector<int> validDtsList,validPtsList;
+    uint64_t lastPts=ADM_NO_PTS;
+    uint64_t lastDts=ADM_NO_PTS;
+    uint64_t maxPts=0;
+    uint64_t maxDts=0;
+    bool oooPts,oooDts,skipPts,skipDts;
+    oooPts=oooDts=skipPts=skipDts=false;
     ADM_info("Checking for doubled FPS.., time increment ceiling = %d\n",(int)dtsCeil);
     for(int i=0;i<totalFrames;i++)
     {
-          uint64_t pts,dts;          
-          hdr->getPtsDts(i,&pts,&dts);
-          
-          if(dts!=ADM_NO_PTS)
-          {
-                dtsList.push_back(dts);
-                validDtsList.push_back(i);
-          }
-          if(pts!=ADM_NO_PTS)
-          {
-                ptsList.push_back(pts);
-                validPtsList.push_back(i);
-          }
-    }
-    bool proceed=false;
-    if(validDtsList.size()>2)
-    {
-        for(int i=0;i<(validDtsList.size()-1);i++)
+        uint64_t pts,dts;
+        hdr->getPtsDts(i,&pts,&dts);
+        if(dts!=ADM_NO_PTS && lastDts!=ADM_NO_PTS)
+        { /* We've got two consecutive frames with valid DTS. We need to add both,
+            the previous one now and the current one will be added to the list in
+            the next iteration. */
+            skipDts=false;
+            if(!oooDts)
+            {
+                if(lastDts>maxDts) maxDts=lastDts;
+                if(maxDts>dts) oooDts=true;
+            }
+        }
+        if(!skipDts && lastDts!=ADM_NO_PTS)
         {
-            if(validDtsList[i+1]-validDtsList[i]==1)
+            dtsList.push_back(lastDts);
+            if(i==totalFrames-1 && dts!=ADM_NO_PTS)
+                dtsList.push_back(dts); // add the last one
+        }else
+        { /* Stop adding further DTS until we have encountered two consecutive
+            frames with valid DTS again. */
+            skipDts=true;
+        }
+        lastDts=dts;
+
+        if(pts!=ADM_NO_PTS && lastPts!=ADM_NO_PTS)
+        { /* We've got two consecutive frames with valid PTS. We need to add both,
+            the previous one now and the current one will be added to the list in
+            the next iteration. */
+            skipPts=false;
+            if(!oooPts)
             {
-                proceed=true;
-                break; // got at least once two consecutive frames with valid DTS
+                if(lastPts>maxPts) maxPts=lastPts;
+                if(maxPts>pts) oooPts=true;
             }
         }
+        if(!skipPts && lastPts!=ADM_NO_PTS)
+        {
+            ptsList.push_back(lastPts);
+            if(i==totalFrames-1 && pts!=ADM_NO_PTS)
+                ptsList.push_back(pts); // add the last one
+        }else
+        { /* Stop adding further PTS until we have encountered two consecutive
+            frames with valid PTS again. */
+            skipPts=true;
+        }
+        lastPts=pts;
     }
-    if(!proceed)
+    if(dtsList.size()<2)
     {
         ADM_info("No consecutive frames with valid DTS found, can't safely halve FPS\n");
         return false;
     }
-    proceed=false;
-    if(validPtsList.size()>2)
-    {
-        for(int i=0;i<(validPtsList.size()-1);i++)
-        {
-            if(validPtsList[i+1]-validPtsList[i]==1)
-            {
-                proceed=true;
-                break; // got at least once two consecutive frames with valid PTS
-            }
-        }
-    }
-    if(!proceed)
+    if(ptsList.size()<2)
     {
         ADM_info("No consecutive frames with valid PTS found, can't safely halve FPS\n");
         return false;
     }
-    std::sort (dtsList.begin(), dtsList.end());   
-    std::sort (ptsList.begin(), ptsList.end());  
-    ADM_info("Checking DTS...\n");
+    if(oooDts)
+        std::sort (dtsList.begin(), dtsList.end());
+    if(oooPts)
+        std::sort (ptsList.begin(), ptsList.end());
+    ADM_info("Checking %sDTS...\n",oooDts? "sorted " : "");
     bool okDts=checkTiming(dtsList,dtsCeil);
-    ADM_info("Checking PTS...\n");
+    ADM_info("Checking %sPTS...\n",oooPts? "sorted " : "");
     bool okPts=checkTiming(ptsList,dtsCeil);
-    
+
     if(okDts && okPts)
     {
         ADM_info("We can safely halve fps\n");

avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edPtsDts.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edPtsDts.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edUndoQueue.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edUndoQueue.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_editIface.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_editIface.cpp Changed

@@ -47,10 +47,9 @@
 
 extern uint8_t GUI_close(void);
 extern bool GUI_GoToTime(uint64_t time);
+extern void GUI_GoToKFrameTime(uint64_t time);
 extern void GUI_NextFrame(uint32_t frameCount);
 extern void GUI_PrevFrame(uint32_t frameCount);
-extern void GUI_NextKeyFrame(void);
-extern void GUI_PreviousKeyFrame(void);
 extern void GUI_PrevBlackFrame(void);
 extern void GUI_NextBlackFrame(void);;
 
@@ -498,20 +497,31 @@
 
 void ADM_Composer::seekKeyFrame(int count)
 {
-	if (count >= 0)
-	{
-		for (int i = 0; i < count; i++)
-		{
-			GUI_NextKeyFrame();
-		}
-	}
-	else
-	{
-		for (int i = 0; i < -count; i++)
-		{
-			GUI_PreviousKeyFrame();
-		}
-	}
+    uint64_t pts = video_body->getCurrentFramePts();
+    if(pts == ADM_NO_PTS)
+        return;
+
+    if(count >= 0)
+    {
+        for(int i = 0; i < count; i++)
+        {
+            uint64_t tmp = pts;
+            if(false == video_body->getNKFramePTS(&tmp))
+                break;
+            pts = tmp;
+        }
+    }else
+    {
+        for(int i = 0; i < -count; i++)
+        {
+            uint64_t tmp = pts;
+            if(false == video_body->getPKFramePTS(&tmp))
+                break;
+            pts = tmp;
+        }
+    }
+
+    GUI_GoToKFrameTime(pts);
 }
 
 void ADM_Composer::seekBlackFrame(int count)

avidemux_2.7.4.tar.gz/avidemux/common/ADM_muxerGate/include/ADM_videoCopy.h -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_muxerGate/include/ADM_videoCopy.h Changed

@@ -60,6 +60,9 @@
 protected:
         bool            extractExtraDataH264();
         bool            extractExtraDataH265();
+private:
+        bool            extractExtraDataH264Internal(void);
+        bool            extractExtraDataH265Internal(void);
 };
 /**
         \fn ADM_videoStreamCopyToAnnexB
@@ -100,4 +103,20 @@
         virtual         ~ADM_videoStreamCopyAudRemover();
         virtual bool    getPacket(ADMBitstream *out);
 };
+/**
+        \fn ADM_videoStreamCopySeiInjector
+        \brief If available, inject SEI message containing x264 version into the first access unit of a H.264 stream
+*/
+class ADM_videoStreamCopySeiInjector : public ADM_videoStreamCopy
+{
+protected:
+#define ADM_H264_MAX_SEI_LENGTH 2048
+        uint8_t         seiBuf[ADM_H264_MAX_SEI_LENGTH];
+        uint32_t        seiLen;
+        uint32_t        nalSize;
+public:
+                        ADM_videoStreamCopySeiInjector(uint64_t startTime,uint64_t endTime);
+        virtual         ~ADM_videoStreamCopySeiInjector();
+        virtual bool    getPacket(ADMBitstream *out);
+};
 #endif

avidemux_2.7.4.tar.gz/avidemux/common/ADM_muxerGate/include/ADM_videoProcess.h -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_muxerGate/include/ADM_videoProcess.h Changed

avidemux_2.7.4.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopy.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopy.cpp Changed

@@ -20,7 +20,6 @@
 #include "ADM_edit.hxx"
 #include "ADM_coreUtils.h"
 #include "ADM_vidMisc.h"
-#include "prefs.h"
 extern ADM_Composer *video_body; // Fixme!
 
 #if 1
@@ -44,7 +43,8 @@
     height=info.height;
     fourCC=info.fcc;
     averageFps1000=info.fps1000;
-    frameIncrement=video_body->getFrameIncrement();
+    video_body->getTimeBase(&timeBaseNum,&timeBaseDen,true);
+    frameIncrement=video_body->getFrameIncrement(true);
     isCFR=false;
     // Estimate start frame
     if(false==video_body->getPKFramePTS(&ptsStart))
@@ -89,9 +89,6 @@
     }
     eofMet=false;
     currentFrame=0;
-    sanitizeDts=false;
-    prefs->get(FEATURES_COPY_MODE_SANITIZE_DTS, &sanitizeDts);
-
     this->startTimeDts=dtsStart;
     this->startTimePts=ptsStart;
     this->endTimePts=endTime;
@@ -150,7 +147,7 @@
     if(true==eofMet) return false;
 again:
     image.data=out->data;
-    if(false==video_body->getCompressedPicture(rewindTime,videoDelay,sanitizeDts,&image))
+    if(false==video_body->getCompressedPicture(rewindTime,videoDelay,&image))
     {
             ADM_warning("Get packet failed\n");
             return false;

avidemux_2.7.4.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopyFromAnnexB.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopyFromAnnexB.cpp Changed

@@ -71,32 +71,12 @@
     return true;
 }
 /**
- * \fn extractExtraDataH264
+ *  \fn extractExtraDataH264Internal
  */
-bool ADM_videoStreamCopyFromAnnexB::extractExtraDataH264()
+bool ADM_videoStreamCopyFromAnnexB::extractExtraDataH264Internal(void)
 {
-    myBitstream=new ADMBitstream(ADM_COPY_FROM_ANNEX_B_SIZE);
-    myBitstream->data=buffer;
-
-    myExtra=NULL;
-    myExtraLen=0;
-    // Read First frame, it contains PPS & SPS
-    // Built avc-like atom from it.
-
-    // We need the absolute 1st frame to gety SPS PPS
-    // Hopefully it will be ok
-    ADMCompressedImage img;
-    img.data=buffer;
-    img.dataLength=0;
-    if(false==video_body->getDirectImageForDebug(0,&img))
-    {
-        ADM_warning("Cannot read first image\n");
-        return false;
-    }
-    myBitstream->len=img.dataLength;
     NALU_descriptor desc[MAX_NALU_PER_CHUNK];
-    //mixDump(img.data,img.dataLength);
-    int nbNalu=ADM_splitNalu(myBitstream->data,myBitstream->data+myBitstream->len,MAX_NALU_PER_CHUNK,desc);
+    int nbNalu=ADM_splitNalu(myBitstream->data, myBitstream->data+myBitstream->len, MAX_NALU_PER_CHUNK, desc);
     // search sps
     uint32_t spsLen=0, ppsLen=0;
     int indexSps,indexPps;
@@ -132,6 +112,7 @@
     ADM_info("Copy from annexB: Found sps=%d, pps=%d.\n",(int)spsLen,(int)ppsLen);
     // Build extraData
     myExtraLen=5+1+2+1+spsLen+1+2+1+ppsLen;
+    if(myExtra) delete [] myExtra;
     myExtra=new uint8_t[myExtraLen];
     uint8_t *ptr=myExtra;
     uint8_t *sps=desc[indexSps].start;
@@ -161,6 +142,47 @@
 }
 
 /**
+ * \fn extractExtraDataH264
+ */
+bool ADM_videoStreamCopyFromAnnexB::extractExtraDataH264()
+{
+    myBitstream=new ADMBitstream(ADM_COPY_FROM_ANNEX_B_SIZE);
+    myBitstream->data=buffer;
+
+    myExtra=NULL;
+    myExtraLen=0;
+    // Read the first keyframe in the range, it contains PPS & SPS
+    // Built avc-like atom from it.
+
+    /* We need the image at the start of the range as parameter sets
+    may change on the fly and we might get a disagreement between
+    the global header and in-band SPS & PPS from the start on if we
+    use the very first image in the stream.
+
+    Multiple SPS & PPS are not supported. */
+
+    ADMCompressedImage img;
+    img.data=buffer;
+    img.dataLength=0;
+    if(false==video_body->getDirectKeyFrameImageAtPts(startTimePts,&img))
+    {
+        ADM_warning("Cannot read the first keyframe image in the range\n");
+        return false;
+    }
+    myBitstream->len=img.dataLength;
+    if(extractExtraDataH264Internal())
+        return true;
+    // No SPS & PPS in the access unit? Fall back on the old behavior.
+    if(false==video_body->getDirectImageForDebug(0,&img))
+    {
+        ADM_warning("Cannot read first image\n");
+        return false;
+    }
+    myBitstream->len=img.dataLength;
+    return extractExtraDataH264Internal();
+}
+
+/**
  * 
  * @param ptr
  * @param naluType
@@ -179,46 +201,25 @@
     memcpy(ptr,d->start,d->size);
     return ptr+d->size;
 }
-
 /**
- * \fn extractExtraDataH265
- * We need to pack VPS/PPS/SPS MP4 style
- * 
- * order should be  VPS, SPS, PPS, SEI. 
+ *  \fn extractExtraDataH265Internal
  */
-bool ADM_videoStreamCopyFromAnnexB::extractExtraDataH265()
+bool ADM_videoStreamCopyFromAnnexB::extractExtraDataH265Internal(void)
 {
-    myBitstream=new ADMBitstream(ADM_COPY_FROM_ANNEX_B_SIZE);
-    myBitstream->data=buffer;
-
-    myExtra=NULL;
-    myExtraLen=0;
-    // Read First frame, it contains PPS & SPS
-  
-    ADMCompressedImage img;
-    img.data=buffer;
-    img.dataLength=0;
-    if(false==video_body->getDirectImageForDebug(0,&img))
-    {
-        ADM_warning("Cannot read first image\n");
-        return false;
-    }
-    mixDump(img.data, 48);
-    myBitstream->len=img.dataLength;
     NALU_descriptor desc[MAX_NALU_PER_CHUNK];
 
-    int nbNalu=ADM_splitNalu(myBitstream->data,myBitstream->data+myBitstream->len, MAX_NALU_PER_CHUNK,desc);
-    
+    int nbNalu=ADM_splitNalu(myBitstream->data, myBitstream->data+myBitstream->len, MAX_NALU_PER_CHUNK, desc);
+
     // The list of NALU we are interested in...
     NALU_descriptor *vpsNalu,*ppsNalu,*spsNalu;
-    
+
 #define LoadNalu(x,y)     x=ADM_findNaluH265(NAL_H265_##y,nbNalu,desc); \
     if(!x) \
     { \
         ADM_error("Cannot find "#y); \
         return false; \
     }
-    
+
 #define NUMBER_OF_NALU_IN_EXTRADATA 3 // SEI ?    
     LoadNalu(vpsNalu,VPS);
     LoadNalu(ppsNalu,PPS);
@@ -226,6 +227,7 @@
     
     // Build extraData
     myExtraLen=vpsNalu->size+ppsNalu->size+spsNalu->size+(7)*NUMBER_OF_NALU_IN_EXTRADATA+32;
+    if(myExtra) delete [] myExtra;
     myExtra=new uint8_t[myExtraLen];
     uint8_t *ptr=myExtra;
     
@@ -274,6 +276,44 @@
     mixDump(myExtra, myExtraLen);
     return true;
 }
+
+/**
+ * \fn extractExtraDataH265
+ * We need to pack VPS/PPS/SPS MP4 style
+ *
+ * order should be  VPS, SPS, PPS, SEI.
+ */
+bool ADM_videoStreamCopyFromAnnexB::extractExtraDataH265()
+{
+    myBitstream=new ADMBitstream(ADM_COPY_FROM_ANNEX_B_SIZE);
+    myBitstream->data=buffer;
+
+    myExtra=NULL;
+    myExtraLen=0;
+    // Read the first keyframe in the range, it contains PPS & SPS
+
+    ADMCompressedImage img;
+    img.data=buffer;
+    img.dataLength=0;
+    if(false==video_body->getDirectKeyFrameImageAtPts(startTimePts,&img))
+    {
+        ADM_warning("Cannot read first the first keyframe image in the range\n");
+        return false;
+    }
+    mixDump(img.data, 48);
+    myBitstream->len=img.dataLength;
+    if(extractExtraDataH265Internal())
+        return true;
+    // No PPS & SPS? Try the first frame of the first ref video.
+    if(false==video_body->getDirectImageForDebug(0,&img))
+    {
+        ADM_warning("Cannot read first image\n");
+        return false;
+    }
+    mixDump(img.data, 48);
+    myBitstream->len=img.dataLength;
+    return extractExtraDataH265Internal();
+}
 /**
     \fn ctor
 */

avidemux_2.7.6.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopySeiInjector.cpp Added

@@ -0,0 +1,126 @@
+/**
+    \file ADM_videoCopySeiInjector
+    \brief Wrapper
+    (c) Mean 2008/GPLv2
+*/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "ADM_cpp.h"
+#include "ADM_default.h"
+#include "ADM_videoCopy.h"
+#include "ADM_edit.hxx"
+#include "ADM_coreUtils.h"
+#include "ADM_videoInfoExtractor.h"
+#include "ADM_h264_tag.h"
+extern ADM_Composer *video_body; // Fixme!
+
+/**
+ *  \fn ctor
+ */
+ADM_videoStreamCopySeiInjector::ADM_videoStreamCopySeiInjector(uint64_t startTime,uint64_t endTime) : ADM_videoStreamCopy(startTime,endTime)
+{
+    ADM_info("SEI injector created\n");
+    uint32_t length=0;
+    seiLen=0;
+    nalSize=0;
+    {
+        uint8_t *extra;
+        uint32_t extraLen=0;
+        getExtraData(&extraLen,&extra);
+        if(extraLen)
+            nalSize=ADM_getNalSizeH264(extra,extraLen);
+        if(!nalSize)
+        {
+            ADM_warning("Cannot get valid extradata, passthrough operation.\n");
+            return;
+        }
+    }
+    if(video_body->getUserDataUnregistered(startTime, seiBuf, ADM_H264_MAX_SEI_LENGTH, &length))
+    {
+        ADM_info("SEI message with x264 build info present, NAL unit length: %u\n",length);
+        mixDump(seiBuf,length);
+        seiLen=length;
+    }else
+    {
+        ADM_info("No x264 build info found, purely passthrough operation.\n");
+    }
+}
+
+/**
+ *  \fn dtor
+ */
+ADM_videoStreamCopySeiInjector::~ADM_videoStreamCopySeiInjector()
+{
+
+}
+
+/**
+ *  \fn getPacket
+ */
+bool  ADM_videoStreamCopySeiInjector::getPacket(ADMBitstream *out)
+{
+    if(!ADM_videoStreamCopy::getPacket(out))
+        return false;
+    if(!seiLen)
+        return true;
+    if(!(out->flags & AVI_KEY_FRAME))
+        return true;
+    // Check whether this particular SEI message is already present.
+    uint32_t len=0;
+    if(extractH264SEI(out->data, out->len, nalSize, NULL, ADM_H264_MAX_SEI_LENGTH, &len))
+    {
+        if(len!=seiLen)
+            ADM_warning("SEI message present, but the length is different?\n");
+        else
+            ADM_info("SEI message with x264 version info already present, nothing to do.\n");
+        seiLen=0;
+        return true;
+    }
+    // Nope, do we have enough space to inject ours?
+    if(out->len+seiLen>=out->bufferSize)
+    {
+        ADM_warning("Not enough free buffer to inject SEI.\n"); // we'll try with the next keyframe
+        return true;
+    }
+    // Inject SEI from seiBuf
+    uint8_t *tail=out->data;
+    uint8_t *head=tail+out->len;
+    uint8_t stream;
+
+    while(tail + nalSize < head)
+    {
+        uint32_t i,length=0;
+        for(i=0; i<nalSize; i++)
+            length=(length<<8)+tail[i];
+        stream=*(tail+nalSize)&0x1F;
+        switch(stream)
+        {
+            case NAL_SEI:
+            case NAL_IDR:
+            case NAL_NON_IDR:
+            {
+                memmove(tail+seiLen,tail,head-tail);
+                memcpy(tail,seiBuf,seiLen);
+                out->len+=seiLen;
+                seiLen=0;
+                ADM_info("SEI message with x264 version info injected.\n");
+                return true;
+            }
+            default:
+                tail+=nalSize+length;
+                continue;
+        }
+    }
+
+    return true;
+}
+
+// EOF
+

avidemux_2.7.4.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoProcess.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoProcess.cpp Changed

@@ -17,6 +17,7 @@
 #include "ADM_videoProcess.h"
 #include "fourcc.h"
 #include "ADM_bitstream.h"
+#include "ADM_coreUtils.h"
 /**
     \fn ADM_videoStreamProcess
 */
@@ -31,14 +32,17 @@
     ADM_info("[StreamProcess] Stream %" PRIu32"x%" PRIu32", codec : %s\n",width,height,fcc);
     fourCC=fourCC::get((uint8_t *)fcc);
     frameIncrement=encoder->getFrameIncrement();
-    float f=encoder->getFrameIncrement();
-    if(f) f=1000000000./f;
-        else f=25000;
-    averageFps1000=(uint32_t)f;
-    printf("[StreamProcess] Average FPS1000=%" PRIu32"\n",averageFps1000);
+    if(frameIncrement)
+        averageFps1000=ADM_Fps1000FromUs(frameIncrement);
+    else
+        averageFps1000=25000;
+    timeBaseDen=encoder->getTimeBaseDen();
+    timeBaseNum=encoder->getTimeBaseNum();
+    printf("[StreamProcess] Average FPS1000=%" PRIu32", timebase: %" PRIu32" / %" PRIu32"\n",averageFps1000,timeBaseNum,timeBaseDen);
     isCFR=false;
     videoDelay=encoder->getEncoderDelay();
-    printf("[StreamProcess] Video Encoder Delay=%" PRIu64"ms\n",videoDelay/1000);
+    ADM_info("[StreamProcess] Initial video encoder delay: %" PRIu64" ms\n",videoDelay/1000);
+    firstPacket=true;
 }
 /**
     \fn ADM_videoStreamProcess
@@ -64,6 +68,12 @@
 {
     if(false==encoder->encode(out)) return false;
     ADM_assert(out->len<out->bufferSize);
+    if(firstPacket)
+    {
+        videoDelay=encoder->getEncoderDelay();
+        ADM_info("[StreamProcess] Final video encoder delay: %" PRIu64" ms\n",videoDelay/1000);
+        firstPacket=false;
+    }
     return true;
 }
 /**

avidemux_2.7.4.tar.gz/avidemux/common/ADM_muxerGate/src/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_muxerGate/src/CMakeLists.txt Changed

avidemux_2.7.4.tar.gz/avidemux/common/ADM_render/GUI_dxva2Render.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_render/GUI_dxva2Render.cpp Changed

@@ -77,7 +77,6 @@
 
   protected:
                         admMutex        lock;
-                        bool            failure;
                         GUI_WindowInfo  info;
                         IDirect3DSurface9 *mySurface;
                         IDirect3DSurface9 *myYV12Surface;
@@ -116,7 +115,6 @@
     videoBuffer=NULL;
     videoWidget=NULL;
     d3dHandle=admD3D::getHandle();
-    failure=false;
 }
 /**
     \fn dxvaRender
@@ -570,54 +568,49 @@
 */
 bool dxvaRender::displayImage_surface(ADMImage *pic,admDx2Surface *surface)
 {
+#if 0
   // this does not work, both surfaces are coming from different device
-
-    if(!failure)
-    {
-        IDirect3DSurface9 *bBuffer;
-        if( ADM_FAILED(D3DCall(IDirect3DDevice9,GetBackBuffer,d3dDevice, 0, 0,
+    IDirect3DSurface9 *bBuffer;
+    if( ADM_FAILED(D3DCall(IDirect3DDevice9,GetBackBuffer,d3dDevice, 0, 0,
                                D3DBACKBUFFER_TYPE_MONO,
                                &bBuffer)))
-        {
-            ADM_warning("D3D Cannot create backBuffer\n");
-            return false;
-        }
-        // OK
-        ADM_info("surface duplicated\n");
+    {
+        ADM_warning("D3D Cannot create backBuffer\n");
+        return false;
+    }
+    // OK
+    ADM_info("surface duplicated\n");
 
-        // can we directly use the surface from dxva ? (can we at all ?)
-        if (ADM_FAILED(D3DCall(IDirect3DDevice9,StretchRect,d3dDevice,
+    // can we directly use the surface from dxva ? (can we at all ?)
+    if (ADM_FAILED(D3DCall(IDirect3DDevice9,StretchRect,d3dDevice,
                                surface->surface,
                                NULL,
                                bBuffer,
                                NULL,
                                D3DTEXF_LINEAR)))
-        {
-            ADM_warning("StretchRec yv12 failed\n");
-            failure=true;
-        }
+    {
+        ADM_warning("StretchRec yv12 failed\n");
     }else
     {
-        // go to indirect route
-        if(!pic->hwDownloadFromRef())
-        {
-            ADM_warning("Failed to download yv12 from dxva\n");
-            return false;
-        }
-        // workaround : use default non bridged path
-        if(useYV12)
+        IDirect3DDevice9_BeginScene(d3dDevice);
+        IDirect3DDevice9_EndScene(d3dDevice);
+        if( ADM_FAILED(IDirect3DDevice9_Present(d3dDevice, &targetRect, 0, 0, 0)))
         {
-            return displayImage_yv12(pic);
+            ADM_warning("D3D Present failed\n");
         }
-        return displayImage_argb(pic);
+        return true;
     }
-    IDirect3DDevice9_BeginScene(d3dDevice);
-    IDirect3DDevice9_EndScene(d3dDevice);
-    if( ADM_FAILED(IDirect3DDevice9_Present(d3dDevice, &targetRect, 0, 0, 0)))
+#endif
+    // go to indirect route
+    if(!pic->hwDownloadFromRef())
     {
-        ADM_warning("D3D Present failed\n");
+        ADM_warning("Failed to download yv12 from dxva\n");
+        return false;
     }
-    return true;
+    // workaround : use default non bridged path
+    if(useYV12)
+        return displayImage_yv12(pic);
+    return displayImage_argb(pic);
 }
 
 /**

avidemux_2.7.4.tar.gz/avidemux/common/ADM_render/GUI_render.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_render/GUI_render.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/common/ADM_render/GUI_render.h -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_render/GUI_render.h Changed

avidemux_2.7.4.tar.gz/avidemux/common/ADM_toolkit/automation.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_toolkit/automation.cpp Changed

@@ -226,6 +226,7 @@
 void call_scriptEngine(const char *scriptFile)
 {
     char *fullpath=ADM_PathCanonize(scriptFile);
+#define BYE delete [] fullpath; fullpath=NULL; return;
     FILE *fd=ADM_fopen(fullpath,"r");
     if(!fd)
     {
@@ -237,7 +238,7 @@
         {
             GUI_Error_HIG(QT_TRANSLATE_NOOP("adm", "File Error"), QT_TRANSLATE_NOOP("adm", "Script \"%s\" does not exist."), fullpath);
         }
-        return;
+        BYE
     }
 
     std::vector<IScriptEngine*> engines = getScriptEngines();
@@ -252,7 +253,7 @@
             A_Rewind();
             UI_setMarkers(video_body->getMarkerAPts(),video_body->getMarkerBPts());
         }
-        return;
+        BYE
     }
 
     for (int i = 0; i < engines.size(); i++)
@@ -262,11 +263,13 @@
             A_parseScript(engines[i],fullpath);
             A_Rewind();
             UI_setMarkers(video_body->getMarkerAPts(),video_body->getMarkerBPts());
-            return;
+            BYE
         }
     }
 
-    ADM_warning("Unable to appropriate script engine for script file\n");    
+    ADM_warning("Unable to appropriate script engine for script file\n");
+    BYE
+#undef BYE
 }
 /**
  * \fn call_quit
@@ -409,15 +412,8 @@
    printf("Video\n");
    printf("   Video Size: %u x %u\n", avifileinfo->width, avifileinfo->height);
    printf("   Frame Rate: %2.3f fps\n", (float)avifileinfo->fps1000/1000.F);
-   printf("   Number of frames: %d frames\n", avifileinfo->nb_frames);
    printf("   Codec FourCC: %s\n", fourCC::tostring(avifileinfo->fcc));
-   if(avifileinfo->nb_frames){
-     uint32_t hh, mm, ss, ms;
-      frame2time(avifileinfo->nb_frames, avifileinfo->fps1000,&hh, &mm, &ss, &ms);
-      printf("   Duration: %02d:%02d:%02d.%03d\n", hh, mm, ss, ms);
-   }else{
-      printf("   Duration: 00:00:00.000\n");
-   }
+   printf("   Duration: %s\n", ADM_us2plain(video_body->getVideoDuration()));
    war=video_body->getPARWidth();
    har=video_body->getPARHeight();
    getAspectRatioFromAR(war,har, &s);
@@ -434,17 +430,12 @@
    if( wavinfo )
     {
       printf("   Codec: %s\n",getStrFromAudioCodec(wavinfo->encoding));
-      printf("   Mode: ");
-      switch( wavinfo->channels ){
-         case 1:  printf("MONO\n"); break;
-         case 2:  printf("STEREO\n"); break;
-         default: printf("????\n"); break;
-      }
+      printf("   Channels: %u\n",wavinfo->channels);
       printf("   BitRate: %u Bps / %u kbps\n", wavinfo->byterate, wavinfo->byterate*8/1000);
       printf("   Frequency: %u Hz\n", wavinfo->frequency);
    }else{
       printf("   Codec: NONE\n");
-      printf("   Mode: NONE\n");
+      printf("   Channels: NONE\n");
       printf("   BitRate: NONE\n");
       printf("   Frequency: NONE\n");
       printf("   Duration: NONE\n");

avidemux_2.7.4.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp Changed

@@ -473,7 +473,7 @@
             out->refType=ADM_HW_NONE;
     }
 
-    if (!in->dataLength )	// Null frame, silently skipped
+    if(!_parent->getDrainingState() && !in->dataLength) // Null frame, silently skipped
     {
         out->_noPicture = 1;
         out->Pts=ADM_COMPRESSED_NO_PTS;
@@ -485,18 +485,10 @@
    // Put a safe value....
     out->Pts=in->demuxerPts;
     _context->reordered_opaque=in->demuxerPts;
-    int got_picture;
-    AVPacket pkt;
-    av_init_packet(&pkt);
-    pkt.data=in->data;
-    pkt.size=in->dataLength;
-    if(in->flags&AVI_KEY_FRAME)
-        pkt.flags=AV_PKT_FLAG_KEY;
-    else
-        pkt.flags=0;
 
     AVFrame *frame=_parent->getFramePointer();
     ADM_assert(frame);
+
     if(_parent->getDrainingState())
     {
         if(_parent->getDrainingInitiated()==false)
@@ -504,9 +496,21 @@
             avcodec_send_packet(_context, NULL);
             _parent->setDrainingInitiated(true);
         }
-    }else
+    }else if(!handover)
     {
+        AVPacket pkt;
+        av_init_packet(&pkt);
+        pkt.data=in->data;
+        pkt.size=in->dataLength;
+        if(in->flags&AVI_KEY_FRAME)
+            pkt.flags=AV_PKT_FLAG_KEY;
+        else
+            pkt.flags=0;
+
         avcodec_send_packet(_context, &pkt);
+    }else
+    {
+        handover=false;
     }
 
     int ret = avcodec_receive_frame(_context, frame);

avidemux_2.7.4.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp Changed

@@ -490,7 +490,7 @@
             out->refType=ADM_HW_NONE;
     }
 
-    if (!in->dataLength )	// Null frame, silently skipped
+    if(!_parent->getDrainingState() && !in->dataLength) // Null frame, silently skipped
     {
         out->_noPicture = 1;
         out->Pts=ADM_COMPRESSED_NO_PTS;
@@ -502,18 +502,10 @@
    // Put a safe value....
     out->Pts=in->demuxerPts;
     _context->reordered_opaque=in->demuxerPts;
-    int got_picture;
-    AVPacket pkt;
-    av_init_packet(&pkt);
-    pkt.data=in->data;
-    pkt.size=in->dataLength;
-    if(in->flags&AVI_KEY_FRAME)
-        pkt.flags=AV_PKT_FLAG_KEY;
-    else
-        pkt.flags=0;
-    
+
     AVFrame *frame=_parent->getFramePointer();
     ADM_assert(frame);
+
     if(_parent->getDrainingState())
     {
         if(_parent->getDrainingInitiated()==false)
@@ -521,9 +513,21 @@
             avcodec_send_packet(_context, NULL);
             _parent->setDrainingInitiated(true);
         }
-    }else
+    }else if(!handover)
     {
+        AVPacket pkt;
+        av_init_packet(&pkt);
+        pkt.data=in->data;
+        pkt.size=in->dataLength;
+        if(in->flags&AVI_KEY_FRAME)
+            pkt.flags=AV_PKT_FLAG_KEY;
+        else
+            pkt.flags=0;
+
         avcodec_send_packet(_context, &pkt);
+    }else
+    {
+        handover=false;
     }
 
     int ret = avcodec_receive_frame(_context, frame);

avidemux_2.7.4.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp Changed

@@ -153,6 +153,7 @@
         ADM_info("[VDPAU] No more available surface, creating a new one\n");
         render=new ADM_vdpauRenderState;
         memset(render,0,sizeof( ADM_vdpauRenderState));
+        render->surface=VDP_INVALID_HANDLE;
         int widthToUse = admVdpau::dimensionRoundUp(avctx->coded_width);
         int heightToUse= admVdpau::dimensionRoundUp(avctx->coded_height);
         if(VDP_STATUS_OK!=admVdpau::surfaceCreate(widthToUse,heightToUse,&(render->surface)))
@@ -162,8 +163,6 @@
             alive=false;
             return -1;
         }
-        render->state=0;
-        vdpauMarkSurfaceUsed(&vdpau,(void *)render);
         surfaceMutex.lock();
         vdpau.fullQueue.push_back(render);
         surfaceMutex.unlock();
@@ -337,7 +336,7 @@
             ADM_vdpauRenderState *r=vdpau.fullQueue[i];
             if(r)
             {
-                if(r->surface)
+                if(r->surface!=VDP_INVALID_HANDLE)
                 {
                         if(VDP_STATUS_OK!=admVdpau::surfaceDestroy((r->surface)))
                                 ADM_error("Error destroying surface %d\n",i);
@@ -360,7 +359,7 @@
             out->refType=ADM_HW_NONE;
     }
 
-    if (!in->dataLength )	// Null frame, silently skipped
+    if(!_parent->getDrainingState() && !in->dataLength) // Null frame, silently skipped
     {
         out->_noPicture = 1;
         out->Pts=ADM_COMPRESSED_NO_PTS;
@@ -371,18 +370,10 @@
    // Put a safe value....
     out->Pts=in->demuxerPts;
     _context->reordered_opaque=in->demuxerPts;
-    int got_picture;
-    AVPacket pkt;
-    av_init_packet(&pkt);
-    pkt.data=in->data;
-    pkt.size=in->dataLength;
-    if(in->flags&AVI_KEY_FRAME)
-        pkt.flags=AV_PKT_FLAG_KEY;
-    else
-        pkt.flags=0;
 
     AVFrame *frame=_parent->getFramePointer();
     ADM_assert(frame);
+
     if(_parent->getDrainingState())
     {
         if(_parent->getDrainingInitiated()==false)
@@ -390,9 +381,21 @@
             avcodec_send_packet(_context, NULL);
             _parent->setDrainingInitiated(true);
         }
-    }else
+    }else if(!handover)
     {
+        AVPacket pkt;
+        av_init_packet(&pkt);
+        pkt.data=in->data;
+        pkt.size=in->dataLength;
+        if(in->flags&AVI_KEY_FRAME)
+            pkt.flags=AV_PKT_FLAG_KEY;
+        else
+            pkt.flags=0;
+
         avcodec_send_packet(_context, &pkt);
+    }else
+    {
+        handover=false;
     }
 
     int ret = avcodec_receive_frame(_context, frame);

avidemux_2.7.4.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_videotoolbox.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_videotoolbox.cpp Changed

@@ -131,7 +131,7 @@
 */
 bool decoderFFVT::uncompress(ADMCompressedImage *in, ADMImage *out)
 {
-    if(!in->dataLength ) // Null frame, silently skipped
+    if(!_parent->getDrainingState() && !in->dataLength) // Null frame, silently skipped
     {
         out->_noPicture = 1;
         out->Pts=ADM_COMPRESSED_NO_PTS;
@@ -144,14 +144,8 @@
 
     AVFrame *frame=_parent->getFramePointer();
     ADM_assert(frame);
-    AVPacket pkt;
-    av_init_packet(&pkt);
-    pkt.data=in->data;
-    pkt.size=in->dataLength;
-    if(in->flags&AVI_KEY_FRAME)
-        pkt.flags=AV_PKT_FLAG_KEY;
-    else
-        pkt.flags=0;
+
+    int ret;
 
     if(_parent->getDrainingState())
     {
@@ -160,12 +154,37 @@
             avcodec_send_packet(_context, NULL);
             _parent->setDrainingInitiated(true);
         }
+    }else if(!handover)
+    {
+        AVPacket pkt;
+        av_init_packet(&pkt);
+        pkt.data=in->data;
+        pkt.size=in->dataLength;
+        if(in->flags&AVI_KEY_FRAME)
+            pkt.flags=AV_PKT_FLAG_KEY;
+        else
+            pkt.flags=0;
+
+        ret = avcodec_send_packet(_context, &pkt);
+
+        /* libavcodec doesn't handle switching between field and frame encoded parts of H.264 streams
+        in the way VideoToolbox expects. Proceeding with avcodec_receive_frame as if nothing happened
+        triggers a segfault. As a workaround, retry once with the same data. We do lose one picture. */
+        if(ret == AVERROR_UNKNOWN)
+        {
+            ADM_warning("Unknown error from avcodec_send_packet, retrying...\n");
+            if(!alive)
+                return false; // avoid endless loop
+            alive = false; // misuse, harmless
+            return _parent->uncompress(in,out); // retry
+        }
     }else
     {
-        avcodec_send_packet(_context, &pkt);
+        handover=false;
     }
+    alive = true;
 
-    int ret = avcodec_receive_frame(_context, frame);
+    ret = avcodec_receive_frame(_context, frame);
 
     if(!_parent->decodeErrorHandler(ret))
         return false;

avidemux_2.7.4.tar.gz/avidemux/common/GUI_jobs.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/GUI_jobs.cpp Changed

@@ -28,29 +28,27 @@
 extern uint8_t DIA_job(uint32_t nb,char **name);
 uint8_t GUI_jobs(void)
 {
-uint32_t nb;
-        memset(jobName,0,sizeof(jobName));
-        const char *jobDir=ADM_getJobDir();
-        if(!buildDirectoryContent(&nb,ADM_getJobDir(),jobName,MAX_JOBS,"py"))
-        {
-          delete [] jobDir;
-          GUI_Error_HIG(QT_TRANSLATE_NOOP("jobs","Oops"),QT_TRANSLATE_NOOP("jobs","Something very wrong happened when building joblist."));
-                return 0;
-        }
-        delete [] jobDir;
-        if(!nb)
-        {
-          GUI_Info_HIG(ADM_LOG_IMPORTANT,QT_TRANSLATE_NOOP("jobs","There are no jobs stored"), NULL);
-                return 1;
-        }
-        DIA_job(nb,jobName);
-        for(int i=0;i<nb;i++)
-        {
-                //printf("List : %s\n",jobName[i]);
-                ADM_dealloc(jobName[i]);
-                jobName[i]=NULL;
-        }
+    uint32_t nb;
+    memset(jobName,0,sizeof(jobName));
+    std::string jobDir=ADM_getJobDir();
+    if(!buildDirectoryContent(&nb,jobDir.c_str(),jobName,MAX_JOBS,"py"))
+    {
+        GUI_Error_HIG(QT_TRANSLATE_NOOP("jobs","Oops"),QT_TRANSLATE_NOOP("jobs","Something very wrong happened when building joblist."));
+        return 0;
+    }
+    if(!nb)
+    {
+        GUI_Info_HIG(ADM_LOG_IMPORTANT,QT_TRANSLATE_NOOP("jobs","There are no jobs stored"), NULL);
         return 1;
+    }
+    DIA_job(nb,jobName);
+    for(int i=0;i<nb;i++)
+    {
+        //printf("List : %s\n",jobName[i]);
+        ADM_dealloc(jobName[i]);
+        jobName[i]=NULL;
+    }
+    return 1;
 }
 
 //EOF

avidemux_2.7.4.tar.gz/avidemux/common/gui_action.names -> avidemux_2.7.6.tar.gz/avidemux/common/gui_action.names Changed

avidemux_2.7.4.tar.gz/avidemux/common/gui_main.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/gui_main.cpp Changed

@@ -39,6 +39,8 @@
 #include "ADM_coreVideoEncoder.h"
 #include "ADM_videoEncoderApi.h"
 #include "ADM_muxerProto.h"
+
+#include "ADM_coreVideoFilterFunc.h"
 #include "ADM_audioFilter/include/ADM_audioFilterInterface.h"
 
 #include "avi_vars.h"
@@ -49,10 +51,10 @@
 #include "ADM_edAudioTrackExternal.h"
 #include "ADM_threads.h"
 #include "ADM_muxerProto.h"
-admMutex singleThread;
 
-float currentZoom=ZOOM_1_1;
+static admMutex singleThread("actionHandlerMutex");
 static int cutsNotOnIntraWarned;
+
 #include "DIA_audioTracks.h"
 //***********************************
 //******** A Function ***************
@@ -340,7 +342,6 @@
             A_saveSession();
             video_body->clearUndoQueue();
         }
-        autolock.unlock();
         return;
     case ACT_RESTORE_SESSION:
         if(playing) break;
@@ -432,14 +433,19 @@
         case ACT_ZOOM_1_2:
         case ACT_ZOOM_1_1:
         case ACT_ZOOM_2_1:
-        case ACT_ZOOM_4_1:
-                currentZoom=(float)(2<<(action-ACT_ZOOM_1_4))/8;
+        //case ACT_ZOOM_4_1:
+        {
+                float currentZoom=(float)(2<<(action-ACT_ZOOM_1_4))/8;
                 UI_setBlockZoomChangesFlag(true);
                 changePreviewZoom(currentZoom);
                 UI_setBlockZoomChangesFlag(false);
                 UI_resetZoomThreshold();
                 admPreview::samePicture();
                 break;
+        }
+        case ACT_ZOOM_FIT_IN:
+                UI_setZoomToFitIntoWindow();
+                break;
         case ACT_AUDIO_SELECT_TRACK:
                 A_audioTrack();
                 break;
@@ -560,21 +566,21 @@
               {
                   video_body->pasteFromClipBoard(currentPts);
               }
-              ADM_cutPointType chk=ADM_EDITOR_CUT_POINT_IDR;
+              ADM_cutPointType chk=ADM_EDITOR_CUT_POINT_KEY;
               if(!UI_getCurrentVCodec())
                   chk=video_body->checkCutsAreOnIntra();
-              if(cutsNotOnIntraWarned!=(int)chk && chk!=ADM_EDITOR_CUT_POINT_IDR)
+              if(cutsNotOnIntraWarned!=(int)chk && chk!=ADM_EDITOR_CUT_POINT_KEY)
               {
                   const char *alert;
                   bool ask=true;
                   switch(chk)
                   {
-                      case ADM_EDITOR_CUT_POINT_NON_IDR:
+                      case ADM_EDITOR_CUT_POINT_NON_KEY:
                           alert=QT_TRANSLATE_NOOP("adm","The cut points of the pasted video are not on keyframes.\n"
                               "Video saved in copy mode will be corrupted at these points.\n"
                               "Proceed anyway?");
                           break;
-                      case ADM_EDITOR_CUT_POINT_RECOVERY:
+                      case ADM_EDITOR_CUT_POINT_BAD_POC:
                           alert=QT_TRANSLATE_NOOP("adm","This video uses non-IDR recovery points instead of IDR as keyframes. "
                               "Picture reordering information in the video stream is not reset at non-IDR frames. "
                               "The cut points of the pasted selection may result in playback interruption "
@@ -718,16 +724,16 @@
                 GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Cutting"),QT_TRANSLATE_NOOP("adm","Error while cutting out."));
                 break;
             }
-            ADM_cutPointType chk=ADM_EDITOR_CUT_POINT_IDR;
+            ADM_cutPointType chk=ADM_EDITOR_CUT_POINT_KEY;
             if(!lastFrame && !UI_getCurrentVCodec())
                 chk=video_body->checkCutIsOnIntra(a);
-            if(cutsNotOnIntraWarned!=(int)chk && chk!=ADM_EDITOR_CUT_POINT_IDR)
+            if(cutsNotOnIntraWarned!=(int)chk && chk!=ADM_EDITOR_CUT_POINT_KEY)
             {
                 const char *alert;
                 bool ask=true;
                 switch(chk)
                 {
-                    case ADM_EDITOR_CUT_POINT_NON_IDR:
+                    case ADM_EDITOR_CUT_POINT_NON_KEY:
                         if(action==ACT_Cut)
                             alert=QT_TRANSLATE_NOOP("adm","The end point of the cut is not on a keyframe.\n"
                                 "Video saved in copy mode will be corrupted at this point.\n"
@@ -737,7 +743,7 @@
                                 "Video saved in copy mode will be corrupted at this point.\n"
                                 "Proceed anyway?");
                         break;
-                    case ADM_EDITOR_CUT_POINT_RECOVERY:
+                    case ADM_EDITOR_CUT_POINT_BAD_POC:
                         if(action==ACT_Cut)
                             alert=QT_TRANSLATE_NOOP("adm","This video uses non-IDR recovery points instead of IDR as keyframes. "
                                 "Picture reordering information in the video stream is not reset at non-IDR frames. "
@@ -1074,12 +1080,6 @@
       GUI_Error_HIG (QT_TRANSLATE_NOOP("adm","Something failed when appending"), NULL);
       return 0;
     }
-    if (!video_body->updateVideoInfo (avifileinfo))
-    {
-      GUI_Error_HIG (QT_TRANSLATE_NOOP("adm","Something bad happened (II)"), NULL);
-      return 0;
-    }
-
 
     if(!markerChanged)
     {        
@@ -1631,7 +1631,7 @@
         if(!name || !final) return;
         if(!*name || !*final) return;
 
-        base=ADM_getJobDir();
+        base=ADM_strdup(ADM_getJobDir().c_str());
         fullname=new char[strlen(name)+strlen(base)+2+4];
 
         strcpy(fullname,base);
@@ -1642,7 +1642,7 @@
         A_saveScript(getScriptEngines()[0], final);
 
         delete [] fullname;
-        delete [] base;
+        ADM_dealloc(base);
         ADM_dealloc(name);
         ADM_dealloc(final);
 }
@@ -1709,6 +1709,7 @@
       delete avifileinfo;
       //delete wavinfo;
       avifileinfo = NULL;
+      ADM_vf_clearFilters();
       video_body->clearUndoQueue();
       video_body->cleanup ();
       UI_setAudioTrackCount(0);

avidemux_2.7.4.tar.gz/avidemux/common/gui_navigate.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/gui_navigate.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/common/gui_save.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/gui_save.cpp Changed

@@ -92,6 +92,9 @@
         case WAV_AAC_HE:
             *audioFileExtension="aac";
             break;
+        case WAV_DTS:
+            *audioFileExtension="dts";
+            break;
         default: break;
     };
     return true;
@@ -112,6 +115,7 @@
     {
     case ACT_SAVE_QUEUE:
             {
+                if(!ADM_mx_getNbMuxers()) break;
                 if(false==ADMJob::jobInit())
                 {
                     GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Job"),QT_TRANSLATE_NOOP("adm","Cannot reach database. Do you have Job control running ?"));
@@ -119,8 +123,9 @@
                 {
                     std::string oFile;
                     std::string prefilled=std::string("Job ")+ADM_getTimeDateAsString();
+                    const char *defaultExtension=ADM_MuxerGetDefaultExtension(UI_GetCurrentFormat());
                     char *oText=ADM_strdup(prefilled.c_str());
-                    diaElemFile wFile(1,oFile,QT_TRANSLATE_NOOP("adm","Output file"),"");
+                    diaElemFile wFile(1,oFile,QT_TRANSLATE_NOOP("adm","Output file"),defaultExtension,NULL);
                     diaElemText wText(&oText,QT_TRANSLATE_NOOP("adm","Job name"));
                     diaElem *elems[2]={&wText,&wFile};
 
@@ -128,6 +133,7 @@
                     {
                         A_queueJob(oText,oFile.c_str());
                     }
+                    ADM_dealloc(oText);
                     ADMJob::jobShutDown();
                 }
             }
@@ -483,7 +489,7 @@
     ADM_PathSplit(std::string(name),baseName,ext);
 
     int check=strlen(baseName.c_str());
-    check+=10;
+    check+=11; // '-'+'\d{5}'+'\.'+'jpg'+'\0'
     if(check>MAX_LEN)
     {
         ADM_error("Full path = %d is too long, aborting.\n",check);
@@ -554,19 +560,11 @@
         working->update((uint32_t)pts,range);
         success++;
         if(!working->isAlive()) break;
-        sprintf(fullName,"%s-%04d.jpg",baseName.c_str(),success);
+        sprintf(fullName,"%s-%05d.jpg",baseName.c_str(),success);
         if(!src->saveAsJpg(fullName)) break;
-        if(success==9999)
-        {
-            GUI_Info_HIG(ADM_LOG_INFO,QT_TRANSLATE_NOOP("adm","Warning"),QT_TRANSLATE_NOOP("adm","Maximum number of 9999 images reached, aborting."));
-            break;
-        }
+        if(success==99999) break;
     }
 
-    if(success)
-        GUI_Info_HIG(ADM_LOG_INFO,QT_TRANSLATE_NOOP("adm","Done"),QT_TRANSLATE_NOOP("adm","Saved %d images."),success);
-    else
-        GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Error"),QT_TRANSLATE_NOOP("adm","Saving images failed."));
     delete working;
     working=NULL;
     delete src;
@@ -575,6 +573,13 @@
     chain=NULL;
     filter=NULL;
 
+    if(success==99999)
+        GUI_Info_HIG(ADM_LOG_INFO,QT_TRANSLATE_NOOP("adm","Warning"),QT_TRANSLATE_NOOP("adm","Maximum number of 99999 images reached."));
+    else if(success)
+        GUI_Info_HIG(ADM_LOG_INFO,QT_TRANSLATE_NOOP("adm","Done"),QT_TRANSLATE_NOOP("adm","Saved %d images."),success);
+    else
+        GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Error"),QT_TRANSLATE_NOOP("adm","Saving images failed."));
+
     admPreview::seekToTime(original);
     admPreview::deferDisplay(false);
     return success;
@@ -678,7 +683,7 @@
             job.jobName=string(jobName);
 //#warning make sure it is unique
             job.scriptName=string(jobName)+string(".")+engine->defaultFileExtension();
-            string completePath=string(ADM_getJobDir());
+            string completePath=ADM_getJobDir();
             completePath+=job.scriptName;
             bool collision=false;
             if(ADM_fileExist(completePath.c_str()))

avidemux_2.7.4.tar.gz/avidemux/common/gui_savenew.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/gui_savenew.cpp Changed

@@ -94,6 +94,8 @@
     uint64_t current=video_body->getCurrentFramePts();
     char *fullpath=ADM_PathCanonize(name);
     admSaver *save=new admSaver(fullpath);
+    delete [] fullpath;
+    fullpath=NULL;
     bool r=save->save();
     delete save;
     ADM_slaveSendResult(r);
@@ -188,6 +190,9 @@
         if(false==pass1->setup())
         {
             printf("[Save] setup failed for pass1 encoder\n");
+            GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Video"),QT_TRANSLATE_NOOP("adm","Cannot set up encoder for the first pass. "
+                "The configuration supplied to the encoder may be incompatible "
+                "or the encoder may depend on features unavailable on this system."));
             delete pass1;
             pass1=NULL;
             return NULL;
@@ -209,24 +214,29 @@
         bitstream.bufferSize=BUFFER_SIZE;
         int nbFrames=0;
         uint32_t percent=0;
+#define GUI_REFRESH_DELAY 500 // in ms
+        uint32_t nextUpdate=GUI_REFRESH_DELAY;
         while(pass1->encode(&bitstream))
         {
             if(bitstream.pts!=ADM_NO_PTS)
             {
+                UI_purge();
+                if(!muxer->getEncoding()->isAlive())
+                {
+                    abort=true;
+                    break;
+                }
                 float f=100;
                 f/=videoDuration;
                 f*=bitstream.pts;
                 uint32_t p=(uint32_t)f;
                 if(percent<p)
-                    percent=p; // avoid progress bar going backwards
-                if(!muxer->getEncoding()->isAlive())
                 {
-                    abort=true;
-                    break;
+                    percent=p; // avoid progress bar going backwards
+                    muxer->getEncoding()->setPercent(percent);
                 }
-                muxer->getEncoding()->setPercent(percent);
                 uint32_t elapsed=ticktock.getElapsedMS();
-                if(percent>=1)
+                if(percent>=1 && elapsed>nextUpdate)
                 {
                     double totalTime=(100*elapsed)/percent;
                     double remaining=totalTime-elapsed;
@@ -234,6 +244,8 @@
                         remaining=0;
                     uint32_t remainingMs=(uint32_t)remaining;
                     muxer->getEncoding()->setRemainingTimeMS(remainingMs);
+                    nextUpdate=elapsed+GUI_REFRESH_DELAY;
+#undef GUI_REFRESH_DELAY
                 }
             }
             nbFrames++;
@@ -289,6 +301,7 @@
             default:
             case 0:  // Both source and target are mp4 , nothing to do
                 ADM_info("Input and output are mp4 style, nothing to do\n");
+                copy=new ADM_videoStreamCopySeiInjector(markerA,markerB);
                 break;
             case 1:  // source is mp4, target is annexB
                 ADM_info("Input is probably MP4 bitstream, target is annexB\n");
@@ -375,18 +388,14 @@
         }
         if(encoder->setup()==false)
         {
-            GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Video"),QT_TRANSLATE_NOOP("adm","Cannot setup codec. Bitrate too low?"));
+            GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Video"),QT_TRANSLATE_NOOP("adm","Cannot set up encoder. "
+                "The configuration supplied to the encoder may be incompatible "
+                "or the encoder may depend on features unavailable on this system."));
             delete encoder;
             encoder=NULL;
             return NULL;
         }
         video= new ADM_videoStreamProcess(encoder);
-        if(!video)
-        {
-                GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Video"),QT_TRANSLATE_NOOP("adm","Cannot create encoder"));
-                delete encoder;
-                return NULL;
-        }
     }  
     return video;
 }
@@ -447,12 +456,12 @@
         bool ask=true;
         switch(chk)
         {
-            case ADM_EDITOR_CUT_POINT_NON_IDR:
+            case ADM_EDITOR_CUT_POINT_NON_KEY:
                 alert=QT_TRANSLATE_NOOP("adm","The video is in copy mode but the cut points are not on keyframes.\n"
                     "The video will be saved but there will be corruption at cut point(s).\n"
                     "Do you want to continue anyway ?");
                 break;
-            case ADM_EDITOR_CUT_POINT_RECOVERY:
+            case ADM_EDITOR_CUT_POINT_BAD_POC:
                 alert=QT_TRANSLATE_NOOP("adm","This video uses non-IDR recovery points instead of IDR as keyframes. "
                     "Picture reordering information in the video stream is not reset at non-IDR frames. "
                     "The choice of cut points may result in playback interruption "
@@ -511,7 +520,8 @@
     }else
     {
         ret=muxer->save();
-        muxer->close();
+        if(false==muxer->close())
+            ret=false;
     }
 
     if(video)

avidemux_2.7.4.tar.gz/avidemux/common/main.cpp -> avidemux_2.7.6.tar.gz/avidemux/common/main.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/osxInstaller/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux/osxInstaller/CMakeLists.txt Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_UIs/include/ADM_toolkitQt.h -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_UIs/include/ADM_toolkitQt.h Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_UIs/src/FAC_float.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_UIs/src/FAC_float.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_UIs/src/FAC_integer.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_UIs/src/FAC_integer.cpp Changed

@@ -29,7 +29,8 @@
 {
 class diaElemInteger : public diaElem,QtFactoryUtils
 {
-
+protected:
+  void *label;
 public:
   int32_t min,max;
   diaElemInteger(int32_t *intValue,const char *toggleTitle, int32_t min, int32_t max,const char *tip=NULL);
@@ -42,7 +43,8 @@
 /* Same but unsigned */
 class diaElemUInteger : public diaElem,QtFactoryUtils
 {
-
+protected:
+  void *label;
 public:
   uint32_t min,max;
   diaElemUInteger(uint32_t *intValue,const char *toggleTitle, uint32_t min, uint32_t max,const char *tip=NULL);
@@ -80,6 +82,7 @@
  QLabel *text=new QLabel( myQtTitle,(QWidget *)dialog);
  text->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
  text->setBuddy(box);
+ label=(void *)text;
 
  QSpacerItem *spacer = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
@@ -101,12 +104,12 @@
 }
 void diaElemInteger::enable(uint32_t onoff) 
 {
- QSpinBox *box=(QSpinBox *)myWidget;
+  QLabel *txt=(QLabel *)label;
+  ADM_assert(txt);
+  QSpinBox *box=(QSpinBox *)myWidget;
   ADM_assert(box);
-  if(onoff)
-    box->setEnabled(1);
-  else
-    box->setDisabled(1);
+  txt->setEnabled(!!onoff);
+  box->setEnabled(!!onoff);
 }
 
 int diaElemInteger::getRequiredLayout(void) { return FAC_QT_GRIDLAYOUT; }
@@ -140,6 +143,7 @@
  QLabel *text=new QLabel(myQtTitle,(QWidget *)dialog);
  text->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
  text->setBuddy(box);
+ label=(void *)text;
 
  QSpacerItem *spacer = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
@@ -162,12 +166,12 @@
 
 void diaElemUInteger::enable(uint32_t onoff) 
 {
- QSpinBox *box=(QSpinBox *)myWidget;
+  QLabel *txt=(QLabel *)label;
+  ADM_assert(txt);
+  QSpinBox *box=(QSpinBox *)myWidget;
   ADM_assert(box);
-  if(onoff)
-    box->setEnabled(1);
-  else
-    box->setDisabled(1);
+  txt->setEnabled(!!onoff);
+  box->setEnabled(!!onoff);
 }
 
 int diaElemUInteger::getRequiredLayout(void) { return FAC_QT_GRIDLAYOUT; }

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_UIs/src/FAC_readOnlyText.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_UIs/src/FAC_readOnlyText.cpp Changed

@@ -29,6 +29,9 @@
 
 class diaElemReadOnlyText : public diaElem,QtFactoryUtils
 {
+protected:
+
+  int layoutType;
 
 public:
   
@@ -36,6 +39,7 @@
   virtual ~diaElemReadOnlyText() ;
   void setMe(void *dialog, void *opaque,uint32_t line);
   void getMe(void);
+  void enable(uint32_t onoff);
   int getRequiredLayout(void);
 };
 
@@ -56,35 +60,62 @@
 diaElemReadOnlyText::diaElemReadOnlyText(const char *readyOnly,const char *toggleTitle,const char *tip)
   : diaElem(ELEM_TOGGLE),QtFactoryUtils(toggleTitle)
 {
-  param=(void *)ADM_strdup(readyOnly);
-  this->tip=tip;
- }
+    param=(void *)ADM_strdup(readyOnly);
+    this->tip=tip;
+    if(readyOnly && toggleTitle)
+        layoutType=FAC_QT_GRIDLAYOUT;
+    else
+        layoutType=FAC_QT_VBOXLAYOUT;
+}
 
 diaElemReadOnlyText::~diaElemReadOnlyText()
 {
- 
+
 }
+
 void diaElemReadOnlyText::setMe(void *dialog, void *opaque,uint32_t line)
 {
+    QLabel *text,*text2;
 
-  QGridLayout *layout=(QGridLayout*) opaque;
+    if(layoutType==FAC_QT_GRIDLAYOUT)
+    {
+        QGridLayout *layout=(QGridLayout *) opaque;
 
-   
- 
- QLabel *text=new QLabel( myQtTitle,(QWidget *)dialog);
-  QLabel *text2=new QLabel( QString::fromUtf8((char *)param),(QWidget *)dialog);
- text->setBuddy(text2);
- layout->addWidget(text,line,0);
- layout->addWidget(text2,line,1);
- myWidget=(void *)text2;  
+        text=new QLabel( myQtTitle,(QWidget *)dialog);
+        text2=new QLabel( QString::fromUtf8((char *)param),(QWidget *)dialog);
+        text->setBuddy(text2);
+        layout->addWidget(text,line,0);
+        layout->addWidget(text2,line,1);
+
+        myWidget=(void *)text2;
+    }else
+    {
+        QVBoxLayout *layout=(QVBoxLayout *)opaque;
+
+        if(myQtTitle.isEmpty())
+            text=new QLabel( QString::fromUtf8((char *)param),(QWidget *)dialog);
+        else
+            text=new QLabel( myQtTitle,(QWidget *)dialog);
+        layout->addWidget(text);
+        text->setWordWrap(true);
+
+        myWidget=(void *)text;
+    }
 }
+
 void diaElemReadOnlyText::getMe(void)
 {
 
- 
 }
 
-int diaElemReadOnlyText::getRequiredLayout(void) { return FAC_QT_GRIDLAYOUT; }
+void diaElemReadOnlyText::enable(uint32_t onoff)
+{
+    ADM_assert(myWidget);
+    QLabel *l=(QLabel *)myWidget;
+    l->setEnabled(!!onoff);
+}
+
+int diaElemReadOnlyText::getRequiredLayout(void) { return layoutType; }
 
 //*********************************

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_UIs/src/T_QSlider.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_UIs/src/T_QSlider.cpp Changed

@@ -16,6 +16,7 @@
 #include "ADM_inttype.h"
 #include <QSlider>
 #include <QStyleOptionSlider>
+#include <QToolTip>
 #include <QMouseEvent>
 #include "ADM_toolkitQt.h"
 #include "ADM_assert.h"
@@ -66,12 +67,50 @@
 
             newVal = minimum() + (maximum() - minimum()) * normalizedPosition;
         }
-
-        setValue(newVal);
+        if(layoutDirection() == Qt::LeftToRight)
+            setValue(newVal);
+        else
+            setValue(maximum() - newVal);
         e->accept();
     }else
     {
         QSlider::mousePressEvent(e);
     }
 }
+
+/**
+    \fn ADM_SliderIndicator
+*/
+ADM_SliderIndicator::ADM_SliderIndicator(QWidget *parent) : QSlider(parent)
+{
+}
+
+/**
+    \fn sliderChange
+    \brief show slider value in a tooltip below slider handle on drag or move
+           stolen from https://stackoverflow.com/questions/18383885/qslider-show-min-max-and-current-value
+*/
+void ADM_SliderIndicator::sliderChange(QAbstractSlider::SliderChange change)
+{
+    QSlider::sliderChange(change);
+
+    if(change == QAbstractSlider::SliderValueChange)
+    {
+        QStyleOptionSlider opt;
+        initStyleOption(&opt);
+
+        QRect sr = style()->subControlRect(QStyle::CC_Slider, &opt, QStyle::SC_SliderHandle, this);
+        QPoint bottomLeftCorner = sr.bottomLeft();
+        QPoint bottomRightCorner = sr.bottomRight();
+        int xpos = bottomLeftCorner.x() + bottomRightCorner.x();
+        int ypos = bottomLeftCorner.y();
+
+        QFontMetrics fm = fontMetrics();
+        QString text = QString::number(value());
+        xpos -= fm.boundingRect(text).width() + 12;
+        xpos /= 2;
+
+        QToolTip::showText(mapToGlobal(QPoint(xpos, ypos)), text, this);
+    }
+}
 //EOF

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_UIs/src/T_bitrate.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_UIs/src/T_bitrate.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_UIs/src/T_dialogFactory.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_UIs/src/T_dialogFactory.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_UIs/src/T_filesel.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_UIs/src/T_filesel.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_UIs/src/T_menu.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_UIs/src/T_menu.cpp Changed

@@ -19,6 +19,7 @@
 
 #include <QGridLayout>
 #include <QLabel>
+#include <QAbstractItemView>
 
 extern const char *shortkey(const char *);
 
@@ -159,6 +160,9 @@
     combo->addItem(QString::fromUtf8(entries[i]->text));
     if( *(uint32_t *)param==entries[i]->val) mem=i;
   }
+  int wdth=combo->minimumSizeHint().width();
+  combo->view()->setMinimumWidth(wdth);
+
    combo->setCurrentIndex(mem);
    text->setBuddy(combo);
    layout->addWidget(text,line,0);
@@ -166,6 +170,7 @@
    layout->addItem(spacer,line,2);
    
    combo->connectMe();
+   label=(void *)text;
 }
 
 void diaElemMenuDynamic::getMe(void)
@@ -220,13 +225,13 @@
   }
 }
 void diaElemMenuDynamic::enable(uint32_t onoff)
-{ 
-   ADM_QComboBox *combo=(ADM_QComboBox *)myWidget;
-  ADM_assert(combo);
-  if(onoff)
-    combo->setEnabled(true);
-  else
-    combo->setDisabled(true);
+{
+    ADM_QComboBox *combo=(ADM_QComboBox *)myWidget;
+    ADM_assert(combo);
+    QLabel *txt=(QLabel *)label;
+    ADM_assert(txt);
+    txt->setEnabled(!!onoff);
+    combo->setEnabled(!!onoff);
 }
 
 uint8_t   diaElemMenuDynamic::link(diaMenuEntryDynamic *entry,uint32_t onoff,diaElem *w)

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_UIs/src/T_menu.h -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_UIs/src/T_menu.h Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_jobs/include/T_jobs.h -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_jobs/include/T_jobs.h Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp Changed

@@ -143,7 +143,7 @@
     \fn ctor
 */
 #define QT_NOOP(x) x
-jobWindow::jobWindow(void) : QDialog()
+jobWindow::jobWindow(bool mode) : QDialog()
 {
     ui.setupUi(this);
     ui.tableWidget->setColumnCount(6); // Job name, fileName, Status
@@ -184,7 +184,7 @@
     //ADM_socket *n=mySocket.waitForConnect(5000);
     refreshList();
     dialog=NULL;
-
+    portable=mode;
 }
 /**
     \fn dtor
@@ -213,7 +213,8 @@
     QApplication *app=new QApplication(ac,av,0);
     Q_INIT_RESOURCE(jobs);
     loadTranslator();
-    jobWindow *jWindow=new jobWindow();
+    bool pmode=ac>1 && !strcmp(av[1],"--portable");
+    jobWindow *jWindow=new jobWindow(pmode);
 
     jWindow->exec();
     destroyTranslator();
@@ -265,9 +266,12 @@
                         break;
             case   JobAction_runNow:
                         {
+                            if(dialog) break;
                             dialog=new jobProgress(1);
                             dialog->setCurrentJob(0);
                             dialog->setCurrentOutputName(j->outputFileName);
+                            dialog->open();
+                            QApplication::processEvents();
                             runOneJob(*j);
                             delete dialog;
                             dialog=NULL;
@@ -352,6 +356,7 @@
 */
 void jobWindow::runAllJob(void)
 {
+    if(dialog) return;
     int n=listOfJob.size();
     dialog=new jobProgress(n);
 
@@ -363,6 +368,8 @@
             {
                 dialog->setCurrentJob(i);
                 dialog->setCurrentOutputName(j->outputFileName);
+                dialog->open();
+                QApplication::processEvents();
                 runOneJob(*j);
             }
     }

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobProgress.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobProgress.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_runOneJob.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_runOneJob.cpp Changed

@@ -69,14 +69,14 @@
     return NULL;
 }
 
-bool spawnProcess(const char *processName, int argc, const string argv[])
+static bool spawnProcess(const char *processName, const vector <string> args)
 {
     ADM_info("Starting <%s>\n",processName);
     string command=string(processName);
-    for(int i=0;i<argc;i++)
+    for(int i=0;i<args.size();i++)
     {
-        ADM_info("%d : %s\n",i,argv[i].c_str());
-        command+=string(" ")+argv[i];
+        ADM_info("%d : %s\n",i,args.at(i).c_str());
+        command+=string(" ")+args.at(i);
     }
     ADM_info("=>%s\n",command.c_str());
     ADM_info("==================== Start of spawner process job ================\n");
@@ -128,20 +128,23 @@
 */
 bool jobWindow::runProcess(spawnData *data)
 {
-    // 3 args in our case...
-    string argv[5];
+    vector <string> args;
+    if(portable)
+        args.push_back(string("--portable"));
+    args.push_back(string("--nogui "));
     char str[100];
     sprintf(str,"--slave %d",localPort);
-    argv[0]=string("--nogui ");
-    argv[1]=string(str);
-    argv[2]=string("--run \"")+data->script+string("\" ");
-    argv[3]=string("--save \"")+data->outputFile+string("\" ");
+    args.push_back(string(str));
+    string s=string("--run \"")+data->script+string("\" ");
+    args.push_back(s);
+    s=string("--save \"")+data->outputFile+string("\" ");
+    args.push_back(s);
 #ifndef _WIN32
-    argv[4]=string("--quit > /tmp/prout.log");
+    args.push_back(string("--quit > /tmp/prout.log"));
 #else
-    argv[4]=string("--quit ");
+    args.push_back(string("--quit"));
 #endif
-    return spawnProcess(data->exeName,5,argv);
+    return spawnProcess(data->exeName,args);
 }
 /**
     \fn spawnChild
@@ -187,10 +190,7 @@
     // 1- Start listening to socket
 
     // 2- Spawn  child
-    string ScriptFullPath;
-    
-    
-    ScriptFullPath=string(ADM_getJobDir())+slash+string(job.scriptName);
+    string ScriptFullPath=ADM_getJobDir()+slash+string(job.scriptName);
     const char *avidemuxVersion=MKCLI();
     if(ui.checkBoxUseQt4->isChecked())
     {

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_jobs/src/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_jobs/src/CMakeLists.txt Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_openGL/src/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_openGL/src/CMakeLists.txt Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp Changed

@@ -438,7 +438,7 @@
                                 QString num;
                                 ADM_edAudioTrackFromVideo *fromVideo=edTrack->castToTrackFromVideo() ;
                                 num.setNum(fromVideo->getMyTrackIndex());
-                                str=QString(QT_TRANSLATE_NOOP("qaudiotracks","Track "))+num+QString(QT_TRANSLATE_NOOP("qaudiotracks"," from video"));
+                                str=QString::fromUtf8(QT_TRANSLATE_NOOP("qaudiotracks","Track "))+num+QString::fromUtf8(QT_TRANSLATE_NOOP("qaudiotracks"," from video"));
                                 }
                                 break;
                 case ADM_EDAUDIO_EXTERNAL:
@@ -446,7 +446,7 @@
                                 ADM_edAudioTrackExternal *ext=edTrack->castToExternal() ;
                                 ADM_assert(ext);
                                 std::string name=ext->getMyName();
-                                str=QString(QT_TRANSLATE_NOOP("qaudiotracks","File "))+QString(name.c_str());
+                                str=QString::fromUtf8(QT_TRANSLATE_NOOP("qaudiotracks","File "))+QString::fromUtf8(name.c_str());
                                 }
                                 break;
                 default:
@@ -480,7 +480,7 @@
    
     //--
     // add the "add audio track" item
-    window->inputs[dex]->addItem(QString(QT_TRANSLATE_NOOP("qaudiotracks",".... Add audio track")));
+    window->inputs[dex]->addItem(QString::fromUtf8(QT_TRANSLATE_NOOP("qaudiotracks",".... Add audio track")));
     // set index if possible
     if(forcedIndex==-1)
     {
@@ -514,7 +514,7 @@
     // now add codecs
     int nbAud=audioEncoderGetNumberOfEncoders();
     window->codec[dex]->clear();
-    window->codec[dex]->addItem(QString(QT_TRANSLATE_NOOP("qaudiotracks","copy")));
+    window->codec[dex]->addItem(QString::fromUtf8(QT_TRANSLATE_NOOP("qaudiotracks","copy")));
 	for(uint32_t i=1;i<nbAud;i++)
 	{
 		QString name=QString(audioEncoderGetDisplayName(i));

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.cpp Changed

@@ -19,10 +19,10 @@
 
 
 #include "prefs.h"
-#include "DIA_working.h"
 #include "DIA_encoding.h"
 #include "DIA_coreToolkit.h"
 #include "ADM_vidMisc.h"
+#include "ADM_misc.h"
 #include "ADM_toolkitQt.h"
 #include "GUI_ui.h"
 #include "ADM_coreUtils.h"
@@ -84,6 +84,27 @@
 
 		GUI_Error_HIG(QT_TRANSLATE_NOOP("qencoding","Privileges Required"), QT_TRANSLATE_NOOP("qencoding","Root privileges are required to perform this operation."));
 	}
+#else
+	if(state)
+	{
+		ui->checkBoxKeepOpen->disconnect(SIGNAL(stateChanged(int)));
+		ui->checkBoxKeepOpen->setCheckState(Qt::Unchecked);
+		stayOpen=false;
+		connect(ui->checkBoxKeepOpen, SIGNAL(stateChanged(int)), this, SLOT(keepOpenChanged(int)));
+	}
+#endif
+}
+
+void DIA_encodingQt4::keepOpenChanged(int state)
+{
+    stayOpen=!!state;
+#ifdef _WIN32
+    if(state)
+    {
+        ui->checkBoxShutdown->disconnect(SIGNAL(stateChanged(int)));
+        ui->checkBoxShutdown->setCheckState(Qt::Unchecked);
+        connect(ui->checkBoxShutdown, SIGNAL(stateChanged(int)), this, SLOT(shutdownChanged(int)));
+    }
 #endif
 }
 
@@ -92,6 +113,7 @@
 DIA_encodingQt4::DIA_encodingQt4(uint64_t duration) : DIA_encodingBase(duration)
 {
         stopRequest=false;
+        stayOpen=false;
         UI_getTaskBarProgress()->enable();
         ui=new Ui_encodingDialog;
 	ui->setupUi(this);
@@ -108,10 +130,10 @@
             ui->comboBoxPriority->setVisible(false);
             ui->labelPrio->setVisible(false);
         }
+        ui->checkBoxShutdown->setVisible(false);
 #endif
-        ui->checkBoxShutdown->setVisible(false); // shutdown is disabled, hide the checkbox on all platforms
-
 	connect(ui->checkBoxShutdown, SIGNAL(stateChanged(int)), this, SLOT(shutdownChanged(int)));
+	connect(ui->checkBoxKeepOpen, SIGNAL(stateChanged(int)), this, SLOT(keepOpenChanged(int)));
 	connect(ui->pushButton1, SIGNAL(pressed()), this, SLOT(useTrayButtonPressed()));
 	connect(ui->pushButton2, SIGNAL(pressed()), this, SLOT(pauseButtonPressed()));
 	connect(ui->comboBoxPriority, SIGNAL(currentIndexChanged(int)), this, SLOT(priorityChanged(int)));
@@ -154,21 +176,26 @@
 {
     ADM_info("Destroying encoding qt4\n");
     UI_getTaskBarProgress()->disable();
-    //bool shutdownRequired = (ui->checkBoxShutdown->checkState() == Qt::Checked);
+    bool shutdownRequested = (ui->checkBoxShutdown->checkState() == Qt::Checked);
     if(tray)
     {
         UI_deiconify();
         delete tray;
         tray=NULL;
     }
-        
-	
-	if(ui) 
-        {
-            qtUnregisterDialog(this);
-            delete ui;
-            ui=NULL;
-        }
+    if(ui)
+    {
+        qtUnregisterDialog(this);
+        delete ui;
+        ui=NULL;
+    }
+    if(shutdownRequested)
+    {
+        prefs->save(); // won't get another chance
+        ADM_info("Requesting shutdown...\n");
+        if(!ADM_shutdown())
+            ADM_warning("Shutdown request failed\n");
+    }
 }
 /**
     \fn setPhasis(const char *n)
@@ -181,16 +208,12 @@
     if(!strcmp(n,"Pass 1"))
     {
         ui->tabWidget->setTabEnabled(1, false); // disable the "Advanced" tab
-        ui->checkBoxShutdown->setVisible(false); // hide the shutdown checkbox
         this->setWindowTitle(QString::fromUtf8(QT_TRANSLATE_NOOP("qencoding","First Pass")));
         WRITEM(labelPhasis,QT_TRANSLATE_NOOP("qencoding","Pass 1"));
     }else
     {
         this->setWindowTitle(QString::fromUtf8(QT_TRANSLATE_NOOP("qencoding","Encoding...")));
         ui->tabWidget->setTabEnabled(1, true);
-#if 0
-        ui->checkBoxShutdown->setVisible(true);
-#endif
         WRITEM(labelPhasis,n);
     }
 }
@@ -367,33 +390,67 @@
 
 /**
     \fn isAlive( void )
-    \brief return 0 if the window was killed or cancel button press, 1 otherwisearchForward
+    \brief return 0 if the window was killed or cancel button pressed, 1 otherwise
 */
 bool DIA_encodingQt4::isAlive( void )
 {
+    if(!stopRequest)
+        return true;
+
+    if(GUI_Alternate((char*)QT_TRANSLATE_NOOP("qencoding","The encoding is paused. Do you want to resume or abort?"),
+                     (char*)QT_TRANSLATE_NOOP("qencoding","Resume"),(char*)QT_TRANSLATE_NOOP("qencoding","Abort")))
+    {
+        stopRequest=false;
+        return true;
+    }
+    ui->checkBoxShutdown->setCheckState(Qt::Unchecked);
+    return false;
+}
 
-        if(stopRequest)
+/**
+    \fn keepOpen
+    \brief Allow user to read the muxing stats calmly
+*/
+void DIA_encodingQt4::keepOpen(void)
+{
+    if(stayOpen)
+    {
+        stopRequest=true;
+        UI_getTaskBarProgress()->disable();
+        if(tray)
         {
-                if(GUI_Alternate((char*)QT_TRANSLATE_NOOP("qencoding","The encoding is paused. Do you want to resume or abort?"),
-                              (char*)QT_TRANSLATE_NOOP("qencoding","Resume"),(char*)QT_TRANSLATE_NOOP("qencoding","Abort")))
-                 {
-                         stopRequest=false;
-                 }
+            UI_deiconify();
+            delete tray;
+            tray=NULL;
         }
-
-        if(!stopRequest) return true;		
-
-        return false;
+        ui->checkBoxShutdown->setCheckState(Qt::Unchecked);
+        ui->checkBoxShutdown->setEnabled(false);
+        ui->pushButton1->setEnabled(false);
+        ui->pushButton2->setEnabled(false);
+        ui->comboBoxPriority->setEnabled(false);
+        show();
+        while(stayOpen)
+        {
+            ADM_usleep(100*1000);
+            QCoreApplication::processEvents();
+        }
+    }
 }
+
 /**
  * \fn closeEvent
  * @param event
  */
- void DIA_encodingQt4::closeEvent(QCloseEvent *event) 
+void DIA_encodingQt4::closeEvent(QCloseEvent *event)
+{
+    if(stopRequest && stayOpen)
     {
-        stopRequest=true;
-        event->ignore(); // keep window
+        stayOpen=false;
+        return;
     }
+    stopRequest=true;
+    event->ignore(); // keep window
+}
 
 /**
  * \fn reject
@@ -401,6 +458,11 @@
  */
 void DIA_encodingQt4::reject(void)
 {
+    if(stopRequest && stayOpen) // close dialog when done
+    {
+        stayOpen=false;
+        return;
+    }
     stopRequest=true;
 }

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.h -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.h Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.cpp Changed

@@ -30,7 +30,8 @@
     ui.setupUi(this);
     uint32_t war,har;
     uint32_t hh, mm, ss, ms;
-    char text[80];
+#define MXL 80
+    char text[MXL];
     const char *s;
 
     text[0] = 0;
@@ -38,10 +39,10 @@
     if (!avifileinfo)
         return;
 
-#define FILLTEXT(a,b,c) {snprintf(text,79,b,c); listOfValues.push_back(QString::fromUtf8(text)); ui.a->setText(QString::fromUtf8(text));}
-#define FILLTEXT4(a,b,c,d) {snprintf(text,79,b,c,d); listOfValues.push_back(QString::fromUtf8(text)); ui.a->setText(QString::fromUtf8(text));}
-#define FILLTEXT5(a,b,c,d,e) {snprintf(text,79,b,c,d,e); listOfValues.push_back(QString::fromUtf8(text)); ui.a->setText(QString::fromUtf8(text));}
-#define SET_YES(a,b) ui.a->setText(QString::fromUtf8(yesno[b])
+#define FILLTEXT(a,b,c) {snprintf(text,MXL,b,c); listOfValues.push_back(QString::fromUtf8(text)); ui.a->setText(QString::fromUtf8(text));}
+#define FILLTEXT4(a,b,c,d) {snprintf(text,MXL,b,c,d); listOfValues.push_back(QString::fromUtf8(text)); ui.a->setText(QString::fromUtf8(text));}
+#define FILLTEXT5(a,b,c,d,e) {snprintf(text,MXL,b,c,d,e); listOfValues.push_back(QString::fromUtf8(text)); ui.a->setText(QString::fromUtf8(text));}
+#define SET_YES(a,b) ui.a->setText(QString::fromUtf8(yesno[b]))
 #define FILLQT_TRANSLATE_NOOP(a,q) listOfValues.push_back(QString::fromUtf8(text)); ui.q->setText(QString::fromUtf8(text));
 
     //------------------------------------
@@ -59,7 +60,7 @@
 
     uint64_t duration=video_body->getVideoDuration();
     ms2time(duration/1000,&hh,&mm,&ss,&ms);
-    snprintf(text,79, QT_TRANSLATE_NOOP("qprops","%02d:%02d:%02d.%03d"), hh, mm, ss, ms);
+    snprintf(text, MXL, QT_TRANSLATE_NOOP("qprops","%02d:%02d:%02d.%03d"), hh, mm, ss, ms);
     listOfValues.push_back(text);
     ui.labelVideoDuration->setText(text);
 
@@ -92,7 +93,16 @@
         wavinfo=st->getInfo();
     if(wavinfo)
     {
-        sprintf(text, "%s", getStrFromAudioCodec(wavinfo->encoding));
+        int nbActive=video_body->getNumberOfActiveAudioTracks();
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+        QString titleAudio=QCoreApplication::translate("qprops","Audio (%n active track(s))",NULL,nbActive);
+#else
+        QString titleAudio=QCoreApplication::translate("qprops","Audio (%n active track(s))",NULL,QCoreApplication::UnicodeUTF8,nbActive);
+#endif
+        ui.groupBoxAudio->setTitle(titleAudio);
+        listOfValues.push_back(titleAudio);
+
+        snprintf(text, MXL, "%s", getStrFromAudioCodec(wavinfo->encoding));
         FILLQT_TRANSLATE_NOOP("qprops",labelACodec);
 
         uint32_t channels=wavinfo->channels;
@@ -193,21 +203,27 @@
         ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Extra data:\t"),listOfValues.at(6))
     }
 
-    ADDCATEGORY(QT_TRANSLATE_NOOP("qprops","Audio"))
+    QString aud;
+    if(listOfValues.size() == 13+hasExtraData)
+        aud=listOfValues.at(6+hasExtraData);
+    else
+        aud=QString::fromUtf8(QT_TRANSLATE_NOOP("qprops","Audio"));
 
-    if(listOfValues.size() > 6+hasExtraData)
+    ADDCATEGORY(aud.toUtf8().constData())
+
+    if(listOfValues.size() == 13+hasExtraData)
     {
-        ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Codec:\t\t"),listOfValues.at(6+hasExtraData))
+        ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Codec:\t\t"),listOfValues.at(7+hasExtraData))
 
-        ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Channels:\t"),listOfValues.at(7+hasExtraData))
+        ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Channels:\t"),listOfValues.at(8+hasExtraData))
 
-        ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Bitrate:\t"),listOfValues.at(8+hasExtraData))
+        ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Bitrate:\t"),listOfValues.at(9+hasExtraData))
 
-        //ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Variable Bitrate"),listOfValues.at(9+hasExtraData))
+        //ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Variable Bitrate"),listOfValues.at(10+hasExtraData))
 
-        ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Frequency:\t"),listOfValues.at(10+hasExtraData))
+        ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Frequency:\t"),listOfValues.at(11+hasExtraData))
 
-        ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Total Duration:\t"),listOfValues.at(11+hasExtraData))
+        ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Total Duration:\t"),listOfValues.at(12+hasExtraData))
     }else
     {
         props += QT_TRANSLATE_NOOP("qprops","No Audio");

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/about.ui -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/about.ui Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/encoding.ui -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/encoding.ui Changed

@@ -41,16 +41,13 @@
       <attribute name="title">
        <string>Main</string>
       </attribute>
-      <layout class="QFormLayout" name="formLayout">
-       <property name="fieldGrowthPolicy">
-        <enum>QFormLayout::ExpandingFieldsGrow</enum>
-       </property>
-       <item row="0" column="0" colspan="2">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
         <layout class="QGridLayout" name="gridLayout">
-         <item row="1" column="1">
-          <widget class="QLabel" name="labelETA">
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_26">
            <property name="text">
-            <string>Unknown</string>
+            <string>Time Remaining:</string>
            </property>
           </widget>
          </item>
@@ -71,24 +68,40 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="0">
-          <widget class="QLabel" name="label_2">
+         <item row="1" column="1">
+          <widget class="QLabel" name="labelETA">
            <property name="text">
-            <string>Phase:</string>
+            <string>Unknown</string>
            </property>
           </widget>
          </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="label_26">
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_2">
            <property name="text">
-            <string>Time Remaining:</string>
+            <string>Phase:</string>
            </property>
           </widget>
          </item>
         </layout>
        </item>
-       <item row="2" column="0" colspan="2">
-        <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <spacer name="verticalSpacer1">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>8</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout1">
          <item>
           <widget class="QCheckBox" name="checkBoxShutdown">
            <property name="text">
@@ -150,7 +163,31 @@
          </item>
         </layout>
        </item>
-       <item row="3" column="0">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout2">
+         <item>
+          <widget class="QCheckBox" name="checkBoxKeepOpen">
+           <property name="text">
+            <string>Keep dialog open when finished</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer>
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>48</width>
+             <height>17</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item>
         <spacer name="verticalSpacer2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -163,8 +200,8 @@
          </property>
         </spacer>
        </item>
-       <item row="4" column="0" colspan="2">
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout3">
          <item>
           <widget class="QPushButton" name="pushButton1">
            <property name="text">
@@ -197,19 +234,6 @@
          </item>
         </layout>
        </item>
-       <item row="1" column="0">
-        <spacer name="verticalSpacer1">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>8</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2">

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/processing.ui -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/processing.ui Changed

@@ -6,14 +6,21 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>298</width>
-    <height>170</height>
+    <width>300</width>
+    <height>186</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>TimeLeft</string>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="1">
     <widget class="QLabel" name="labelTimeLeft">
      <property name="sizePolicy">
@@ -27,27 +34,6 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
-    <widget class="QLabel" name="labelImages">
-     <property name="text">
-      <string>0</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="2">
-    <widget class="QProgressBar" name="progressBar">
-     <property name="value">
-      <number>24</number>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>TimeLeft</string>
-     </property>
-    </widget>
-   </item>
    <item row="2" column="1">
     <widget class="QLabel" name="labelSpeed">
      <property name="text">
@@ -55,6 +41,13 @@
      </property>
     </widget>
    </item>
+   <item row="6" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel</set>
+     </property>
+    </widget>
+   </item>
    <item row="2" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
@@ -69,8 +62,8 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
-    <spacer name="verticalSpacer">
+   <item row="5" column="0">
+    <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
@@ -80,18 +73,41 @@
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>13</height>
+       <height>16</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="5" column="0" colspan="2">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel</set>
+   <item row="1" column="1">
+    <widget class="QLabel" name="labelImages">
+     <property name="text">
+      <string>0</string>
      </property>
     </widget>
    </item>
+   <item row="4" column="0" colspan="2">
+    <widget class="QProgressBar" name="progressBar">
+     <property name="value">
+      <number>24</number>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <spacer name="verticalSpacer_1">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::MinimumExpanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>5</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/working.ui -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/working.ui Changed

@@ -1,15 +1,16 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>workingDialog</class>
- <widget class="QDialog" name="workingDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="workingDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>252</width>
-    <height>129</height>
+    <width>300</width>
+    <height>166</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Processing</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -20,6 +21,20 @@
      </property>
     </widget>
    </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QProgressBar" name="progressBar">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_1">
+     <property name="text">
+      <string>Time Remaining:</string>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="1">
     <widget class="QLabel" name="labelElapsed">
      <property name="sizePolicy">
@@ -33,12 +48,21 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="label_1">
-     <property name="text">
-      <string>Time Remaining:</string>
+   <item row="4" column="0">
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
      </property>
-    </widget>
+     <property name="sizeType">
+      <enum>QSizePolicy::MinimumExpanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>16</height>
+      </size>
+     </property>
+    </spacer>
    </item>
    <item row="1" column="1">
     <widget class="QLabel" name="labelTimeLeft">
@@ -53,20 +77,29 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2">
-    <widget class="QProgressBar" name="progressBar" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="2">
+   <item row="5" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
       <set>QDialogButtonBox::Cancel</set>
      </property>
     </widget>
    </item>
+   <item row="2" column="0">
+    <spacer name="verticalSpacer_1">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::MinimumExpanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>10</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_mwNavSlider.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_mwNavSlider.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_dummyWidget.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_dummyWidget.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp Changed

@@ -91,9 +91,6 @@
 static int shiftKeyHeld=0;
 static ADM_mwNavSlider *slider=NULL;
 static int _upd_in_progres=0;
-static int currentFps = 0;
-static int frameCount = 0;
-static int currentFrame = 0;
 bool     ADM_ve6_getEncoderInfo(int filter, const char **name, uint32_t *major,uint32_t *minor,uint32_t *patch);
 uint32_t ADM_ve6_getNbEncoders(void);
 void UI_refreshCustomMenu(void);
@@ -108,8 +105,9 @@
 extern bool AVDM_hasVolumeControl(void);
 extern bool ADM_QPreviewCleanup(void);
 extern void vdpauCleanup();
-extern bool A_loadDefaultSettings(void);;
+extern bool A_loadDefaultSettings(void);
 
+extern int ADM_clearQtShellHistory(void);
 extern void ADM_ExitCleanup(void);
 
 static bool uiRunning=false;
@@ -142,10 +140,6 @@
 static Action searchTranslationTable(const char *name);
 #define SIZEOF_MY_TRANSLATION sizeof(myTranslationTable)/sizeof(adm_qt4_translation)
 
-int UI_readCurTime(uint16_t &hh, uint16_t &mm, uint16_t &ss, uint16_t &ms);
-void UI_updateFrameCount(uint32_t curFrame);
-void UI_updateTimeCount(uint32_t curFrame,uint32_t fps);
-
 class FileDropEvent : public QEvent
 {
 public:
@@ -1360,68 +1354,14 @@
         case QEvent::Resize:
             if(watched == QuiMainWindows)
             {
-                if(blockZoomChanges || playing || !avifileinfo)
-                    break;
-                if(ignoreResizeEvent)
-                {
-                    ignoreResizeEvent = false;
-                    break;
-                }
-                uint32_t reqw, reqh;
-                calcDockWidgetDimensions(reqw,reqh);
-
-                uint32_t availw = 1;
-                if(QuiMainWindows->width() > reqw)
-                    availw = QuiMainWindows->width() - reqw;
-                else
-                    break;
-
-                uint32_t availh = 1;
-                if(QuiMainWindows->height() > reqh)
-                    availh = QuiMainWindows->height() - reqh;
-                else
-                    break;
-
-                uint32_t w = avifileinfo->width;
-                uint32_t h = avifileinfo->height;
-                if(!w || !h)
-                    break;
-                // We've got the available space and the video resolution,
-                // now calculate the zoom to fit the video into this space.
-                float widthRatio = (float)availw / (float)w;
-                float heightRatio = (float)availh / (float)h;
-                float zoom = (widthRatio < heightRatio ? widthRatio : heightRatio);
-
-                // Detect if the zoom has been likely set automatically on loading a new video or
-                // changed using a keyboard shortcut. In this case imitate physical friction
-                // requiring the window to be resized beyond certain threshold first.
-                float oldzoom = admPreview::getCurrentZoom();
-                QSize os = static_cast<QResizeEvent*>(event)->oldSize();
-                if(zoom > oldzoom && actZoomCalled)
-                {
-                    if(QuiMainWindows->width() > os.width())
-                        threshold -= QuiMainWindows->width() - os.width();
-                    if(QuiMainWindows->height() > os.height())
-                        threshold -= QuiMainWindows->height() - os.height();
-                    if(threshold > 0)
-                        break;
-                    if(threshold < 0)
-                        threshold = 0;
-                }
-
-                if(zoom > oldzoom + .001 || zoom < oldzoom - .001)
-                {
-                    blockResizing = true;
-                    admPreview::setMainDimension(w,h,zoom);
-                    actZoomCalled = false;
-                    admPreview::samePicture(); // required at least for VDPAU
-                    blockResizing = false;
-                }
+                QSize os = static_cast<QResizeEvent *>(event)->oldSize();
+                adjustZoom(os.width(),os.height());
+                break;
             }
             if (watched == ui.sliderPlaceHolder)
             {
-                    thumbSlider->resize(ui.sliderPlaceHolder->width(), 16);
-                    thumbSlider->move(0, (ui.sliderPlaceHolder->height() - thumbSlider->height()) / 2);
+                thumbSlider->resize(ui.sliderPlaceHolder->width(), 16);
+                thumbSlider->move(0, (ui.sliderPlaceHolder->height() - thumbSlider->height()) / 2);
             }
             break;
 
@@ -1463,29 +1403,136 @@
     }
 }
 
+/**
+ *  \fn windowStateToString
+ */
+static const char *windowStateToString(const Qt::WindowStates s)
+{
+    if(s & Qt::WindowMinimized)
+        return "minimized";
+    else if(s & Qt::WindowMaximized)
+        return "maximized";
+    else if(s & Qt::WindowFullScreen)
+        return "fullscreen";
+    else
+        return "normal";
+}
+
 // If a video was loaded or zoom changed while the main window was maximized,
 // unmaximizing the window restores it to dimensions not necessarily matching
 // the actual dimensions of the video frame. Catch the window state change event
 // and resize the window when appropriate.
 void MainWindow::changeEvent(QEvent *event)
 {
-    if (event->type() == QEvent::WindowStateChange)
+    if (event->type() == QEvent::WindowStateChange && false==QuiMainWindows->isMinimized())
     {
-        QWindowStateChangeEvent* ev = static_cast<QWindowStateChangeEvent*>(event);
-        if (true==UI_getNeedsResizingFlag() && ev->oldState() == Qt::WindowMaximized && false==QuiMainWindows->isMinimized())
+        QWindowStateChangeEvent *ev = static_cast<QWindowStateChangeEvent*>(event);
+        const Qt::WindowStates old = ev->oldState();
+        const Qt::WindowStates cur = QuiMainWindows->windowState();
+        ADM_info("Window change event: %s -> %s\n", windowStateToString(old), windowStateToString(cur));
+
+        if (!(old & Qt::WindowMinimized)) // Don't do anything on restore from minimized state.
         {
-            uint32_t w=ui.frame_video->width();
-            uint32_t h=ui.frame_video->height();
-            UI_resize(w,h);
-            UI_setNeedsResizingFlag(false);
+            if (old & Qt::WindowMaximized)
+            {
+                if (UI_getNeedsResizingFlag())
+                {
+                    uint32_t w=ui.frame_video->width();
+                    uint32_t h=ui.frame_video->height();
+                    UI_resize(w,h);
+                    UI_setNeedsResizingFlag(false);
+                }else
+                {
+                    setZoomToFit();
+                }
+            }
+            // Always adjust zoom on maximize from normal state.
+            if (!(old & Qt::WindowMaximized) && QuiMainWindows->isMaximized())
+            {
+                ignoreResizeEvent = false;
+                adjustZoom(0,0);
+            }
         }
-        // Always adjust zoom on maximize
-        if (ev->oldState() != Qt::WindowMaximized && QuiMainWindows->isMaximized())
-            ignoreResizeEvent = false;
     }
     QWidget::changeEvent(event);
 }
 
+/**
+ *  \fn adjustZoom
+ */
+bool MainWindow::adjustZoom(int oldWidth, int oldHeight)
+{
+    if(blockZoomChanges || playing || !avifileinfo)
+        return false;
+    if(ignoreResizeEvent)
+    {
+        ignoreResizeEvent = false;
+        return false;
+    }
+
+    uint32_t reqw, reqh;
+    calcDockWidgetDimensions(reqw,reqh);
+
+    if(QuiMainWindows->width() <= reqw)
+        return false;
+
+    uint32_t availw = QuiMainWindows->width() - reqw;
+
+    if(QuiMainWindows->height() <= reqh)
+        return false;
+
+    uint32_t availh = QuiMainWindows->height() - reqh;
+
+    uint32_t w = avifileinfo->width;
+    uint32_t h = avifileinfo->height;
+    if(!w || !h)
+        return false;
+    // We've got the available space and the video resolution,
+    // now calculate the zoom to fit the video into this space.
+    float widthRatio = (float)availw / (float)w;
+    float heightRatio = (float)availh / (float)h;
+    float zoom = (widthRatio < heightRatio ? widthRatio : heightRatio);
+
+    // Detect if the zoom has been likely set automatically on loading a new video or
+    // changed using a keyboard shortcut. In this case imitate physical friction
+    // requiring the window to be resized beyond certain threshold first.
+    float oldzoom = admPreview::getCurrentZoom();
+    if(oldWidth && oldHeight && zoom > oldzoom && actZoomCalled)
+    {
+        if(QuiMainWindows->width() > oldWidth)
+            threshold -= QuiMainWindows->width() - oldWidth;
+        if(QuiMainWindows->height() > oldHeight)
+            threshold -= QuiMainWindows->height() - oldHeight;
+        if(threshold > 0)
+            return false;
+        if(threshold < 0)
+            threshold = 0;
+    }
+
+    if(zoom > oldzoom + .001 || zoom < oldzoom - .001)
+    {
+        blockResizing = true;
+        admPreview::setMainDimension(w,h,zoom);
+        actZoomCalled = false;
+        admPreview::samePicture(); // required at least for VDPAU
+        blockResizing = false;
+
+        return true;
+    }
+    return false;
+}
+
+/**
+ *  \fn setZoomToFit
+ *  \brief adjust zoom level to fit video into available space at current window size
+ */
+void MainWindow::setZoomToFit(void)
+{
+    ignoreResizeEvent=false;
+    adjustZoom(0,0);
+    UI_setNeedsResizingFlag(false);
+}
+
 void MainWindow::openFiles(QList<QUrl> urlList)
 {
     QFileInfo info;
@@ -1978,38 +2025,6 @@
     _upd_in_progres--;
 }
 
-int UI_readCurFrame(void)
-{
-    return 0;
-}
-
-int UI_readCurTime(uint16_t &hh, uint16_t &mm, uint16_t &ss, uint16_t &ms)
-{
-    int success = 0;
-
-    QString timeText = WIDGET(currentTime)->text();
-    int pos;
-
-    if (WIDGET(currentTime)->validator()->validate(timeText, pos) == QValidator::Acceptable)
-    {
-        uint32_t frame;
-
-        hh = (uint16_t)timeText.left(2).toUInt();
-        mm = (uint16_t)timeText.mid(3, 2).toUInt();
-        ss = (uint16_t)timeText.mid(6, 2).toUInt();
-        ms = (uint16_t)timeText.right(3).toUInt();
-
-        time2frame(&frame, currentFps, hh, mm, ss, ms);
-
-        if (frame <= frameCount)
-            success = 1;
-    }
-
-    return success;
-}
-
-
-
 //*******************************************
 
 /**
@@ -2079,39 +2094,6 @@
 {
     return QuiTaskBarProgress;
 }
-/**
-    \fn     UI_updateFrameCount(uint32_t curFrame)
-    \brief  Display the current displayed frame #
-*/
-void UI_updateFrameCount(uint32_t curFrame)
-{
-
-}
-
-/**
-    \fn      UI_setFrameCount(uint32_t curFrame,uint32_t total)
-    \brief  Display the current displayed frame # and total frame #
-*/
-void UI_setFrameCount(uint32_t curFrame,uint32_t total)
-{
-
-}
-
-/**
-    \fn     UI_updateTimeCount(uint32_t curFrame,uint32_t fps)
-    \brief  Display the time corresponding to current frame according to fps (fps1000)
-*/
-void UI_updateTimeCount(uint32_t curFrame,uint32_t fps)
-{
-    char text[80];
-    uint32_t mm,hh,ss,ms;
-
-    frame2time(curFrame,fps, &hh, &mm, &ss, &ms);
-    sprintf(text, "%02d:%02d:%02d.%03d", hh, mm, ss, ms);
-    WIDGET(currentTime)->setText(text);
-}
-
-
 
 /**
     \fn UI_setCurrentTime
@@ -2170,7 +2152,7 @@
     timems=(uint32_t)(b-a);
     ms2time(timems,&hh,&mm,&ss,&ms);
     snprintf(text,79,"%02" PRIu32":%02" PRIu32":%02" PRIu32".%03" PRIu32,hh,mm,ss,ms);
-    QString duration=QString("Selection: ")+QString(text);
+    QString duration=QString::fromUtf8(QT_TRANSLATE_NOOP("qgui2","Selection: "))+QString(text);
     WIDGET(selectionDuration)->setText(duration);
 
     slider->setMarkers(absoluteA, absoluteB);
@@ -2357,9 +2339,47 @@
     reqh += h;
     UI_setBlockZoomChangesFlag(true);
     QuiMainWindows->resize(reqw,reqh);
+    ADM_info("Resizing the main window to %dx%d px\n",reqw,reqh);
+#ifdef _WIN32
+    QSize fs = QuiMainWindows->frameSize();
+    QPoint p = QuiMainWindows->pos();
+
+    uint32_t screenWidth,screenHeight;
+    UI_getPhysicalScreenSize(QuiMainWindows, &screenWidth, &screenHeight);
+
+    int x = p.x() + fs.width() - (int)screenWidth;
+    bool move=false;
+    if(x > 0) // the right edge of the window doesn't fit into the screen
+    {
+        move = true;
+        if(x < p.x())
+            x = p.x() - x;
+        else
+            x = 0;
+    }else
+    {
+        x = p.x();
+    }
+    int y = p.y() + fs.height() - (int)screenHeight;
+    if(y > 0) // the bottom edge of the window doesn't fit into the screen
+    {
+        move = true;
+        if(y < p.y())
+            y = p.y() - y;
+        else
+            y = 0;
+    }else
+    {
+        y = p.y();
+    }
+    if(move)
+    {
+        ADM_info("Moving the main window to position (%d, %d)\n",x,y);
+        QuiMainWindows->move(x,y);
+    }
+#endif
     UI_setBlockZoomChangesFlag(false);
     ((MainWindow *)QuiMainWindows)->setResizeThreshold(RESIZE_THRESHOLD);
-    ADM_info("Resizing the main window to %dx%d px\n",reqw,reqh);
 }
 
 /**
@@ -2396,20 +2416,31 @@
 }
 
 /**
+    \fn UI_setZoomToFitIntoWindow
+*/
+void UI_setZoomToFitIntoWindow(void)
+{
+    ((MainWindow *)QuiMainWindows)->setZoomToFit();
+}
+
+/**
     \fn UI_setAudioTrackCount
 */
 void UI_setAudioTrackCount( int nb )
 {
-    char txt[50];
-    sprintf(txt,QT_TRANSLATE_NOOP("qgui2"," (%d track(s))"),nb);
-    WIDGET(TrackCountLabel)->setText(QString::fromUtf8(txt));
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+    QString text=QCoreApplication::translate("qgui2"," (%n track(s))",NULL,nb);
+#else
+    QString text=QCoreApplication::translate("qgui2"," (%n track(s))",NULL,QCoreApplication::UnicodeUTF8,nb);
+#endif
+    WIDGET(TrackCountLabel)->setText(text);
 }
 /**
  * \fn dtor
  */
 myQApplication::~myQApplication()
 {
-    
+    ADM_clearQtShellHistory();
     ADM_warning("Cleaning render...\n");
     renderDestroy();
     ADM_warning("Cleaning preview...\n");

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.h -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.h Changed

@@ -85,27 +85,28 @@
 */
 class MainWindow : public QMainWindow
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	Ui_MainWindow ui;
-
-	MainWindow(const std::vector<IScriptEngine*>& scriptEngines);
-	virtual ~MainWindow();
-
-	void buildCustomMenu(void);
-	void buildRecentMenu(void);
-	void buildRecentProjectMenu(void);
-	void updateActionShortcuts(void);
-        void volumeWidgetOperational(void);
-        void calcDockWidgetDimensions(uint32_t &width, uint32_t &height);
-        void setBlockZoomChangesFlag(bool block);
-        bool getBlockResizingFlag(void);
-        void setBlockResizingFlag(bool block);
-        void setResizeThreshold(int value);
-        void setActZoomCalledFlag(bool called);
-        static void updateCheckDone(int version, const std::string &date, const std::string &downloadLink);
-        static MainWindow *mainWindowSingleton;
+    Ui_MainWindow ui;
+
+    MainWindow(const std::vector<IScriptEngine*>& scriptEngines);
+    virtual ~MainWindow();
+
+    void buildCustomMenu(void);
+    void buildRecentMenu(void);
+    void buildRecentProjectMenu(void);
+    void updateActionShortcuts(void);
+    void volumeWidgetOperational(void);
+    void calcDockWidgetDimensions(uint32_t &width, uint32_t &height);
+    void setBlockZoomChangesFlag(bool block);
+    bool getBlockResizingFlag(void);
+    void setBlockResizingFlag(bool block);
+    void setResizeThreshold(int value);
+    void setActZoomCalledFlag(bool called);
+    void setZoomToFit(void);
+    static void updateCheckDone(int version, const std::string &date, const std::string &downloadLink);
+    static MainWindow *mainWindowSingleton;
 
 protected:
     QMenu *jsMenu;
@@ -128,47 +129,83 @@
     std::vector<QPushButton *>PushButtonsAvailableWhenFileLoaded;
     std::vector<QPushButton *>PushButtonsDisabledOnPlayback;
 
+    ADM_dragState dragState;
+    QTimer dragTimer;
+    const  std::vector<IScriptEngine*>& _scriptEngines;
+
+    void addScriptDirToMenu(QMenu* scriptMenu, const QString& dir, const QStringList& fileExts);
+    void addScriptEnginesToFileMenu(std::vector<MenuEntry>& fileMenu);
+    void addScriptShellsToToolsMenu(vector<MenuEntry>& toolMenu);
+    void addScriptReferencesToHelpMenu();
+    void addSessionRestoreToRecentMenu(vector<MenuEntry>& menu);
+    bool buildMyMenu(void);
+    bool buildMenu(QMenu *root,MenuEntry *menu, int nb);
+    void buildRecentMenu(QMenu *menu,std::vector<std::string>files, QAction **actions);
+    void buildActionLists(void);
+    void buildButtonLists(void);
+    void updateCodecWidgetControlsState(void);
+    void widgetsUpdateTooltips(void);
+    void searchMenu(QAction * action,MenuEntry *menu, int nb);
+    void searchRecentFiles(QAction *action, QAction **actionList, int firstEventId);
+#ifdef ENABLE_EVENT_FILTER
+    bool eventFilter(QObject* watched, QEvent* event);
+#endif
+    void mousePressEvent(QMouseEvent* event);
+    void dragEnterEvent(QDragEnterEvent *event);
+    void dropEvent(QDropEvent *event);
+    void openFiles(QList<QUrl>);
+    void changeEvent(QEvent* event);
+    /* Zoom control */
+    bool adjustZoom(int width, int height);
+    bool blockResizing;
+    bool blockZoomChanges;
+    bool ignoreResizeEvent; // suppress unwanted zoom changes
+    bool actZoomCalled; // zoom was set to a pre-defined fraction by a menu action
+    int  threshold; // track how much the window was resized
+    /* allow to copy current pts to clipboard using a keyboard shortcut for convenience */
+    void currentTimeToClipboard(void);
+
 public slots:
-        void updateAvailableSlot(int version, std::string date, std::string url);
-        void dragTimerTimeout(void);
-        void setRefreshCap(void);
-        void actionSlot(Action a)
+    void updateAvailableSlot(int version, std::string date, std::string url);
+    void dragTimerTimeout(void);
+    void setRefreshCap(void);
+    void actionSlot(Action a)
+    {
+        if(a==ACT_PlayAvi) // ugly
         {
-            if(a==ACT_PlayAvi) // ugly
-            {
-                playing=1-playing;
-                setMenuItemsEnabledState();
-                playing=1-playing;
-            }
-            HandleAction(a);
+            playing=1-playing;
             setMenuItemsEnabledState();
+            playing=1-playing;
         }
-        void sendAction(Action a)
-        {
-            //printf("Sending internal event %d\n",(int)a);
-            emit actionSignal(a);
-        }
-	void timeChanged(int);
-        void checkChanged(int);
-	void buttonPressed(void);
-	void toolButtonPressed(bool z);
-	void setMenuItemsEnabledState(void);
-
-	void comboChanged(int z);
-	void sliderValueChanged(int u);
-	void sliderMoved(int value);
-	void sliderReleased(void);
-        void sliderPressed(void);
-        void sliderWheel(int way);
-	void volumeChange( int u );
-	void audioToggled(bool checked);
-	void previewModeChangedFromMenu(bool status);
-	void previewModeChangedFromToolbar(bool status);
-	void previousIntraFrame(void);
-	void nextIntraFrame(void);
-	void timeChangeFinished(void);
-	void currentFrameChanged(void);
-	void currentTimeChanged(void);
+        HandleAction(a);
+        setMenuItemsEnabledState();
+    }
+    void sendAction(Action a)
+    {
+        //printf("Sending internal event %d\n",(int)a);
+        emit actionSignal(a);
+    }
+    void timeChanged(int);
+    void checkChanged(int);
+    void buttonPressed(void);
+    void toolButtonPressed(bool z);
+    void setMenuItemsEnabledState(void);
+
+    void comboChanged(int z);
+    void sliderValueChanged(int u);
+    void sliderMoved(int value);
+    void sliderReleased(void);
+    void sliderPressed(void);
+    void sliderWheel(int way);
+    void volumeChange( int u );
+    void audioToggled(bool checked);
+    void previewModeChangedFromMenu(bool status);
+    void previewModeChangedFromToolbar(bool status);
+    void previousIntraFrame(void);
+    void nextIntraFrame(void);
+    void timeChangeFinished(void);
+    void currentFrameChanged(void);
+    void currentTimeChanged(void);
 
     void thumbSlider_valueEmitted(int value);
 
@@ -188,50 +225,15 @@
     void scriptFileActionHandler();
     void scriptReferenceActionHandler();
 
-     void closeEvent(QCloseEvent *event)
-        {
-                printf("Close event!\n");
-                //QMainWindow::closeEvent(event);
-                sendAction(ACT_EXIT);
-        }
+    void closeEvent(QCloseEvent *event)
+    {
+        printf("Close event!\n");
+        //QMainWindow::closeEvent(event);
+        sendAction(ACT_EXIT);
+    }
 
 signals:
-        void actionSignal(Action a);
-        void updateAvailable(int version,const std::string date,const std::string downloadLink);
-protected:
-        ADM_dragState    dragState;        
-        QTimer dragTimer;
-	const  std::vector<IScriptEngine*>& _scriptEngines;
-
-	void addScriptDirToMenu(QMenu* scriptMenu, const QString& dir, const QStringList& fileExts);
-	void addScriptEnginesToFileMenu(std::vector<MenuEntry>& fileMenu);
-	void addScriptShellsToToolsMenu(vector<MenuEntry>& toolMenu);
-	void addScriptReferencesToHelpMenu();
-        void addSessionRestoreToRecentMenu(vector<MenuEntry>& menu);
-        bool buildMyMenu(void);
-        bool buildMenu(QMenu *root,MenuEntry *menu, int nb);
-	void buildRecentMenu(QMenu *menu,std::vector<std::string>files, QAction **actions);
-        void buildActionLists(void);
-        void buildButtonLists(void);
-        void updateCodecWidgetControlsState(void);
-        void widgetsUpdateTooltips(void);
-        void searchMenu(QAction * action,MenuEntry *menu, int nb);
-	void searchRecentFiles(QAction *action, QAction **actionList, int firstEventId);
-#ifdef   ENABLE_EVENT_FILTER      
-	bool eventFilter(QObject* watched, QEvent* event);
-#endif
-	void mousePressEvent(QMouseEvent* event);
-	void dragEnterEvent(QDragEnterEvent *event);
-	void dropEvent(QDropEvent *event);
-	void openFiles(QList<QUrl>);
-        void changeEvent(QEvent* event);
-        /* Zoom control */
-        bool blockResizing;
-        bool blockZoomChanges;
-        bool ignoreResizeEvent; // suppress unwanted zoom changes
-        bool actZoomCalled; // zoom was set to a pre-defined fraction by a menu action
-        int  threshold; // track how much the window was resized
-        /* allow to copy current pts to clipboard using a keyboard shortcut for convenience */
-        void currentTimeToClipboard(void);
+    void actionSignal(Action a);
+    void updateAvailable(int version,const std::string date,const std::string downloadLink);
 };
 #endif	// Q_gui2_h

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_thumbSlider.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_thumbSlider.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/gui2.ui -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/gui2.ui Changed

@@ -556,7 +556,7 @@
          <item>
           <widget class="QLabel" name="TrackCountLabel">
            <property name="text">
-            <string>   (0 track(s))</string>
+            <string> (0 tracks)</string>
            </property>
           </widget>
          </item>
@@ -1706,9 +1706,6 @@
    <property name="text">
     <string>&amp;Information...</string>
    </property>
-   <property name="shortcut">
-    <string>Alt+Return</string>
-   </property>
   </action>
   <action name="actionSave_video">
    <property name="icon">
@@ -1767,18 +1764,6 @@
     <string>Save Project</string>
    </property>
   </action>
-  <action name="actionCalculator">
-   <property name="icon">
-    <iconset resource="avidemux.qrc">
-     <normaloff>:/new/prefix1/pics/calc.png</normaloff>:/new/prefix1/pics/calc.png</iconset>
-   </property>
-   <property name="text">
-    <string>&amp;Calculator...</string>
-   </property>
-   <property name="shortcut">
-    <string>F7</string>
-   </property>
-  </action>
   <action name="actionPreviewInput">
    <property name="checkable">
     <bool>true</bool>

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_shell/Q_shell.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_shell/Q_shell.cpp Changed

@@ -15,12 +15,9 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <vector>
 #include "ADM_inttype.h"
-#include <QtCore/QFileInfo>
-#include <QtCore/QUrl>
-#include <QtGui/QKeyEvent>
-#include <QGraphicsView>
+#include <QKeyEvent>
+#include <QAction>
 #include "Q_shell.h"
 #include "ADM_default.h"
 #include "ui_shell.h"
@@ -29,20 +26,39 @@
 /**
     \fn qShell
 */
-qShell::qShell(QWidget *parent, IScriptEngine *engine) : QDialog(parent)
+qShell::qShell(QWidget *parent, IScriptEngine *engine, std::vector <shellHistoryEntry> *commands) : QDialog(parent)
 {
-    ADM_info("Setting up JS shell..\n");
+    ADM_info("Setting up shell for %s...\n",engine->name().c_str());
     _engine = engine;
-    for(int i=0;i<Q_SHELL_HISTORY;i++)
-                    history[i]=NULL;
-
+    _history = commands;
+    indexRead=indexWrite=0;
+    for(int i=0;i<_history->size();i++)
+    {
+        shellHistoryEntry e=_history->at(i);
+        if(e.name!=_engine->name()) continue;
+        indexRead++;
+        indexWrite++;
+    }
     ui.setupUi(this);
     ui.textBrowser_2->installEventFilter(this);
+
+    QAction *ev = new QAction(this);
+    ev->setShortcut(Qt::CTRL + Qt::Key_Return);
+    connect(ev,SIGNAL(triggered(bool)),this,SLOT(evaluate(bool)));
+    addAction(ev);
+
     connect((ui.evalute),SIGNAL(clicked(bool)),this,SLOT(evaluate(bool)));
     connect((ui.clear),SIGNAL(clicked(bool)),this,SLOT(clear(bool)));
+#ifndef __APPLE__
     print(IScriptEngine::Information, QT_TRANSLATE_NOOP("qshell","Enter your commands then press the evaluate button or CTRL+ENTER.\n"));
     print(IScriptEngine::Information, QT_TRANSLATE_NOOP("qshell","You can use CTRL+PageUP and CTRL+Page Down to recall previous commands\nReady.\n"));
-    indexRead=indexWrite=0;
+#else
+    print(IScriptEngine::Information, QT_TRANSLATE_NOOP("qshell","Enter your commands then press the evaluate button or ⌘⏎.\n"));
+    print(IScriptEngine::Information, QT_TRANSLATE_NOOP("qshell","You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.\nReady.\n"));
+#endif
+#ifdef SCRIPT_SHELL_HISTORY_VERBOSE
+    dumpHistory();
+#endif
 }
 /**
     \fn ~qShell
@@ -50,19 +66,52 @@
 qShell::~qShell()
 {
     ADM_info("Destroying JS shell..\n");
-    for(int i=0;i<Q_SHELL_HISTORY;i++)
-    {
-            if(history[i]) delete history[i];
-            history[i]=NULL;
-    }
-
 }
+/**
+    \fn run
+*/
 bool qShell::run(void)
 {
     this->exec();
     return true;
 }
 /**
+    \fn addToHistory
+*/
+int qShell::addToHistory(QString &command)
+{
+    int r=0;
+    int size=_history->size();
+    // remove duplicates
+    for(int i=0;i<size;i++)
+    {
+        shellHistoryEntry e=_history->at(size-i-1);
+        if(e.name!=_engine->name())
+            continue;
+        if(*(e.command)==command)
+        {
+            if(!i) // nothing to do
+                return r;
+            QString *cmd=e.command;
+            delete cmd;
+            e.command=NULL;
+            std::vector <shellHistoryEntry>::iterator it=_history->begin();
+            it+=size-i-1;
+            _history->erase(it);
+            size--;
+            r--;
+        }
+    }
+    // append our entry
+    shellHistoryEntry e;
+    e.name=_engine->name();
+    QString *cmd=new QString(command);
+    e.command=cmd;
+    _history->push_back(e);
+    r++;
+    return r;
+}
+/**
         \fn evaluate
         \brief callback for the evaluate button
 */
@@ -71,10 +120,8 @@
     ADM_info("Evaluating...\n");
     // 1 Get text from UI
     QString text=ui.textBrowser_2->toPlainText();
-    int dex=indexWrite & (Q_SHELL_HISTORY-1);
-    if(history[dex]) delete history[dex];
-    history[dex]=new QString(text);
-    indexWrite++;
+    indexWrite+=addToHistory(text);
+    if(indexWrite<1) indexWrite=1;
     indexRead=indexWrite-1; // Points to the last one
 
     ui.textBrowser->setFontItalic(true);
@@ -82,8 +129,34 @@
     ui.textBrowser->setFontItalic(false);
     ui.textBrowser_2->setPlainText("");
     _engine->runScript(text.toLatin1().constData(), IScriptEngine::Normal);
+#ifdef SCRIPT_SHELL_HISTORY_VERBOSE
+    dumpHistory();
+#endif
     return true;
 }
+#ifdef SCRIPT_SHELL_HISTORY_VERBOSE
+/**
+    \fn dumpHistory
+*/
+bool qShell::dumpHistory(void)
+{
+    if(_history->empty())
+    {
+        ADM_info("History is empty.\n");
+        return true;
+    }
+    int count=0;
+    for(int i=0;i<_history->size();i++)
+    {
+        shellHistoryEntry e=_history->at(i);
+        if(e.name!=_engine->name())
+            continue;
+        QString *cmd=e.command;
+        printf(" --> history entry %d: \"%s\"\n",count++,cmd->toUtf8().constData());
+    }
+    return true;
+}
+#endif
 /**
     \fn print
 */
@@ -110,21 +183,44 @@
     return true;
 }
 /**
+    \fn showEvent
+    \brief set focus to text input
+*/
+void qShell::showEvent(QShowEvent *ev)
+{
+    ui.textBrowser_2->setFocus();
+    QWidget::showEvent(ev);
+}
+/**
     \fn eventFilter
     \brief
 */
 bool qShell::eventFilter(QObject* watched, QEvent* event)
 {
-	if(event->type()==QEvent::KeyPress)
+    if(event->type()==QEvent::KeyPress)
     {
-			QKeyEvent *keyEvent = (QKeyEvent*)event;
-            if(keyEvent->modifiers() == Qt::ControlModifier)
-                switch (keyEvent->key())
-                {
-                    case Qt::Key_PageUp:   previousCommand();return true;break;
-                    case Qt::Key_PageDown: nextCommand();return true;break;
-                    default:break;
-                }
+        QKeyEvent *keyEvent = (QKeyEvent*)event;
+#ifndef __APPLE__
+        if(keyEvent->modifiers() == Qt::ControlModifier)
+        {
+            switch (keyEvent->key())
+            {
+                case Qt::Key_PageUp: previousCommand();return true;
+                case Qt::Key_PageDown: nextCommand();return true;
+                default:break;
+            }
+        }
+#else
+        if((keyEvent->modifiers() & Qt::AltModifier) && (keyEvent->modifiers() & Qt::ControlModifier))
+        {
+            switch (keyEvent->key())
+            {
+                case Qt::Key_Up: previousCommand();return true;
+                case Qt::Key_Down: nextCommand();return true;
+                default:break;
+            }
+        }
+#endif
     }
     return QObject::eventFilter(watched, event);
 }
@@ -133,9 +229,31 @@
 */
 bool   qShell::previousCommand(void)
 {
-    int dex=indexRead & (Q_SHELL_HISTORY-1);
-    QString *copy=history[dex];
-    if(indexRead) indexRead--;
+    if(indexWrite<1)
+        return false;
+    int count=0;
+    int size=_history->size();
+    QString *copy=NULL;
+    if(indexRead>=indexWrite) indexRead=indexWrite-1;
+    // Retrieve text from UI
+    QString text=ui.textBrowser_2->toPlainText();
+    for(int i=0;i<size;i++)
+    {
+        shellHistoryEntry e=_history->at(i);
+        if(e.name!=_engine->name())
+            continue;
+        if(count==indexRead)
+        {
+            copy=e.command;
+            if(indexRead>0 && *copy==text) // The command is already filled in, skip it
+            {
+                indexRead--;
+                return previousCommand();
+            }
+            break;
+        }
+        count++;
+    }
     if(!copy) return true;
     ui.textBrowser_2->clear();
     ui.textBrowser_2->append(*copy);
@@ -146,10 +264,24 @@
 */
 bool   qShell::nextCommand(void)
 {
+    if(indexRead+1>=indexWrite)
+        return true;
+    QString *copy=NULL;
+    int count=0;
+    int size=_history->size();
     if(indexRead+1<indexWrite) indexRead++;
-            else return true;
-    int dex=indexRead & (Q_SHELL_HISTORY-1);
-    QString *copy=history[dex];
+    for(int i=0;i<size;i++)
+    {
+        shellHistoryEntry e=_history->at(i);
+        if(e.name!=_engine->name())
+            continue;
+        if(count==indexRead)
+        {
+            copy=e.command;
+            break;
+        }
+        count++;
+    }
     if(!copy) return true;
     ui.textBrowser_2->clear();
     ui.textBrowser_2->append(*copy);

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_shell/Q_shell.h -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_shell/Q_shell.h Changed

@@ -4,30 +4,41 @@
 #ifndef Q_SHELL_H
 #define Q_SHELL_H
 
-#include <QItemDelegate>
 #include "ui_shell.h"
 
 #include "ADM_inttype.h"
 #include "IScriptEngine.h"
 
+#include <vector>
+
+typedef struct
+{
+    std::string name;
+    QString *command;
+} shellHistoryEntry;
+
 /**
     \class ADM_jsQt4Shell
 */
-#define Q_SHELL_HISTORY 8 // Must be a power of 2!
 class qShell: public QDialog
 {
 	Q_OBJECT
+#ifdef SCRIPT_SHELL_HISTORY_VERBOSE
+    bool                 dumpHistory(void);
+#endif
+    void                 showEvent(QShowEvent *ev);
 protected:
     IScriptEngine      *_engine;
     Ui_SpiderMonkeyShell ui;
     bool                 eventFilter(QObject* watched, QEvent* event);
     bool                 previousCommand(void);
     bool                 nextCommand(void);
-    QString              *history[Q_SHELL_HISTORY];
+    std::vector<shellHistoryEntry> *_history;
+    int                  addToHistory(QString &str);
     int                  indexWrite;
     int                  indexRead;
 public:
-                    qShell(QWidget *parent, IScriptEngine *engine);
+                    qShell(QWidget *parent, IScriptEngine *engine, std::vector <shellHistoryEntry> *commands);
     virtual         ~qShell() ;
     bool            run(void);
     bool            print(IScriptEngine::EventType type, const char *s);

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_shell/qt4Shell.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_shell/qt4Shell.cpp Changed

@@ -9,6 +9,7 @@
 #include "IScriptEngine.h"
 
 static qShell *s;
+static std::vector <shellHistoryEntry> shellHistory;
 
 /**
     \fn qt4ShellLogger
@@ -25,7 +26,7 @@
 */
 bool ADM_startShell(IScriptEngine *engine)
 {
-        s = new qShell(qtLastRegisteredDialog(), engine);
+        s = new qShell(qtLastRegisteredDialog(), engine, &shellHistory);
 		qtRegisterDialog(s);
 
 		engine->registerEventHandler(qt4ShellLogger);
@@ -37,5 +38,30 @@
         delete s;
         return true;
 }
+
+/**
+    \fn ADM_clearQtShellHistory
+    \brief free memory
+*/
+int ADM_clearQtShellHistory(void)
+{
+    int freed=0;
+    int size=shellHistory.size();
+    ADM_info("Clearing script shell history (%d entries)\n",size);
+    for(int i=0;i<size;i++)
+    {
+        shellHistoryEntry e=shellHistory.at(i);
+        if(!e.command) continue;
+        QString *s=e.command;
+        QByteArray b=s->toUtf8();
+        freed+=b.size();
+        delete s;
+        s=NULL;
+    }
+    shellHistory.clear();
+    if(freed)
+        ADM_info("Freed %d bytes allocated for commands.\n",freed);
+    return freed;
+}
 //EOF

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_shell/shell.ui -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_shell/shell.ui Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/translator.cpp -> avidemux_2.7.6.tar.gz/avidemux/qt4/ADM_userInterfaces/translator.cpp Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux/qt4/CMakeLists.txt Changed

avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/.git Added

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/CMakeLists.txt Changed

avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/README.md Added

avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/Ts.cmake Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux.pro -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux.pro Changed

@@ -4,7 +4,6 @@
 ../../../avidemux_core/ADM_coreMuxer/include/ADM_muxerUtils.h \ 
 ../../../avidemux_core/ADM_coreMuxer/include/ADM_coreMuxerFfmpeg.h \ 
 ../../../avidemux_core/ADM_coreMuxer/include/ADM_coreMuxer6_export.h \ 
-../../../avidemux_core/ADM_coreMuxer/include/.ADM_muxer.h.swp \ 
 ../../../avidemux_core/ADM_coreMuxer/include/ADM_muxerProto.h \ 
 ../../../avidemux_core/ADM_coreJobs/include/sqlJobs.h \ 
 ../../../avidemux_core/ADM_coreJobs/include/ADM_coreJobs_export.h \ 
@@ -72,13 +71,6 @@
 ../../../avidemux_core/ADM_coreVideoEncoder/include/FFcodecSettings_desc.cpp.h \ 
 ../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderFFmpeg_param.h \ 
 ../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoder.h \ 
-../../../avidemux_core/ffmpeg_package/patches/libavutil_lfg.h.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_avcodec.h.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_ff_spsinfo.h.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavutil_timer.h.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_golomb.h.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_mathops.h.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavutil_avutil.h.patch \ 
 ../../../avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilter.h \ 
 ../../../avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilter6_export.h \ 
 ../../../avidemux_core/ADM_coreVideoFilter/include/ADM_videoFilterCache.h \ 
@@ -235,7 +227,6 @@
 ../../../avidemux_core/ADM_coreUtils/include/prefs.h \ 
 ../../../avidemux_core/ADM_coreUtils/include/ADM_codecType.h \ 
 ../../../avidemux_core/ADM_coreUtils/include/ADM_coreCodecMapping.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_putbits.h \ 
 ../../../avidemux_core/ADM_coreUtils/include/FFcodecContext_param.h \ 
 ../../../avidemux_core/ADM_coreUtils/include/ADM_confCouple.h \ 
 ../../../avidemux_core/ADM_coreUtils/include/ADM_paramList.h \ 
@@ -462,6 +453,7 @@
 ../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv_param.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilterDeint.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/largeMedian/convolution.h \ 
@@ -497,6 +489,7 @@
 ../../../avidemux_plugins/ADM_videoFilters6/avsfilter/cdebug.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/blend/blend.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/yadif/yadif.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/admIvtc/admIvtc.h \ 
@@ -547,6 +540,7 @@
 ../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.h \ 
 ../../../avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.h \ 
+../../../avidemux_plugins/ADM_videoDecoder/aom/ADM_aomDec.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264.h \ 
@@ -587,6 +581,8 @@
 ../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/mpeg2_encoder.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/vp9/vp9_encoder.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qosqualifiers.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atoms.h \ 
@@ -844,20 +840,6 @@
 ../../../avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/src/ADM_coreLibVA_bitstream.cpp \ 
 ../../../avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/src/ADM_coreLibVA_encodingContext.cpp \ 
 ../../../avidemux_core/ADM_coreVideoEncoder/include/FFcodecSettings_desc.cpp.h \ 
-../../../avidemux_core/ffmpeg_package/patches/libavformat_mpegenc.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_hevc_parser.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/attic/libavcodec_h263dec.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_mpegvideo_enc.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_mpeg12enc.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_nvenc.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavutil_lfg2.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc_vp9.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavutil_lfg.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_h264_parser.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavformat_mpegtsenc.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavformat_isom.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavutil_file_open.c.patch \ 
 ../../../avidemux_core/ADM_coreVideoFilter/src/ADM_videoFilterCache.cpp \ 
 ../../../avidemux_core/ADM_coreVideoFilter/src/ADM_coreVideoFilter.cpp \ 
 ../../../avidemux_core/ADM_coreVideoFilter/src/ADM_coreVideoFilterFunc.cpp \ 
@@ -884,12 +866,6 @@
 ../../../avidemux_core/ADM_coreVideoCodec/src/ADM_ffHwAccel.cpp \ 
 ../../../avidemux_core/ADM_coreImage/src/ADM_print.cpp \ 
 ../../../avidemux_core/ADM_coreImage/src/ADM_imageResizer.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/attic/ADM_vidFieldUtil.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/attic/ADM_vidFields.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/attic/ADM_videoFilter.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/attic/ADM_vidFieldASM.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/attic/ADM_vidFieldBlend.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/attic/ADM_interlaceUtil.cpp \ 
 ../../../avidemux_core/ADM_coreImage/src/ADM_image.cpp \ 
 ../../../avidemux_core/ADM_coreImage/src/ADM_pp.cpp \ 
 ../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp \ 
@@ -959,7 +935,6 @@
 ../../../avidemux_core/ADM_coreUtils/src/ADM_getbits.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/prefs2.conf \ 
 ../../../avidemux_core/ADM_coreUtils/src/ADM_codecType.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_putbits.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/ADM_infoExtractorVC1.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONAllocator.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONNode_Mutex.cpp \ 
@@ -1126,6 +1101,7 @@
 ../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp \ 
 ../../../avidemux/common/ADM_muxerGate/src/ADM_videoProcess.cpp \ 
 ../../../avidemux/common/ADM_muxerGate/src/ADM_videoCopyAudRemover.cpp \ 
+../../../avidemux/common/ADM_muxerGate/src/ADM_videoCopySeiInjector.cpp \ 
 ../../../avidemux/common/ADM_muxerGate/src/ADM_videoCopy.cpp \ 
 ../../../avidemux/common/ADM_muxerGate/src/ADM_videoCopyFromAnnexB.cpp \ 
 ../../../avidemux/common/ADM_editor/src/ADM_edSearch.cpp \ 
@@ -1175,6 +1151,7 @@
 ../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvDeviation.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/Matroska/mkv_tags.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvAccessLatm.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvTrackType.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/Matroska/ebml.cpp \ 
@@ -1288,8 +1265,11 @@
 ../../../avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/testHeader.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilterDeint_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilterDeint.conf \ 
 ../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidMergeField.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidSeparateField.cpp \ 
@@ -1371,6 +1351,10 @@
 ../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam.conf \ 
 ../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/blend/blend_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/blend/blend.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/blend/blend_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/yadif/yadif_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/yadif/yadif_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp \ 
@@ -1427,7 +1411,6 @@
 ../../../avidemux_plugins/ADM_videoFilters6/stackField/unstackField.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/stackField/hzStackField.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/fadeTo/fade.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/fadeTo/fade_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/fadeTo/fade_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/dummy/dummyVideoFilter.cpp \ 
@@ -1462,6 +1445,8 @@
 ../../../avidemux_plugins/ADM_videoFilters6/contrast/contrast_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoDecoder/vpx/vpxPlugin.cpp \ 
 ../../../avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp \ 
+../../../avidemux_plugins/ADM_videoDecoder/aom/aomDecPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoDecoder/aom/ADM_aomDec.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffDv/ffDvPlugin.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264.conf \ 
@@ -1550,6 +1535,11 @@
 ../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/mpeg2_encoder_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ffMpeg4Plugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Plugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/vp9/vp9_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/vp9/vp9_encoder.conf \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Video.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/mp4v2_muxer_desc.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_ftyp.cpp \ 
@@ -1942,5 +1932,6 @@
 ./avidemux_ja.ts \ 
 ./avidemux_de.ts \ 
 ./avidemux_tr.ts \ 
+./avidemux_sk.ts \

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_ca.ts -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_ca.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">Ha fallat l&apos;intent d&apos;obrir %s!</translation>
     </message>
@@ -51,12 +51,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+47"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -375,22 +375,22 @@
         <translation type="unfinished">Diàleg</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+19"/>
         <source>00:00:00</source>
         <translation type="unfinished">00:00:00</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+51"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="-64"/>
         <source>TimeLeft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+41"/>
         <source>ProcessImages</source>
         <translation type="unfinished"></translation>
     </message>
@@ -400,7 +400,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-14"/>
         <source>0 fps</source>
         <translation type="unfinished"></translation>
     </message>
@@ -436,30 +436,28 @@
 <context>
     <name>FDK-AAC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
-        <source>_Profile::</source>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+9"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+2"/>
         <source>SBR enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+7"/>
-        <source>After burner</source>
+        <location line="+2"/>
+        <source>Afterburner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>FDK-AAC Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -591,7 +589,12 @@
         <translation type="unfinished">Ve&amp;s</translation>
     </message>
     <message>
-        <location line="+1544"/>
+        <location line="+408"/>
+        <source> (0 tracks)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1136"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">&amp;Obre</translation>
     </message>
@@ -601,9 +604,8 @@
         <translation type="unfinished">&amp;Propietats</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Alt+Return</source>
-        <translation type="unfinished">Alt+Return</translation>
+        <translation type="obsolete">Alt+Return</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -639,22 +641,20 @@
         <translation type="unfinished">Desa el projecte</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+69"/>
         <source>Ctrl+Alt+S</source>
         <translation type="unfinished">Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location line="-72"/>
         <source>&amp;Calculator...</source>
-        <translation type="unfinished">&amp;Calculadora</translation>
+        <translation type="obsolete">&amp;Calculadora</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>F7</source>
-        <translation type="unfinished">F7</translation>
+        <translation type="obsolete">F7</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="-54"/>
         <source>&amp;Input</source>
         <translation type="unfinished">&amp;Entrada</translation>
     </message>
@@ -679,7 +679,7 @@
         <translation type="unfinished">Sepa&amp;rades</translation>
     </message>
     <message>
-        <location line="-1152"/>
+        <location line="-1137"/>
         <source>ms</source>
         <translation type="unfinished">ms</translation>
     </message>
@@ -735,23 +735,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>   (0 track(s))</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+212"/>
+        <location line="+222"/>
         <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+114"/>
-        <location line="+946"/>
+        <location line="+931"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-871"/>
+        <location line="-856"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -841,12 +836,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+210"/>
         <source>Play filtered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-169"/>
         <source>Vol&amp;ume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -866,7 +861,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+104"/>
         <source>&amp;Codec Options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -909,7 +904,7 @@
 <context>
     <name>Opus</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -931,11 +926,6 @@
         <source>Evaluate</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+3"/>
-        <source>Ctrl+Return</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>VapourSynthProxy</name>
@@ -984,7 +974,7 @@
     </message>
     <message>
         <location line="+10"/>
-        <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1050,7 +1040,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1192,21 +1182,27 @@
         <translation type="unfinished">Priorització</translation>
     </message>
     <message>
-        <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="obsolete">_Usa etiqueta (tag) alternativa per a MP3 en MP4</translation>
-    </message>
-    <message>
         <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Auto-Append Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>XVideo (best)</source>
         <translation type="unfinished">Xv (millor)</translation>
     </message>
@@ -1247,7 +1243,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+213"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
         <translation type="unfinished">PCM</translation>
     </message>
@@ -1346,18 +1342,18 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+277"/>
+        <location line="+283"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+423"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
         <source>Audio</source>
         <translation type="unfinished">Àudio</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-73"/>
+        <location filename="../../common/gui_savenew.cpp" line="-239"/>
+        <location line="+170"/>
         <location line="+12"/>
         <location line="+16"/>
-        <location line="+8"/>
         <source>Video</source>
         <translation type="unfinished">Vídeo</translation>
     </message>
@@ -1384,10 +1380,6 @@
         <translation type="unfinished">Tanca</translation>
     </message>
     <message>
-        <source>-</source>
-        <translation type="obsolete">-</translation>
-    </message>
-    <message>
         <location line="+4"/>
         <source>Connect to avsproxy</source>
         <translation type="unfinished">Connecta a l&apos;avsproxy</translation>
@@ -1414,7 +1406,7 @@
         <translation type="unfinished">Posa el marcador B</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+18"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation type="unfinished">Filtres</translation>
@@ -1658,12 +1650,12 @@
         <translation type="unfinished">S&apos;ha produït un error de còdec</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+369"/>
+        <location filename="../../common/gui_main.cpp" line="+370"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">No s&apos;ha codificat en aquesta versió</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+214"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
@@ -1799,8 +1791,7 @@
         <translation type="unfinished">Alguna cosa ha fallat en afegir.</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+321"/>
+        <location line="+320"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">Alguna cosa ha falalt (II).</translation>
     </message>
@@ -1858,7 +1849,7 @@
         <translation type="unfinished">Pista principal d&apos;àudio</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+264"/>
         <source>AvsProxy</source>
         <translation type="unfinished">AvsProxy</translation>
     </message>
@@ -1941,30 +1932,35 @@
         <translation type="unfinished">S&apos;està desant l&apos;àudio.</translation>
     </message>
     <message>
-        <location line="+318"/>
-        <location line="+83"/>
+        <location line="+322"/>
+        <source>Maximum number of 99999 images reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+76"/>
         <source>Done</source>
         <translation type="unfinished">Fet</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-76"/>
         <source>Saved %d images.</source>
         <translation type="unfinished">S&apos;han desat %d imatges.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="-250"/>
+        <location filename="../../common/gui_main.cpp" line="-251"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
         <location line="+4"/>
         <location filename="../../common/gui_save.cpp" line="+2"/>
-        <location line="+99"/>
+        <location line="+92"/>
         <location line="+7"/>
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
@@ -2042,12 +2038,12 @@
         <translation type="unfinished">Guany</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+495"/>
         <source>Saving</source>
         <translation type="unfinished">S&apos;està desant</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+181"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2137,7 +2133,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-290"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-296"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2167,7 +2163,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2245,7 +2241,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-96"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-100"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2341,12 +2337,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <location line="+2"/>
         <source>Save current settings as default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Load saved settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2441,7 +2438,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2461,8 +2458,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
-        <location line="+44"/>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-43"/>
+        <location line="+43"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished"></translation>
@@ -2492,7 +2494,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="-144"/>
-        <location filename="../../common/gui_save.cpp" line="-597"/>
+        <location filename="../../common/gui_save.cpp" line="-602"/>
         <source>No audio track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2540,7 +2542,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1449"/>
+        <location filename="../../common/gui_main.cpp" line="-1447"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2565,13 +2567,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+68"/>
+        <location line="+126"/>
+        <location line="+73"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-48"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2581,7 +2583,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2604,7 +2606,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+795"/>
+        <location line="+789"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -2635,7 +2637,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+297"/>
+        <location line="+298"/>
         <source>Oops</source>
         <translation type="unfinished">Caram!</translation>
     </message>
@@ -2655,7 +2657,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>No</source>
         <translation type="unfinished">No</translation>
     </message>
@@ -2665,7 +2667,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Job</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2675,7 +2677,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Output file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2690,7 +2692,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Select PNG to Save</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2726,22 +2728,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Maximum number of 9999 images reached, aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Saving images failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+25"/>
         <source>PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2771,29 +2768,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-207"/>
+        <location filename="../../common/gui_savenew.cpp" line="-210"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+182"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+24"/>
         <source>Cannot create encoder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-8"/>
-        <source>Cannot setup codec. Bitrate too low?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+57"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2805,20 +2796,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-253"/>
-        <location line="+286"/>
+        <location line="-257"/>
+        <location line="+290"/>
         <location line="+26"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-312"/>
-        <location line="+286"/>
+        <location line="-326"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+290"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="-102"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The choice of cut points may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Do you want to continue anyway?</source>
         <translation type="unfinished"></translation>
@@ -3136,7 +3137,7 @@
         <translation type="unfinished">MP4</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>AAC</source>
         <translation type="unfinished">AAC</translation>
     </message>
@@ -3192,7 +3193,7 @@
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
-        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+374"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+382"/>
         <source>Unknown</source>
         <translation type="unfinished">Desconegut</translation>
     </message>
@@ -3283,20 +3284,20 @@
         <translation type="unfinished">1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
-        <location line="+30"/>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
-        <location line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
         <source>Codec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
         <source>Internal error finding codec 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Internal error opening 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3312,31 +3313,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+812"/>
-        <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
-Dropping a keyframe will result in severely corrupted video.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
-Dropping a frame may result in some video corruption.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Do not warn again and drop frames silently while saving this video?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3574,7 +3551,7 @@
 <context>
     <name>avimuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+75"/>
         <source>Bad Idea</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3651,7 +3628,7 @@
 <context>
     <name>bitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+51"/>
         <source>Constant Bitrate</source>
         <translation type="unfinished">Taxa de bits constant</translation>
     </message>
@@ -3768,34 +3745,39 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+23"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+51"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>blackframes</name>
@@ -3816,6 +3798,29 @@
     </message>
 </context>
 <context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -3844,7 +3849,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
+        <source>59.94  (NTSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3858,7 +3863,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+141"/>
+        <location line="+146"/>
         <source>Source Fps:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4187,7 +4192,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4448,25 +4453,25 @@
         <translation type="unfinished">S&apos;està codificant...</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+55"/>
         <source>Phase:</source>
         <translation type="unfinished">Fase:</translation>
     </message>
     <message>
-        <location line="+248"/>
+        <location line="+268"/>
         <source>Video Codec:</source>
         <translation type="unfinished">Còdec de vídeo:</translation>
     </message>
     <message>
-        <location line="-255"/>
-        <location line="+220"/>
+        <location line="-282"/>
+        <location line="+247"/>
         <location line="+21"/>
         <source>None</source>
         <translation type="unfinished">Cap</translation>
     </message>
     <message>
-        <location line="-258"/>
-        <location line="+251"/>
+        <location line="-261"/>
+        <location line="+254"/>
         <source>Unknown</source>
         <translation type="unfinished">Desconegut</translation>
     </message>
@@ -4498,12 +4503,12 @@
         <translation type="unfinished">Transcorregut:</translation>
     </message>
     <message>
-        <location line="-446"/>
+        <location line="-504"/>
         <source>Time Remaining:</source>
         <translation type="unfinished">Temps restant:</translation>
     </message>
     <message>
-        <location line="+467"/>
+        <location line="+525"/>
         <source>Frames/sec:</source>
         <translation type="unfinished">Fotogrames/s:</translation>
     </message>
@@ -4550,7 +4555,7 @@
         <translation type="unfinished">Quantificador:</translation>
     </message>
     <message>
-        <location line="-378"/>
+        <location line="-389"/>
         <source>Shut down computer when finished</source>
         <translation type="unfinished">Apaga l&apos;ordinador en acabar</translation>
     </message>
@@ -4585,22 +4590,27 @@
         <translation type="unfinished">Baixa</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+12"/>
+        <source>Keep dialog open when finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
         <source>Pause / Abort</source>
         <translation type="unfinished">Atura / Cancel·la</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+13"/>
         <source>Advanced</source>
         <translation type="unfinished">Avançat</translation>
     </message>
     <message>
-        <location line="-175"/>
+        <location line="-199"/>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+129"/>
+        <location line="+166"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4693,7 +4703,7 @@
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished">Fade</translation>
@@ -4704,7 +4714,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+13"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4717,13 +4752,13 @@
 <context>
     <name>fadeToBlack</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
-        <location line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+55"/>
+        <location line="+20"/>
         <source>Fade to black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-19"/>
         <source>Fade to black in/out.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4748,7 +4783,7 @@
         <translation type="unfinished">Fosa en blanc</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>_Fade type:</source>
         <translation type="unfinished">_Tipus de fosa:</translation>
     </message>
@@ -4766,7 +4801,7 @@
 <context>
     <name>ffVAEncH264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4781,12 +4816,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Profile:</source>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4797,16 +4853,21 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Bitrate (kbps):</source>
+        <source>Quality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4816,7 +4877,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4824,27 +4885,53 @@
 <context>
     <name>ffVAEncHEVC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+343"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4854,7 +4941,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4862,7 +4949,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+223"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+256"/>
         <source>Default</source>
         <translation type="unfinished">Predetermin.</translation>
     </message>
@@ -5331,8 +5418,32 @@
 <context>
     <name>ffnvenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+229"/>
+        <source>Controlled by Preset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
         <source>Low Quality</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5384,6 +5495,12 @@
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+        <source>RC Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Preset:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5393,6 +5510,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Bitrate (kbps):</source>
@@ -5406,32 +5529,48 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Frame Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>NVENC H.264 configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
-        <source>nvEnc HEVC  configuration</source>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+28"/>
+        <source>NVENC HEVC configuration</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5443,7 +5582,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+87"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5539,7 +5678,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5612,7 +5751,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5770,7 +5909,7 @@
 <context>
     <name>flvdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6301,7 +6440,7 @@
 <context>
     <name>jobs</name>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Oops</source>
         <translation type="unfinished">Caram!</translation>
     </message>
@@ -6311,7 +6450,7 @@
         <translation type="unfinished">S&apos;ha produït un error molt greu en construir la llista de tasques.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>There are no jobs stored</source>
         <translation type="unfinished">No hi ha cap tasca desada</translation>
     </message>
@@ -6799,12 +6938,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+523"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6904,7 +7043,7 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+167"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
         <source>Saving Mkv</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7003,31 +7142,46 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Hi ha hagut un problema en la lectura d&apos;encapçalaments d&apos;SVQ3</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+67"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <location line="+17"/>
         <source>Unsupported</source>
         <translation type="unfinished">No está suportat</translation>
     </message>
     <message>
-        <location line="-9"/>
-        <source>Only MP4Video, H264, and H265 supported for video</source>
+        <location line="-17"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+182"/>
         <source>Saving mp4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7037,7 +7191,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7072,7 +7226,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Do not rotate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7098,6 +7252,51 @@
     </message>
     <message>
         <location line="+3"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>MP4 Muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7269,7 +7468,7 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+242"/>
+        <location filename="../../common/gui_navigate.cpp" line="+232"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7499,21 +7698,17 @@
 <context>
     <name>psdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Error</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
         <translation type="unfinished">S&apos;està indexant</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -7583,7 +7778,7 @@
         <translation type="unfinished">Calen privilegis de root per realitzar aquesta operació.</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+126"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7598,7 +7793,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+185"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished">S&apos;ha aturat la codificació. Voleu reprendre-la o bé cancel·lar-la?</translation>
     </message>
@@ -7636,7 +7831,7 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+212"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+206"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7716,21 +7911,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+626"/>
+        <location line="+681"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+262"/>
+        <location line="+230"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+334"/>
-        <source> (%d track(s))</source>
+        <location line="+70"/>
+        <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>qgui2menu</name>
@@ -7965,8 +8169,17 @@
         <source>Yes</source>
         <translation type="unfinished">Sí</translation>
     </message>
+    <message numerus="yes">
+        <location line="+72"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
     <message>
-        <location line="+98"/>
+        <location line="+34"/>
         <source>Mono</source>
         <translation type="unfinished">Mono</translation>
     </message>
@@ -8002,12 +8215,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+27"/>
+        <location line="+33"/>
         <source>Total Duration:	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-31"/>
         <source>Extra Video Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8022,12 +8235,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Codec:		</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8052,18 +8265,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-155"/>
+        <location line="-170"/>
         <source>%2.3f fps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+81"/>
+        <location line="+90"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-87"/>
+        <location line="-96"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8071,7 +8284,7 @@
 <context>
     <name>qshell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+53"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
         <translation type="unfinished"></translation>
@@ -8083,6 +8296,19 @@
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>qtalert</name>
@@ -8144,6 +8370,16 @@
         <source>Video Only Muxer Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>removeplane</name>
@@ -8196,7 +8432,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
         <source>_Mode:</source>
         <translation type="unfinished">_Mode:</translation>
     </message>
@@ -8211,7 +8447,7 @@
         <translation type="unfinished">Resample fps</translation>
     </message>
     <message>
-        <location line="-325"/>
+        <location line="-329"/>
         <source>Custom</source>
         <translation type="unfinished">Personalitzat</translation>
     </message>
@@ -8237,7 +8473,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
+        <source>59.94  (NTSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8254,7 +8490,7 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished">Ni l&apos;amplada ni l&apos;alçària no poden ser senars</translation>
     </message>
@@ -8417,6 +8653,20 @@
         <translation type="unfinished">Destinació:</translation>
     </message>
     <message>
+        <location line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+356"/>
+        <source>Lanzcos3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
         <source>Source PAR:</source>
         <translation type="unfinished"></translation>
@@ -8434,16 +8684,16 @@
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+44"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-312"/>
         <source>Resize Dimensions</source>
         <translation type="unfinished">Redimensiona</translation>
     </message>
@@ -8614,18 +8864,8 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+5"/>
-        <source>Lanzcos3</source>
-        <translation type="unfinished">Lanzcos3</translation>
+        <source>Lanczos-3</source>
+        <translation type="unfinished">Lanczos-3</translation>
     </message>
 </context>
 <context>
@@ -8983,26 +9223,32 @@
 <context>
     <name>tsdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Error</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+183"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+325"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+84"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+207"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+19"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
         <translation type="unfinished">S&apos;està indexant</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -9094,19 +9340,137 @@
     </message>
 </context>
 <context>
+    <name>vaapiDeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Adaptive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Compensated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vaapiResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
-        <source>vaapi: Resize</source>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>vaapi: Resize image using vaapi.</source>
+        <source>Resize image using VA-API.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+129"/>
         <source>Width :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9117,7 +9481,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>mpeg-&gt;PC:</source>
+        <source>mpeg-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9139,7 +9503,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+197"/>
         <source>Keep Top Field</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9155,31 +9519,31 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>_Ivtc:</source>
+        <source>_IVTC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Resize:</source>
+        <source>_Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>_Deint Mode:</source>
+        <location line="+2"/>
+        <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Width :</source>
+        <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Height :</source>
+        <location line="-2"/>
+        <source>_Deint Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>vdpau</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9197,13 +9561,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
-        <source>Width :</source>
+        <location line="+131"/>
+        <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9287,6 +9651,84 @@
     </message>
 </context>
 <context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vsWindow</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
@@ -9302,7 +9744,7 @@
 <context>
     <name>webmmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+68"/>
         <source>Unsupported Video.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
         <translation type="unfinished"></translation>
@@ -9314,7 +9756,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+89"/>
         <source>Saving Webm</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9337,7 +9779,7 @@
 <context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
         <source>Processing</source>
         <translation type="unfinished">Processament</translation>
     </message>
@@ -9347,12 +9789,12 @@
         <translation type="unfinished">Transcorregut:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+14"/>
         <source>Time Remaining:</source>
         <translation type="unfinished">Temps restant:</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+13"/>
         <source>00:00:00</source>
         <translation type="unfinished">00:00:00</translation>
     </message>
@@ -9360,7 +9802,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9376,7 +9818,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished">Personalitzat</translation>
     </message>
@@ -9501,12 +9943,12 @@
         <translation type="unfinished">Desa com</translation>
     </message>
     <message>
-        <location line="+2982"/>
+        <location line="+2987"/>
         <source>kbit/s</source>
         <translation type="unfinished">kbit/s</translation>
     </message>
     <message>
-        <location line="-2655"/>
+        <location line="-2660"/>
         <source>Target Video Size:</source>
         <translation type="unfinished">Mida vídeo sortida:</translation>
     </message>
@@ -9527,12 +9969,12 @@
     </message>
     <message>
         <location line="+24"/>
-        <location line="+3152"/>
+        <location line="+3157"/>
         <source>Delete</source>
         <translation type="unfinished">Esborra</translation>
     </message>
     <message>
-        <location line="-3110"/>
+        <location line="-3115"/>
         <source>General</source>
         <translation type="unfinished">General</translation>
     </message>
@@ -9597,7 +10039,7 @@
     </message>
     <message>
         <location line="+14"/>
-        <location line="+2490"/>
+        <location line="+2495"/>
         <source>frames</source>
         <translation type="unfinished">fotogrames</translation>
     </message>
@@ -9632,7 +10074,7 @@
         <translation type="unfinished">Custom Threaded Lookahead Buffer:</translation>
     </message>
     <message>
-        <location line="-2369"/>
+        <location line="-2374"/>
         <source>Motion</source>
         <translation type="unfinished">Moviment</translation>
     </message>
@@ -9725,12 +10167,12 @@
     </message>
     <message>
         <location line="+13"/>
-        <location line="+2596"/>
+        <location line="+2601"/>
         <source>None</source>
         <translation type="unfinished">Cap</translation>
     </message>
     <message>
-        <location line="-2591"/>
+        <location line="-2596"/>
         <source>Spatial</source>
         <translation type="unfinished">Espacial</translation>
     </message>
@@ -9812,12 +10254,12 @@
     </message>
     <message>
         <location line="+21"/>
-        <location line="+1328"/>
+        <location line="+1333"/>
         <source>Strength:</source>
         <translation type="unfinished">Intensitat:</translation>
     </message>
     <message>
-        <location line="-1289"/>
+        <location line="-1294"/>
         <source>Threshold:</source>
         <translation type="unfinished">Llindar:</translation>
     </message>
@@ -9969,12 +10411,12 @@
     </message>
     <message>
         <location line="+10"/>
-        <location line="+856"/>
+        <location line="+861"/>
         <source>Edit</source>
         <translation type="unfinished">Edita</translation>
     </message>
     <message>
-        <location line="-809"/>
+        <location line="-814"/>
         <source>Quantiser Control</source>
         <translation type="unfinished">Control quantificador</translation>
     </message>
@@ -9991,12 +10433,12 @@
     <message>
         <location line="+85"/>
         <location line="+179"/>
-        <location line="+302"/>
+        <location line="+307"/>
         <source>%</source>
         <translation type="unfinished">%</translation>
     </message>
     <message>
-        <location line="-459"/>
+        <location line="-464"/>
         <source>Maximum Quantiser Step:</source>
         <translation type="unfinished">Màxima variació del quantificador:</translation>
     </message>
@@ -10046,7 +10488,17 @@
         <translation type="unfinished">Quantificació adaptativa</translation>
     </message>
     <message>
-        <location line="+129"/>
+        <location line="+26"/>
+        <source>Auto Variance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Video Buffer Verifier</source>
         <translation type="unfinished">Verificador mem. intermèdia vídeo</translation>
     </message>
@@ -10111,7 +10563,7 @@
         <translation type="unfinished">Sortida</translation>
     </message>
     <message>
-        <location line="-3165"/>
+        <location line="-3170"/>
         <location line="+669"/>
         <source>1</source>
         <translation type="unfinished">1</translation>
@@ -10218,7 +10670,7 @@
         <translation type="unfinished">31</translation>
     </message>
     <message>
-        <location line="+2482"/>
+        <location line="+2487"/>
         <source>Generate Access Unit Delimiters</source>
         <translation type="unfinished">Genera delimitadors d&apos;unitat d&apos;accés</translation>
     </message>
@@ -10425,7 +10877,7 @@
         <translation type="unfinished">Mostres de tot l&apos;interval</translation>
     </message>
     <message>
-        <location line="-3682"/>
+        <location line="-3687"/>
         <source>Fast First Pass</source>
         <translation type="unfinished">Primera passada ràpida</translation>
     </message>
@@ -10435,24 +10887,24 @@
         <translation type="unfinished">Control de la taxa ramificat per macrobloc</translation>
     </message>
     <message>
-        <location line="+2440"/>
+        <location line="+2445"/>
         <source>Custom:</source>
         <comment>multithreading</comment>
         <translation type="unfinished">Personalitzat:</translation>
     </message>
     <message>
-        <location line="-1259"/>
+        <location line="-1264"/>
         <source>Periodic Intra Refresh</source>
         <translation type="unfinished">Actualització periòdica fotogrames clau</translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1420"/>
         <source>Custom:</source>
         <comment>PAR</comment>
         <translation type="unfinished">Personalitzat:</translation>
     </message>
     <message>
-        <location line="-2343"/>
+        <location line="-2348"/>
         <source>11 (Best)</source>
         <translation type="unfinished">11 (Millor)</translation>
     </message>
@@ -10477,7 +10929,7 @@
         <translation type="unfinished">Normal</translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>VBR</source>
         <translation type="unfinished">VBR</translation>
     </message>
@@ -10487,7 +10939,7 @@
         <translation type="unfinished">CBR</translation>
     </message>
     <message>
-        <location line="-3853"/>
+        <location line="-3858"/>
         <source>Basic</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10597,12 +11049,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Auto Variance AQ</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+91"/>
+        <location line="+114"/>
         <source>Advanced 1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10713,7 +11160,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished">Personalitzat</translation>
     </message>
@@ -11921,7 +12368,7 @@
 <context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+37"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+32"/>
         <location line="+24"/>
         <source>None</source>
         <translation type="unfinished">Cap</translation>
@@ -11982,27 +12429,43 @@
         <translation type="unfinished">Multiprocessament</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="-2"/>
         <source>Motion Estimation</source>
         <translation type="unfinished">Estimac. moviment</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+35"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+25"/>
         <source>Rate Control</source>
         <translation type="unfinished">Control taxa</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-52"/>
         <source>Aspect Ratio:</source>
         <translation type="unfinished">Relació d&apos;aspecte:</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+47"/>
         <source>Aspect Ratio</source>
         <translation type="unfinished">Relació d&apos;aspecte</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-93"/>
         <source>DCT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12047,12 +12510,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>MotionEstimation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+15"/>
         <source>Mi_n. quantizer:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12073,6 +12531,16 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>_Quantization type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12097,12 +12565,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Advanced Simple Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+25"/>
         <source>Quantization</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12130,23 +12593,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Temporal &amp; spatial check</source>
-        <translation type="obsolete">Comprov. temporal i espacial</translation>
-    </message>
-    <message>
-        <source>Bob, temporal &amp; spatial check</source>
-        <translation type="obsolete">Bob, comprov. temp. i espacial </translation>
-    </message>
-    <message>
-        <source>Skip spatial temporal check</source>
-        <translation type="obsolete">Salta compr. temp. espacial </translation>
-    </message>
-    <message>
-        <source>Bob, skip spatial temporal check</source>
-        <translation type="obsolete">Bob, salta compr. temp. espac.</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+70"/>
         <source>Bottom field first</source>
         <translation type="unfinished">Camp senar abans</translation>
     </message>

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_cs.ts -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_cs.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">Selhalo otevření %s!</translation>
     </message>
@@ -51,12 +51,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+47"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -375,22 +375,22 @@
         <translation type="unfinished">Dialog</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+19"/>
         <source>00:00:00</source>
         <translation type="unfinished">00:00:00</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+51"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="-64"/>
         <source>TimeLeft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+41"/>
         <source>ProcessImages</source>
         <translation type="unfinished"></translation>
     </message>
@@ -400,7 +400,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-14"/>
         <source>0 fps</source>
         <translation type="unfinished"></translation>
     </message>
@@ -436,30 +436,28 @@
 <context>
     <name>FDK-AAC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
-        <source>_Profile::</source>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+9"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+2"/>
         <source>SBR enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+7"/>
-        <source>After burner</source>
+        <location line="+2"/>
+        <source>Afterburner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>FDK-AAC Configuration</source>
         <translation>Nastavení FDK-AAC</translation>
     </message>
@@ -586,7 +584,12 @@
         <translation type="unfinished">Pře&amp;jít</translation>
     </message>
     <message>
-        <location line="+1544"/>
+        <location line="+408"/>
+        <source> (0 tracks)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1136"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">&amp;Otevřít...</translation>
     </message>
@@ -596,7 +599,7 @@
         <translation type="unfinished">&amp;Informace...</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+9"/>
         <source>Save &amp;Video...</source>
         <translation type="unfinished">&amp;Uložit video...</translation>
     </message>
@@ -629,12 +632,11 @@
         <translation type="unfinished">Uložit projekt</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>&amp;Calculator...</source>
-        <translation type="unfinished">&amp;Kalkulátor...</translation>
+        <translation type="obsolete">&amp;Kalkulátor...</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+15"/>
         <source>&amp;Input</source>
         <translation type="unfinished">&amp;Vstup</translation>
     </message>
@@ -654,7 +656,7 @@
         <translation type="unfinished">&amp;Na sebe</translation>
     </message>
     <message>
-        <location line="-1650"/>
+        <location line="-1635"/>
         <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
         <translation>&lt;b&gt;Video dekodér&lt;/b&gt;</translation>
     </message>
@@ -664,12 +666,12 @@
         <translation type="unfinished">Typ snímku:</translation>
     </message>
     <message>
-        <location line="+512"/>
+        <location line="+497"/>
         <source>&amp;Separate</source>
         <translation type="unfinished">S&amp;amostatně</translation>
     </message>
     <message>
-        <location line="-1152"/>
+        <location line="-1137"/>
         <source>ms</source>
         <translation type="unfinished">ms</translation>
     </message>
@@ -720,23 +722,18 @@
         <translation>&lt;b&gt;Zvukový výstup&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>   (0 track(s))</source>
-        <translation type="unfinished">   (0 stopa(y))</translation>
-    </message>
-    <message>
-        <location line="+212"/>
+        <location line="+222"/>
         <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
         <translation>&lt;b&gt;Výstupní formát&lt;/b&gt;</translation>
     </message>
     <message>
         <location line="+114"/>
-        <location line="+946"/>
+        <location line="+931"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navigace</translation>
     </message>
     <message>
-        <location line="-871"/>
+        <location line="-856"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -826,12 +823,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+210"/>
         <source>Play filtered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-169"/>
         <source>Vol&amp;ume</source>
         <translation>Hlas&amp;itost</translation>
     </message>
@@ -851,17 +848,7 @@
         <translation>Otevřít video</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Alt+Return</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
-        <source>F7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+38"/>
+        <location line="+104"/>
         <source>&amp;Codec Options</source>
         <translation>Možnosti &amp;kodeku</translation>
     </message>
@@ -909,7 +896,7 @@
 <context>
     <name>Opus</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -931,11 +918,6 @@
         <source>Evaluate</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+3"/>
-        <source>Ctrl+Return</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>VapourSynthProxy</name>
@@ -983,12 +965,7 @@
         <translation type="unfinished">Multiplatformní video editor</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
@@ -998,7 +975,12 @@
         <translation type="unfinished">http://www.avidemux.org</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-19"/>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
         <source>&amp;License</source>
         <translation type="unfinished">&amp;Licence</translation>
     </message>
@@ -1050,7 +1032,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1180,16 +1162,27 @@
         <translation type="unfinished">Priority</translation>
     </message>
     <message>
-        <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="obsolete">_Používat alternativní značku pro MP3 v .mp4</translation>
-    </message>
-    <message>
         <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+2"/>
+        <source>Auto-Append Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>XVideo (best)</source>
         <translation type="unfinished">XVideo (nejlepší)</translation>
     </message>
@@ -1230,7 +1223,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+213"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
         <translation type="unfinished">PCM</translation>
     </message>
@@ -1323,18 +1316,18 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+277"/>
+        <location line="+283"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+423"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
         <source>Audio</source>
         <translation type="unfinished">Audio</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-73"/>
+        <location filename="../../common/gui_savenew.cpp" line="-239"/>
+        <location line="+170"/>
         <location line="+12"/>
         <location line="+16"/>
-        <location line="+8"/>
         <source>Video</source>
         <translation type="unfinished">Video</translation>
     </message>
@@ -1366,10 +1359,6 @@
         <translation type="unfinished">Zavřít</translation>
     </message>
     <message>
-        <source>-</source>
-        <translation type="obsolete">-</translation>
-    </message>
-    <message>
         <location line="+4"/>
         <source>Connect to avsproxy</source>
         <translation type="unfinished">Připojit se k avsproxy</translation>
@@ -1390,7 +1379,7 @@
         <translation type="unfinished">Nastavit značku B</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+18"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation type="unfinished">Filtry</translation>
@@ -1622,7 +1611,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
-        <location filename="../../common/gui_save.cpp" line="-313"/>
+        <location filename="../../common/gui_save.cpp" line="-319"/>
         <source>No audio track</source>
         <translation type="unfinished">Chybí zvuková stopa</translation>
     </message>
@@ -1667,12 +1656,12 @@
 To je potřeba k vytvoření PSP kompatibilního videa.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+369"/>
+        <location filename="../../common/gui_main.cpp" line="+370"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">Nepodporováno v této verzi</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+214"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
@@ -1793,8 +1782,7 @@
         <translation type="unfinished">Při připojování něco selhalo</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+321"/>
+        <location line="+320"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">Přihodilo se něco zlého (II)</translation>
     </message>
@@ -1852,7 +1840,7 @@
         <translation type="unfinished">Hlavní audio stopa</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+264"/>
         <source>AvsProxy</source>
         <translation type="unfinished">AvsProxy</translation>
     </message>
@@ -1899,7 +1887,7 @@
         <translation type="unfinished">_Deringing</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+85"/>
+        <location filename="../../common/gui_save.cpp" line="+91"/>
         <source>Select Workbench to Save</source>
         <translation type="unfinished">Zvolte projekt k uložení</translation>
     </message>
@@ -1935,30 +1923,35 @@
         <translation type="unfinished">Ukládá se zvuk</translation>
     </message>
     <message>
-        <location line="+318"/>
-        <location line="+83"/>
+        <location line="+322"/>
+        <source>Maximum number of 99999 images reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+76"/>
         <source>Done</source>
         <translation type="unfinished">Hotovo</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-76"/>
         <source>Saved %d images.</source>
         <translation type="unfinished">Počet uložených obrázků: %d.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="-250"/>
+        <location filename="../../common/gui_main.cpp" line="-251"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
         <location line="+4"/>
         <location filename="../../common/gui_save.cpp" line="+2"/>
-        <location line="+99"/>
+        <location line="+92"/>
         <location line="+7"/>
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
@@ -2201,12 +2194,12 @@
         <translation type="unfinished">Nastavení Xvid4</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+495"/>
         <source>Saving</source>
         <translation type="unfinished">Ukládání</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+181"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2309,7 +2302,7 @@
         <translation>Multiplexery</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-143"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-149"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2351,12 +2344,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+20"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2434,7 +2422,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-96"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-100"/>
         <source>Open</source>
         <translation>Otevřít</translation>
     </message>
@@ -2531,12 +2519,13 @@
         <translation>Př&amp;edvolby</translation>
     </message>
     <message>
+        <location line="+3"/>
         <location line="+2"/>
         <source>Save current settings as default</source>
         <translation>Uložit aktuální nastavení jako výchozí</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Load saved settings</source>
         <translation>Načíst uložené nastavení</translation>
     </message>
@@ -2631,7 +2620,7 @@
         <translation>Přejít na čas</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2651,8 +2640,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
-        <location line="+44"/>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-43"/>
+        <location line="+43"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished"></translation>
@@ -2697,7 +2691,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1449"/>
+        <location filename="../../common/gui_main.cpp" line="-1447"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2722,13 +2716,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+68"/>
+        <location line="+126"/>
+        <location line="+73"/>
         <source>Select Video File...</source>
         <translation>Vybrat video soubor...</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-48"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2738,7 +2732,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2776,7 +2770,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+604"/>
+        <location line="+598"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -2807,7 +2801,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+297"/>
+        <location line="+298"/>
         <source>Oops</source>
         <translation type="unfinished">Ouha</translation>
     </message>
@@ -2822,12 +2816,12 @@
         <translation type="unfinished">Chyba inicializace zvukového zařízení</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-587"/>
+        <location filename="../../common/gui_save.cpp" line="-592"/>
         <source>Audio encoder index out of bounds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>No</source>
         <translation type="unfinished">Ne</translation>
     </message>
@@ -2837,7 +2831,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Job</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2847,7 +2841,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Output file</source>
         <translation>Výstupní soubor</translation>
     </message>
@@ -2862,7 +2856,7 @@
         <translation>Přidat úlohu na seznam</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Select PNG to Save</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2898,22 +2892,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Maximum number of 9999 images reached, aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Saving images failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+25"/>
         <source>PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2943,29 +2932,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-207"/>
+        <location filename="../../common/gui_savenew.cpp" line="-210"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+182"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+24"/>
         <source>Cannot create encoder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-8"/>
-        <source>Cannot setup codec. Bitrate too low?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+57"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2977,20 +2960,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-253"/>
-        <location line="+286"/>
+        <location line="-257"/>
+        <location line="+290"/>
         <location line="+26"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-312"/>
-        <location line="+286"/>
+        <location line="-326"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+290"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="-102"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The choice of cut points may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Do you want to continue anyway?</source>
         <translation type="unfinished"></translation>
@@ -3138,7 +3131,7 @@
         <translation type="unfinished">MP4</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>AAC</source>
         <translation type="unfinished">AAC</translation>
     </message>
@@ -3194,7 +3187,7 @@
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
-        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+374"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+382"/>
         <source>Unknown</source>
         <translation type="unfinished">Neznámý</translation>
     </message>
@@ -3285,20 +3278,20 @@
         <translation type="unfinished">1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
-        <location line="+30"/>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
-        <location line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
         <source>Codec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
         <source>Internal error finding codec 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Internal error opening 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3314,31 +3307,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+812"/>
-        <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
-Dropping a keyframe will result in severely corrupted video.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
-Dropping a frame may result in some video corruption.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Do not warn again and drop frames silently while saving this video?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3576,7 +3545,7 @@
 <context>
     <name>avimuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+75"/>
         <source>Bad Idea</source>
         <translation>Špatný nápad</translation>
     </message>
@@ -3654,7 +3623,7 @@
 <context>
     <name>bitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+51"/>
         <source>Constant Bitrate</source>
         <translation type="unfinished">Konstantní datový tok</translation>
     </message>
@@ -3771,34 +3740,39 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+23"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+51"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>blackframes</name>
@@ -3819,6 +3793,29 @@
     </message>
 </context>
 <context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -3847,7 +3844,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
+        <source>59.94  (NTSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3861,7 +3858,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+141"/>
+        <location line="+146"/>
         <source>Source Fps:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4190,7 +4187,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4451,25 +4448,25 @@
         <translation type="unfinished">Probíhá kódování...</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+55"/>
         <source>Phase:</source>
         <translation type="unfinished">Fáze:</translation>
     </message>
     <message>
-        <location line="+248"/>
+        <location line="+268"/>
         <source>Video Codec:</source>
         <translation type="unfinished">Video kodek:</translation>
     </message>
     <message>
-        <location line="-255"/>
-        <location line="+220"/>
+        <location line="-282"/>
+        <location line="+247"/>
         <location line="+21"/>
         <source>None</source>
         <translation type="unfinished">Nic</translation>
     </message>
     <message>
-        <location line="-258"/>
-        <location line="+251"/>
+        <location line="-261"/>
+        <location line="+254"/>
         <source>Unknown</source>
         <translation type="unfinished">Neznámý</translation>
     </message>
@@ -4501,12 +4498,12 @@
         <translation type="unfinished">Uplynulý čas:</translation>
     </message>
     <message>
-        <location line="-446"/>
+        <location line="-504"/>
         <source>Time Remaining:</source>
         <translation type="unfinished">Zbývající čas:</translation>
     </message>
     <message>
-        <location line="+467"/>
+        <location line="+525"/>
         <source>Frames/sec:</source>
         <translation type="unfinished">Snímků za sekundu:</translation>
     </message>
@@ -4553,7 +4550,7 @@
         <translation type="unfinished">Kvantizér:</translation>
     </message>
     <message>
-        <location line="-378"/>
+        <location line="-389"/>
         <source>Shut down computer when finished</source>
         <translation type="unfinished">Po ukončení vypnout počítač</translation>
     </message>
@@ -4588,22 +4585,27 @@
         <translation type="unfinished">Nízká</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+12"/>
+        <source>Keep dialog open when finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
         <source>Pause / Abort</source>
         <translation type="unfinished">Pozastavit / Ukončit</translation>
     </message>
     <message>
-        <location line="-149"/>
+        <location line="-186"/>
         <source>Main</source>
         <translation type="unfinished">Hlavní</translation>
     </message>
     <message>
-        <location line="+175"/>
+        <location line="+199"/>
         <source>Advanced</source>
         <translation type="unfinished">Pokročilé</translation>
     </message>
     <message>
-        <location line="-46"/>
+        <location line="-33"/>
         <source>Minimize to Tray</source>
         <translation>Minimalizovat</translation>
     </message>
@@ -4696,7 +4698,7 @@
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished">Fade</translation>
@@ -4707,7 +4709,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+13"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4720,13 +4747,13 @@
 <context>
     <name>fadeToBlack</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
-        <location line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+55"/>
+        <location line="+20"/>
         <source>Fade to black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-19"/>
         <source>Fade to black in/out.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4751,7 +4778,7 @@
         <translation type="unfinished">Postupný náběh</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>_Fade type:</source>
         <translation type="unfinished">_Typ přechodu:</translation>
     </message>
@@ -4769,7 +4796,7 @@
 <context>
     <name>ffVAEncH264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4784,12 +4811,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Profile:</source>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4800,16 +4848,21 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Bitrate (kbps):</source>
+        <source>Quality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4819,7 +4872,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4827,27 +4880,53 @@
 <context>
     <name>ffVAEncHEVC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+343"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4857,7 +4936,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4865,7 +4944,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+223"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+256"/>
         <source>Default</source>
         <translation type="unfinished">Výchozí</translation>
     </message>
@@ -5334,8 +5413,32 @@
 <context>
     <name>ffnvenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+229"/>
+        <source>Controlled by Preset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
         <source>Low Quality</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5387,6 +5490,12 @@
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+        <source>RC Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Preset:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5396,6 +5505,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Bitrate (kbps):</source>
@@ -5409,32 +5524,48 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Frame Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>NVENC H.264 configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
-        <source>nvEnc HEVC  configuration</source>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+28"/>
+        <source>NVENC HEVC configuration</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5446,7 +5577,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+87"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5542,7 +5673,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5615,7 +5746,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5773,7 +5904,7 @@
 <context>
     <name>flvdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6304,7 +6435,7 @@
 <context>
     <name>jobs</name>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Oops</source>
         <translation type="unfinished">Ouha</translation>
     </message>
@@ -6314,7 +6445,7 @@
         <translation type="unfinished">Při sestavování seznamu úloh se stalo něco velmi zlého.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>There are no jobs stored</source>
         <translation type="unfinished">Nejsou uloženy žádné úlohy</translation>
     </message>
@@ -6802,12 +6933,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
         <source>Matroska Images</source>
         <translation>Matroska obrázky</translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+523"/>
         <source>Matroska clusters</source>
         <translation>Matroska klastry</translation>
     </message>
@@ -6907,7 +7038,7 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+167"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
         <source>Saving Mkv</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7006,31 +7137,46 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Chyba čtení hlavičky SVQ3</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+67"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <location line="+17"/>
         <source>Unsupported</source>
         <translation type="unfinished">Nepodporováno</translation>
     </message>
     <message>
-        <location line="-9"/>
-        <source>Only MP4Video, H264, and H265 supported for video</source>
+        <location line="-17"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+182"/>
         <source>Saving mp4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7040,15 +7186,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
         <source>Muxing Format</source>
         <translation>Formát multiplexeru</translation>
     </message>
     <message>
-        <source>Use alternate MP3 tag</source>
-        <translation type="vanished">Použít alternativní MP3 značky</translation>
-    </message>
-    <message>
         <location line="+2"/>
         <source>No optimization</source>
         <translation type="unfinished"></translation>
@@ -7079,7 +7221,7 @@
         <translation>Poměr stran (DAR)</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Do not rotate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7105,6 +7247,51 @@
     </message>
     <message>
         <location line="+3"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>MP4 Muxer</source>
         <translation>MP4 multiplexer</translation>
     </message>
@@ -7276,7 +7463,7 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+242"/>
+        <location filename="../../common/gui_navigate.cpp" line="+232"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7506,21 +7693,17 @@
 <context>
     <name>psdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Chyba</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -7590,7 +7773,7 @@
         <translation type="unfinished">K této akci jsou vyžadována práva roota.</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+126"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7605,7 +7788,7 @@
         <translation>Probíhá kódování...</translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+185"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished">Kódování je pozastaveno. Chcete v něm pokračovat, nebo jej ukončit?</translation>
     </message>
@@ -7643,7 +7826,7 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+212"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+206"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7723,20 +7906,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+626"/>
+        <location line="+681"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+262"/>
+        <location line="+230"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+334"/>
-        <source> (%d track(s))</source>
-        <translation type="unfinished"> (%d stopa(y))</translation>
+        <location line="+70"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -7973,18 +8166,28 @@
         <translation type="unfinished">Ano</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+33"/>
         <source>%2.3f fps</source>
         <translation type="unfinished">%2.3f snímků/s</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+81"/>
+        <location line="+90"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation type="unfinished">%02d:%02d:%02d.%03d</translation>
     </message>
+    <message numerus="yes">
+        <location line="-55"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
     <message>
-        <location line="+30"/>
+        <location line="+83"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8010,12 +8213,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+27"/>
+        <location line="+33"/>
         <source>Total Duration:	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-31"/>
         <source>Extra Video Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8030,12 +8233,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Codec:		</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8060,12 +8263,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-172"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished">%s (%u:%u)</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+77"/>
         <source>Mono</source>
         <translation type="unfinished">Mono</translation>
     </message>
@@ -8078,7 +8281,7 @@
 <context>
     <name>qshell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+53"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
         <translation type="unfinished"></translation>
@@ -8090,6 +8293,19 @@
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>qtalert</name>
@@ -8151,6 +8367,16 @@
         <source>Video Only Muxer Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>removeplane</name>
@@ -8203,7 +8429,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
         <source>_Mode:</source>
         <translation type="unfinished">_Režim:</translation>
     </message>
@@ -8218,7 +8444,7 @@
         <translation type="unfinished">Resample fps</translation>
     </message>
     <message>
-        <location line="-325"/>
+        <location line="-329"/>
         <source>Custom</source>
         <translation type="unfinished">Vlastní</translation>
     </message>
@@ -8244,7 +8470,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
+        <source>59.94  (NTSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8261,7 +8487,7 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished">Šířka a výška nemohou být liché</translation>
     </message>
@@ -8424,6 +8650,20 @@
         <translation type="unfinished">Cíl:</translation>
     </message>
     <message>
+        <location line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+356"/>
+        <source>Lanzcos3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
         <source>Source PAR:</source>
         <translation type="unfinished"></translation>
@@ -8441,16 +8681,16 @@
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+44"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-312"/>
         <source>Resize Dimensions</source>
         <translation type="unfinished">Velikost</translation>
     </message>
@@ -8621,18 +8861,8 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+5"/>
-        <source>Lanzcos3</source>
-        <translation type="unfinished">Lanzcos3</translation>
+        <source>Lanczos-3</source>
+        <translation type="unfinished">Lanczos-3</translation>
     </message>
 </context>
 <context>
@@ -8990,26 +9220,32 @@
 <context>
     <name>tsdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Chyba</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+183"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+325"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+84"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+207"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+19"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -9101,19 +9337,137 @@
     </message>
 </context>
 <context>
+    <name>vaapiDeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Adaptive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Compensated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vaapiResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
-        <source>vaapi: Resize</source>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>vaapi: Resize image using vaapi.</source>
+        <source>Resize image using VA-API.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+129"/>
         <source>Width :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9124,7 +9478,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>mpeg-&gt;PC:</source>
+        <source>mpeg-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9146,7 +9500,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+197"/>
         <source>Keep Top Field</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9162,31 +9516,31 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>_Ivtc:</source>
+        <source>_IVTC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Resize:</source>
+        <source>_Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>_Deint Mode:</source>
+        <location line="+2"/>
+        <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Width :</source>
+        <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Height :</source>
+        <location line="-2"/>
+        <source>_Deint Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>vdpau</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9204,13 +9558,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
-        <source>Width :</source>
+        <location line="+131"/>
+        <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9294,6 +9648,84 @@
     </message>
 </context>
 <context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vsWindow</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
@@ -9309,7 +9741,7 @@
 <context>
     <name>webmmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+68"/>
         <source>Unsupported Video.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
         <translation type="unfinished"></translation>
@@ -9321,7 +9753,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+89"/>
         <source>Saving Webm</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9344,7 +9776,7 @@
 <context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
         <source>Processing</source>
         <translation type="unfinished">Zpracovávání</translation>
     </message>
@@ -9354,12 +9786,12 @@
         <translation type="unfinished">Uplynulý čas:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+14"/>
         <source>Time Remaining:</source>
         <translation type="unfinished">Zbývající čas:</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+13"/>
         <source>00:00:00</source>
         <translation type="unfinished">00:00:00</translation>
     </message>
@@ -9367,7 +9799,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9383,7 +9815,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished">Vlastní</translation>
     </message>
@@ -9459,10 +9891,6 @@
         <translation>Uložit profil</translation>
     </message>
     <message>
-        <source>my profile</source>
-        <translation type="vanished">můj profil</translation>
-    </message>
-    <message>
         <location line="+46"/>
         <source>Overwrite</source>
         <translation type="unfinished"></translation>
@@ -9512,12 +9940,12 @@
         <translation type="unfinished">Uložit jako</translation>
     </message>
     <message>
-        <location line="+2982"/>
+        <location line="+2987"/>
         <source>kbit/s</source>
         <translation type="unfinished">kb/s</translation>
     </message>
     <message>
-        <location line="-2655"/>
+        <location line="-2660"/>
         <source>Target Video Size:</source>
         <translation type="unfinished">Cílová velikost videa:</translation>
     </message>
@@ -9538,12 +9966,12 @@
     </message>
     <message>
         <location line="+24"/>
-        <location line="+3152"/>
+        <location line="+3157"/>
         <source>Delete</source>
         <translation type="unfinished">Odstranit</translation>
     </message>
     <message>
-        <location line="-3110"/>
+        <location line="-3115"/>
         <source>General</source>
         <translation type="unfinished">Obecné</translation>
     </message>
@@ -9608,7 +10036,7 @@
     </message>
     <message>
         <location line="+14"/>
-        <location line="+2490"/>
+        <location line="+2495"/>
         <source>frames</source>
         <translation type="unfinished">snímků</translation>
     </message>
@@ -9633,7 +10061,7 @@
         <translation type="unfinished">Vynutit opakovatelnost</translation>
     </message>
     <message>
-        <location line="-2353"/>
+        <location line="-2358"/>
         <source>Motion</source>
         <translation type="unfinished">Pohyb</translation>
     </message>
@@ -9726,12 +10154,12 @@
     </message>
     <message>
         <location line="+13"/>
-        <location line="+2596"/>
+        <location line="+2601"/>
         <source>None</source>
         <translation type="unfinished">Žádný</translation>
     </message>
     <message>
-        <location line="-2591"/>
+        <location line="-2596"/>
         <source>Spatial</source>
         <translation type="unfinished">Prostorový</translation>
     </message>
@@ -9813,12 +10241,12 @@
     </message>
     <message>
         <location line="+21"/>
-        <location line="+1328"/>
+        <location line="+1333"/>
         <source>Strength:</source>
         <translation type="unfinished">Síla:</translation>
     </message>
     <message>
-        <location line="-1289"/>
+        <location line="-1294"/>
         <source>Threshold:</source>
         <translation type="unfinished">Práh:</translation>
     </message>
@@ -9893,13 +10321,13 @@
         <translation type="unfinished">Strom makrobloků</translation>
     </message>
     <message>
-        <location line="+2440"/>
+        <location line="+2445"/>
         <source>Custom:</source>
         <comment>multithreading</comment>
         <translation type="unfinished">Vlastní:</translation>
     </message>
     <message>
-        <location line="-2187"/>
+        <location line="-2192"/>
         <source>11 (Best)</source>
         <translation type="unfinished">11 (nejlepší)</translation>
     </message>
@@ -9991,12 +10419,12 @@
     </message>
     <message>
         <location line="+10"/>
-        <location line="+856"/>
+        <location line="+861"/>
         <source>Edit</source>
         <translation type="unfinished">Upravit</translation>
     </message>
     <message>
-        <location line="-809"/>
+        <location line="-814"/>
         <source>Quantiser Control</source>
         <translation type="unfinished">Regulace kvantizérů</translation>
     </message>
@@ -10013,12 +10441,12 @@
     <message>
         <location line="+85"/>
         <location line="+179"/>
-        <location line="+302"/>
+        <location line="+307"/>
         <source>%</source>
         <translation type="unfinished">%</translation>
     </message>
     <message>
-        <location line="-459"/>
+        <location line="-464"/>
         <source>Maximum Quantiser Step:</source>
         <translation type="unfinished">Maximální rozdíl kvantizérů:</translation>
     </message>
@@ -10068,7 +10496,17 @@
         <translation type="unfinished">Adaptivní kvantizace</translation>
     </message>
     <message>
-        <location line="+129"/>
+        <location line="+26"/>
+        <source>Auto Variance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Video Buffer Verifier</source>
         <translation type="unfinished">Kontrola video bufferu</translation>
     </message>
@@ -10113,7 +10551,7 @@
         <translation type="unfinished">Výstup</translation>
     </message>
     <message>
-        <location line="-3165"/>
+        <location line="-3170"/>
         <location line="+669"/>
         <source>1</source>
         <translation type="unfinished">1</translation>
@@ -10215,7 +10653,7 @@
         <translation type="unfinished">Normální</translation>
     </message>
     <message>
-        <location line="+590"/>
+        <location line="+595"/>
         <source>Pixel Aspect Ratio</source>
         <translation type="unfinished">Poměr stran pixelu</translation>
     </message>
@@ -10413,7 +10851,7 @@
         <translation type="unfinished">Overscan:</translation>
     </message>
     <message>
-        <location line="-3525"/>
+        <location line="-3530"/>
         <source>Basic</source>
         <translation>Základní</translation>
     </message>
@@ -10553,12 +10991,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Auto Variance AQ</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+91"/>
+        <location line="+114"/>
         <source>Advanced 1</source>
         <translation>Pokročilé 1</translation>
     </message>
@@ -10724,7 +11157,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished">Vlastní</translation>
     </message>
@@ -11932,7 +12365,7 @@
 <context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+39"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+34"/>
         <source>Medium</source>
         <translation type="unfinished">Střední</translation>
     </message>
@@ -11993,6 +12426,16 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>_Quantization type:</source>
         <translation type="unfinished">_Typ kvantizace:</translation>
     </message>
@@ -12002,17 +12445,12 @@
         <translation type="unfinished">_Rozhodování makrobloků:</translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Advanced Simple Profile</source>
-        <translation type="unfinished">Advanced Simple Profile</translation>
-    </message>
-    <message>
-        <location line="+9"/>
+        <location line="-17"/>
         <source>Motion Estimation</source>
         <translation type="unfinished">Odhad pohybu</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+57"/>
         <source>Quantization</source>
         <translation type="unfinished">Kvantizace</translation>
     </message>
@@ -12022,7 +12460,7 @@
         <translation type="unfinished">Řízení datového toku</translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="-69"/>
         <source>Mi_n. quantizer:</source>
         <translation type="unfinished">Mi_n. kvantizér:</translation>
     </message>
@@ -12032,17 +12470,17 @@
         <translation type="unfinished">Ma_x. kvantizér:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Aspect Ratio:</source>
         <translation type="unfinished">Poměr stran pixelu:</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+47"/>
         <source>Aspect Ratio</source>
         <translation type="unfinished">Poměr stran</translation>
     </message>
     <message>
-        <location line="-108"/>
+        <location line="-118"/>
         <location line="+24"/>
         <source>None</source>
         <translation type="unfinished"></translation>
@@ -12098,12 +12536,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>MotionEstimation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
+        <location line="+30"/>
         <source>Profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12118,7 +12551,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+3"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Threads</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12141,23 +12590,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Temporal &amp; spatial check</source>
-        <translation type="obsolete">Časová a prostorová kontrola</translation>
-    </message>
-    <message>
-        <source>Bob, temporal &amp; spatial check</source>
-        <translation type="obsolete">Bob, časová a prostorová kontrola</translation>
-    </message>
-    <message>
-        <source>Skip spatial temporal check</source>
-        <translation type="obsolete">Vynechat prostorovou časovou kontrolu</translation>
-    </message>
-    <message>
-        <source>Bob, skip spatial temporal check</source>
-        <translation type="obsolete">Bob, vynechat prostorovou časovou kontrolu</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+70"/>
         <source>Bottom field first</source>
         <translation type="unfinished">Nejdřív spodní půlsnímek</translation>
     </message>

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_da.ts -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_da.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+102"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+124"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation>Denne video indeholder B-frames, men præsentationstidsstemplerne (PTS) findes enten ikke eller øges monotont. Avidemux kan forsøge at rekonstruere de korrekte PTS&apos;er ved at dekodere hele videoen. Dette kan tage lang tid. Fortsæt?</translation>
     </message>
@@ -31,7 +31,7 @@
 Drop timinginformationer?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+194"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+425"/>
         <source>Cannot find a demuxer for %s</source>
         <translation>Kan ikke finde en demuxer for %s</translation>
     </message>
@@ -80,7 +80,7 @@
 2.) sæt dem sammen</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-189"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-193"/>
         <source>Checking if timestamps are valid..</source>
         <translation>Tjekker om tidsstempler er gyldige...</translation>
     </message>
@@ -383,32 +383,32 @@
         <translation>Dialog</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+6"/>
         <source>TimeLeft</source>
         <translation>Resterende tid</translation>
     </message>
     <message>
-        <location line="-21"/>
+        <location line="+13"/>
         <source>00:00:00</source>
         <translation>00:00:00</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+28"/>
         <source>ProcessImages</source>
         <translation>Behandl billeder</translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+23"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="-30"/>
         <source>Speed</source>
         <translation>Hastighed</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-14"/>
         <source>0 fps</source>
         <translation>0 billeder/sekund</translation>
     </message>
@@ -444,30 +444,28 @@
 <context>
     <name>FDK-AAC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
-        <source>_Profile::</source>
-        <translation>_Profil::</translation>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+9"/>
         <source>_Bitrate:</source>
         <translation>_Bithastighed:</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+2"/>
         <source>SBR enabled</source>
         <translation>SBR aktiveret</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+7"/>
-        <source>After burner</source>
-        <translation>Efterbrænder</translation>
+        <location line="+2"/>
+        <source>Afterburner</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>FDK-AAC Configuration</source>
         <translation>FDK-AAC-konfiguration</translation>
     </message>
@@ -576,12 +574,7 @@
         <translation>&lt;b&gt;Lyd-output&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>   (0 track(s))</source>
-        <translation>   (0 spor)</translation>
-    </message>
-    <message>
-        <location line="+145"/>
+        <location line="+155"/>
         <source>&amp;Shift:</source>
         <translation>&amp;Forskyd:</translation>
     </message>
@@ -670,9 +663,8 @@
         <translation>&amp;Information...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Alt+Return</source>
-        <translation>Alt+Retur</translation>
+        <translation type="vanished">Alt+Retur</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -708,14 +700,12 @@
         <translation>Gem projekt</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>&amp;Calculator...</source>
-        <translation>&amp;Lommeregner...</translation>
+        <translation type="vanished">&amp;Lommeregner...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>F7</source>
-        <translation>F7</translation>
+        <translation type="vanished">F7</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -738,18 +728,18 @@
         <translation>Ctrl+Alt+C</translation>
     </message>
     <message>
-        <location line="-935"/>
-        <location line="+946"/>
+        <location line="-920"/>
+        <location line="+931"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navigation</translation>
     </message>
     <message>
-        <location line="-1581"/>
+        <location line="-1566"/>
         <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1584"/>
+        <location line="+1569"/>
         <source>Ctrl+Alt+N</source>
         <translation>Ctrl+Alt+N</translation>
     </message>
@@ -799,12 +789,17 @@
         <translation>Si&amp;de</translation>
     </message>
     <message>
-        <location line="-1695"/>
+        <location line="-1680"/>
         <source>Codec O&amp;ptions</source>
         <translation>Codec-&amp;valgmuligheder</translation>
     </message>
     <message>
-        <location line="+743"/>
+        <location line="+342"/>
+        <source> (0 tracks)</source>
+        <translation> (0 spor)</translation>
+    </message>
+    <message>
+        <location line="+401"/>
         <source>Play [SPACE]</source>
         <translation>Afspil [MELLEMRUM]</translation>
     </message>
@@ -894,12 +889,12 @@
         <translation>Gå til markør B [PAGE DOWN]</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+210"/>
         <source>Play filtered</source>
         <translation>Afspil filtreret</translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-169"/>
         <source>Vol&amp;ume</source>
         <translation>&amp;Lydstyrke</translation>
     </message>
@@ -917,7 +912,7 @@
 <context>
     <name>Opus</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -940,9 +935,8 @@
         <translation>Evaluér</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Ctrl+Return</source>
-        <translation>Ctrl+Retur</translation>
+        <translation type="vanished">Ctrl+Retur</translation>
     </message>
 </context>
 <context>
@@ -992,7 +986,7 @@
     </message>
     <message>
         <location line="+10"/>
-        <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1108,10 +1102,6 @@
         <translation>Luk</translation>
     </message>
     <message>
-        <source>-</source>
-        <translation type="vanished">-</translation>
-    </message>
-    <message>
         <location line="+2"/>
         <source>Information</source>
         <translation>Information</translation>
@@ -1174,13 +1164,13 @@
         <translation>Sæt markør B</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+525"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+533"/>
         <location line="+3"/>
         <source>Preferences</source>
         <translation>Præferencer</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+12"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+16"/>
         <source>Decoder Option</source>
         <translation>Dekoder-valgmuligheder</translation>
     </message>
@@ -1301,7 +1291,7 @@
         <translation>Gå til tid</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1321,6 +1311,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+34"/>
         <source>R_esampling (Hz):</source>
         <translation>_Gensampling (Hz):</translation>
@@ -1551,10 +1546,10 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+277"/>
+        <location line="+283"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+423"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
         <source>Audio</source>
         <translation>Lyd</translation>
     </message>
@@ -1624,7 +1619,7 @@
         <translation>Pluginsinfo</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-227"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-233"/>
         <source>Enable openGl support</source>
         <translation>Aktivér understøttelse af OpenGL</translation>
     </message>
@@ -1751,16 +1746,27 @@
         <translation>Prioritering</translation>
     </message>
     <message>
-        <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="vanished">_Brug alternativt mærkat for MP3 i .mp4</translation>
-    </message>
-    <message>
         <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished">Foreslå at gemme i mappen fra den sidst åbnede fil</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+2"/>
+        <source>Auto-Append Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>XVideo (best)</source>
         <translation>XVideo (bedste)</translation>
     </message>
@@ -1806,7 +1812,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+213"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
         <translation>PCM</translation>
     </message>
@@ -1893,10 +1899,10 @@
         <translation>Output</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-73"/>
+        <location filename="../../common/gui_savenew.cpp" line="-239"/>
+        <location line="+170"/>
         <location line="+12"/>
         <location line="+16"/>
-        <location line="+8"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
@@ -1907,7 +1913,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
-        <location filename="../../common/gui_save.cpp" line="-313"/>
+        <location filename="../../common/gui_save.cpp" line="-319"/>
         <source>No audio track</source>
         <translation>Ingen lydspor</translation>
     </message>
@@ -1964,7 +1970,7 @@
 Det er nødvendigt for at kunne oprette PSP-kompatibel video.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+186"/>
+        <location filename="../../common/gui_main.cpp" line="+188"/>
         <source>Select script to save</source>
         <translation>Vælg script som skal gemmes</translation>
     </message>
@@ -1974,12 +1980,12 @@
         <translation>Du er igang med at slette listen over de sidst åbnede filer og projekter. Dette kan ikke fortrydes. Fortsæt?</translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+115"/>
         <source>Not coded in this version</source>
         <translation>Ikke kodet i denne version</translation>
     </message>
     <message>
-        <location line="+204"/>
+        <location line="+209"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
@@ -2122,8 +2128,7 @@
         <translation>Noget fejlede ved tilføjelse til slutning</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+321"/>
+        <location line="+320"/>
         <source>Something bad happened (II)</source>
         <translation>Noget gik galt (II)</translation>
     </message>
@@ -2174,7 +2179,7 @@
         <translation>Hovedlydspor</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+264"/>
         <source>AvsProxy</source>
         <translation>AvsProxy</translation>
     </message>
@@ -2226,7 +2231,7 @@
         <translation>_Deringing</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+66"/>
+        <location filename="../../common/gui_save.cpp" line="+71"/>
         <source>Output file</source>
         <translation>Output-fil</translation>
     </message>
@@ -2241,7 +2246,7 @@
         <translation>Sæt i kø, i jobliste</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Select Workbench to Save</source>
         <translation>Vælg den arbejdsbænk som skal gemmes</translation>
     </message>
@@ -2287,30 +2292,35 @@
         <translation>JPEG</translation>
     </message>
     <message>
-        <location line="+113"/>
-        <location line="+83"/>
+        <location line="+117"/>
+        <source>Maximum number of 99999 images reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+76"/>
         <source>Done</source>
         <translation>Færdig</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-76"/>
         <source>Saved %d images.</source>
         <translation>Gemte %d billeder.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="-250"/>
+        <location filename="../../common/gui_main.cpp" line="-251"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
         <location line="+4"/>
         <location filename="../../common/gui_save.cpp" line="+2"/>
-        <location line="+99"/>
+        <location line="+92"/>
         <location line="+7"/>
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
@@ -2588,7 +2598,7 @@
         <translation>Mikser</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-282"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-288"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>Dekod video ved brug af DXVA2 (windows)</translation>
     </message>
@@ -2598,10 +2608,6 @@
         <translation>Dekod video ved brug af VDPAU (NVIDIA)</translation>
     </message>
     <message>
-        <source>Decode video using XVBA (AMD)</source>
-        <translation type="vanished">Dekod video ved brug af XVBA (AMD)</translation>
-    </message>
-    <message>
         <location line="+1"/>
         <source>Decode video using LIBVA (INTEL)</source>
         <translation>Dekod video ved brug af LIBVA (INTEL)</translation>
@@ -2637,12 +2643,7 @@
         <translation>_Søg efter ny udgivelse</translation>
     </message>
     <message>
-        <location line="+56"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+64"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2715,7 +2716,7 @@
         <translation>Standardport som skal bruges</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-79"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-86"/>
         <source>Redo</source>
         <translation>Omgør</translation>
     </message>
@@ -2730,18 +2731,19 @@
         <translation>&amp;Præferencer</translation>
     </message>
     <message>
+        <location line="+3"/>
         <location line="+2"/>
         <source>Save current settings as default</source>
         <translation>Gem aktuelle indstillinger som standard</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Load saved settings</source>
         <translation>Indlæs gemte indstillinger</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-43"/>
+        <location line="+43"/>
         <source>You cannot remove *all* the video
 </source>
         <translation>Du kan ikke fjerne *hele* videoen
@@ -2786,7 +2788,7 @@
         <translation>Kan ikke vælge MPEG-4 SP-codec.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1449"/>
+        <location filename="../../common/gui_main.cpp" line="-1447"/>
         <source>Select script/project to run</source>
         <translation>Vælg script/projekt som skal køre</translation>
     </message>
@@ -2801,13 +2803,13 @@
         <translation>Vælg script som skal fejlfindes</translation>
     </message>
     <message>
-        <location line="+198"/>
-        <location line="+68"/>
+        <location line="+197"/>
+        <location line="+73"/>
         <source>Select Video File...</source>
         <translation>Vælg videofil...</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-48"/>
         <source>No engine</source>
         <translation>Ingen motor</translation>
     </message>
@@ -2817,7 +2819,7 @@
         <translation>tinyPy-script er ikke aktiveret i denne byg</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Select Video File to Append...</source>
         <translation>Vælg videofil som skal føjes til slutning...</translation>
     </message>
@@ -2833,7 +2835,7 @@
         <translation>Fejl under udklipning.</translation>
     </message>
     <message>
-        <location line="+480"/>
+        <location line="+474"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
@@ -2872,7 +2874,7 @@
         <translation>Indstilling af sproget til det givne sporindeks er ikke muligt: ugyldigt sporindeks!</translation>
     </message>
     <message>
-        <location line="+297"/>
+        <location line="+298"/>
         <source>Oops</source>
         <translation>Ups</translation>
     </message>
@@ -2887,12 +2889,12 @@
         <translation>Problem ved initialisering af lydenhed</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-587"/>
+        <location filename="../../common/gui_save.cpp" line="-592"/>
         <source>Audio encoder index out of bounds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>No</source>
         <translation>Nej</translation>
     </message>
@@ -2902,7 +2904,7 @@
         <translation>Ingen fil indlæst</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Job</source>
         <translation>Job</translation>
     </message>
@@ -2912,7 +2914,7 @@
         <translation>Kan ikke kontakte database. Har du Job-kontrol kørende?</translation>
     </message>
     <message>
-        <location line="+227"/>
+        <location line="+229"/>
         <source>Function not implemented
 </source>
         <translation>Funktion ikke implementeret
@@ -2939,22 +2941,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Maximum number of 9999 images reached, aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Saving images failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+25"/>
         <source>PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2979,39 +2976,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cannot get tinyPÿ script engine</source>
-        <translation type="vanished">Kan ikke få tinyPÿ-script-motor</translation>
-    </message>
-    <message>
         <location line="+7"/>
         <source>Cannot add job %s</source>
         <translation>Kan ikke tilføje job %s</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-207"/>
+        <location filename="../../common/gui_savenew.cpp" line="-210"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation>Genbrug forrige første gennemløbsdata?
 Advarsel, indstillingerne skal være lukket.</translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+182"/>
         <source>Cannot instantiate video chain</source>
         <translation>Kan ikke instantiere videokæde</translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+24"/>
         <source>Cannot create encoder</source>
         <translation>Kan ikke oprette koder</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>Cannot setup codec. Bitrate too low?</source>
-        <translation>Kan ikke opsætte codec. Er bithastigheden for lav?</translation>
+        <translation type="vanished">Kan ikke opsætte codec. Er bithastigheden for lav?</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+57"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
         <translation>Kan ikke opsætte lydkoder. Sørg for at din strøm er kompatibel med lydkoderen (antal kanaler, bithastighed, format)</translation>
     </message>
@@ -3025,20 +3016,30 @@
 Vil du fortsætte alligevel?</translation>
     </message>
     <message>
-        <location line="-253"/>
-        <location line="+286"/>
+        <location line="-257"/>
+        <location line="+290"/>
         <location line="+26"/>
         <source>Muxer</source>
         <translation>Muxer</translation>
     </message>
     <message>
-        <location line="-312"/>
-        <location line="+286"/>
+        <location line="-326"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+290"/>
         <source>Cannot instantiate muxer</source>
         <translation>Kan ikke instantiere muxer</translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="-102"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The choice of cut points may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Do you want to continue anyway?</source>
         <translation type="unfinished"></translation>
@@ -3161,7 +3162,7 @@
         <translation>MP4</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>AAC</source>
         <translation>AAC</translation>
     </message>
@@ -3211,12 +3212,12 @@
         <translation>Hukommelsesfejl</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+495"/>
         <source>Saving</source>
         <translation>Gemmer</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+181"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3227,7 +3228,7 @@
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
-        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+374"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+382"/>
         <source>Unknown</source>
         <translation>Ukendt</translation>
     </message>
@@ -3324,20 +3325,20 @@
         <translation>1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
-        <location line="+30"/>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
-        <location line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
         <source>Codec</source>
         <translation>Codec</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
         <source>Internal error finding codec 0x%x</source>
         <translation>Intern fejl ved forsøg på at finde codec 0x%x</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Internal error opening 0x%x</source>
         <translation>Intern fejl ved åbning af 0x%x</translation>
     </message>
@@ -3347,31 +3348,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+812"/>
-        <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
-Dropping a keyframe will result in severely corrupted video.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
-Dropping a frame may result in some video corruption.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Do not warn again and drop frames silently while saving this video?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
         <translation>Tilladelsesfejl</translation>
     </message>
@@ -3611,7 +3588,7 @@
 <context>
     <name>avimuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+75"/>
         <source>Bad Idea</source>
         <translation>Dårlig ide</translation>
     </message>
@@ -3689,7 +3666,7 @@
 <context>
     <name>bitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+51"/>
         <source>Constant Bitrate</source>
         <translation>Konstant bithastighed</translation>
     </message>
@@ -3806,34 +3783,39 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+23"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+51"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>blackframes</name>
@@ -3854,6 +3836,29 @@
     </message>
 </context>
 <context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -3881,12 +3886,7 @@
         <translation>50 (PAL)</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>59.93  (NTSC)</source>
-        <translation>59,93 (NTSC)</translation>
-    </message>
-    <message>
-        <location line="+174"/>
+        <location line="+180"/>
         <source>Source Fps:</source>
         <translation>Kilde billeder/sekund:</translation>
     </message>
@@ -3916,17 +3916,22 @@
         <translation>Ugyldig billeder/sekund</translation>
     </message>
     <message>
-        <location line="-161"/>
+        <location line="-166"/>
         <source>Change FPS</source>
         <translation>Skift billeder/sekund</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-32"/>
+        <source>59.94  (NTSC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
         <source>Speed up/slow down the video as if altering fps. This filter changes duration.</source>
         <translation>Gør videoen hurtigere/langsommere som ved ændring af billeder/sekund. Dette filtre ændrer varighed.</translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+165"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
@@ -4227,7 +4232,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4488,25 +4493,25 @@
         <translation>Kodning...</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+55"/>
         <source>Phase:</source>
         <translation>Fase:</translation>
     </message>
     <message>
-        <location line="+248"/>
+        <location line="+268"/>
         <source>Video Codec:</source>
         <translation>Video-codec:</translation>
     </message>
     <message>
-        <location line="-255"/>
-        <location line="+220"/>
+        <location line="-282"/>
+        <location line="+247"/>
         <location line="+21"/>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
-        <location line="-258"/>
-        <location line="+251"/>
+        <location line="-261"/>
+        <location line="+254"/>
         <source>Unknown</source>
         <translation>Ukendt</translation>
     </message>
@@ -4538,12 +4543,12 @@
         <translation>Forløbet:</translation>
     </message>
     <message>
-        <location line="-446"/>
+        <location line="-504"/>
         <source>Time Remaining:</source>
         <translation>Resterende tid:</translation>
     </message>
     <message>
-        <location line="+467"/>
+        <location line="+525"/>
         <source>Frames/sec:</source>
         <translation>Billeder/sekund:</translation>
     </message>
@@ -4590,7 +4595,7 @@
         <translation>Quantiser:</translation>
     </message>
     <message>
-        <location line="-378"/>
+        <location line="-389"/>
         <source>Shut down computer when finished</source>
         <translation>Luk computer når fuldført</translation>
     </message>
@@ -4625,22 +4630,27 @@
         <translation>Lav</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+12"/>
+        <source>Keep dialog open when finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
         <source>Pause / Abort</source>
         <translation>Pause/afbryd</translation>
     </message>
     <message>
-        <location line="-149"/>
+        <location line="-186"/>
         <source>Main</source>
         <translation>Hoved</translation>
     </message>
     <message>
-        <location line="+129"/>
+        <location line="+166"/>
         <source>Minimize to Tray</source>
         <translation>Minimer til bakke</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+33"/>
         <source>Advanced</source>
         <translation>Avanceret</translation>
     </message>
@@ -4733,7 +4743,7 @@
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation>Overgang</translation>
@@ -4744,7 +4754,32 @@
         <translation>Overgang.</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+13"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Start time:</source>
         <translation>_Starttid:</translation>
     </message>
@@ -4757,13 +4792,13 @@
 <context>
     <name>fadeToBlack</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
-        <location line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+55"/>
+        <location line="+20"/>
         <source>Fade to black</source>
         <translation>Overgang til sort</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-19"/>
         <source>Fade to black in/out.</source>
         <translation>Overgang til sort ind/ud.</translation>
     </message>
@@ -4788,7 +4823,7 @@
         <translation>Overgang ind</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>_Fade type:</source>
         <translation>_Overgangstype:</translation>
     </message>
@@ -4806,7 +4841,7 @@
 <context>
     <name>ffVAEncH264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4821,12 +4856,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Profile:</source>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4837,16 +4893,21 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Bitrate (kbps):</source>
+        <source>Quality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4856,7 +4917,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4864,27 +4925,53 @@
 <context>
     <name>ffVAEncHEVC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+343"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4894,7 +4981,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4902,7 +4989,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+217"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+250"/>
         <source>Normal (4:3)</source>
         <translation>Normal (4:3)</translation>
     </message>
@@ -5371,8 +5458,32 @@
 <context>
     <name>ffnvenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+229"/>
+        <source>Controlled by Preset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
         <source>Low Quality</source>
         <translation>Lav kvalitet</translation>
     </message>
@@ -5424,6 +5535,12 @@
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+        <source>RC Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Preset:</source>
         <translation>Forudindstilling:</translation>
     </message>
@@ -5433,6 +5550,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Bitrate (kbps):</source>
@@ -5446,32 +5569,48 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Frame Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>NVENC H.264 configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
-        <source>nvEnc HEVC  configuration</source>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+28"/>
+        <source>NVENC HEVC configuration</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5483,7 +5622,7 @@
         <translation>[uoverensstemmelse]</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+87"/>
         <source>Saving mpeg PS (ff)</source>
         <translation>Gemmer MPEG PS (ff)</translation>
     </message>
@@ -5587,7 +5726,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
         <source>Saving mpeg TS (ff)</source>
         <translation>Gemmer MPEG TS (ff)</translation>
     </message>
@@ -5660,7 +5799,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5818,7 +5957,7 @@
 <context>
     <name>flvdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
@@ -6390,7 +6529,7 @@
         <translation>Afslut</translation>
     </message>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Oops</source>
         <translation>Ups</translation>
     </message>
@@ -6400,7 +6539,7 @@
         <translation>Noget gik helt galt under bygning af jobliste.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>There are no jobs stored</source>
         <translation>Der er ingen gemte jobs</translation>
     </message>
@@ -6848,12 +6987,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
         <source>Matroska Images</source>
         <translation>Matroska-billeder</translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+523"/>
         <source>Matroska clusters</source>
         <translation>Matroska-klynger</translation>
     </message>
@@ -6953,7 +7092,7 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+167"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
         <source>Saving Mkv</source>
         <translation>Gemmer MKV</translation>
     </message>
@@ -7052,31 +7191,46 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
         <source>Problem reading SVQ3 headers</source>
         <translation>Problem ved læsning af SVQ3-hoveder</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+67"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <location line="+17"/>
         <source>Unsupported</source>
         <translation>Understøttes ikke</translation>
     </message>
     <message>
-        <location line="-9"/>
-        <source>Only MP4Video, H264, and H265 supported for video</source>
-        <translation>Understøtter kun MP4Video, H264 og H265 til video</translation>
+        <location line="-17"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
-        <translation>Understøtter kun AAC, AC3, E-AC3 og mpegaudio til lyd</translation>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+182"/>
         <source>Saving mp4</source>
         <translation>Gemmer MP4</translation>
     </message>
@@ -7086,15 +7240,11 @@
         <translation>Gemmer PSP</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
         <source>Muxing Format</source>
         <translation>Muxing-format</translation>
     </message>
     <message>
-        <source>Use alternate MP3 tag</source>
-        <translation type="vanished">Brug alternativt MP3-tag</translation>
-    </message>
-    <message>
         <location line="+2"/>
         <source>No optimization</source>
         <translation type="unfinished"></translation>
@@ -7125,7 +7275,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Do not rotate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7151,6 +7301,51 @@
     </message>
     <message>
         <location line="+3"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>MP4 Muxer</source>
         <translation>MP4-muxer</translation>
     </message>
@@ -7323,7 +7518,7 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+242"/>
+        <location filename="../../common/gui_navigate.cpp" line="+232"/>
         <source>Cannot go to next keyframe</source>
         <translation>Kan ikke gå til det næste nøglebillede</translation>
     </message>
@@ -7553,27 +7748,17 @@
 <context>
     <name>psdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="vanished">Fejl</translation>
-    </message>
-    <message>
-        <source>This file&apos;s index has been created with an older version of avidemux.
-Please delete the idx2 file and reopen.</source>
-        <translation type="vanished">Denne fils indeks er blevet oprettet med en ældre version af avidemux.
-Slet venligst idx2-filen og genåbn.</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
         <translation>Indekserer</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>Der er flere med filer fortløbende filnavne. Skal de indlæses allesammen?</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -7643,7 +7828,7 @@
         <translation>Root-rettigheder kræves for at udføre denne handling.</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+126"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7658,7 +7843,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+185"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>Kodningen er sat på pause. Vil du genoptage eller afbryde?</translation>
     </message>
@@ -7696,7 +7881,7 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+212"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+206"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;Ny version tilgængelig&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Udgivet den %2.&lt;br&gt;Du kan downloade den her&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; Du kan deaktivere automatisk opdatering i præferencer.&lt;/small&gt;</translation>
     </message>
@@ -7776,21 +7961,30 @@
         <translation>Fremad ét minut</translation>
     </message>
     <message>
-        <location line="+626"/>
+        <location line="+681"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>Programmet er stødt på et fatalt problem
 Den aktuelle redigering er blevet gemt og vil blive genindlæst ved næste start</translation>
     </message>
     <message>
-        <location line="+262"/>
+        <location line="+230"/>
         <source>%c-%s (%02d)</source>
         <translation>%c-%s (%02d)</translation>
     </message>
     <message>
-        <location line="+334"/>
-        <source> (%d track(s))</source>
-        <translation> (%d spor)</translation>
+        <location line="+70"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation>
+            <numerusform> (%n spor)</numerusform>
+            <numerusform> (%n spor)</numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -8027,18 +8221,27 @@
         <translation>Ja</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+33"/>
         <source>%2.3f fps</source>
         <translation>%2.3f billeder/sekund</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+81"/>
+        <location line="+90"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation>%02d:%02d:%02d,%03d</translation>
     </message>
+    <message numerus="yes">
+        <location line="-55"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
     <message>
-        <location line="+30"/>
+        <location line="+83"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8064,12 +8267,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+27"/>
+        <location line="+33"/>
         <source>Total Duration:	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-31"/>
         <source>Extra Video Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8084,12 +8287,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Codec:		</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8114,12 +8317,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-172"/>
         <source>%s (%u:%u)</source>
         <translation>%s (%u:%u)</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+77"/>
         <source>Mono</source>
         <translation>Mono</translation>
     </message>
@@ -8132,7 +8335,7 @@
 <context>
     <name>qshell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+53"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
         <translation>Indtast dine kommandoer og tryk så på Evaluér-knappen eller CTRL+ENTER.
@@ -8147,6 +8350,19 @@
 Klar.
 </translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>qtalert</name>
@@ -8208,6 +8424,16 @@
         <source>Video Only Muxer Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>removeplane</name>
@@ -8285,12 +8511,7 @@
         <translation>50 (PAL)</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>59.93  (NTSC)</source>
-        <translation>59,93 (NTSC)</translation>
-    </message>
-    <message>
-        <location line="+313"/>
+        <location line="+318"/>
         <source>_Mode:</source>
         <translation>_Tilstand:</translation>
     </message>
@@ -8305,12 +8526,17 @@
         <translation>Gensample billeder/sekund</translation>
     </message>
     <message>
-        <location line="-285"/>
+        <location line="-289"/>
         <source>Resample FPS</source>
         <translation>Gensample billeder/sekund</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-35"/>
+        <source>59.94  (NTSC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Change and enforce FPS. Keep duration and sync.</source>
         <translation>Ændr og gennemtving billeder/sekund. Behold varighed og synk.</translation>
     </message>
@@ -8328,7 +8554,7 @@
         <translation>sw skalering tilpas størrelse.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
         <source>Width and height cannot be odd</source>
         <translation>Bredde og højde kan ikke være ulige</translation>
     </message>
@@ -8481,6 +8707,20 @@
         <translation>Destination:</translation>
     </message>
     <message>
+        <location line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+356"/>
+        <source>Lanzcos3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
         <source>Source PAR:</source>
         <translation type="unfinished"></translation>
@@ -8498,16 +8738,16 @@
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+44"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-312"/>
         <source>Resize Dimensions</source>
         <translation>Tilpas størrelse-dimensioner</translation>
     </message>
@@ -8678,18 +8918,8 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+5"/>
-        <source>Lanzcos3</source>
-        <translation>Lanzcos3</translation>
+        <source>Lanczos-3</source>
+        <translation>Lanczos-3</translation>
     </message>
 </context>
 <context>
@@ -9047,32 +9277,32 @@
 <context>
     <name>tsdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="vanished">Fejl</translation>
-    </message>
-    <message>
-        <source>This file&apos;s index has been created with an older version of avidemux.
-Please delete the idx2 file and reopen.</source>
-        <translation type="vanished">Denne fils indeks er blevet oprettet med en ældre version af avidemux.
-Slet venligst idx2-filen og genåbn.</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+183"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+325"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+84"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+207"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>Der er flere med filer fortløbende filnavne. Skal de indlæses allesammen?</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+19"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
         <translation>Indekserer</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -9164,19 +9394,137 @@
     </message>
 </context>
 <context>
+    <name>vaapiDeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Adaptive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Compensated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vaapiResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
-        <source>vaapi: Resize</source>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>vaapi: Resize image using vaapi.</source>
+        <source>Resize image using VA-API.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+129"/>
         <source>Width :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9187,7 +9535,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>mpeg-&gt;PC:</source>
+        <source>mpeg-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9209,7 +9557,7 @@
         <translation>VDPAU-afsammenfletter (+resize).</translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+197"/>
         <source>Keep Top Field</source>
         <translation>Behold øverste felt</translation>
     </message>
@@ -9225,13 +9573,13 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>_Ivtc:</source>
-        <translation>_Ivtc:</translation>
+        <source>_IVTC</source>
+        <translation>_IVTC</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Resize:</source>
-        <translation>_Tilpas størrelse:</translation>
+        <source>_Resize</source>
+        <translation>_Tilpas størrelse</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9240,12 +9588,12 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Width :</source>
+        <source>Width:</source>
         <translation>Bredde:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation>Højde:</translation>
     </message>
     <message>
@@ -9267,13 +9615,13 @@
         <translation>vdpau: skift billedstørrelse ved brug af vdpau.</translation>
     </message>
     <message>
-        <location line="+133"/>
-        <source>Width :</source>
+        <location line="+131"/>
+        <source>Width:</source>
         <translation>Bredde:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation>Højde:</translation>
     </message>
     <message>
@@ -9357,6 +9705,84 @@
     </message>
 </context>
 <context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vsWindow</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
@@ -9372,7 +9798,7 @@
 <context>
     <name>webmmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+68"/>
         <source>Unsupported Video.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
         <translation>Ikke-understøttet video.
@@ -9386,7 +9812,7 @@
 Understøtter kun VP8-/VP9-video og Vorbis-/Opus-lyd</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+89"/>
         <source>Saving Webm</source>
         <translation>Gemmer Webm</translation>
     </message>
@@ -9409,7 +9835,7 @@
 <context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
         <source>Processing</source>
         <translation>Behandler</translation>
     </message>
@@ -9419,12 +9845,12 @@
         <translation>Forløbet:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+14"/>
         <source>Time Remaining:</source>
         <translation>Resterende tid:</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+13"/>
         <source>00:00:00</source>
         <translation>00:00:00</translation>
     </message>
@@ -9432,7 +9858,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
         <source>Not coded</source>
         <translation>Ikke kodet</translation>
     </message>
@@ -9449,7 +9875,7 @@
         <translation>intet</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation>Brugerdefineret</translation>
     </message>
@@ -9525,10 +9951,6 @@
         <translation>Gem profil</translation>
     </message>
     <message>
-        <source>my profile</source>
-        <translation type="vanished">min profil</translation>
-    </message>
-    <message>
         <location line="+46"/>
         <source>Overwrite</source>
         <translation>Overskriv</translation>
@@ -9590,12 +10012,12 @@
     </message>
     <message>
         <location line="+7"/>
-        <location line="+3152"/>
+        <location line="+3157"/>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
-        <location line="-3110"/>
+        <location line="-3115"/>
         <source>General</source>
         <translation>Generelt</translation>
     </message>
@@ -9823,12 +10245,12 @@
     </message>
     <message>
         <location line="+14"/>
-        <location line="+2490"/>
+        <location line="+2495"/>
         <source>frames</source>
         <translation>billeder</translation>
     </message>
     <message>
-        <location line="-2466"/>
+        <location line="-2471"/>
         <source>Sequence Parameter Set Identifer:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9961,12 +10383,12 @@
     </message>
     <message>
         <location line="+13"/>
-        <location line="+2596"/>
+        <location line="+2601"/>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
-        <location line="-2591"/>
+        <location line="-2596"/>
         <source>Spatial</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10047,12 +10469,12 @@
     </message>
     <message>
         <location line="+12"/>
-        <location line="+1328"/>
+        <location line="+1333"/>
         <source>Strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1289"/>
+        <location line="-1294"/>
         <source>Threshold:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10259,12 +10681,12 @@
     </message>
     <message>
         <location line="+10"/>
-        <location line="+856"/>
+        <location line="+861"/>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
-        <location line="-809"/>
+        <location line="-814"/>
         <source>Quantiser Control</source>
         <translation>Quantiserkontrol</translation>
     </message>
@@ -10281,12 +10703,12 @@
     <message>
         <location line="+85"/>
         <location line="+179"/>
-        <location line="+302"/>
+        <location line="+307"/>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-459"/>
+        <location line="-464"/>
         <source>Maximum Quantiser Step:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10347,7 +10769,12 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>Auto Variance AQ</source>
+        <source>Auto Variance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -10792,7 +11219,7 @@
         <translation>ingen</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation>Brugerdefineret</translation>
     </message>
@@ -12001,7 +12428,7 @@
 <context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+37"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+32"/>
         <location line="+24"/>
         <source>None</source>
         <translation>Ingen</translation>
@@ -12097,12 +12524,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>MotionEstimation</source>
-        <translation>Bevægelsesestimering</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+9"/>
         <source>Threading</source>
         <translation>Trådning</translation>
     </message>
@@ -12118,6 +12540,16 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>_Quantization type:</source>
         <translation>_Quantisationstype:</translation>
     </message>
@@ -12137,17 +12569,12 @@
         <translation>_Gop-størrelse:</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Advanced Simple Profile</source>
-        <translation>Avanceret simpel profil</translation>
-    </message>
-    <message>
-        <location line="+9"/>
+        <location line="-29"/>
         <source>Motion Estimation</source>
         <translation>Bevægelsesestimering</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+57"/>
         <source>Quantization</source>
         <translation>Quantisation</translation>
     </message>
@@ -12167,7 +12594,7 @@
         <translation>Xvid4 MPEG-4 ASP-konfiguration</translation>
     </message>
     <message>
-        <location line="-77"/>
+        <location line="-87"/>
         <source>1:1 (PC)</source>
         <translation></translation>
     </message>
@@ -12182,7 +12609,7 @@
         <translation>Ma_ks. quantiser:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Aspect Ratio:</source>
         <translation>Højde-bredde-forhold:</translation>
     </message>
@@ -12192,7 +12619,23 @@
         <translation>Brug XVID fcc (ellers DIVX)</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+3"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Aspect Ratio</source>
         <translation>Højde-bredde-forhold</translation>
     </message>
@@ -12210,23 +12653,7 @@
         <translation>Yadif, port af avisynth version (c) Fizick.</translation>
     </message>
     <message>
-        <source>Temporal &amp; spatial check</source>
-        <translation type="vanished">Temporal- og spatialtjek</translation>
-    </message>
-    <message>
-        <source>Bob, temporal &amp; spatial check</source>
-        <translation type="vanished">Bob-, temporal- og spatialtjek</translation>
-    </message>
-    <message>
-        <source>Skip spatial temporal check</source>
-        <translation type="vanished">Spring spatial temporal tjek over</translation>
-    </message>
-    <message>
-        <source>Bob, skip spatial temporal check</source>
-        <translation type="vanished">Bob, spring spatial temporal tjek over</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+70"/>
         <source>Bottom field first</source>
         <translation>Nederste felt først</translation>
     </message>

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_de.ts -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_de.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
         <source>Attempt to open %s failed!</source>
         <translation>Der Versuch, %s zu öffnen, ist fehlgeschlagen!</translation>
     </message>
@@ -53,12 +53,12 @@
 2) Die so bearbeiteten Videos zusammenfügen.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
         <source>Checking if timestamps are valid..</source>
         <translation>Prüfe Gültigkeit der Zeitstempel...</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+47"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation>Dieses Video enthält B-Frames, aber Presentation Timestamps (PTS) entweder fehlen oder monoton ansteigen. Avidemux kann durch Dekodierung des ganzen Videos die korrekten PTS zu rekonstruieren versuchen. Das kann viel Zeit in Anspruch nehmen. Fortfahren?</translation>
     </message>
@@ -377,22 +377,22 @@
         <translation type="unfinished">Dialog</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+6"/>
         <source>TimeLeft</source>
         <translation type="unfinished">Restzeit</translation>
     </message>
     <message>
-        <location line="-14"/>
+        <location line="+64"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-51"/>
         <source>00:00:00</source>
         <translation type="unfinished">00:00:00</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+28"/>
         <source>ProcessImages</source>
         <translation type="unfinished"></translation>
     </message>
@@ -402,7 +402,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-14"/>
         <source>0 fps</source>
         <translation type="unfinished"></translation>
     </message>
@@ -412,58 +412,56 @@
     <message>
         <location filename="../ADM_jobs/src/uiProgress.ui" line="+37"/>
         <source>1/1</source>
-        <translation type="unfinished">1/1</translation>
+        <translation>1/1</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location line="-34"/>
         <source>Progress</source>
-        <translation type="unfinished">Fortschritt</translation>
+        <translation>Fortschritt</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Current job</source>
-        <translation type="unfinished">Laufender Auftrag</translation>
+        <translation>Laufender Job</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>File being written </source>
-        <translation type="unfinished">Datei wird geschrieben</translation>
+        <translation>Datei wird geschrieben</translation>
     </message>
 </context>
 <context>
     <name>FDK-AAC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
-        <source>_Profile::</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
+        <translation>_Profil:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+9"/>
         <source>_Bitrate:</source>
-        <translation type="unfinished"></translation>
+        <translation>_Bitrate:</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+2"/>
         <source>SBR enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+7"/>
-        <source>After burner</source>
+        <location line="+2"/>
+        <source>Afterburner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>FDK-AAC Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguration FDK-AAC</translation>
     </message>
 </context>
 <context>
@@ -582,11 +580,6 @@
         <translation type="unfinished">E&amp;igenschaften...</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Alt+Return</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location line="+9"/>
         <source>Save &amp;Video...</source>
         <translation type="unfinished">&amp;Video speichern...</translation>
@@ -620,17 +613,15 @@
         <translation type="unfinished">Projekt speichern</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>&amp;Calculator...</source>
-        <translation type="unfinished">Video-&amp;Kalkulation...</translation>
+        <translation type="obsolete">Video-&amp;Kalkulation...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>F7</source>
-        <translation type="unfinished">F7</translation>
+        <translation type="obsolete">F7</translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <location line="-1028"/>
         <source>ms</source>
         <translation type="unfinished">ms</translation>
     </message>
@@ -645,7 +636,7 @@
         <translation type="unfinished">B:</translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+272"/>
         <source>&amp;Input</source>
         <translation type="unfinished">&amp;Original</translation>
     </message>
@@ -665,17 +656,17 @@
         <translation type="unfinished">&amp;übereinander</translation>
     </message>
     <message>
-        <location line="-524"/>
+        <location line="-509"/>
         <source>Frame type:</source>
         <translation>Frame-Typ:</translation>
     </message>
     <message>
-        <location line="+512"/>
+        <location line="+497"/>
         <source>&amp;Separate</source>
         <translation type="unfinished">&amp;eigenständig</translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1744"/>
         <source>&amp;Toolbars</source>
         <translation type="unfinished">&amp;Werkzeugleisten</translation>
     </message>
@@ -700,17 +691,12 @@
         <translation type="unfinished">&lt;b&gt;Audio-Codec&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>   (0 track(s))</source>
-        <translation type="unfinished"> (0 Tonspur(en))</translation>
-    </message>
-    <message>
-        <location line="+212"/>
+        <location line="+222"/>
         <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
         <translation type="unfinished">&lt;b&gt;Ausgabeformat&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+1046"/>
+        <location line="+1031"/>
         <source>&amp;Codec Options</source>
         <translation type="unfinished">&amp;Codec-Einstellungen</translation>
     </message>
@@ -730,12 +716,12 @@
         <translation type="unfinished">&amp;Pegelanzeige</translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-124"/>
         <source>Play filtered</source>
         <translation type="unfinished">Filter anwenden</translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-36"/>
         <source>Open Video</source>
         <translation type="unfinished">Videodatei öffnen</translation>
     </message>
@@ -831,13 +817,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+553"/>
-        <location line="+946"/>
+        <location line="+227"/>
+        <source> (0 tracks)</source>
+        <translation> (0 Tonspuren)</translation>
+    </message>
+    <message>
+        <location line="+326"/>
+        <location line="+931"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-868"/>
+        <location line="-853"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -870,7 +861,7 @@
     <message>
         <location line="+13"/>
         <source>Selection: 000000</source>
-        <translation type="unfinished"></translation>
+        <translation>Auswahl: 000000</translation>
     </message>
     <message>
         <location line="+25"/>
@@ -883,7 +874,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+151"/>
         <source>Ctrl+Alt+C</source>
         <translation type="unfinished"></translation>
     </message>
@@ -911,7 +902,7 @@
 <context>
     <name>Opus</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -926,17 +917,12 @@
     <message>
         <location line="+32"/>
         <source>Clear</source>
-        <translation type="unfinished"></translation>
+        <translation>Leeren</translation>
     </message>
     <message>
         <location line="+40"/>
         <source>Evaluate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Ctrl+Return</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausführen</translation>
     </message>
 </context>
 <context>
@@ -980,12 +966,7 @@
         <translation type="unfinished">Eine plattformunabhängige Videoschnittsoftware</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
@@ -995,7 +976,12 @@
         <translation type="unfinished">http://www.avidemux.org</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-19"/>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
         <source>&amp;License</source>
         <translation type="unfinished">&amp;Lizenz</translation>
     </message>
@@ -1046,13 +1032,13 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h" line="+1"/>
         <source>Add black borders around the image.</source>
-        <translation type="unfinished">Schwarze Ränder um das Bild herum hinzufügen.</translation>
+        <translation>Schwarze Ränder um das Bild herum hinzufügen.</translation>
     </message>
 </context>
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+246"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+248"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">_Erlaube auch nicht DVD-konforme Audiofrequenzen (DVD-konform sind lediglich 48kHz und 96kHz)</translation>
     </message>
@@ -1167,21 +1153,27 @@
         <translation type="unfinished">Priorisierung bestimmter Aufgaben</translation>
     </message>
     <message>
-        <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="obsolete">_Alternativen &apos;Tag&apos; für MP3-Tonspuren in MPEG-4 Containern benutzen</translation>
-    </message>
-    <message>
         <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation>_Den Ordner der gerade geladenen Datei als Speicherziel vorschlagen</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Auto-Append Settings</source>
+        <translation>Automatisches Zusammenfügen von gestückelten Dateien</translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
-        <translation>Im Kopiermodus _Gleichmäßigkeit der Zeitstempel für Dekodierung (DTS) erhöhen</translation>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
+        <translation>_Benutzerdefinierte Fragmentgröße als Kriterium bei sequenziell benannten MPEG-TS-Dateien verwenden</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation>_Fragmentgröße (MiB):</translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Caching of decoded pictures</source>
         <translation>Zwischenspeicher für dekodierte Frames</translation>
     </message>
@@ -1213,17 +1205,17 @@
     <message>
         <location line="+29"/>
         <source>No alerts</source>
-        <translation type="unfinished">Keine Meldungen anzeigen</translation>
+        <translation>Keine Meldungen anzeigen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Display only error alerts</source>
-        <translation type="unfinished">Nur Fehlermeldungen anzeigen</translation>
+        <translation>Nur Fehlermeldungen anzeigen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Display all alerts</source>
-        <translation type="unfinished">Alle Meldungen anzeigen</translation>
+        <translation>Alle Meldungen anzeigen</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -1243,7 +1235,7 @@
     <message>
         <location line="+5"/>
         <source>No downmixing</source>
-        <translation type="unfinished">Nicht herunter mischen</translation>
+        <translation>Nicht heruntermischen</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+49"/>
@@ -1264,7 +1256,7 @@
     <message>
         <location line="+2"/>
         <source>_Local playback downmixing:</source>
-        <translation type="unfinished">_Lokale Wiedergabe herunter mischen:</translation>
+        <translation>_Lokale Wiedergabe heruntermischen:</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -1284,7 +1276,7 @@
     <message>
         <location line="+45"/>
         <source>User Interface</source>
-        <translation type="unfinished">Benutzerschnittstelle</translation>
+        <translation>Benutzerschnittstelle</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -1298,20 +1290,20 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+277"/>
+        <location line="+283"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+423"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
         <source>Audio</source>
-        <translation type="unfinished">Audio</translation>
+        <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-73"/>
+        <location filename="../../common/gui_savenew.cpp" line="-239"/>
+        <location line="+170"/>
         <location line="+12"/>
         <location line="+16"/>
-        <location line="+8"/>
         <source>Video</source>
-        <translation type="unfinished">Video</translation>
+        <translation>Video</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
@@ -1398,7 +1390,7 @@
     <message>
         <location line="+2"/>
         <source>Information</source>
-        <translation type="unfinished">&amp;Eigenschaften</translation>
+        <translation>&amp;Eigenschaften</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -1424,7 +1416,7 @@
     <message>
         <location line="+1"/>
         <source>Redo</source>
-        <translation type="unfinished">&amp;Wiederholen</translation>
+        <translation>&amp;Wiederholen</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1468,12 +1460,13 @@
         <translation>Markierungen zurücksetzen</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
+        <location line="+2"/>
         <source>Save current settings as default</source>
         <translation>Aus&amp;gabekonfiguration als Vorgabe setzen</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Load saved settings</source>
         <translation type="unfinished">Ges&amp;peicherte Ausgabekonfiguration laden</translation>
     </message>
@@ -1569,7 +1562,7 @@
         <translation type="unfinished">Gehe zum Zeitpunkt</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1589,6 +1582,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation>Ins Fenster einpassen</translation>
+    </message>
+    <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-15"/>
         <source>R_esampling (Hz):</source>
         <translation type="unfinished">_Abtastrate (Hz):</translation>
@@ -1739,12 +1737,12 @@
         <translation type="unfinished">Audiogeräte</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-283"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-289"/>
         <source>Enable openGl support</source>
         <translation>OpenG_L benutzen</translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="+238"/>
         <source>_Limit Refresh Rate</source>
         <translation>_Bildwiederholungsfrequenz begrenzen</translation>
     </message>
@@ -1754,7 +1752,7 @@
         <translation>Bild _neu aufbauen nicht häufiger als nach (ms)</translation>
     </message>
     <message>
-        <location line="-188"/>
+        <location line="-194"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+47"/>
         <source>High</source>
         <translation>Hoch</translation>
@@ -1767,12 +1765,12 @@
     <message>
         <location line="+1"/>
         <source>Ignore driver blacklist (Intel)</source>
-        <translation type="unfinished"></translation>
+        <translation>Schwarze Liste für Intel-Grafiktreiber ignorieren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
-        <translation type="unfinished"></translation>
+        <translation>Schwarze Liste für Codecs ignorieren (Intel, HEVC 10bit)</translation>
     </message>
     <message>
         <location line="+60"/>
@@ -1781,9 +1779,9 @@
         <translation>Niedrig</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>VDPAU (best)</source>
-        <translation type="unfinished">VDPAU (bestens)</translation>
+        <translation>VDPAU (bestens)</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -1829,12 +1827,12 @@
         <translation>Codec-Fehler</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+369"/>
+        <location filename="../../common/gui_main.cpp" line="+370"/>
         <source>Not coded in this version</source>
         <translation>Nicht implementiert in dieser Version</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+214"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation>Dieses Video verwendet Nicht-IDR-Frames für den Direktzugriff. Der Zähler für die Anzeigereihenfolge der Frames (POC) wird an solchen Keyframes nicht zurückgesetzt. Die Wiedergabe des im Kopiermodus gespeicherten editierten Videos kann durch den unerwartet zurückgehenden Zähler an Schnittpunkten der eingefügten Auswahl stocken.
@@ -1930,22 +1928,22 @@
     <message>
         <location line="+103"/>
         <source>Permission error</source>
-        <translation type="unfinished">Rechtefehler</translation>
+        <translation>Fehlende Berechtigungen</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot open &quot;%s&quot;.</source>
-        <translation type="unfinished">&quot;%s&quot; kann nicht geöffnet werden.</translation>
+        <translation>&quot;%s&quot; kann nicht geöffnet werden.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>File error</source>
-        <translation type="unfinished">Dateifehler</translation>
+        <translation>Dateifehler</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>&quot;%s&quot; does not exist.</source>
-        <translation type="unfinished">&quot;%s&quot; existiert nicht.</translation>
+        <translation>&quot;%s&quot; existiert nicht.</translation>
     </message>
     <message>
         <location line="+36"/>
@@ -1980,8 +1978,7 @@
         <translation type="unfinished">Beim Anhängen ging irgendetwas schief</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+321"/>
+        <location line="+320"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">Irgendetwas Schlimmes ist passiert (II)</translation>
     </message>
@@ -2033,7 +2030,7 @@
         <translation type="unfinished">Haupt-Tonspur</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+264"/>
         <source>AvsProxy</source>
         <translation type="unfinished">Avs-Proxy</translation>
     </message>
@@ -2106,30 +2103,35 @@
         <translation type="unfinished">Audio speichern</translation>
     </message>
     <message>
-        <location line="+318"/>
-        <location line="+83"/>
+        <location line="+322"/>
+        <source>Maximum number of 99999 images reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+76"/>
         <source>Done</source>
         <translation type="unfinished">Fertig</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-76"/>
         <source>Saved %d images.</source>
-        <translation type="unfinished">%d Bilder gespeichert.</translation>
+        <translation>%d Bilder gespeichert.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="-250"/>
+        <location filename="../../common/gui_main.cpp" line="-251"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
         <location line="+4"/>
         <location filename="../../common/gui_save.cpp" line="+2"/>
-        <location line="+99"/>
+        <location line="+92"/>
         <location line="+7"/>
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
@@ -2192,15 +2194,11 @@
         <translation type="unfinished">2. Durchlauf</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-167"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-173"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation>Video mittels _VDPAU dekodieren</translation>
     </message>
     <message>
-        <source>Decode video using XVBA (AMD)</source>
-        <translation type="vanished">Video mittels _XvBA (AMD Catalyst) dekodieren</translation>
-    </message>
-    <message>
         <location line="+1"/>
         <source>Decode video using LIBVA (INTEL)</source>
         <translation>Video mittels _LibVA dekodieren (Intel)</translation>
@@ -2216,7 +2214,7 @@
         <translation>Bei aktivierter Dekodierung in Hardware ist es ratsam, die entsprechende Video-Anzeige zu verwenden</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+91"/>
         <source>LIBVA (best)</source>
         <translation type="unfinished">libVA (bestens)</translation>
     </message>
@@ -2231,12 +2229,12 @@
         <translation>Systemvorgabe</translation>
     </message>
     <message>
-        <location line="-168"/>
+        <location line="-174"/>
         <source>_Check for new release</source>
         <translation>Auf _Update überprüfen</translation>
     </message>
     <message>
-        <location line="+229"/>
+        <location line="+235"/>
         <source>GUI Rendering Options</source>
         <translation>Darstellungsoptionen der grafischen Oberfläche</translation>
     </message>
@@ -2253,16 +2251,16 @@
         <translation type="unfinished">HW-Beschleunigung</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-43"/>
+        <location line="+43"/>
         <source>You cannot remove *all* the video
 </source>
         <translation>Das *ganze* Video zu löschen ist nicht möglich
 </translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1223"/>
-        <location line="+68"/>
+        <location filename="../../common/gui_main.cpp" line="-1222"/>
+        <location line="+73"/>
         <source>Select Video File...</source>
         <translation>Videodatei wählen...</translation>
     </message>
@@ -2272,23 +2270,23 @@
         <translation>Videodatei zum Anfügen wählen...</translation>
     </message>
     <message>
-        <location line="+1062"/>
+        <location line="+1056"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished">Ungültige Liste der Tonspuren</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+495"/>
         <source>Saving</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+181"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das gespeicherte Video ist unvollständig. Der Fehler ereignete sich bei %s (%d%%). Dies kann eine Folge ungültiger Zeitstempel im Video sein.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1366"/>
+        <location filename="../../common/gui_main.cpp" line="-1364"/>
         <source>Select script/project to run</source>
         <translation>Skript/Projekt zum Ausführen wählen</translation>
     </message>
@@ -2308,7 +2306,7 @@
         <translation>Sie sind dabei, die Liste der zuletzt geladenen Videos und Projekte zu leeren. Dies kann nicht rückgängig gemacht werden. Fortfahren?</translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+151"/>
         <source>No engine</source>
         <translation>Keine Skript-Engine</translation>
     </message>
@@ -2318,11 +2316,13 @@
         <translation>tinyPy wurde beim Kompilieren nicht aktiviert</translation>
     </message>
     <message>
-        <location line="+168"/>
+        <location line="+173"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Einfügepunkte befinden sich nicht an Keyframes.
+Video wird an diesen Stellen beschädigt sein.
+Trotzdem fortsetzen?</translation>
     </message>
     <message>
         <location line="+124"/>
@@ -2336,7 +2336,7 @@
         <translation>Fehler beim Ausschneiden.</translation>
     </message>
     <message>
-        <location line="+822"/>
+        <location line="+816"/>
         <source>Cannot use that file as audio track</source>
         <translation>Kann diese Datei nicht als Tonspur verwenden</translation>
     </message>
@@ -2420,7 +2420,7 @@
     <message>
         <location line="+0"/>
         <source>Shift Value (ms):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Wert in ms:</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-14"/>
@@ -2530,16 +2530,12 @@
     </message>
     <message>
         <location line="+15"/>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+213"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>-</source>
-        <translation type="obsolete">-</translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-38"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-41"/>
         <source>Build Option</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2556,17 +2552,17 @@
     <message>
         <location line="+1"/>
         <source>Open Application &amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Logdatei öffnen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Open Application Data &amp;Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Ordner mit &amp;Anwendungsdaten öffnen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>About</source>
-        <translation type="unfinished"></translation>
+        <translation>Über Avidemux</translation>
     </message>
     <message>
         <location filename="../../common/ADM_editor/src/utils/ADM_edFrameType.cpp" line="+72"/>
@@ -2595,7 +2591,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="-144"/>
-        <location filename="../../common/gui_save.cpp" line="-597"/>
+        <location filename="../../common/gui_save.cpp" line="-602"/>
         <source>No audio track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2643,18 +2639,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1418"/>
+        <location filename="../../common/gui_main.cpp" line="-1416"/>
         <source>Select script to save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1207"/>
+        <location line="+1205"/>
         <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+120"/>
         <source>Something bad happened</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+508"/>
+        <location line="+509"/>
         <source>Oops</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2674,7 +2670,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>No</source>
         <translation type="unfinished">Nein</translation>
     </message>
@@ -2684,7 +2680,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Job</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2694,7 +2690,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Output file</source>
         <translation type="unfinished">Ausgabedatei</translation>
     </message>
@@ -2709,7 +2705,7 @@
         <translation type="unfinished">Job zur Warteschlange hinzufügen</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Select PNG to Save</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2745,22 +2741,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Maximum number of 9999 images reached, aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Saving images failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+25"/>
         <source>PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2790,30 +2781,28 @@
         <translation type="unfinished">Kann den Job %s nicht hinzufügen</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-207"/>
+        <location filename="../../common/gui_savenew.cpp" line="-210"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished">Ergebnisse eines früheren ersten Durchlaufs wiederverwenden?
 Warnung: Die Encoder-Konfiguration muss ähnlich sein.</translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+182"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished">Kann Filterkette nicht aufbauen</translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+24"/>
         <source>Cannot create encoder</source>
         <translation type="unfinished">Kann Encoder nicht initialisieren</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>Cannot setup codec. Bitrate too low?</source>
-        <translation type="unfinished">Kann Encoder nicht konfigurieren. Ist die Bitrate zu niedrig?</translation>
+        <translation type="obsolete">Kann Encoder nicht konfigurieren. Ist die Bitrate zu niedrig?</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+57"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
         <translation type="unfinished">Kann Audio-Encoder nicht konfigurieren. Stellen Sie sicher, dass der Stream kompatibel ist (Anzahl der Kanäle, Bitrate, Format)</translation>
     </message>
@@ -2827,20 +2816,30 @@
 Trotzdem fortsetzen?</translation>
     </message>
     <message>
-        <location line="-253"/>
-        <location line="+286"/>
+        <location line="-257"/>
+        <location line="+290"/>
         <location line="+26"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-312"/>
-        <location line="+286"/>
+        <location line="-326"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+290"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished">Kann Muxer-Instanz nicht erstellen</translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="-102"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The choice of cut points may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Do you want to continue anyway?</source>
         <translation type="unfinished"></translation>
@@ -3158,7 +3157,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>AAC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3214,7 +3213,7 @@
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
-        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+374"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+382"/>
         <source>Unknown</source>
         <translation type="unfinished">Unbekannt</translation>
     </message>
@@ -3311,20 +3310,20 @@
         <translation type="unfinished">1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
-        <location line="+30"/>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
-        <location line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
         <source>Codec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
         <source>Internal error finding codec 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Internal error opening 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3341,35 +3340,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+812"/>
-        <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
-Dropping a keyframe will result in severely corrupted video.
-Proceed anyway?</source>
-        <translation>Zeitstempelkonflikt (DTS) festgestellt, das betroffene Keyframe bei %s wird übersprungen.
-Dies wird zu schweren Bildstörungen im gespeicherten Video führen.
-Trotzdem fortsetzen?</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
-Dropping a frame may result in some video corruption.
-Proceed anyway?</source>
-        <translation>Zeitstempelkonflikt (DTS) festgestellt, das betroffene Frame bei %s wird übersprungen.
-Dies kann zu Bildstörungen im gespeicherten Video führen.
-Trotzdem fortsetzen?</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Do not warn again and drop frames silently while saving this video?</source>
-        <translation>Nicht mehr über übersprungene Frames beim Speichern dieses Videos warnen?</translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
-        <translation>Einige Frames vor %s mussten verzögert werden, was zum vorübergehenden Verlust der Bild-Ton-Synchronität führte. Trotzdem fortsetzen?</translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
         <translation>Berechtigungsfehler</translation>
     </message>
@@ -3608,7 +3579,7 @@
 <context>
     <name>avimuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+75"/>
         <source>Bad Idea</source>
         <translation type="unfinished">Tun Sie dies nicht!</translation>
     </message>
@@ -3686,49 +3657,49 @@
 <context>
     <name>bitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+51"/>
         <source>Constant Bitrate</source>
-        <translation type="unfinished">konstante Bitrate</translation>
+        <translation>Konstante Bitrate</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Constant Quantiser</source>
-        <translation type="unfinished">konstante Quantisierung</translation>
+        <translation>Konstante Quantisierung</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Same Quantiser as Input</source>
-        <translation type="unfinished">gleiche Quantisierung wie Quelle</translation>
+        <translation>Gleiche Quantisierung wie Quelle</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Constant Rate Factor</source>
-        <translation type="unfinished">konstante Rate</translation>
+        <translation>Konstante Qualität (CRF)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Two Pass - Video Size</source>
-        <translation type="unfinished">feste Videogröße          (2 Durchläufe)</translation>
+        <translation>Feste Videogröße (2 Durchläufe)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Two Pass - Average Bitrate</source>
-        <translation type="unfinished">durchschnittliche Bitrate (2 Durchläufe)</translation>
+        <translation>Durchschnittliche Bitrate (2 Durchläufe)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Encoding mode</source>
-        <translation type="unfinished">Kodiermodus</translation>
+        <translation>Kodiermodus</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Bitrate</source>
-        <translation type="unfinished">Bitrate</translation>
+        <translation>Bitrate</translation>
     </message>
     <message>
         <location line="+86"/>
         <source>Target bitrate (kb/s)</source>
-        <translation type="unfinished">Zielbitrate (kb/s)</translation>
+        <translation>Zielbitrate (kb/s)</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -3739,12 +3710,12 @@
     <message>
         <location line="-14"/>
         <source>Target video size (MB)</source>
-        <translation type="unfinished">Zielvideogröße (MB)</translation>
+        <translation>Zielgröße für Video (MB)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Average bitrate (kb/s)</source>
-        <translation type="unfinished">Durchschnittsbitrate (kb/s)</translation>
+        <translation>Durchschnittsbitrate (kb/s)</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -3790,7 +3761,7 @@
     <message>
         <location line="+1"/>
         <source>Remove noisy edge by turning them to black.</source>
-        <translation type="unfinished">Flimmern am Bildrand mit Schwarz überdecken.</translation>
+        <translation>Flimmern am Bildrand mit Schwarz überdecken.</translation>
     </message>
 </context>
 <context>
@@ -3799,37 +3770,42 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/blackenBorders.ui" line="+14"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+14"/>
         <source>Blacken Borders</source>
-        <translation type="unfinished"></translation>
+        <translation>Rand schwärzen</translation>
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
         <source>Right:</source>
-        <translation type="unfinished"></translation>
+        <translation>Rechts:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+23"/>
         <source>Top:</source>
-        <translation type="unfinished"></translation>
+        <translation>Oben:</translation>
     </message>
     <message>
         <location line="+43"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
         <source>Reset</source>
-        <translation type="unfinished"></translation>
+        <translation>Zurücksetzen</translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
         <source>Bottom:</source>
-        <translation type="unfinished"></translation>
+        <translation>Unten:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+51"/>
         <source>Left:</source>
-        <translation type="unfinished"></translation>
+        <translation>Links:</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation>&amp;Auswahlrahmen verstecken</translation>
     </message>
 </context>
 <context>
@@ -3851,6 +3827,29 @@
     </message>
 </context>
 <context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+77"/>
@@ -3889,11 +3888,11 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
-        <translation>59,93 (NTSC)</translation>
+        <source>59.94  (NTSC)</source>
+        <translation>59,94 (NTSC)</translation>
     </message>
     <message>
-        <location line="+174"/>
+        <location line="+179"/>
         <source>Source Fps:</source>
         <translation>Ausgangsbildfrequenz:</translation>
     </message>
@@ -3915,7 +3914,7 @@
     <message>
         <location line="+8"/>
         <source>Change fps</source>
-        <translation type="unfinished">Bildfrequenz ändern</translation>
+        <translation>Bildfrequenz ändern</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -3925,7 +3924,7 @@
     <message>
         <location line="+0"/>
         <source>Error</source>
-        <translation type="unfinished">Fehler</translation>
+        <translation>Fehler</translation>
     </message>
 </context>
 <context>
@@ -4224,9 +4223,9 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
         <source>Size: </source>
-        <translation type="unfinished"></translation>
+        <translation>Größe: </translation>
     </message>
 </context>
 <context>
@@ -4235,53 +4234,53 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
         <source>Crop</source>
-        <translation type="unfinished">Zuschneiden</translation>
+        <translation>Zuschneiden</translation>
     </message>
     <message>
         <location line="+38"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+75"/>
         <source>Right:</source>
-        <translation type="unfinished">Rechts:</translation>
+        <translation>Rechts:</translation>
     </message>
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
         <source>Top:</source>
-        <translation type="unfinished">Oben:</translation>
+        <translation>Oben:</translation>
     </message>
     <message>
         <location line="+43"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-30"/>
         <source>Reset</source>
-        <translation type="unfinished">Originalzustand</translation>
+        <translation>Originalzustand</translation>
     </message>
     <message>
         <location line="+21"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
         <source>Bottom:</source>
-        <translation type="unfinished">Unten:</translation>
+        <translation>Unten:</translation>
     </message>
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
         <source>Left:</source>
-        <translation type="unfinished">Links:</translation>
+        <translation>Links:</translation>
     </message>
     <message>
         <location line="+30"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
         <source>Auto Crop</source>
-        <translation type="unfinished">Zuschneideautomatik</translation>
+        <translation>Zuschneideautomatik</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
         <source>Size: </source>
-        <translation type="unfinished"></translation>
+        <translation>Bildgröße: </translation>
     </message>
     <message>
         <location line="+26"/>
         <source>&amp;Hide Rubber Band</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Auswahlrahmen verstecken</translation>
     </message>
 </context>
 <context>
@@ -4380,7 +4379,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp" line="+42"/>
         <source>Blend a logo by interpolating its surrounding box.</source>
-        <translation type="unfinished">Logo durch Interpolation der Umgebung entfernen.</translation>
+        <translation>Logo durch Interpolation der Umgebung entfernen.</translation>
     </message>
     <message>
         <location line="-1"/>
@@ -4482,30 +4481,30 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+26"/>
         <source>Encoding...</source>
-        <translation type="unfinished">Kodieren...</translation>
+        <translation>Kodieren...</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+55"/>
         <source>Phase:</source>
         <translation>Vorgang:</translation>
     </message>
     <message>
-        <location line="+248"/>
+        <location line="+268"/>
         <source>Video Codec:</source>
         <translation>Video-Codec:</translation>
     </message>
     <message>
-        <location line="-255"/>
-        <location line="+220"/>
+        <location line="-282"/>
+        <location line="+247"/>
         <location line="+21"/>
         <source>None</source>
-        <translation type="unfinished">Keine</translation>
+        <translation>Keiner</translation>
     </message>
     <message>
-        <location line="-258"/>
-        <location line="+251"/>
+        <location line="-261"/>
+        <location line="+254"/>
         <source>Unknown</source>
-        <translation type="unfinished">Unbekannt</translation>
+        <translation>Unbekannt</translation>
     </message>
     <message>
         <location line="+78"/>
@@ -4520,7 +4519,7 @@
         <translation type="unfinished">0 kb/s</translation>
     </message>
     <message>
-        <location line="-385"/>
+        <location line="-396"/>
         <source>Shut down computer when finished</source>
         <translation>Nach Beendigung den Computer herunterfahren</translation>
     </message>
@@ -4555,39 +4554,44 @@
         <translation type="unfinished">Niedrig</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+69"/>
         <source>Pause / Abort</source>
         <translation>Pause / Abbruch</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+13"/>
         <source>Advanced</source>
         <translation>Details</translation>
     </message>
     <message>
-        <location line="-175"/>
+        <location line="-199"/>
         <source>Main</source>
         <translation>Allgemein</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+8"/>
         <source>Time Remaining:</source>
         <translation>Verbleibende Zeit:</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+121"/>
+        <source>Keep dialog open when finished</source>
+        <translation>Dialog geöffnet lassen</translation>
+    </message>
+    <message>
+        <location line="+37"/>
         <source>Minimize to Tray</source>
-        <translation type="unfinished"></translation>
+        <translation>In den Infobereich minimieren</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+113"/>
         <source>Audio Codec:</source>
-        <translation type="unfinished">Audio-Codec:</translation>
+        <translation>Audio-Codec:</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Container:</source>
-        <translation type="unfinished"></translation>
+        <translation>Container:</translation>
     </message>
     <message>
         <location line="+50"/>
@@ -4647,17 +4651,17 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+65"/>
         <source>Adjust contrast, brightness, saturation and gamma.</source>
-        <translation type="unfinished">Kontrast, Helligkeit, Sättigung und Gamma einstellen.</translation>
+        <translation>Kontrast, Helligkeit, Sättigung und Gamma anpassen.</translation>
     </message>
     <message>
         <location line="-1"/>
         <source>MPlayer eq2</source>
-        <translation type="unfinished"></translation>
+        <translation>MPlayer eq2</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
         <source>Reset</source>
-        <translation type="unfinished"></translation>
+        <translation>Zurücksetzen</translation>
     </message>
 </context>
 <context>
@@ -4676,7 +4680,7 @@
         <location line="-187"/>
         <location line="+88"/>
         <source>Contrast</source>
-        <translation type="unfinished">Kontrast</translation>
+        <translation>Kontrast</translation>
     </message>
     <message>
         <location line="-14"/>
@@ -4730,7 +4734,7 @@
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished">Ausblenden</translation>
@@ -4741,7 +4745,32 @@
         <translation type="unfinished">Zum Ende dieses Filters hin auf das Bild am Beginn überblenden.</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+13"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Start time:</source>
         <translation type="unfinished">_Beginn:</translation>
     </message>
@@ -4754,13 +4783,13 @@
 <context>
     <name>fadeToBlack</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
-        <location line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+55"/>
+        <location line="+20"/>
         <source>Fade to black</source>
         <translation type="unfinished">Zu Schwarz überblenden</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-19"/>
         <source>Fade to black in/out.</source>
         <translation type="unfinished">Einblenden von Schwarz aus / Ausblenden zu Schwarz.</translation>
     </message>
@@ -4785,7 +4814,7 @@
         <translation>Einblenden</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>_Fade type:</source>
         <translation type="unfinished">Überb_lenden:</translation>
     </message>
@@ -4803,7 +4832,7 @@
 <context>
     <name>ffVAEncH264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4818,12 +4847,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Profile:</source>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4834,16 +4884,21 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Bitrate (kbps):</source>
+        <source>Quality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4853,7 +4908,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4861,27 +4916,53 @@
 <context>
     <name>ffVAEncHEVC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+343"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4891,7 +4972,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4899,7 +4980,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+223"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+256"/>
         <source>Default</source>
         <translation type="unfinished">Voreinstellung</translation>
     </message>
@@ -5368,8 +5449,32 @@
 <context>
     <name>ffnvenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+229"/>
+        <source>Controlled by Preset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
         <source>Low Quality</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5421,6 +5526,12 @@
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+        <source>RC Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Preset:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5430,6 +5541,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Bitrate (kbps):</source>
@@ -5443,32 +5560,48 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Frame Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>NVENC H.264 configuration</source>
         <translation>NVENC H.264 Konfiguration</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
-        <source>nvEnc HEVC  configuration</source>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+28"/>
+        <source>NVENC HEVC configuration</source>
         <translation>NVENC HEVC Konfiguration</translation>
     </message>
 </context>
@@ -5477,10 +5610,10 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+64"/>
         <source>[Mismatch]</source>
-        <translation type="unfinished">Inkompatible Parameter</translation>
+        <translation>Inkompatible Parameter</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+87"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished">Speichern als MPEG-PS (ff)</translation>
     </message>
@@ -5576,7 +5709,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5649,7 +5782,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5807,7 +5940,7 @@
 <context>
     <name>flvdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6338,12 +6471,12 @@
 <context>
     <name>jobs</name>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Something very wrong happened when building joblist.</source>
         <translation type="unfinished">Irgendwas ganz Falsches ist beim Erstellen der Job-Liste passiert.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>There are no jobs stored</source>
         <translation type="unfinished">Es sind keine Jobs gespeichert</translation>
     </message>
@@ -6388,7 +6521,7 @@
         <translation type="unfinished">&amp;Beenden</translation>
     </message>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="-6"/>
+        <location filename="../../common/GUI_jobs.cpp" line="-5"/>
         <source>Oops</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6398,27 +6531,27 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="+13"/>
         <source>Jobs</source>
-        <translation type="unfinished">Jobs</translation>
+        <translation>Jobs</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Delete Sel. Job</source>
-        <translation type="unfinished">lösche Job</translation>
+        <translation>Job löschen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Delete All Jobs</source>
-        <translation type="unfinished">Alle Jobs löschen</translation>
+        <translation>Alle Jobs löschen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Run All Jobs</source>
-        <translation type="unfinished">Alle Jobs starten</translation>
+        <translation>Alle Jobs starten</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Run Selected Job</source>
-        <translation type="unfinished">gewählten Job starten</translation>
+        <translation>Job starten</translation>
     </message>
 </context>
 <context>
@@ -6677,12 +6810,12 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/license.ui" line="+16"/>
         <source>License</source>
-        <translation type="unfinished">Lizenz</translation>
+        <translation>Lizenz</translation>
     </message>
     <message>
         <location line="+46"/>
         <source>OK</source>
-        <translation type="unfinished">OK</translation>
+        <translation>Schließen</translation>
     </message>
 </context>
 <context>
@@ -6695,17 +6828,17 @@
     <message>
         <location line="+1"/>
         <source>Put a logo on top of video, with alpha blending.</source>
-        <translation type="unfinished">Video mit einem halbtransparenten Logo überlagern.</translation>
+        <translation>Video mit einem halbtransparenten Logo überlagern.</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
         <source>Select Logo Image</source>
-        <translation type="unfinished">Bild als Logo auswählen</translation>
+        <translation>Bild als Logo auswählen</translation>
     </message>
     <message>
         <location line="+72"/>
         <source> s</source>
-        <translation type="unfinished"></translation>
+        <translation> s</translation>
     </message>
 </context>
 <context>
@@ -6836,12 +6969,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+523"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6941,9 +7074,9 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+167"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
         <source>Saving Mkv</source>
-        <translation type="unfinished">Speichere MKV</translation>
+        <translation>Speichere MKV</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
@@ -6958,12 +7091,12 @@
     <message>
         <location line="+2"/>
         <source>Force Aspect Ratio (DAR)</source>
-        <translation type="unfinished">Bildformat (DAR) erzwingen</translation>
+        <translation>Bildformat (DAR) erzwingen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>MKV Muxer</source>
-        <translation type="unfinished"></translation>
+        <translation>MKV Muxer</translation>
     </message>
 </context>
 <context>
@@ -7040,67 +7173,78 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Problem beim Lesen der SVQ3 Kopfzeilen</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+67"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <location line="+17"/>
         <source>Unsupported</source>
         <translation>Nicht unterstütztes Format</translation>
     </message>
     <message>
-        <location line="-9"/>
-        <source>Only MP4Video, H264, and H265 supported for video</source>
-        <translation type="unfinished">Für Video ist nur MPEG4, H264 und H265 zulässig</translation>
+        <location line="-17"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
+        <translation>Nur MPEG-4, H.264, HEVC und AV1 können als Video verwendet werden</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
-        <translation type="unfinished"></translation>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
+        <translation>Nur AAC, AC3, E-AC3, LPCM, MP2, MP3 und Vorbis können als Audio verwendet werden</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation>Inkompatibles Format</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation>Format PSP kann nicht mit LPCM Audio verwendet werden</translation>
+    </message>
+    <message>
+        <location line="+182"/>
         <source>Saving mp4</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichere mp4</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Saving PSP</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichere PSP</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use alternate MP3 tag</source>
-        <translation type="obsolete">Alternativen Tag für MP3 benutzen</translation>
-    </message>
-    <message>
         <location line="+2"/>
         <source>No optimization</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht optimieren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Move index to the beginning of the file</source>
-        <translation type="unfinished"></translation>
+        <translation>Index zum Anfang der Datei verschieben</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Use fragmentation</source>
-        <translation type="unfinished"></translation>
+        <translation>Fragmentieren</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Optimize for Streaming</source>
-        <translation type="unfinished"></translation>
+        <translation>Für Streaming optimieren</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -7113,7 +7257,7 @@
         <translation>Bildformat (DAR)</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Do not rotate</source>
         <translation>Nicht drehen</translation>
     </message>
@@ -7139,6 +7283,51 @@
     </message>
     <message>
         <location line="+3"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation>Zeitbasis</translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>MP4 Muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7310,7 +7499,7 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+242"/>
+        <location filename="../../common/gui_navigate.cpp" line="+232"/>
         <source>Cannot go to next keyframe</source>
         <translation>Kann nicht zum nächsten Keyframe wechseln</translation>
     </message>
@@ -7403,17 +7592,17 @@
     <message>
         <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
         <source>_Start time:</source>
-        <translation type="unfinished">_Beginn:</translation>
+        <translation>_Beginn:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_End time:</source>
-        <translation type="unfinished">_Ende:</translation>
+        <translation>_Ende:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Configure filter</source>
-        <translation type="unfinished">_Konfigurieren</translation>
+        <translation>_Konfigurieren</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -7540,21 +7729,17 @@
 <context>
     <name>psdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Fehler</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
         <translation type="unfinished">Indizierung</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -7624,9 +7809,9 @@
         <translation type="unfinished">Für diese Operation sind Root-Rechte erforderlich.</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+126"/>
         <source>First Pass</source>
-        <translation type="unfinished"></translation>
+        <translation>Erster Durchgang</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -7639,19 +7824,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+185"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
-        <translation type="unfinished">Der Kodierungvorgang wurde angehalten. Möchten Sie den Vorgang fortsetzen oder abbrechen?</translation>
+        <translation>Der Kodierungvorgang wurde angehalten. Möchten Sie den Vorgang fortsetzen oder abbrechen?</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Resume</source>
-        <translation type="unfinished">Fortfahren</translation>
+        <translation>Fortfahren</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Abort</source>
-        <translation type="unfinished">Abbruch</translation>
+        <translation>Abbruch</translation>
     </message>
 </context>
 <context>
@@ -7671,13 +7856,13 @@
     <message>
         <location line="-82"/>
         <source>Overwrite file </source>
-        <translation type="unfinished">Überschreiben </translation>
+        <translation>Überschreiben </translation>
     </message>
 </context>
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+457"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+451"/>
         <source>Recent Files</source>
         <translation>Zuletzt verwendete &amp;Dateien</translation>
     </message>
@@ -7689,7 +7874,7 @@
     <message>
         <location line="+671"/>
         <source>Play/Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiedergabe/Stopp</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -7752,24 +7937,33 @@
         <translation>Eine Minute vor</translation>
     </message>
     <message>
-        <location line="+1222"/>
-        <source> (%d track(s))</source>
-        <translation> (%d Tonspur(en))</translation>
+        <location line="+981"/>
+        <source>Selection: </source>
+        <translation>Auswahl: </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation>
+            <numerusform> (%n Tonspur)</numerusform>
+            <numerusform> (%n Tonspuren)</numerusform>
+        </translation>
     </message>
     <message>
-        <location line="-2190"/>
+        <location line="-2228"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;Neue Version verfügbar&lt;/b&gt;&lt;br&gt;Version %1&lt;br&gt;Freigegeben am %2.&lt;br&gt;Das Update kann hier heruntergeladen werden:&lt;br&gt;&lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt;Sie können automatische Überprüfung auf Updates in Einstellungen deaktivieren.&lt;/small&gt;</translation>
     </message>
     <message>
-        <location line="+1594"/>
+        <location line="+1649"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>Die Anwendung hat ein schwerwiegendes Problem festgestellt.
 Der letzte Bearbeitungsstand wurde gespeichert und wird beim nächsten Anwendungsstart geladen.</translation>
     </message>
     <message>
-        <location line="+262"/>
+        <location line="+230"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7832,22 +8026,22 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="+13"/>
         <source>Ready</source>
-        <translation type="unfinished">Fertig</translation>
+        <translation>Fertig</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Succeeded</source>
-        <translation type="unfinished">Gelungen</translation>
+        <translation>Erfolgreich</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Failed</source>
-        <translation type="unfinished">Fehlgeschlagen</translation>
+        <translation>Fehlgeschlagen</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Deleted</source>
-        <translation type="unfinished">Gelöscht</translation>
+        <translation>Gelöscht</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -7857,22 +8051,22 @@
     <message>
         <location line="+24"/>
         <source>Job Name</source>
-        <translation type="unfinished">Job Name</translation>
+        <translation>Job-Name</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Status</source>
-        <translation type="unfinished">Status</translation>
+        <translation>Status</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Start Time</source>
-        <translation type="unfinished">Startzeit</translation>
+        <translation>Startzeit</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>End Time</source>
-        <translation type="unfinished">Endzeit</translation>
+        <translation>Endzeit</translation>
     </message>
     <message>
         <location line="+64"/>
@@ -7893,22 +8087,22 @@
     <message>
         <location line="+15"/>
         <source>Delete *all* job</source>
-        <translation type="unfinished">Alle Aufgaben löschen</translation>
+        <translation>Alle Jobs löschen</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Are you sure you want to delete ALL jobs?</source>
-        <translation type="unfinished">Sie löschen hiermit alle Aufgaben. Sind Sie sicher?</translation>
+        <translation>Sie löschen hiermit alle Jobs. Sind Sie sicher?</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Already done</source>
-        <translation type="unfinished">Fertig</translation>
+        <translation>Bereits erledigt</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>This script has already been successfully executed.</source>
-        <translation type="unfinished">Dieses Script wurde bereits erfolgreich abgearbeitet.</translation>
+        <translation>Dieses Script wurde bereits erfolgreich abgearbeitet.</translation>
     </message>
 </context>
 <context>
@@ -7977,7 +8171,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
         <source>Unknown</source>
-        <translation type="unfinished">Unbekannt</translation>
+        <translation>Unbekannt</translation>
     </message>
     <message>
         <location line="+94"/>
@@ -8007,8 +8201,17 @@
         <source>Yes</source>
         <translation type="unfinished">Ja</translation>
     </message>
+    <message numerus="yes">
+        <location line="+72"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
+        <translation>
+            <numerusform>Audio (%n aktive Tonspur)</numerusform>
+            <numerusform>Audio (%n aktive Tonspuren)</numerusform>
+        </translation>
+    </message>
     <message>
-        <location line="+98"/>
+        <location line="+34"/>
         <source>Mono</source>
         <translation type="unfinished">Mono</translation>
     </message>
@@ -8044,12 +8247,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+27"/>
+        <location line="+33"/>
         <source>Total Duration:	</source>
         <translation>Gesamtdauer:	</translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-31"/>
         <source>Extra Video Properties</source>
         <translation>Zusätzliche Video-Eigenschaften</translation>
     </message>
@@ -8064,12 +8267,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Codec:		</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8094,18 +8297,18 @@
         <translation>Kein Ton</translation>
     </message>
     <message>
-        <location line="-155"/>
+        <location line="-170"/>
         <source>%2.3f fps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+81"/>
+        <location line="+90"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation>%02d:%02d:%02d,%03d</translation>
     </message>
     <message>
-        <location line="-87"/>
+        <location line="-96"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8113,7 +8316,7 @@
 <context>
     <name>qshell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+53"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
         <translation type="unfinished"></translation>
@@ -8125,6 +8328,19 @@
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>qtalert</name>
@@ -8186,6 +8402,16 @@
         <source>Video Only Muxer Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>removeplane</name>
@@ -8238,22 +8464,22 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
         <source>_Mode:</source>
-        <translation type="unfinished">_Modus:</translation>
+        <translation>_Modus:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_New frame rate:</source>
-        <translation type="unfinished">_Neue Bildfrequenz:</translation>
+        <translation>_Neue Bildrate:</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Resample fps</source>
-        <translation type="unfinished">Bildfrequenz (Hz) ändern</translation>
+        <translation>Bildrate (Hz) ändern</translation>
     </message>
     <message>
-        <location line="-325"/>
+        <location line="-329"/>
         <source>Custom</source>
         <translation>Benutzerdefiniert</translation>
     </message>
@@ -8279,8 +8505,8 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
-        <translation type="unfinished">59,93 (NTSC)</translation>
+        <source>59.94  (NTSC)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+35"/>
@@ -8290,13 +8516,13 @@
     <message>
         <location line="+1"/>
         <source>Change and enforce FPS. Keep duration and sync.</source>
-        <translation type="unfinished">Bildfrequenz durch Duplizieren oder Weglassen von Frames unter Beibehaltung der Abspieldauer und der Synchronisation ändern.</translation>
+        <translation>Bildrate durch Duplizieren oder Weglassen von Frames unter Beibehaltung der Abspieldauer und der Synchronisation ändern.</translation>
     </message>
 </context>
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished">Breite und Höhe können nicht ungerade sein</translation>
     </message>
@@ -8464,6 +8690,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+356"/>
+        <source>Lanzcos3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+8"/>
         <location line="+32"/>
         <source>1:1 (square pixels)</source>
@@ -8476,16 +8716,16 @@
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+44"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-312"/>
         <source>Resize Dimensions</source>
         <translation type="unfinished">Angaben zur Größenänderung</translation>
     </message>
@@ -8656,18 +8896,8 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+5"/>
-        <source>Lanzcos3</source>
-        <translation type="unfinished">Lanzcos3</translation>
+        <source>Lanczos-3</source>
+        <translation type="unfinished">Lanczos-3</translation>
     </message>
 </context>
 <context>
@@ -8830,12 +9060,12 @@
     <message>
         <location line="+181"/>
         <source>_Start time:</source>
-        <translation type="unfinished">_Beginn:</translation>
+        <translation>_Beginn:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Duration:</source>
-        <translation type="unfinished">_Dauer:</translation>
+        <translation>_Dauer:</translation>
     </message>
 </context>
 <context>
@@ -9025,35 +9255,36 @@
 <context>
     <name>tsdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Fehler</translation>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+207"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
+        <source>There are several files with sequential file names. Should they be all loaded ?</source>
+        <translation>Es gibt mehrere Dateien mit fortlaufender Nummerierung im Dateinamen. Sollen sie alle geladen werden?</translation>
     </message>
     <message>
-        <source>This file&apos;s index has been created with an older version of avidemux.
-Please delete the idx2 file and reopen.</source>
-        <translation type="vanished">Der Index dieser Datei wurde mit einer älteren Version von Avidemux erstellt. 
-Bitte die idx2-Datei löschen und das Video erneut öffnen.</translation>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+19"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
+        <source>Indexing</source>
+        <translation>Indexierung</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+183"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+325"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+84"/>
-        <source>There are several files with sequential file names. Should they be all loaded ?</source>
-        <translation>Es gibt mehrere Dateien mit fortlaufender Nummerierung im Dateinamen. Sollen sie alle geladen werden?</translation>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation>Neue Auflösung</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
-        <source>Indexing</source>
-        <translation type="unfinished">Indizierung</translation>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation>Die Auflösung ändert sich beim Frame %u von %ux%u zu %ux%u. Dies wird nicht unterstützt. Die Indexierung wird abgebrochen.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Index für diese Datei wurde erstellt mit einer älteren Version von Avidemux.
+Die Datei muss neu indexiert werden. Fortfahren?</translation>
     </message>
 </context>
 <context>
@@ -9142,36 +9373,154 @@
     </message>
 </context>
 <context>
-    <name>vaapiResize</name>
+    <name>vaapiDeint</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
-        <source>vaapi: Resize</source>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>vaapi: Resize image using vaapi.</source>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation>Deinterlacen und Ändern der Bildgröße mittels VA-API.</translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Width :</source>
+        <location line="+1"/>
+        <source>Weave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Motion-Adaptive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>mpeg-&gt;PC:</source>
+        <source>Motion-Compensated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation>Oberes Halbbild zuerst</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation>Unteres Halbbild zuerst</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation>Bild je Bild</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation>Bildrate verdoppeln</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation>_Modus:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation>_Halbbildreihenfolge:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation>_Ausgabe:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation>Deinterlacing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation>G_röße ändern</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation>Breite:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation>Höhe:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation>Transformation</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation>VA-API Deinterlacer und Resizer</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation>Nicht unterstützter Modus</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation>Angeforderter Deinterlacing-Modus %s wird nicht unterstützt, ersetzt durch %s.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation>Fehler beim Einrichten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation>Initialisierung von VA-API fehlgeschlagen, Durchreichebetrieb.</translation>
+    </message>
+</context>
+<context>
+    <name>vaapiResize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize image using VA-API.</source>
+        <translation>Bildgröße mittels VA-API ändern.</translation>
+    </message>
+    <message>
+        <location line="+129"/>
+        <source>Width :</source>
+        <translation>Breite:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height :</source>
+        <translation>Höhe:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>mpeg-&gt;PC</source>
+        <translation>Eingang entspricht BT.601</translation>
+    </message>
+    <message>
         <location line="+4"/>
         <source>vaapi</source>
-        <translation type="unfinished"></translation>
+        <translation>VA-API Resizer-Konfiguration</translation>
     </message>
 </context>
 <context>
@@ -9179,22 +9528,22 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+131"/>
         <source>vdpauDeint</source>
-        <translation type="unfinished">VDPAU-Deinterlacer</translation>
+        <translation>VDPAU-Deinterlacer</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>VDPAU deinterlacer (+resize).</source>
-        <translation type="unfinished">Deinterlacing und Änderung der Bildgröße mittels VDPAU.</translation>
+        <translation>Deinterlacen und Ändern der Bildgröße mittels VDPAU.</translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+197"/>
         <source>Keep Top Field</source>
-        <translation type="unfinished">Erstes Halbbild verwenden</translation>
+        <translation>Erstes Halbbild verwenden</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Keep Bottom Field</source>
-        <translation type="unfinished">Zweites Halbbild verwenden</translation>
+        <translation>Zweites Halbbild verwenden</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9203,33 +9552,33 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>_Ivtc:</source>
-        <translation type="unfinished">_Inverse Telecine (IVTC)</translation>
+        <source>_IVTC</source>
+        <translation>_Inverse Telecine (IVTC)</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Resize:</source>
-        <translation type="unfinished">Bildg_röße ändern</translation>
+        <source>_Resize</source>
+        <translation>Bildg_röße ändern</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Deint Mode:</source>
-        <translation type="unfinished">_Deint.-Modus:</translation>
+        <translation>_Deint.-Modus:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Width :</source>
+        <source>Width:</source>
         <translation>_Breite:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation>_Höhe:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>vdpau</source>
-        <translation type="unfinished"></translation>
+        <translation>VDPAU Deinterlacer</translation>
     </message>
 </context>
 <context>
@@ -9245,13 +9594,13 @@
         <translation type="unfinished">Bildgröße in Pixeln mittels VDPAU verändern.</translation>
     </message>
     <message>
-        <location line="+133"/>
-        <source>Width :</source>
+        <location line="+131"/>
+        <source>Width:</source>
         <translation>_Breite:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation>_Höhe:</translation>
     </message>
     <message>
@@ -9335,6 +9684,84 @@
     </message>
 </context>
 <context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation>Für bestmögliche Qualität den 2-Pass-Modus mit Zielbitrate gesetzt auf null wählen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation>So viele Threads wie Prozessorkerne verwenden</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation>GOP-Länge</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation>Erweiterten Farbwertebereich verwenden</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation>Kodiermodus</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation>Geschwindigkeit gegenüber Qualität</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation>Diverses</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation>libvpx VP9-Encoder-Konfiguration</translation>
+    </message>
+</context>
+<context>
     <name>vsWindow</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
@@ -9350,7 +9777,7 @@
 <context>
     <name>webmmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+68"/>
         <source>Unsupported Video.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
         <translation type="unfinished">Nicht unterstütztes Video.
@@ -9364,7 +9791,7 @@
 Nur Vorbis und Opus sind zulässig.</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+89"/>
         <source>Saving Webm</source>
         <translation type="unfinished">WebM speichern</translation>
     </message>
@@ -9387,7 +9814,7 @@
 <context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
         <source>Processing</source>
         <translation type="unfinished">Bearbeitung</translation>
     </message>
@@ -9397,12 +9824,12 @@
         <translation type="unfinished">Verbrauchte Zeit:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+14"/>
         <source>Time Remaining:</source>
         <translation type="unfinished">Verbleibende Zeit:</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+13"/>
         <source>00:00:00</source>
         <translation type="unfinished">00:00:00</translation>
     </message>
@@ -9410,7 +9837,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
         <source>Not coded</source>
         <translation type="unfinished">Nicht verfügbar</translation>
     </message>
@@ -9426,7 +9853,7 @@
         <translation>Kein Tuning</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation>Benutzerdefiniert</translation>
     </message>
@@ -9563,54 +9990,54 @@
     </message>
     <message>
         <location line="+7"/>
-        <location line="+3152"/>
+        <location line="+3157"/>
         <source>Delete</source>
         <translation type="unfinished">löschen</translation>
     </message>
     <message>
-        <location line="-3110"/>
+        <location line="-3115"/>
         <source>General</source>
         <translation type="unfinished">Allgemein</translation>
     </message>
     <message>
         <location line="+270"/>
         <source>Rate Control</source>
-        <translation type="unfinished">Bitraten-Kontrolle (die entsprechenden x264 CLI Schalter sind in &quot;[ ]&quot; angegeben)</translation>
+        <translation>Bitratensteuerung (die entsprechenden x264 CLI Schalter sind in &quot;[ ]&quot; angegeben)</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Target Video Size:</source>
-        <translation type="unfinished">Ziel-Videogröße:</translation>
+        <translation>Zielgröße Video:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Constant Bitrate (Single Pass)</source>
-        <translation type="unfinished">konstante Bitrate [bitrate]          (1 Durchlauf)</translation>
+        <translation>Konstante Bitrate [bitrate] (ein Durchlauf)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Constant Quantiser (Single Pass)</source>
-        <translation type="unfinished">konstante Quantisierung [qp]     (1 Durchlauf)</translation>
+        <translation>Konstante Quantisierung [qp] (ein Durchlauf)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Constant Rate Factor (Single Pass)</source>
-        <translation type="unfinished">konstante Bildqualität [crf]         (1 Durchlauf)</translation>
+        <translation>Konstante Bildqualität [crf] (ein Durchlauf)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Video Size (Two Pass)</source>
-        <translation type="unfinished">feste Videogröße [bitrate, pass] (2 Durchläufe)</translation>
+        <translation>Feste Videogröße [bitrate, pass] (zwei Durchläufe)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Average Bitrate (Two Pass)</source>
-        <translation type="unfinished">durchschnittliche Bitrate [pass]   (2 Durchläufe)</translation>
+        <translation>Mittlere Bitrate [pass] (zwei Durchläufe)</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Encoding Mode:</source>
-        <translation type="unfinished">Kodiermodus:</translation>
+        <translation>Kodiermodus:</translation>
     </message>
     <message>
         <location line="+22"/>
@@ -9644,11 +10071,11 @@
     <message>
         <location line="+9"/>
         <source>Frametype Lookahead:</source>
-        <translation type="unfinished">vorausschauende Bildtypeinschatzung (MB-Tree, VBV) [rc-lookahead] für:</translation>
+        <translation>Vorausschauende Bildtypeinschatzung (MB-Tree, VBV) [rc-lookahead] für:</translation>
     </message>
     <message>
         <location line="+14"/>
-        <location line="+2490"/>
+        <location line="+2495"/>
         <source>frames</source>
         <translation type="unfinished">Bilder (I-Bilder: max. GOP beachten)</translation>
     </message>
@@ -9683,7 +10110,7 @@
         <translation type="unfinished">individueller strangbezogener Vorschaupuffer [sync-lookahead]:</translation>
     </message>
     <message>
-        <location line="-2369"/>
+        <location line="-2374"/>
         <source>Motion</source>
         <translation type="unfinished">Bewegung</translation>
     </message>
@@ -9735,22 +10162,22 @@
     <message>
         <location line="+98"/>
         <source>Motion Vector</source>
-        <translation type="unfinished">Bewegungsvektor</translation>
+        <translation>Bewegungsvektoren</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>Maximum Motion Vector Length:</source>
-        <translation type="unfinished">maximale Bewegungsvektorlänge [mvrange]:</translation>
+        <translation>Maximale Bewegungsvektorlänge [mvrange]:</translation>
     </message>
     <message>
         <location line="+70"/>
         <source>Minimum Buffer Between Threads:</source>
-        <translation type="unfinished">minimaler Puffer zwischen zwei Arbeitsträngen [mvrange-thread]:</translation>
+        <translation>Minimaler Puffer zwischen zwei Arbeitsträngen [mvrange-thread]:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Maximum Motion Vector Search Range:</source>
-        <translation type="unfinished">max. Suchradius für die Bewegungssuche in Pixel [merange]:</translation>
+        <translation>Max. Suchradius für die Bewegungssuche in Pixel [merange]:</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -9772,16 +10199,16 @@
     <message>
         <location line="+7"/>
         <source>Weighted Prediction for P-frames:</source>
-        <translation type="unfinished">gewichtete Bewegungskompensierung für P-Bilder [weightp]:</translation>
+        <translation>Gewichtete Bewegungskompensierung für P-Bilder [weightp]:</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location line="+2596"/>
+        <location line="+2601"/>
         <source>None</source>
         <translation type="unfinished">keiner</translation>
     </message>
     <message>
-        <location line="-2591"/>
+        <location line="-2596"/>
         <source>Spatial</source>
         <translation type="unfinished">räumlich [spatial]</translation>
     </message>
@@ -9799,12 +10226,12 @@
     <message>
         <location line="+25"/>
         <source>Weighted Prediction for B-frames</source>
-        <translation type="unfinished">gewichtete Vorhersage aus B-Bildreferenzen erlauben [weightb]</translation>
+        <translation>Gewichtete Vorhersage aus B-Bildreferenzen erlauben [weightb]</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Constrained Intra Prediction</source>
-        <translation type="unfinished">I-Bildvorhersage beschränken (mindert die Kompression) [constrained-intra]</translation>
+        <translation>I-Bildvorhersage beschränken (mindert die Kompression) [constrained-intra]</translation>
     </message>
     <message>
         <location line="+24"/>
@@ -9858,12 +10285,12 @@
     </message>
     <message>
         <location line="+21"/>
-        <location line="+1328"/>
+        <location line="+1333"/>
         <source>Strength:</source>
         <translation type="unfinished">Stärke:</translation>
     </message>
     <message>
-        <location line="-1289"/>
+        <location line="-1294"/>
         <source>Threshold:</source>
         <translation type="unfinished">Schwellwert:</translation>
     </message>
@@ -9905,12 +10332,12 @@
     <message>
         <location line="+7"/>
         <source>Maximum Consecutive B-frames:</source>
-        <translation type="unfinished">maximale Anzahl aufeinanderfolgender B-Bilder [bframes]:</translation>
+        <translation>Maximale Anzahl aufeinanderfolgender B-Bilder [bframes]:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Adaptive B-frame Decision:</source>
-        <translation type="unfinished">adaptive Entscheidung zwischen P- und B-Bildern (DCT) [b-adapt]:</translation>
+        <translation>Adaptive Entscheidung zwischen P- und B-Bildern (DCT) [b-adapt]:</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -10000,12 +10427,12 @@
     </message>
     <message>
         <location line="+10"/>
-        <location line="+856"/>
+        <location line="+861"/>
         <source>Edit</source>
         <translation type="unfinished">Bearbeiten</translation>
     </message>
     <message>
-        <location line="-809"/>
+        <location line="-814"/>
         <source>Quantiser Control</source>
         <translation type="unfinished">Quantisierungskontrolle</translation>
     </message>
@@ -10022,12 +10449,12 @@
     <message>
         <location line="+85"/>
         <location line="+179"/>
-        <location line="+302"/>
+        <location line="+307"/>
         <source>%</source>
         <translation type="unfinished">%</translation>
     </message>
     <message>
-        <location line="-459"/>
+        <location line="-464"/>
         <source>Maximum Quantiser Step:</source>
         <translation type="unfinished">max. Quantisierungsschwankung zwischen 2 Bildern [qpframes]:</translation>
     </message>
@@ -10077,7 +10504,17 @@
         <translation type="unfinished">Dem menschlichen Sehapparat angepaßte Quantisierung [aq-mode, aq-strength]</translation>
     </message>
     <message>
-        <location line="+129"/>
+        <location line="+26"/>
+        <source>Auto Variance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Video Buffer Verifier</source>
         <translation type="unfinished">Überwachung des Videopuffers (VBV ist für Hardware-Player eventuell erforderlich.)</translation>
     </message>
@@ -10097,18 +10534,18 @@
         <translation type="unfinished">kbit/s</translation>
     </message>
     <message>
-        <location line="-2700"/>
+        <location line="-2705"/>
         <source>Fast First Pass</source>
-        <translation type="unfinished">ersten Durchlauf schnell ausführen [no-slow-firstpass]</translation>
+        <translation>Ersten Durchlauf schnell ausführen [no-slow-firstpass]</translation>
     </message>
     <message>
-        <location line="+2938"/>
+        <location line="+2943"/>
         <source>Custom:</source>
         <comment>multithreading</comment>
         <translation type="unfinished">die Anzahl der Aufgabenstränge [threads] manuell festlegen:</translation>
     </message>
     <message>
-        <location line="-1841"/>
+        <location line="-1846"/>
         <source>Partition Search</source>
         <translation type="unfinished">Bildaufteilung in unterschiedlich große Makroblöcke (Partitionen) [partitions]</translation>
     </message>
@@ -10160,7 +10597,7 @@
     <message>
         <location line="+162"/>
         <source>GOP Size:</source>
-        <translation type="unfinished">GOP Größe (Bildanzahl zwischen zwei Vollbildern) [keyint]:</translation>
+        <translation>GOP-Länge (Anzahl Bilder zwischen zwei Vollbildern) [keyint]:</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -10175,7 +10612,7 @@
     <message>
         <location line="+68"/>
         <source>Periodic Intra Refresh</source>
-        <translation type="unfinished">keine IDR-Frames verwenden, stattdessen kontinuierlich aktualisieren [intra-refresh]</translation>
+        <translation>Keine IDR-Frames verwenden, stattdessen kontinuierlich aktualisieren [intra-refresh]</translation>
     </message>
     <message>
         <location line="+181"/>
@@ -10193,7 +10630,7 @@
         <translation type="unfinished">Normal</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+101"/>
         <source>Advanced 1</source>
         <translation type="unfinished">VBV/Slices</translation>
     </message>
@@ -10258,7 +10695,7 @@
         <translation type="unfinished">Ausgabe</translation>
     </message>
     <message>
-        <location line="-3165"/>
+        <location line="-3170"/>
         <location line="+669"/>
         <source>1</source>
         <translation type="unfinished">1</translation>
@@ -10337,7 +10774,7 @@
     <message>
         <location line="+584"/>
         <source>Sequence Parameter Set Identifer:</source>
-        <translation type="unfinished">Sequence Parameter Set Identifer [sps-id]:</translation>
+        <translation>Sequence Parameter Set Identifer [sps-id]:</translation>
     </message>
     <message>
         <location line="-692"/>
@@ -10365,7 +10802,7 @@
         <translation type="unfinished">31</translation>
     </message>
     <message>
-        <location line="+2506"/>
+        <location line="+2511"/>
         <source>Pixel Aspect Ratio</source>
         <translation type="unfinished">Pixel Seitenverhältnis [SAR]</translation>
     </message>
@@ -10373,7 +10810,7 @@
         <location line="+8"/>
         <source>Custom:</source>
         <comment>PAR</comment>
-        <translation type="unfinished">individuelles Seitenverhältnis angeben:</translation>
+        <translation>Individuelles Seitenverhältnis angeben:</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -10383,12 +10820,12 @@
     <message>
         <location line="+49"/>
         <source>:</source>
-        <translation type="unfinished">:</translation>
+        <translation>:</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Predefined Aspect Ratio:</source>
-        <translation type="unfinished">Vordefiniertes Seitenverhältnis:</translation>
+        <translation>Vordefiniertes Seitenverhältnis:</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -10475,7 +10912,7 @@
         <translation type="unfinished">Video Format:</translation>
     </message>
     <message>
-        <location line="-3568"/>
+        <location line="-3573"/>
         <source>Basic</source>
         <translation type="unfinished">Grundlegend</translation>
     </message>
@@ -10550,12 +10987,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Auto Variance AQ</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+561"/>
+        <location line="+584"/>
         <source>Generate Access Unit Delimiters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10764,7 +11196,7 @@
         <translation>Kein Tuning</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation>Benutzerdefiniert</translation>
     </message>
@@ -11040,32 +11472,32 @@
     <message>
         <location line="+21"/>
         <source>Target Video Size:</source>
-        <translation type="unfinished">Ziel-Videogröße:</translation>
+        <translation>Zielgröße Video:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Constant Bitrate (Single Pass)</source>
-        <translation type="unfinished">Konstante Bitrate (ein Durchlauf)</translation>
+        <translation>Konstante Bitrate (ein Durchlauf)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Constant Quantiser (Single Pass)</source>
-        <translation type="unfinished">Konstante Quantisierungsstufe (ein Durchlauf)</translation>
+        <translation>Konstante Quantisierungsstufe (ein Durchlauf)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Constant Rate Factor (Single Pass)</source>
-        <translation type="unfinished">Konstante Bildqualität [crf] (ein Durchlauf)</translation>
+        <translation>Konstante Bildqualität [crf] (ein Durchlauf)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Video Size (Two Pass)</source>
-        <translation type="unfinished">Videogröße (zwei Durchläufe)</translation>
+        <translation>Videogröße (zwei Durchläufe)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Average Bitrate (Two Pass)</source>
-        <translation type="unfinished">Mittlere Bitrate (zwei Durchläufe)</translation>
+        <translation>Mittlere Bitrate (zwei Durchläufe)</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -11220,7 +11652,7 @@
     <message>
         <location line="+35"/>
         <source>Maximum Motion Vector Search Range:</source>
-        <translation type="unfinished">max. Suchradius für die Bewegungssuche in Pixel [merange]:</translation>
+        <translation>Max. Suchradius für Bewegungssuche in Pixel [merange]:</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -11230,7 +11662,7 @@
     <message>
         <location line="+6"/>
         <source>Weighted Prediction for B-frames</source>
-        <translation type="unfinished">gewichtete Vorhersage aus B-Bildreferenzen erlauben [weightb]</translation>
+        <translation>Gewichtete Vorhersage aus B-Bildreferenzen erlauben [weightb]</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -11240,7 +11672,7 @@
     <message>
         <location line="+9"/>
         <source>Weighted Prediction for P-frames:</source>
-        <translation type="unfinished">gewichtete Bewegungskompensierung für P-Bilder [weightp]:</translation>
+        <translation>Gewichtete Bewegungskompensierung für P-Bilder [weightp]:</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -11973,7 +12405,7 @@
 <context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+40"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+35"/>
         <source>Full</source>
         <translation type="unfinished">Voll</translation>
     </message>
@@ -12013,17 +12445,43 @@
         <translation type="unfinished">Mehrkernprozessoren</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+10"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Aspect Ratio:</source>
         <translation type="unfinished">Seitenverhältnis:</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+14"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Aspect Ratio</source>
         <translation type="unfinished">Seitenverhältnis</translation>
     </message>
     <message>
-        <location line="-108"/>
+        <location line="-118"/>
         <location line="+24"/>
         <source>None</source>
         <translation type="unfinished"></translation>
@@ -12089,12 +12547,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>MotionEstimation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+15"/>
         <source>Mi_n. quantizer:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12114,7 +12567,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+5"/>
         <source>_Quantization type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12139,17 +12592,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Advanced Simple Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
+        <location line="-32"/>
         <source>Motion Estimation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+57"/>
         <source>Quantization</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12174,58 +12622,42 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
         <source>Yadif</source>
-        <translation type="unfinished"></translation>
+        <translation>Yadif</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Yadif, port of avisynth version (c) Fizick.</source>
-        <translation type="unfinished">Yadif (Yet Another DeInterlacing Filter), Portierung der Version aus Avisynth © Alexander Balakhnin (&quot;Fizick&quot;).</translation>
-    </message>
-    <message>
-        <source>Temporal &amp; spatial check</source>
-        <translation type="obsolete">Zeitliche und räumliche Prüfung</translation>
-    </message>
-    <message>
-        <source>Bob, temporal &amp; spatial check</source>
-        <translation type="obsolete">Bob, zeitliche und räumliche Prüfung (Frequenzverdopplung!)</translation>
-    </message>
-    <message>
-        <source>Skip spatial temporal check</source>
-        <translation type="obsolete">Ohne räumliche und zeitliche Prüfung</translation>
-    </message>
-    <message>
-        <source>Bob, skip spatial temporal check</source>
-        <translation type="obsolete">Bob, ohne räumliche und zeitliche Prüfung (Frequenzverdopplung!)</translation>
+        <translation>Yadif (Yet Another DeInterlacing Filter), Portierung der Version aus Avisynth © Alexander Balakhnin (&quot;Fizick&quot;).</translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+70"/>
         <source>Bottom field first</source>
-        <translation type="unfinished">Unteres Halbbild zuerst</translation>
+        <translation>Unteres Halbbild zuerst</translation>
     </message>
     <message>
         <location line="-1"/>
         <source>Top field first</source>
-        <translation type="unfinished">Oberes Halbbild zuerst</translation>
+        <translation>Oberes Halbbild zuerst</translation>
     </message>
     <message>
         <location line="-7"/>
         <source>Frame : Temporal &amp; spatial check</source>
-        <translation type="unfinished"></translation>
+        <translation>Bild pro Bild mit zeitlicher und räumlicher Analyse</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Field :  Temporal &amp; spatial check</source>
-        <translation type="unfinished"></translation>
+        <translation>Bild pro Halbbild mit zeitlicher und räumlicher Analyse</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Frame : Skip spatial temporal check</source>
-        <translation type="unfinished"></translation>
+        <translation>Bild pro Bild, keine räumliche Analyse</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Field : Skip spatial temporal check</source>
-        <translation type="unfinished"></translation>
+        <translation>Bild pro Halbbild, keine räumliche Analyse</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -12240,7 +12672,7 @@
     <message>
         <location line="+5"/>
         <source>_Mode:</source>
-        <translation type="unfinished">_Modus:</translation>
+        <translation>_Modus:</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -12250,12 +12682,12 @@
     <message>
         <location line="+1"/>
         <source>_Order:</source>
-        <translation type="unfinished">_Reihenfolge:</translation>
+        <translation>_Reihenfolge:</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>yadif</source>
-        <translation type="unfinished">Yadif</translation>
+        <translation>Yadif</translation>
     </message>
 </context>
 </TS>

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_el.ts -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_el.ts Changed

@@ -4,14 +4,14 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
         <source>Attempt to open %s failed!</source>
-        <translation>Η προσπάθεια ανοίγματος του %s απέτυχε.</translation>
+        <translation>Η προσπάθεια ανοίγματος του %s απέτυχε!</translation>
     </message>
     <message>
         <location line="-36"/>
         <source>Cannot find a demuxer for %s</source>
-        <translation>Αδυναμία εύρεσης πολυαποπλέκτη για το %s</translation>
+        <translation>Αδυναμία εύρεσης αποπολυπλέκτη για το %s</translation>
     </message>
     <message>
         <location line="+64"/>
@@ -31,7 +31,7 @@
     <message>
         <location line="+3"/>
         <source>%sdifferent between first and this video stream</source>
-        <translation>%sδιαφορετικό μεταξύ της πρώτης και της παρούσας ροής βίντεου</translation>
+        <translation>%sδιαφορετικό μεταξύ της πρώτης και της παρούσας ροής βίντεο</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -48,25 +48,20 @@
         <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
-        <translation>Δεν μπορείς, ακόμη, να κάνεις μείξη βίντεων με διαφορετικές διαστάσεις. Η χρήση, αργότερα, του μερικού μεταμορφωτή βίντεου δεν θα λύσει, από διαφορετική διαδρομή, αυτό το πρόβλημα. Η λύση είναι:
-Πρώτα, «αλλαγή διαστάσεων» ή «προσθήκη ορίων» ή «περιτομή», του κάθε νήματος (βίντεου), ξεχωριστά, όλα, στις ίδιες διαστάσεις.
-Και μετά, ένωση των βίντεων.</translation>
+        <translation>Δεν μπορείτε να κάνετε μείξη βίντεο με διαφορετικές διαστάσεις. Η χρήση, αργότερα, του μερικού μεταμορφωτή βίντεο
+δεν θα λύσει, αυτό το πρόβλημα. Η λύση είναι:
+1) αλλαγή διαστάσεων/προσθήκη ορίων/περιτομή και αποθήκευση κάθε ροής βίντεο, ξεχωριστά
+2) συνένωση των βίντεο</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
         <source>Checking if timestamps are valid..</source>
         <translation>Ελέγχεται η εγκυρότητα των χρονοσφραγίδων...</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+47"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
-        <translation>Αυτό το βίντεο περιέχει Β΄-στιγμιότυπα.
-Αλλά, οι Χρονοσφραγίδες Παρουσίασης (PTS), είτε λείπουν, είτε αυξάνονται μονοτονικά.
-Το Αβιντεμιούξιο μπορεί να προσπαθήσει να ξαναχτίσει, σωστά, τις Χρονοσφραγίδες Παρουσίασης,
-αποκωδικοποιόντας ολόκληρο το βίντεο.
-Αυτό, όμως, μάλλον θα φάει πολλή ώρα.
-
-Να συνεχίσει;</translation>
+        <translation>Αυτό το βίντεο περιέχει Β-στιγμιότυπα αλλά, οι χρονοσφραγίδες παρουσίασης (PTS) είτε λείπουν, είτε αυξάνονται μονοτονικά.Το Avidemux μπορεί να προσπαθήσει να ξαναχτίσει σωστά τις χρονοσφραγίδες παρουσίασης αποκωδικοποιώντας ολόκληρο το βίντεο. Πρόκειται για μια χρονοφάγο εργασία. Να συνεχίσω;</translation>
     </message>
     <message>
         <location line="+31"/>
@@ -83,7 +78,12 @@
  you should keep them.
 Drop timing informations ?</source>
         <translation>Κάποιες πληροφορίες χρονισμού είναι εσφαλμένες.
-Αυτό συνέβη με κάποιο πρόγραμμα σύλληψης.</translation>
+Αυτό συμβαίνει με μερικά λογισμικά σύλληψης.
+Αν κάνετε επανακωδικοποίηση του βίντεο αγνοήστε αυτές τις πληροφορίες,
+διαφορετικά θα προκαλέσει αρρυθμίες στο βίντεο.
+Αν απλώς αντιγράφετε το βίντεο χωρίς επανακωδικοποίηση,
+θα πρέπει να τις κρατήσετε αυτές τις πληροφορίες χρονισμού.
+Να αγνοηθούν οι πληροφορίες χρονισμού;</translation>
     </message>
 </context>
 <context>
@@ -140,7 +140,7 @@
     <message>
         <location line="+54"/>
         <source>Medium:</source>
-        <translation>Μεσαίο:</translation>
+        <translation>Μέσο:</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -150,32 +150,32 @@
     <message>
         <location line="+15"/>
         <source>1 x 80 minute CD</source>
-        <translation>1 x 80 λεπτών ΣιΝτί</translation>
+        <translation>1 x 80 λεπτών CD</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>2 x 80 minute CD</source>
-        <translation>2 x 80 λεπτών ΣιΝτί</translation>
+        <translation>2 x 80 λεπτών CD</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>1 x 74 minute CD</source>
-        <translation>1 x 74 λεπτών ΣιΝτί</translation>
+        <translation>1 x 74 λεπτών CD</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>2 x 74 minute CD</source>
-        <translation>2 x 74 λεπτών ΣιΝτί</translation>
+        <translation>2 x 74 λεπτών CD</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>DVD-5</source>
-        <translation>ΝτιΒιΝτί-5</translation>
+        <translation>DVD-5</translation>
     </message>
     <message>
         <location line="+63"/>
         <source>Custom Size:</source>
-        <translation>Προσαρμοσμένο Μέγεθος:</translation>
+        <translation>Προσαρμοσμένο μέγεθος:</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -183,29 +183,29 @@
         <location line="+27"/>
         <location line="+34"/>
         <source>MB</source>
-        <translation>ΜέγαΜπάιτια</translation>
+        <translation>MB</translation>
     </message>
     <message>
         <location line="-217"/>
         <source>Audio Bitrate</source>
-        <translation>Μπιτιορυθμός Ήχου</translation>
+        <translation>Δυφιορυθμός ήχου</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Track 1:</source>
-        <translation>Κομμάτι 1:</translation>
+        <translation>Κανάλι 1:</translation>
     </message>
     <message>
         <location line="+14"/>
         <location line="+37"/>
         <location line="+232"/>
         <source>kbps</source>
-        <translation>χιλιομπιτιανάδευτ</translation>
+        <translation>kbps</translation>
     </message>
     <message>
         <location line="-246"/>
         <source>Track 2:</source>
-        <translation>Κομμάτι 2:</translation>
+        <translation>Κανάλι 2:</translation>
     </message>
     <message>
         <location line="+39"/>
@@ -215,27 +215,27 @@
     <message>
         <location line="+28"/>
         <source>Audio Size:</source>
-        <translation>Μέγεθος του Ήχου:</translation>
+        <translation>Μέγεθος του ήχου:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Video Size:</source>
-        <translation>Μέγεθος του Βίντεου:</translation>
+        <translation>Μέγεθος του βίντεο:</translation>
     </message>
     <message>
         <location line="+61"/>
         <source>Total Size:</source>
-        <translation>Συνολικό Μέγεθος:</translation>
+        <translation>Συνολικό μέγεθος:</translation>
     </message>
     <message>
         <location line="+120"/>
         <source>Bits Per Pixel:</source>
-        <translation>Μπίτια Ανά Εικονοστοιχείο:</translation>
+        <translation>Δυφία ανά εικονοστοιχείο:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Video Bitrate:</source>
-        <translation>Ρυθμός Μπιτιών Βίντεου:</translation>
+        <translation>Δυφιορυθμός βίντεο:</translation>
     </message>
     <message>
         <location line="+61"/>
@@ -258,7 +258,7 @@
     <message>
         <location line="+1"/>
         <source>Time Left : Infinity</source>
-        <translation>Απομείναντας Χρόνος: Άπειρο</translation>
+        <translation>Εναπομένων χρόνος: Άπειρο</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -274,7 +274,7 @@
         <location line="+41"/>
         <location line="+41"/>
         <source>Configure</source>
-        <translation>Ρύθμιση</translation>
+        <translation>Διαμόρφωση</translation>
     </message>
     <message>
         <location line="-116"/>
@@ -287,12 +287,12 @@
     <message>
         <location line="-164"/>
         <source>Audio Tracks Configuration</source>
-        <translation>Ρύθμιση Καναλιών Ήχου</translation>
+        <translation>Ρύθμιση καναλιών ήχου</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Track 1</source>
-        <translation>Κομμάτι 1</translation>
+        <translation>Κανάλι 1</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -305,17 +305,17 @@
     <message>
         <location line="-89"/>
         <source>Track 2</source>
-        <translation>Κομμάτι 2</translation>
+        <translation>Κανάλι 2</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Track 3</source>
-        <translation>Κομμάτι 3</translation>
+        <translation>Κανάλι 3</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Track 4</source>
-        <translation>Κομμάτι 4</translation>
+        <translation>Κανάλι 4</translation>
     </message>
 </context>
 <context>
@@ -323,12 +323,12 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_ocr/ocr.ui" line="+47"/>
         <source>Skip Glyph</source>
-        <translation>Παράβλεψη Ανάγλυφου</translation>
+        <translation>Παράβλεψη της γλύφου</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Ignore</source>
-        <translation>Αγνόησε</translation>
+        <translation>Αγνόηση</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -343,7 +343,7 @@
     <message>
         <location line="+7"/>
         <source>Timecode:</source>
-        <translation>Χρονοκώδικας:</translation>
+        <translation>Χρονοδείκτης:</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -358,12 +358,12 @@
     <message>
         <location line="+20"/>
         <source>Calibrate</source>
-        <translation>Ζυγοστάθμιση</translation>
+        <translation>Βαθμονόμηση</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Skip All</source>
-        <translation>Παράβλεψη Όλων</translation>
+        <translation>Παράλειψη όλων</translation>
     </message>
     <message>
         <location line="+52"/>
@@ -373,35 +373,35 @@
     <message>
         <location line="+31"/>
         <source>Nb Lines :</source>
-        <translation>Πλήθος Γραμμών:</translation>
+        <translation>Πλήθος γραμμών:</translation>
     </message>
 </context>
 <context>
     <name>DialogProcessing</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+26"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+33"/>
         <source>00:00:00</source>
         <translation>00:00:00</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+51"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="-19"/>
+        <location line="-70"/>
         <source>Dialog</source>
         <translation>Διάλογος</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+6"/>
         <source>TimeLeft</source>
-        <translation>ΑπομείνανταςΧρόνος</translation>
+        <translation>Εναπομένων χρόνος</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+41"/>
         <source>ProcessImages</source>
-        <translation>ΕπεξεργασίαΕικόνων</translation>
+        <translation>Επεξεργασμένες εικόνες</translation>
     </message>
     <message>
         <location line="-7"/>
@@ -409,9 +409,9 @@
         <translation>Ταχύτητα</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-14"/>
         <source>0 fps</source>
-        <translation>0 στιγ.ανάδευτ.</translation>
+        <translation>0 fps</translation>
     </message>
 </context>
 <context>
@@ -434,41 +434,39 @@
     <message>
         <location line="+13"/>
         <source>Current job</source>
-        <translation>Τωρινή διαδικασία</translation>
+        <translation>Τρέχουσα διαδικασία</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>File being written </source>
-        <translation>Γράφεται το αρχείο </translation>
+        <translation>Εγγραφή στο αρχείο </translation>
     </message>
 </context>
 <context>
     <name>FDK-AAC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
-        <source>_Profile::</source>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
         <translation>_Προφίλ:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+9"/>
         <source>_Bitrate:</source>
-        <translation>Ρυθμός _Μπιτιών:</translation>
+        <translation>_Δυφιορυθμός:</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+2"/>
         <source>SBR enabled</source>
         <translation>Ενεργό το SBR</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+7"/>
-        <source>After burner</source>
-        <translation>Μετάκαυση</translation>
+        <location line="+2"/>
+        <source>Afterburner</source>
+        <translation>Afterburner</translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>FDK-AAC Configuration</source>
         <translation>Ρύθμιση FDK-AAC</translation>
     </message>
@@ -595,7 +593,12 @@
         <translation>&amp;Μετάβαση</translation>
     </message>
     <message>
-        <location line="+1544"/>
+        <location line="+408"/>
+        <source> (0 tracks)</source>
+        <translation> (0 κανάλια)</translation>
+    </message>
+    <message>
+        <location line="+1136"/>
         <source>&amp;Open...</source>
         <translation>Άν&amp;οιγμα...</translation>
     </message>
@@ -605,62 +608,59 @@
         <translation>&amp;Πληροφορίες...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Alt+Return</source>
-        <translation>Alt+Return</translation>
+        <translation type="vanished">Alt+Return</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Save &amp;Video...</source>
-        <translation>Αποθήκευση του &amp;Βίντεου...</translation>
+        <translation>Αποθήκευση του &amp;βίντεο...</translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+3"/>
         <source>Save Video</source>
-        <translation>Αποθήκευση του Βίντεου</translation>
+        <translation>Αποθήκευση του βίντεο</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>&amp;Load/Run Project...</source>
-        <translation>&amp;Φόρτωση ή Τρέξιμο Εργασίας...</translation>
+        <translation>&amp;Φόρτωση/εκτέλεση εργασίας...</translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+3"/>
         <source>Load/Run Project</source>
-        <translation>Φόρτωση ή Τρέξιμο Εργασίας</translation>
+        <translation>Φόρτωση/εκτέλεση εργασίας</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Save &amp;Project</source>
-        <translation>Αποθήκευση της &amp;Εργασίας</translation>
+        <translation>Αποθήκευση της &amp;εργασίας</translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+3"/>
         <source>Save Project</source>
-        <translation>Αποθήκευση της Εργασίας</translation>
+        <translation>Αποθήκευση της εργασίας</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+69"/>
         <source>Ctrl+Alt+S</source>
         <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location line="-72"/>
         <source>&amp;Calculator...</source>
-        <translation> &amp;Υπολογιστής...</translation>
+        <translation type="vanished">&amp;Υπολογιστής...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>F7</source>
-        <translation>F7</translation>
+        <translation type="vanished">F7</translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <location line="-1097"/>
         <source>ms</source>
-        <translation>χιλ.τουδευτ.</translation>
+        <translation>ms</translation>
     </message>
     <message>
         <location line="+764"/>
@@ -673,14 +673,14 @@
         <translation>Β:</translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+272"/>
         <source>&amp;Input</source>
-        <translation>Δεδομένα Ε&amp;ισόδου</translation>
+        <translation>Δεδομένα ει&amp;σόδου</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>&amp;Output</source>
-        <translation>Δεδ&amp;ομένα Εξόδου</translation>
+        <translation>Δεδομένα ε&amp;ξόδου</translation>
     </message>
     <message>
         <location line="+106"/>
@@ -693,9 +693,9 @@
         <translation>&amp;Κορυφή</translation>
     </message>
     <message>
-        <location line="-1650"/>
+        <location line="-1635"/>
         <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Αποκωδικοποιητής Βίντεου&lt;b&gt;</translation>
+        <translation>&lt;b&gt;Αποκωδικοποιητής βίντεο&lt;/b&gt;</translation>
     </message>
     <message>
         <location line="+1126"/>
@@ -703,14 +703,14 @@
         <translation>Τύπος στιγμιότυπου:</translation>
     </message>
     <message>
-        <location line="+512"/>
+        <location line="+497"/>
         <source>&amp;Separate</source>
         <translation>Δια&amp;χωρισμός</translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1744"/>
         <source>&amp;Toolbars</source>
-        <translation>&amp;Γραμμές εργαλείων</translation>
+        <translation>&amp;Εργαλειοθήκες</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -725,7 +725,7 @@
     <message>
         <location line="+46"/>
         <source>Codec O&amp;ptions</source>
-        <translation>Ε&amp;πιλογές Κώδικα</translation>
+        <translation>Ε&amp;πιλογές κωδικοποιητή</translation>
     </message>
     <message>
         <location line="+108"/>
@@ -736,31 +736,26 @@
     <message>
         <location line="+57"/>
         <source>&lt;b&gt;Video Output&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Έξοδος Βίντεου&lt;/b&gt;</translation>
+        <translation>&lt;b&gt;Έξοδος βίντεο&lt;/b&gt;</translation>
     </message>
     <message>
         <location line="+160"/>
         <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Έξοδος Ήχου&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>   (0 track(s))</source>
-        <translation>   (κανάλια:0)</translation>
+        <translation>&lt;b&gt;Έξοδος ήχου&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+222"/>
         <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Μορφή Εξόδου&lt;/b&gt;</translation>
+        <translation>&lt;b&gt;Μορφή εξόδου&lt;/b&gt;</translation>
     </message>
     <message>
         <location line="+114"/>
-        <location line="+946"/>
+        <location line="+931"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Πλοήγηση</translation>
     </message>
     <message>
-        <location line="-871"/>
+        <location line="-856"/>
         <source>Play [SPACE]</source>
         <translation>Αναπαραγωγή [ΔΙΑΣΤΗΜΑ]</translation>
     </message>
@@ -792,12 +787,12 @@
     <message>
         <location line="+23"/>
         <source>Set start marker [CTRL+PAGEUP]</source>
-        <translation>Όρισε των δείκτη αρχής [CTRL+PAGEUP]</translation>
+        <translation>Ορίστε τον σημαδευτή αρχής [CTRL+PAGEUP]</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Set end marker [CTRL+PAGEDOWN]</source>
-        <translation>Όρισε των δείκτη τέλους [CTRL+PAGEDOWN]</translation>
+        <translation>Ορίστε τον σημαδευτή τέλους [CTRL+PAGEDOWN]</translation>
     </message>
     <message>
         <location line="+26"/>
@@ -822,7 +817,7 @@
     <message>
         <location line="+23"/>
         <source>Backward one minute [CTRL+DOWN]</source>
-        <translation>Προς τα πίσω για ένα λεπτό [CTRL+DOWN]</translation>
+        <translation>Προς τα πίσω κατά ένα λεπτό [CTRL+DOWN]</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -842,20 +837,20 @@
     <message>
         <location line="+87"/>
         <source>Go to marker A [PAGE UP]</source>
-        <translation>Μετάβαση στο δείκτη Α΄ [PAGE UP]</translation>
+        <translation>Μετάβαση στον σημαδευτή Α [PAGE UP]</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Go to Marker B [PAGE DOWN]</source>
-        <translation>Μετάβαση στο Δείκτη Β΄ [PAGE DOWN]</translation>
+        <translation>Μετάβαση στον σημαδευτή Β [PAGE DOWN]</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+210"/>
         <source>Play filtered</source>
         <translation>Αναπαραγωγή του μεταμορφωμένου</translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-169"/>
         <source>Vol&amp;ume</source>
         <translation>Έντασ&amp;η</translation>
     </message>
@@ -867,17 +862,17 @@
     <message>
         <location line="+114"/>
         <source>Audio &amp;Metre</source>
-        <translation>Ήχος και &amp;Μετρητής</translation>
+        <translation>&amp;Μετρητής ήχου</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>Open Video</source>
-        <translation>Άνοιγμα Βίντεου</translation>
+        <translation>Άνοιγμα βίντεο</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+104"/>
         <source>&amp;Codec Options</source>
-        <translation>Επιλογές &amp;Κώδικα</translation>
+        <translation>Επιλογές &amp;κωδικοποιητή</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -907,7 +902,7 @@
     <message>
         <location line="+11"/>
         <source>&amp;Audio Metre</source>
-        <translation>Μετρητής &amp;Ήχου</translation>
+        <translation>Μετρητής &amp;ήχου</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -918,9 +913,9 @@
 <context>
     <name>Opus</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
-        <translation>Ρυθμός _Μπιτιών:</translation>
+        <translation>_Δυφιορυθμός:</translation>
     </message>
 </context>
 <context>
@@ -933,17 +928,16 @@
     <message>
         <location line="+32"/>
         <source>Clear</source>
-        <translation>Καθάρισμα</translation>
+        <translation>Εκκαθάριση</translation>
     </message>
     <message>
         <location line="+40"/>
         <source>Evaluate</source>
-        <translation>Εκτίμηση</translation>
+        <translation>Υπολογισμός</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Ctrl+Return</source>
-        <translation>Ctrl+Επιστροφή</translation>
+        <translation type="vanished">Ctrl+Return</translation>
     </message>
 </context>
 <context>
@@ -956,12 +950,12 @@
     <message>
         <location line="+12"/>
         <source>Select VS file</source>
-        <translation>Επέλεξε αρχείο VS</translation>
+        <translation>Επιλέξτε αρχείο VS</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Port to use: </source>
-        <translation>Θύρα για χρήση:</translation>
+        <translation>Θύρα προς χρήση: </translation>
     </message>
     <message>
         <location line="+24"/>
@@ -982,12 +976,11 @@
         <translation>Σχετικά με το Avidemux</translation>
     </message>
     <message>
-        <location line="+122"/>
         <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
-        <translation>© 2001 - 2019  Μυιν (Mean) / Eumagga0x2a</translation>
+        <translation type="vanished">© 2001 - 2019  Mean / Eumagga0x2a</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+141"/>
         <source>http://www.avidemux.org</source>
         <translation>http://www.avidemux.org</translation>
     </message>
@@ -999,12 +992,17 @@
     <message>
         <location line="+19"/>
         <source>Multi-platform Video Editor</source>
-        <translation>Πολλαπλών Πλατφορμών Επεξεργαστής Βίντεων</translation>
+        <translation>Επεξεργαστής βίντεο πολλαπλών πλατυβάθρων</translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+10"/>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
         <source>&amp;License</source>
-        <translation>&amp;Άδεια</translation>
+        <translation>&amp;Άδεια χρήσης</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -1038,7 +1036,7 @@
         <location line="+3"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h" line="+42"/>
         <source>Add Borders</source>
-        <translation>Προσθήκη Ορίων</translation>
+        <translation>Προσθήκη ορίων</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1048,7 +1046,7 @@
     <message>
         <location line="+0"/>
         <source>All parameters must be even and within range.</source>
-        <translation>Όλες οι παράμετροι πρέπει να είναι ζυγοί αριθμοί και μέσα στα όρια.</translation>
+        <translation>Όλες οι παράμετροι πρέπει να είναι ζυγοί αριθμοί και μέσα στο εύρος.</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h" line="+1"/>
@@ -1059,34 +1057,34 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
         <source>Decode video using DXVA2 (windows)</source>
-        <translation>Αποκωδικοποίηση του βίντεου με τη χρήση DXVA2 (windows)</translation>
+        <translation>Αποκωδικοποίηση του βίντεο με τη χρήση DXVA2 (windows)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ignore driver blacklist (Intel)</source>
-        <translation type="unfinished"></translation>
+        <translation>Αγνόηση της μαύρης λίστας του οδηγού (Intel)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
-        <translation type="unfinished"></translation>
+        <translation>Αγνόηση της μαύρης λίστας του κωδικοποιητή (Intel, HEVC 10bit)</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>_Revert to saved default output settings on video load</source>
-        <translation>_Επαναφορά στις προεπιλεγμένες ρυθμίσεις εξόδου του βίντεου, κατά τη φόρτωση του αρχείου</translation>
+        <translation>_Επαναφορά στις προεπιλεγμένες ρυθμίσεις εξόδου του βίντεο, κατά τη φόρτωση του αρχείου</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Enable alternative keyboard shortcuts</source>
-        <translation>_Ενεργοποίηση εναλλακτικών συντομεύσεων πληκτρολογίου</translation>
+        <translation>_Ενεργοποίηση των εναλλακτικών συντομεύσεων πληκτρολογίου</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Re_verse UP and DOWN arrow keys for navigation</source>
-        <translation>Αντιστροφή τ_ων πλήκτρων ΠΑΝΩ και ΚΑΤΩ βελών, για την πλοήγηση</translation>
+        <translation>_Αντιστροφή των πλήκτρων ΠΑΝΩ και ΚΑΤΩ βελών, για την πλοήγηση</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1141,12 +1139,12 @@
     <message>
         <location line="+21"/>
         <source>_lavc threads:</source>
-        <translation>_Lavc κλωστές:</translation>
+        <translation>_Νήματα lavc:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Multi-threading</source>
-        <translation>Πολυγνέσιμο</translation>
+        <translation>Πολυνημάτωση</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1157,7 +1155,7 @@
     <message>
         <location line="+1"/>
         <source>Above normal</source>
-        <translation>Πάνω από το Κανονικό</translation>
+        <translation>Πάνω από το κανονικό</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1167,7 +1165,7 @@
     <message>
         <location line="+1"/>
         <source>Below normal</source>
-        <translation>Κάτω από το Κανονικό</translation>
+        <translation>Κάτω από το κανονικό</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1178,52 +1176,62 @@
     <message>
         <location line="+2"/>
         <source>_Encoding priority:</source>
-        <translation>Προτ_εραιότητα της κωδικοποίησης:</translation>
+        <translation>Προτεραιότητα της _κωδικοποίησης:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Indexing/unpacking priority:</source>
-        <translation>Προτερα_ιότητα της δημιουργίας ευρετηρίου και του απο-πακεταρίσματος:</translation>
+        <translation>Προτεραιότητα της _δεικτοδότησης/αποσυμπίεσης:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Playback priority:</source>
-        <translation>Προτεραιότητα της ανα_παραγωγής:</translation>
+        <translation>Προτεραιότητα της _αναπαραγωγής:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Prioritisation</source>
-        <translation>Ορισμός Προτεραιοτήτων</translation>
+        <translation>Ορισμός προτεραιοτήτων</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
-        <translation>_Προεπιλογή, για αποθήκευση, στον κατάλογο του τελευταίου διαβασμένου αρχείου</translation>
+        <translation>_Χρήση του καταλόγου του τελευταίως αναγνωσμένου αρχείου ως του καταλόγου αποθήκευσης εξ ορισμού</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Auto-Append Settings</source>
+        <translation>Ρυθμίσεις αυτόματης προσάρτησης</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
-        <translation>Εξυγίαν_ση των Στιγμιότυπων Αποκωδικοποίησης (DTS), όταν λειτουργεί σε κατάσταση αντιγραφής</translation>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
+        <translation>_Χρήση προσαρμοσμένου μεγέθους τμημάτων για αυτόματη προσάρτηση των αρχείων MPEG-TS</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation>_Μέγεθος τμήματος:</translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Caching of decoded pictures</source>
-        <translation type="unfinished"></translation>
+        <translation>Προσωρινή μνήμη αποκωδικοποιημένων εικόνων</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Cache size:</source>
-        <translation type="unfinished"></translation>
+        <translation>_Μέγεθος προσωρινής μνήμης:</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>XVideo (best)</source>
-        <translation>XVideo (καλύτερη)</translation>
+        <translation>XVideo (κάλλιστη)</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>DXVA2 (best)</source>
-        <translation>DXVA2 (καλύτερη)</translation>
+        <translation>DXVA2 (κάλλιστη)</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -1233,22 +1241,22 @@
     <message>
         <location line="+3"/>
         <source>Video _display:</source>
-        <translation>_Προβολή του βίντεου:</translation>
+        <translation>_Προβολή του βίντεο:</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>No alerts</source>
-        <translation>Χωρίς ειδοποιήσεις</translation>
+        <translation>Χωρίς προειδοποιήσεις</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Display only error alerts</source>
-        <translation>Προβολή μόνο των ειδοποιήσεων σφαλμάτων</translation>
+        <translation>Προβολή μόνο των προειδοποιήσεων σφαλμάτων</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Display all alerts</source>
-        <translation>Προβολή όλων των ειδοποιήσεων</translation>
+        <translation>Προβολή όλων των προειδοποιήσεων</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -1257,7 +1265,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+213"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
         <translation>PCM</translation>
     </message>
@@ -1274,7 +1282,7 @@
     <message>
         <location line="+5"/>
         <source>No downmixing</source>
-        <translation>Χωρίς σύμπτυξη καναλιών</translation>
+        <translation>Χωρίς σύμπτυξη καναλιών (downmixing)</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+49"/>
@@ -1295,12 +1303,12 @@
     <message>
         <location line="+2"/>
         <source>_Local playback downmixing:</source>
-        <translation>_Σύμπτυξη καναλιών τοπικής αναπαραγωγής:</translation>
+        <translation>_Σύμπτυξη καναλιών (downmixing) τοπικής αναπαραγωγής:</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>De_ringing</source>
-        <translation>Αφαί_ρεση δακτυλιδιών</translation>
+        <translation>Αφαί_ρεση δακτυλιδιών (Deringing)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1310,12 +1318,12 @@
     <message>
         <location line="+1"/>
         <source>Default Postprocessing</source>
-        <translation>Προεπιλεγμένη Μετεπεξεργασία</translation>
+        <translation>Προεπιλεγμένη μεταεπεξεργασία</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>User Interface</source>
-        <translation>Περιβάλλον Χρήσης</translation>
+        <translation>Περιβάλλον χρήστη</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -1329,18 +1337,18 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+277"/>
+        <location line="+283"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+423"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
         <source>Audio</source>
         <translation>Ήχος</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-73"/>
+        <location filename="../../common/gui_savenew.cpp" line="-239"/>
+        <location line="+170"/>
         <location line="+12"/>
         <location line="+16"/>
-        <location line="+8"/>
         <source>Video</source>
         <translation>Βίντεο</translation>
     </message>
@@ -1348,7 +1356,7 @@
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
         <source>CPU</source>
-        <translation>Κεντρικός Επεξεργαστής</translation>
+        <translation>CPU</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+15"/>
@@ -1357,10 +1365,6 @@
         <translation>Προτιμήσεις</translation>
     </message>
     <message>
-        <source>-</source>
-        <translation type="vanished">-</translation>
-    </message>
-    <message>
         <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+49"/>
         <source>Connect to avsproxy</source>
         <translation>Σύνδεση στο avsproxy</translation>
@@ -1373,15 +1377,15 @@
     <message>
         <location line="+8"/>
         <source>Set Marker A</source>
-        <translation>Όρισε το Δείκτη Α΄</translation>
+        <translation>Ορίστε τον σημαδευτή Α</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Set Marker B</source>
-        <translation>Όρισε το Δείκτη Β΄</translation>
+        <translation>Ορίστε τον σημαδευτή Β</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+18"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation>Μεταμορφωτές</translation>
@@ -1389,27 +1393,27 @@
     <message>
         <location line="+22"/>
         <source>Play/Stop</source>
-        <translation>Αναπαραγωγή / Σταμάτημα</translation>
+        <translation>Εκτέλεση/Διακοπή</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Previous Black Frame</source>
-        <translation>Προηγούμενο Μαύρο Στιγμιότυπο</translation>
+        <translation>Προηγούμενο μαύρο στιγμιότυπο</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Next Black Frame</source>
-        <translation>Επόμενο Μαύρο Στιγμιότυπο</translation>
+        <translation>Επόμενο μαύρο στιγμιότυπο</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-15"/>
         <source>R_esampling (Hz):</source>
-        <translation>Ε_παναδειγματοληψία (Χερτζ):</translation>
+        <translation>Ε_παναδειγματοληψία (Hz):</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Resampling frequency (Hz)</source>
-        <translation>Συχνότητα επανακωδικοποίησης (Χερτζ)</translation>
+        <translation>Συχνότητα επαναδειγματοληψίας (Hz)</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1461,7 +1465,7 @@
     <message>
         <location line="+1"/>
         <source>Stereo front+stereo rear</source>
-        <translation>Στερεοφωνικός εμπρός + στερεοφωνικό πίσω</translation>
+        <translation>Στερεοφωνικός εμπρός + στερεοφωνικός πίσω</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1486,12 +1490,12 @@
     <message>
         <location line="+11"/>
         <source>_Gain mode:</source>
-        <translation>Κατάσταση λειτουργίας του _κέρδους:</translation>
+        <translation>Λειτουργία _απολαβής:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>G_ain value:</source>
-        <translation>Τιμή του _κέρδους:</translation>
+        <translation>Τιμή της _απολαβής:</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -1501,12 +1505,12 @@
     <message>
         <location line="+13"/>
         <source>Audio Filters</source>
-        <translation>Μεταμορφωτές Ήχου</translation>
+        <translation>Μεταμορφωτές ήχου</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-16"/>
         <source>Fontconfig</source>
-        <translation>Ρύθμιση γραμματοσειράς (Fontconfig)</translation>
+        <translation>Fontconfig</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -1541,7 +1545,7 @@
     <message>
         <location line="+5"/>
         <source>Built-in Support</source>
-        <translation>Ενσωματωμένη Υποστήριξη</translation>
+        <translation>Ενσωματωμένη υποστήριξη</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="+8"/>
@@ -1562,53 +1566,55 @@
         <location line="+27"/>
         <location line="+35"/>
         <source>Codec Error</source>
-        <translation>Σφάλμα Κώδικα</translation>
+        <translation>Σφάλμα κωδικοποιητή</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+369"/>
+        <location filename="../../common/gui_main.cpp" line="+370"/>
         <source>Not coded in this version</source>
         <translation>Δεν κωδικοποιήθηκε σε αυτή την έκδοση</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+214"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>Αυτό το βίντεο χρησιμοποιεί μη IDR σημεία επαναφοράς αντί για IDR ως κλειδοστιγμιότυπα. Η επαναταξινόμηση εικόνων στη ροή του βίντεο δεν είναι αρχικοποιημένη σε μη IDR στιγμιότυπα. Τα σημεία αποκοπής της επικολλημένης επιλογής μπορεί να προκαλέσουν διακοπές στην αναπαραγωγή λόγω της αντιστραμμένης σειράς προβολής των στιγμιότυπων αν αποθηκευθεί σε λειτουργία αντιγραφής.
+Να συνεχίσω ούτως ή άλλως;</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Codec or codec settings across a cut point of the pasted video do not match.
 Playback of the video saved in copy mode may stop at this point.
 Proceed anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>Ο αποκωδικοποιητής ή οι ρυθμίσεις του αποκωδικοποιητή δια μέσου ενός σημείου αποκοπής του επικολλημένου βίντεο δεν ταιριάζουν.
+Η αναπαραγωγή του βίντεο αποθηκευμένου σε λειτουργία αντιγραφής μπορεί να διακοπεί σε αυτό το σημείο.
+Να συνεχίσω ούτως ή άλλως;</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Cut points of the pasted video could not be checked. This indicates an issue with a source video, the state of editing or a bug in the program. Please check the application log file or console output for details.
 Try anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>Τα σημεία αποκοπής του επικολλημένου βίντεο δεν μπόρεσαν να ελεγχθούν. Αυτό δείχνει ότι υπάρχει ένα πρόβλημα με το πηγαίο βίντεο, την κατάσταση επεξεργασίας ή ένα σφάλμα στο πρόγραμμα. Παρακαλώ ελέγξτε το αρχείο καταγραφών της εφαρμογής ή την έξοδο του τερματικού για τις λεπτομέρειες.
+Να γίνει προσπάθεια ούτως ή άλλως;</translation>
     </message>
     <message>
         <location line="+60"/>
         <source>Are you sure?</source>
-        <translation>Στα σίγουρα;</translation>
+        <translation>Είστε σίγουρος/η;</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>It is impossible to cut out the entire video. Please recheck the position of markers A and B.</source>
-        <translation>Είναι αδύνατη η αποκοπή ολόκληρου του βίντεου. 
-Παρακαλώ, έλεγξε, ξανά, τις θέσεις των δεικτών Α και Β.</translation>
+        <translation>Αδύνατη η αποκοπή ολόκληρου του βίντεο. Παρακαλώ, ελέγξτε ξανά τις θέσεις των σημαδευτών Α και Β.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Deleting</source>
-        <translation>Διαγράφει</translation>
+        <translation>Γίνεται διαγραφή</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>It is impossible to delete the entire video. Please recheck the position of markers A and B.</source>
-        <translation>Είναι αδύνατη η διαγραφή ολόκληρου του βίντεου. 
-Παρακαλώ, έλεγξε, ξανά, τις θέσεις των δεικτών Α και Β.</translation>
+        <translation>Είναι αδύνατη η διαγραφή ολόκληρου του βίντεο. Παρακαλώ, ελέγξτε ξανά τις θέσεις των σημαδευτών Α και Β.</translation>
     </message>
     <message>
         <location line="+30"/>
@@ -1616,52 +1622,59 @@
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
         <translation>Το τελικό σημείο της αποκοπής δεν είναι σε κλειδοστιγμιότυπο.
-Όταν το βίντεο θα αποθηκευθεί σε κατάστσαης λειτουργίας αντιγραφής,
-θα είναι φθαρμένο σε αυτό το σημείο.
+Όταν το βίντεο θα αποθηκευθεί σε λειτουργία αντιγραφής,
+θα είναι κατεστραμμένο σε αυτό το σημείο.
 
-Να συνεχιστεί, έτσι κι αλλιώς;</translation>
+Να συνεχίσω ούτως ή άλλως;</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>The end point of the deletion is not on a keyframe.
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
-        <translation>Το τελικό σημείο της διαγρφής δεν είναι σε κλειδοστιγμιότυπο.
-Όταν το βίντεο θα αποθηκευθεί σε κατάστσαης λειτουργίας αντιγραφής,
-θα είναι φθαρμένο σε αυτό το σημείο.
+        <translation>Το τελικό σημείο της διαγραφής δεν είναι σε κλειδοστιγμιότυπο.
+Όταν το βίντεο θα αποθηκευθεί σε λειτουργία αντιγραφής,
+θα είναι κατεστραμμένο σε αυτό το σημείο.
 
-Να συνεχιστεί, έτσι κι αλλιώς;</translation>
+Να συνεχίσω ούτως ή άλλως;</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the cut may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>Αυτό το βίντεο χρησιμοποιεί μη IDR σημεία επαναφοράς αντί για IDR ως κλειδοστιγμιότυπα. Η επαναταξινόμηση εικόνων στη ροή του βίντεο δεν είναι αρχικοποιημένη σε μη IDR στιγμιότυπα. Τα επιλεγμένα σημεία αρχής και τέλους της αποκοπής μπορεί να προκαλέσουν διακοπές στην αναπαραγωγή λόγω της αντιστραμμένης σειράς προβολής των στιγμιότυπων αν αποθηκευθεί σε λειτουργία αντιγραφής.
+Να συνεχίσω ούτως ή άλλως;</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the deletion may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>Αυτό το βίντεο χρησιμοποιεί μη IDR σημεία επαναφοράς αντί για IDR ως κλειδοστιγμιότυπα. Η επαναταξινόμηση εικόνων στη ροή του βίντεο δεν είναι αρχικοποιημένη σε μη IDR στιγμιότυπα. Τα επιλεγμένα σημεία αρχής και τέλους της διαγραφής μπορεί να προκαλέσουν διακοπές στην αναπαραγωγή λόγω της αντιστραμμένης σειράς προβολής των στιγμιότυπων αν αποθηκευθεί σε λειτουργία αντιγραφής.
+Να συνεχίσω ούτως ή άλλως;</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Codec or codec settings across the cut do not match. Playback of the video saved in copy mode may stop at this point.
 Proceed anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>Ο αποκωδικοποιητής ή οι ρυθμίσεις του αποκωδικοποιητή δια μέσου της αποκοπής δεν ταιριάζουν.
+Η αναπαραγωγή του βίντεο αποθηκευμένου σε λειτουργία αντιγραφής μπορεί να διακοπεί σε αυτό το σημείο.
+Να συνεχίσω ούτως ή άλλως;</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Codec or codec settings across the deletion do not match. Playback of the video saved in copy mode may stop at this point.
 Proceed anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>Ο αποκωδικοποιητής ή οι ρυθμίσεις του αποκωδικοποιητή δια μέσου της διαγραφής δεν ταιριάζουν.
+Η αναπαραγωγή του βίντεο αποθηκευμένου σε λειτουργία αντιγραφής μπορεί να διακοπεί σε αυτό το σημείο.
+Να συνεχίσω ούτως ή άλλως;</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Cut points could not be checked.
 This indicates an issue with a source video, the state of editing or a bug in the program. Please check the application log file or console output for details.
 Proceed anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>Τα σημεία αποκοπής δεν μπόρεσαν να ελεγχθούν. Αυτό δείχνει ότι υπάρχει ένα πρόβλημα με το πηγαίο βίντεο, την κατάσταση επεξεργασίας ή ένα σφάλμα στο πρόγραμμα. Παρακαλώ ελέγξτε το αρχείο καταγραφών της εφαρμογής ή την έξοδο του τερματικού για τις λεπτομέρειες.
+Να συνεχίσω ούτως ή άλλως;</translation>
     </message>
     <message>
         <location line="+103"/>
@@ -1671,8 +1684,7 @@
     <message>
         <location line="+0"/>
         <source>Cannot open &quot;%s&quot;.</source>
-        <translation>Αδυναμία ανοίγματος του
- &quot;%s&quot; .</translation>
+        <translation>Αδυναμία ανοίγματος του &quot;%s&quot; .</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1692,7 +1704,7 @@
     <message>
         <location line="+1"/>
         <source>Try &apos;File&apos; -&gt; &apos;Load/Run Project...&apos;</source>
-        <translation>Δοκίμασε «Αρχείο» --&gt; «Φόρτωση ή Τρέξιμο Εργασίας...»</translation>
+        <translation>Δοκιμάστε &apos;Αρχείο&apos; --&gt; &apos;Φόρτωση/εκτέλεση εργασίας...&apos;</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1702,23 +1714,22 @@
     <message>
         <location line="+55"/>
         <source>Multiple Audio Tracks</source>
-        <translation>Πολλαπλά Κανάλια Ήχου</translation>
+        <translation>Πολλαπλά κανάλια ήχου</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>The file you just loaded contains several audio tracks.
 Go to Audio-&gt;MainTrack to select the active one.</source>
         <translation>Το αρχείο που μόλις φορτώθηκε περιέχει διάφορα κανάλια ήχου.
-Πήγαινε στο «Ήχος» -&gt; «ΚύριοΚανάλι» για να επιλέξεις ποιο θα είναι ενεργό.</translation>
+Μεταβείτε στο Ήχος -&gt; Κύριο Κανάλι για να επιλέξετε ποιο θα είναι ενεργό.</translation>
     </message>
     <message>
         <location line="+106"/>
         <source>Something failed when appending</source>
-        <translation>Κάτι απέτυχε στην προσκόλληση</translation>
+        <translation>Κάτι απέτυχε στην προσάρτηση</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+321"/>
+        <location line="+320"/>
         <source>Something bad happened (II)</source>
         <translation>Κάτι στραβό συνέβη (II)</translation>
     </message>
@@ -1728,7 +1739,7 @@
         <source>The tinypy plugin is missing.
 Expect problems.</source>
         <translation>Λείπει το ένθεμα tinypy.
-Αναμένωνται προβλήματα.</translation>
+Αναμένονται προβλήματα.</translation>
     </message>
     <message>
         <location line="+103"/>
@@ -1748,7 +1759,7 @@
     <message>
         <location line="+16"/>
         <source>Marker A &gt; B</source>
-        <translation>Δείκτης Α &gt; B</translation>
+        <translation>Σημαδευτής Α &gt; B</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -1758,7 +1769,7 @@
     <message>
         <location line="+5"/>
         <source>You can&apos;t remove all frames</source>
-        <translation>Δεν μπορείς να μετακινήσεις όλα τα στιγμιότυπα</translation>
+        <translation>Δεν μπορείτε να αφαιρέσετε όλα τα στιγμιότυπα</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -1769,15 +1780,15 @@
     <message>
         <location line="+88"/>
         <source>_Track from video:</source>
-        <translation>_Κανάλι από το βίντεο</translation>
+        <translation>_Κανάλι από το βίντεο:</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Main Audio Track</source>
-        <translation>Κύριο Κανάλι Ήχου</translation>
+        <translation>Κύριο κανάλι ήχου</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+264"/>
         <source>AvsProxy</source>
         <translation>AvsProxy</translation>
     </message>
@@ -1807,43 +1818,43 @@
     <message>
         <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+36"/>
         <source>Go to Time</source>
-        <translation>Μετάβαση στο Χρόνο</translation>
+        <translation>Μετάβαση στον χρόνο</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+27"/>
         <source>_Filter strength:</source>
-        <translation>Ένταση _μεταμορφωτή:</translation>
+        <translation>Ισχύς _μεταμορφωτή:</translation>
     </message>
     <message>
         <location filename="../../common/gui_save.cpp" line="-228"/>
         <source>Select Workbench to Save</source>
-        <translation>Επέλεξε Workbench για Αποθήκευση</translation>
+        <translation>Επιλέξτε το έργο για αποθήκευση</translation>
     </message>
     <message>
         <location line="+12"/>
         <location line="+2"/>
         <source>Select File to Save Audio</source>
-        <translation>Επέλεξε Αρχείο για να Αποθηκεύσεις τον Ήχο</translation>
+        <translation>Επιλέξτε αρχείο για αποθήκευση του ήχου</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Select JPEG Sequence to Save</source>
-        <translation>Επέλεξε την Ακολουθία JPEG για Αποθήκευση</translation>
+        <translation>Επιλέξτε την ακολουθία JPEG για αποθήκευση</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Select BMP to Save</source>
-        <translation>Επιλογή BMP για να Φορτωθεί</translation>
+        <translation>Επιλέξτε BMP για αποθήκευση</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Select JPEG to Save</source>
-        <translation>Επέλεξε JPEG για Αποθήκευση</translation>
+        <translation>Επιλέξτε JPEG για αποθήκευση</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Select File to Save</source>
-        <translation>Επέλεξε Αρχείο για να Φορτωθεί</translation>
+        <translation>Επιλέξτε αρχείο για αποθήκευση</translation>
     </message>
     <message>
         <location line="+62"/>
@@ -1851,30 +1862,35 @@
         <translation>Αποθηκεύεται ο ήχος</translation>
     </message>
     <message>
-        <location line="+318"/>
-        <location line="+83"/>
+        <location line="+322"/>
+        <source>Maximum number of 99999 images reached.</source>
+        <translation>Συμπληρώθηκε το μέγιστο πλήθος των 99999 εικόνων, εγκατάλειψη.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+76"/>
         <source>Done</source>
         <translation>Έγινε</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-76"/>
         <source>Saved %d images.</source>
         <translation>Αποθηκεύτηκαν %d εικόνες.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="-248"/>
+        <location filename="../../common/gui_main.cpp" line="-249"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
         <location line="+4"/>
         <location filename="../../common/gui_save.cpp" line="+2"/>
-        <location line="+99"/>
+        <location line="+92"/>
         <location line="+7"/>
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
@@ -1899,7 +1915,7 @@
     <message>
         <location line="+4"/>
         <source>Failed</source>
-        <translation>Αποτυχία</translation>
+        <translation>Απέτυχε</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -1919,19 +1935,19 @@
     <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-25"/>
         <source>Gain</source>
-        <translation>Κέρδος</translation>
+        <translation>Απολαβή</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+495"/>
         <source>Saving</source>
         <translation>Αποθηκεύεται</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+181"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
-        <translation>Το αποθηκευμένο βίντεο είναι ατελές. 
-Το σφάλμα παρουσιάστηκε στα %s (%d%). 
-Αυτό συνέβη, ίσως σαν αποτέλεσμα μη έγκυρων χρονοσφραγίδων στο βίντεο.</translation>
+        <translation>Το αποθηκευμένο βίντεο είναι ατελές.
+Το σφάλμα παρουσιάστηκε στα %s (%d%).
+Αυτό συνέβη, ίσως λόγω μη έγκυρων χρονοσφραγίδων στο βίντεο.</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-7"/>
@@ -1946,7 +1962,7 @@
     <message>
         <location line="+1"/>
         <source>Manual (dB)</source>
-        <translation>Χειροκίνητη (Ντεσιμπέλ)</translation>
+        <translation>Χειροκίνητη (dB)</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -1971,7 +1987,7 @@
     <message>
         <location line="+0"/>
         <source>Shift Value (ms):</source>
-        <translation>Τιμή Μετατόπισης (χιλ.τουδευτ.):</translation>
+        <translation>Τιμή μετατόπισης (ms):</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-19"/>
@@ -1986,77 +2002,77 @@
     <message>
         <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="-3"/>
         <source>TimeStamp:</source>
-        <translation>ΧρονοΣφραγίδα:</translation>
+        <translation>Χρονοσφραγίδα:</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="-3"/>
         <source>Output _File:</source>
-        <translation>Αρχείο Ε_ξόδου:</translation>
+        <translation>Αρχείο ε_ξόδου:</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Select Video To Write</source>
-        <translation>Επιλέξτε Αρχείο Βίντεου Προς Εγγραφή</translation>
+        <translation>Επιλέξτε αρχείο βίντεο προς εγγραφή</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-23"/>
         <source>Audio Plugins</source>
-        <translation>Ενθέματα Ήχου</translation>
+        <translation>Ενθέματα ήχου</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Video Encoder Plugins</source>
-        <translation>Ενθέματα Κωδικοποίησης Βίντεου</translation>
+        <translation>Ενθέματα κωδικοποίησης βίντεο</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Video Encoder</source>
-        <translation>Κωδικοποιητής Βίντεου</translation>
+        <translation>Κωδικοποιητής βίντεο</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Video Decoder Plugins</source>
-        <translation>Ενθέματα Αποκωδικοποιητή Βίντεου</translation>
+        <translation>Ενθέματα αποκωδικοποιητή βίντεο</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Video Decoder</source>
-        <translation>Αποκωδικοποιητής Βίντεου</translation>
+        <translation>Αποκωδικοποιητής βίντεο</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Audio Device Plugins</source>
-        <translation>Ενθέματα Συσκευής Ήχου</translation>
+        <translation>Ενθέματα συσκευής ήχου</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Audio Device</source>
-        <translation>Συσκευή Ήχου</translation>
+        <translation>Συσκευή ήχου</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Audio Encoder Plugins</source>
-        <translation>Ενθέματα Κωδικοποιητή Ήχου</translation>
+        <translation>Ενθέματα κωδικοποιητή ήχου</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Audio Encoders</source>
-        <translation>Κωδικοποιητές Ήχου</translation>
+        <translation>Κωδικοποιητές ήχου</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Demuxer Plugins</source>
-        <translation>Ενθέματα Πολυαποπλέκτη</translation>
+        <translation>Ενθέματα αποπολυπλέκτη</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Demuxers</source>
-        <translation>Πολυαποπλέκτες</translation>
+        <translation>Αποπολυπλέκτες</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Muxer Plugins</source>
-        <translation>Ενθέματα Πολυπλέκτη</translation>
+        <translation>Ενθέματα πολυπλέκτη</translation>
     </message>
     <message>
         <location line="+22"/>
@@ -2066,53 +2082,49 @@
     <message>
         <location line="+5"/>
         <source>Plugins Info</source>
-        <translation>Πληροφορίες Ενθεμάτων</translation>
+        <translation>Πληροφορίες ενθεμάτων</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="-1"/>
         <source>The options above are effective only for MPEG and DivX with software decoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Οι ανωτέρω επιλογές εφαρμόζονται μόνο σε MPEG και DivX με αποκωδικοποίηση μέσω λογισμικού</translation>
     </message>
     <message>
         <location line="+13"/>
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-126"/>
         <source>_Horizontal deblocking</source>
-        <translation>Ορι_ζόντια αφαίρεση τμημάτων</translation>
+        <translation>Ορι_ζόντια αφαίρεση τμημάτων (deblocking)</translation>
     </message>
     <message>
         <location line="+1"/>
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
         <source>_Vertical deblocking</source>
-        <translation>Κατακόρυ_φη αφαίρεση τμημάτων</translation>
+        <translation>Κατακόρυ_φη αφαίρεση τμημάτων (deblocking)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Deringing</source>
-        <translation>Αφαίρεση _δακτυλίων</translation>
+        <translation>Αφαίρεση _δακτυλίων (Deringing)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>De_interlacing (ffmpegdeint)</source>
-        <translation type="unfinished"></translation>
+        <translation>_Απόπλεξη (ffmpegdeint)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-165"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
-        <translation>Αποκωδικοποίηση του βίντεου με τη χρήση VDPAU (NVIDIA)</translation>
-    </message>
-    <message>
-        <source>Decode video using XVBA (AMD)</source>
-        <translation type="vanished">Αποκωδικοποίηση του βίντεου με τη χρήση XVBA (AMD)</translation>
+        <translation>Αποκωδικοποίηση του βίντεο με τη χρήση VDPAU (NVIDIA)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Decode video using LIBVA (INTEL)</source>
-        <translation>Αποκωδικοποίηση του βίντεου με τη χρήση LIBVA (INTEL)</translation>
+        <translation>Αποκωδικοποίηση του βίντεο με τη χρήση LIBVA (INTEL)</translation>
     </message>
     <message>
         <location line="-3"/>
         <source>Decode video using VideoToolbox (macOS)</source>
-        <translation>Αποκωδικοποίηση του βίντεου με τη χρήση VideoToolbox (macOS)</translation>
+        <translation>Αποκωδικοποίηση του βίντεο με τη χρήση VideoToolbox (macOS)</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -2122,12 +2134,12 @@
     <message>
         <location line="-3"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
-        <translation>Αν χρησιμοποιήσεις την αποκωδικοποίηση υλικού, να επιλέξεις και τον ταιριαστό οδηγό της συσκευής απεικόνισης.</translation>
+        <translation>Αν χρησιμοποιείτε την αποκωδικοποίηση μέσω υλικού, είναι καλύτερα να επιλέξετε και τον κατάλληλο οδηγό της συσκευής απεικόνισης</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>_Accept non-standard audio frequency for DVD</source>
-        <translation>_Αποδοχή μη τυποποιημένων συχνοτήτων ήχου για DVD</translation>
+        <translation>_Αποδοχή μη τυπικών συχνοτήτων ήχου για DVD</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -2135,23 +2147,19 @@
         <translation>Έλεγ_χος για νέα έκδοση</translation>
     </message>
     <message>
-        <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="vanished">_Χρήση εναλλακτικής ετικέτας, για MP3 μέσα σε .mp4</translation>
-    </message>
-    <message>
-        <location line="+68"/>
+        <location line="+74"/>
         <source>VDPAU (best)</source>
-        <translation>VDPAU (καλύτερη)</translation>
+        <translation>VDPAU (κάλλιστη)</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>OpenGL (best)</source>
-        <translation>OpenGL (καλύτερο)</translation>
+        <translation>OpenGL (κάλλιστη)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>LIBVA (best)</source>
-        <translation>LIBVA (καλύτερο)</translation>
+        <translation>LIBVA (κάλλιστη)</translation>
     </message>
     <message>
         <location line="+28"/>
@@ -2162,7 +2170,7 @@
     <message>
         <location line="+41"/>
         <source>_AudioDevice</source>
-        <translation>Συσκευή _Ήχου</translation>
+        <translation>Συσκευή _ήχου</translation>
     </message>
     <message>
         <location line="+19"/>
@@ -2177,17 +2185,17 @@
     <message>
         <location line="+34"/>
         <source>_Limit Refresh Rate</source>
-        <translation>_Περιορισμός του Ρυθμού Ανανέωσης</translation>
+        <translation>_Περιορισμός του ρυθμού ανανέωσης</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Refresh Rate Cap (ms)</source>
-        <translation>Ανώτατος Ρυθμός Ανανέωσης (χιλ.τουδευτ..)</translation>
+        <translation>Ανώτατος ρυθμός ανανέωσης (ms)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>GUI Rendering Options</source>
-        <translation>Επιλογές Αποτύπωσης της Γενικής Διάδρασης Χρήστη</translation>
+        <translation>Επιλογές αποτύπωσης γραφικού περιβάλλοντος χρήστη</translation>
     </message>
     <message>
         <location line="+16"/>
@@ -2199,12 +2207,12 @@
         <location line="+3"/>
         <location line="+3"/>
         <source>HW Accel</source>
-        <translation>Επιτάχυνση Υλικού</translation>
+        <translation>Επιτάχυνση υλικού</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Threading</source>
-        <translation>Γνέσιμο</translation>
+        <translation>Νημάτωση</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -2217,14 +2225,14 @@
         <translation>Προεπιλεγμένη θύρα προς χρήση</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-96"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-100"/>
         <source>Open</source>
         <translation>Άνοιγμα</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Append</source>
-        <translation>Προσκόλληση</translation>
+        <translation>Προσάρτηση</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2234,32 +2242,32 @@
     <message>
         <location line="+1"/>
         <source>Queue</source>
-        <translation>Σειρά Αναμονής</translation>
+        <translation>Σειρά αναμονής</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Save as Image</source>
-        <translation>Αποθήκευση  ως Εικόνα</translation>
+        <translation>Αποθήκευση ως εικόνα</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Save as BMP</source>
-        <translation>Αποθήκευση  ως BMP</translation>
+        <translation>Αποθήκευση ως BMP</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Save as PNG</source>
-        <translation>Αποθήκευση  ως PNG</translation>
+        <translation>Αποθήκευση ως PNG</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Save as JPEG</source>
-        <translation>Αποθήκευση  ως JPEG</translation>
+        <translation>Αποθήκευση ως JPEG</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Save Selection as JPEG</source>
-        <translation>Αποθήκευση της Επιλογής ως JPEG</translation>
+        <translation>Αποθήκευση της επιλογής ως JPEG</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2295,7 +2303,7 @@
     <message>
         <location line="+1"/>
         <source>Reset Edit</source>
-        <translation>Επαναφορά της Επεξεργασίας</translation>
+        <translation>Επαναφορά της επεξεργασίας</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2316,32 +2324,33 @@
     <message>
         <location line="+5"/>
         <source>Reset Markers</source>
-        <translation>Επαναφορά των Δεικτών</translation>
+        <translation>Επαναφορά των σημαδευτών</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Pr&amp;eferences</source>
-        <translation>Προτιμήσεις</translation>
+        <translation>Π&amp;ροτιμήσεις</translation>
     </message>
     <message>
+        <location line="+3"/>
         <location line="+2"/>
         <source>Save current settings as default</source>
-        <translation>Αποθήκευση των τωρινών ρυθμίσεων ως προεπιλεγμένες</translation>
+        <translation>Αποθήκευση των τρεχουσών ρυθμίσεων ως προεπιλεγμένες</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Load saved settings</source>
         <translation>Φόρτωση αποθηκευμένων ρυθμίσεων</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Decoder Option</source>
-        <translation>Επιλογές Αποκωδικοποιητή</translation>
+        <translation>Επιλογές αποκωδικοποιητή</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>PostProcessing</source>
-        <translation>ΜετΕπεξεργασία</translation>
+        <translation>Μεταεπεξεργασία</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -2351,7 +2360,7 @@
     <message>
         <location line="+6"/>
         <source>Select Track</source>
-        <translation>Επέλεξε Κανάλι</translation>
+        <translation>Επιλέξτε κανάλι</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2361,7 +2370,7 @@
     <message>
         <location line="+7"/>
         <source>Build Option</source>
-        <translation>Επιλογές Σύνθεσης</translation>
+        <translation>Επιλογές κατασκευής</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2376,177 +2385,183 @@
     <message>
         <location line="+1"/>
         <source>Open Application &amp;Log</source>
-        <translation>Άνοιγμα Εφαρμογής κ΄ Καταγραφής</translation>
+        <translation>Άνοιγμα των &amp;καταγραφών της εφαρμογής</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Open Application Data &amp;Folder</source>
-        <translation>Άνοιγμα Δεδομένων Εφαρμογής κ΄ Φάκελος</translation>
+        <translation>Άνοιγμα του &amp;φακέλου των δεδομένων της εφαρμογής</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>About</source>
-        <translation>Σχετικά με...</translation>
+        <translation>Σχετικά</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Previous Frame</source>
-        <translation>Προηγούμενο Στιγμιότυπο</translation>
+        <translation>Προηγούμενο στιγμιότυπο</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Next Frame</source>
-        <translation>Επόμενο Στιγμιότυπο</translation>
+        <translation>Επόμενο στιγμιότυπο</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Previous Intra Frame</source>
-        <translation>Προηγούμενο «Έσωθεν» Στιγμιότυπο</translation>
+        <translation>Προηγούμενο ενδοστιγμιότυπο</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Next Intra Frame</source>
-        <translation>Επόμενο «Έσωθεν» Στιγμιότυπο</translation>
+        <translation>Επόμενο ενδοστιγμιότυπο</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>First Frame</source>
-        <translation>Πρώτο Στιγμιότυπο</translation>
+        <translation>Πρώτο στιγμιότυπο</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Last Frame</source>
-        <translation>Τελευταίο Στιγμιότυπο</translation>
+        <translation>Τελευταίο στιγμιότυπο</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Go To Marker A</source>
-        <translation>Μετάβαση στο Δείκτη Α΄</translation>
+        <translation>Μετάβαση στον σημαδευτή Α</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Go To Marker B</source>
-        <translation>Μετάβαση στο Δείκτη Β΄</translation>
+        <translation>Μετάβαση στον σημαδευτή Β</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Go To Time</source>
-        <translation>Μετάβαση στο Χρόνο</translation>
+        <translation>Μετάβαση στον χρόνο</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
-        <translation>Σμίκρυνση 1:4</translation>
+        <translation>Εστίαση 1:4</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Zoom 1:2</source>
-        <translation>Σμίκρυνση 1:2</translation>
+        <translation>Εστίαση 1:2</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Zoom 1:1</source>
-        <translation>Προβολή 1:1</translation>
+        <translation>Εστίαση 1:1</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Zoom 2:1</source>
-        <translation>Μεγέθυνση 2:1</translation>
+        <translation>Εστίαση 2:1</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
-        <location line="+44"/>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation>Προσαρμογή στο παράθυρο</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-43"/>
+        <location line="+43"/>
         <source>You cannot remove *all* the video
 </source>
-        <translation>Δεν μπορείς να αφαιρέσεις *όλο* το βίντεο</translation>
+        <translation>Δεν μπορείτε να αφαιρέσετε *όλο* το βίντεο
+</translation>
     </message>
     <message>
         <location filename="../../common/ADM_editor/src/utils/ADM_edFrameType.cpp" line="+72"/>
         <source>Updating frametype</source>
-        <translation>Ενημερώνεται τύπος στιγμιότυπων</translation>
+        <translation>Ενημερώνεται ο τύπος στιγμιότυπων</translation>
     </message>
     <message>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+0"/>
         <source>Core has been compiled without LIBVA support, but the application has been compiled with it.
 Installation mismatch</source>
-        <translation>Ο πυρήνας έχει συντεθεί χωρίς υποστήριξη του LIBVA, όμως, η εφαρμογή έχει συντεθεί με αυτήν.
-Αταίριαστη η εγκατάσταση.</translation>
+        <translation>Το avidemux_core έχει μεταγλωττιστεί χωρίς υποστήριξη LIBVA, όμως το avidemux_app έχει μεταγλωττιστεί με αυτήν.
+Αναντιστοιχία εγκατάστασης</translation>
     </message>
     <message>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+0"/>
         <source>Core has been compiled without VDPAU support, but the application has been compiled with it.
 Installation mismatch</source>
-        <translation>Ο πυρήνας έχει συντεθεί χωρίς υποστήριξη του VDPAU, όμως, η εφαρμογή έχει συντεθεί με αυτήν.
-Αταίριαστη η εγκατάσταση.</translation>
+        <translation>Το avidemux_core έχει μεταγλωττιστεί χωρίς υποστήριξη του VDPAU, όμως το avidemux_app έχει μεταγλωττιστεί με αυτήν.
+Αναντιστοιχία εγκατάστασης</translation>
     </message>
     <message>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+0"/>
         <source>Core has been compiled without XVBA support, but the application has been compiled with it.
 Installation mismatch</source>
-        <translation>Ο πυρήνας έχει συντεθεί χωρίς υποστήριξη του XVBA, όμως, η εφαρμογή έχει συντεθεί με αυτήν.
-Αταίριαστη η εγκατάσταση.</translation>
+        <translation>Το avidemux_core έχει μεταγλωττιστεί χωρίς υποστήριξη του XVBA, όμως το avidemux_app έχει μεταγλωττιστεί με αυτήν.
+Αναντιστοιχία εγκατάστασης</translation>
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="-144"/>
-        <location filename="../../common/gui_save.cpp" line="-597"/>
+        <location filename="../../common/gui_save.cpp" line="-602"/>
         <source>No audio track</source>
         <translation>Κανένα κανάλι ήχου</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>An audio track is necessary to create such file</source>
-        <translation>Το κανάλι ήχου είναι απαραίτητο για τη δημιουργία ενός τέτοιου αρχείου</translation>
+        <translation>Ένα κανάλι ήχου είναι απαραίτητο για τη δημιουργία ενός τέτοιου αρχείου</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Cannot select the MPEG-4 SP codec.</source>
-        <translation>Αδυναμία επιλογής του κώδικα MPEG-4 SP.</translation>
+        <translation>Αδυναμία επιλογής του κωδικοποιητή MPEG-4 SP.</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>No AAC audio encoder plugin found.</source>
-        <translation>Δεν βρέθηκε AAC ένθεμα κωδικοποιητή ήχου</translation>
+        <translation>Δεν βρέθηκε ένθεμα κωδικοποιητή ήχου AAC.</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>The MP3 codec does not allow disabling reservoir.
 Install lame plugin</source>
-        <translation>Ο κώδικας MP3 δεν επιτρέπει την απενεργοποίηση των δεξαμενών.
-Κάνε εγκατάσταση του ενθέματος lame</translation>
+        <translation>Ο κωδικοποιητής MP3 δεν επιτρέπει την επιλογή δεξαμενής.
+Εγκαταστήστε το ένθεμα lame</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>You don&apos;t have LAME!.
 It is needed to create FLV  video.</source>
-        <translation>Δεν έχεις το LAME!.
-Είναι απαραίτητο για τη δημιουργία βίντεου FLV.</translation>
+        <translation>Δεν έχετε το LAME!.
+Είναι απαραίτητο για τη δημιουργία βίντεο FLV.</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Cannot select FLV1  codec.</source>
-        <translation>Αδυναμία επιλογής του κώδικα FLV1.</translation>
+        <translation>Αδυναμία επιλογής του κωδικοποιητή FLV1.</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Cannot select MPEG-4 SP codec.</source>
-        <translation>Αδυναμία επιλογής του κώδικα MPEG-4 SP.</translation>
+        <translation>Αδυναμία επιλογής του κωδικοποιητή MPEG-4 SP.</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>You don&apos;t have FAAC!.
 It is needed to create PSP compatible video.</source>
-        <translation>Δεν έχεις το FAAC!.
-Είναι απαραίτητο για τη δημιουργία βίντεου συμβατό με PSP.</translation>
+        <translation>Δεν έχετε το FAAC!.
+Είναι απαραίτητο για τη δημιουργία βίντεο συμβατό με PSP.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1449"/>
+        <location filename="../../common/gui_main.cpp" line="-1447"/>
         <source>Select script/project to run</source>
-        <translation>Επέλεξε σενάριο ή εργασία για τρέξιμο</translation>
+        <translation>Επιλέξτε σενάριο ή εργασία για εκτέλεση</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Select script to run</source>
-        <translation>Επέλεξε σενάριο για τρέξιμο</translation>
+        <translation>Επέλεξε σενάριο για εκτέλεση</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -2561,48 +2576,48 @@
     <message>
         <location line="+67"/>
         <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
-        <translation>Πρόκειται να εκκαθαρίσεις το κατάστιχο των πρόσφατων αρχείων και εργασιών. 
-Δεν θα είναι δυνατή η επαναφορά αυτού. 
+        <translation>Πρόκειται να εκκαθαρίσετε το κατάστιχο των πρόσφατων αρχείων και εργασιών.
+Δεν θα είναι δυνατή η επαναφορά αυτού.
 
-Να συνεχίσω, έτσι κι αλλιώς;</translation>
+Να συνεχίσω;</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+68"/>
+        <location line="+126"/>
+        <location line="+73"/>
         <source>Select Video File...</source>
-        <translation>Επιλέξτε Αρχείο Βίντεου...</translation>
+        <translation>Επιλέξτε αρχείο βίντεο...</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-48"/>
         <source>No engine</source>
         <translation>Καμία μηχανή</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>tinyPy script is not enabled in this build</source>
-        <translation>το σενάριο tinyPy δεν είναι ενεργό σε αυτή τη σύνθεση</translation>
+        <translation>Το σενάριο tinyPy δεν είναι ενεργό σε αυτήν την εγκατάσταση</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Select Video File to Append...</source>
-        <translation>Επιλέξτε Αρχείο Βίντεου για Προσκόλληση...</translation>
+        <translation>Επιλέξτε ένα αρχείο βίντεο για προσάρτηση...</translation>
     </message>
     <message>
         <location line="+122"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
-        <translation>Τα σημεία αποκοπής του επικολλημένου βίντεου δεν είναι σε κλειδοστιγμιότυπα.
-Όταν το βίντεο θα αποθηκευθεί σε κατάστσαης λειτουργίας αντιγραφής,
-θα είναι φθαρμένο σε αυτά τα σημεία.
+        <translation>Τα σημεία αποκοπής του επικολλημένου βίντεο δεν είναι σε κλειδοστιγμιότυπα.
+Όταν το βίντεο θα αποθηκευθεί σε λειτουργία αντιγραφής,
+θα είναι κατεστραμμένο σε αυτά τα σημεία.
 
-Να συνεχιστεί, έτσι κι αλλιώς;</translation>
+Να συνεχίσω, ούτως ή άλλως;</translation>
     </message>
     <message>
         <location line="+124"/>
         <location line="+21"/>
         <source>Cutting</source>
-        <translation>Αποκόβει</translation>
+        <translation>Γίνεται αποκοπή</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -2610,10 +2625,10 @@
         <translation>Σφάλμα κατά την αποκοπή.</translation>
     </message>
     <message>
-        <location line="+795"/>
+        <location line="+789"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
-        <translation>Δόθηκε μη έγκυρο ευρετήριο ήχου</translation>
+        <translation>Μη έγκυρο δοθέν ευρετήριο ήχου</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -2623,37 +2638,37 @@
     <message>
         <location line="+28"/>
         <source>Audio file not found in list, even though it should be there. Create a bug report!</source>
-        <translation>Το αρχείο ήχου δεν βρέθηκε στη λίστα, παρ&apos; όλο που θα έπρεπε να είναι εκεί. Μπορείς να ανοίξεις μια αναφορά δυσλειτουργίας.</translation>
+        <translation>Το αρχείο ήχου δεν βρέθηκε στη λίστα, παρ&apos; όλο που θα έπρεπε να είναι εκεί. Στείλτε μια αναφορά δυσλειτουργίας!</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Unable to set the audio language: No video loaded yet!</source>
-        <translation>Αδυναμία ορισμού της γλώσσας του ήχου: Δεν έχει φορτωθεί, ακόμη, κάποιο βίντεο.</translation>
+        <translation>Αδυναμία ορισμού της γλώσσας του ήχου: Δεν έχει φορτωθεί ακόμη κάποιο βίντεο!</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Setting the language for the given track index is not possible: Video has no audio file!</source>
-        <translation>Ο ορισμός της γλώσσας για τα περιεχόμενα του δοσμένου καναλιού δεν είναι εφικτός: Το βίντεο δεν έχει κανάλι ήχου.</translation>
+        <translation>Ο ορισμός της γλώσσας για τα περιεχόμενα του δοθέντος καναλιού δεν είναι εφικτός: Το βίντεο δεν έχει κανάλι ήχου!</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Setting the language for the given track index is not possible: Invalid track index!</source>
-        <translation>Ο ορισμός της γλώσσας για τα περιεχόμενα του δοσμένου καναλιού δεν είναι εφικτός: Μη έγκυρα περιεχόμενα καναλιού.</translation>
+        <translation>Ο ορισμός της γλώσσας για τα περιεχόμενα του δοθέντος καναλιού δεν είναι εφικτός: Μη έγκυρα περιεχόμενα καναλιού!</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+187"/>
         <source>Frame Hex Dump</source>
-        <translation>Εξαγωνική Απόρριψη Στιγμιότυπων</translation>
+        <translation>Δεκαεξαδική αποτύπωση στιγμιότυπων</translation>
     </message>
     <message>
         <location line="+111"/>
         <source>Oops</source>
-        <translation>Ώπα της</translation>
+        <translation>Ωχ</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>This function is disabled or no longer valid</source>
-        <translation>Αυτή η λειτουργία είναι απενεργοποιημένη και δεν ισχύει πια</translation>
+        <translation>Αυτή η λειτουργία είναι απενεργοποιημένη ή δεν ισχύει πια</translation>
     </message>
     <message>
         <location filename="../../common/gui_play.cpp" line="+442"/>
@@ -2663,10 +2678,10 @@
     <message>
         <location filename="../../common/gui_save.cpp" line="+10"/>
         <source>Audio encoder index out of bounds</source>
-        <translation>Τα περιεχόμενα του κωδικοποιητή ήχου είναι εκτός ορίων</translation>
+        <translation>Το ευρετήριο του κωδικοποιητή ήχου είναι εκτός ορίων</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>No</source>
         <translation>Όχι</translation>
     </message>
@@ -2676,17 +2691,17 @@
         <translation>Δεν φορτώθηκε κάποιο αρχείο</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Job</source>
         <translation>Διαδικασία</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot reach database. Do you have Job control running ?</source>
-        <translation>Αδυναμία πρόσβασης στην βάση δεδομένων. Έχεις τον έλεγχο Διαδικασιών να τρέχει;</translation>
+        <translation>Αδυναμία πρόσβασης στην βάση δεδομένων. Το avidemux_job εκτελείται;</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Output file</source>
         <translation>Αρχείο εξόδου</translation>
     </message>
@@ -2698,18 +2713,19 @@
     <message>
         <location line="+3"/>
         <source>Queue job to jobList</source>
-        <translation>Προσθήκη της διαδικασίας στη σειρά του ΚατάστιχουΔιαδικασιών</translation>
+        <translation>Προσθήκη της διαδικασίας στο κατάστιχο διαδικασιών</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Select PNG to Save</source>
-        <translation>Επέλεξε PNG για Αποθήκευση</translation>
+        <translation>Επιλέξτε PNG για αποθήκευση</translation>
     </message>
     <message>
         <location line="+166"/>
         <source>Function not implemented
 </source>
-        <translation>Η λειτουργία δεν έχει υλοποιηθεί</translation>
+        <translation>Η λειτουργία δεν έχει υλοποιηθεί
+</translation>
     </message>
     <message>
         <location line="+19"/>
@@ -2734,25 +2750,20 @@
     <message>
         <location line="+87"/>
         <source>Saving selection as set of JPEG images</source>
-        <translation>Αποθήκευση της επιλογής ως μία ομάδα από εικόνες JPEG</translation>
+        <translation>Αποθήκευση της επιλογής ως σύνολο εικόνων JPEG</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Warning</source>
         <translation>Προειδοποίηση</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Maximum number of 9999 images reached, aborting.</source>
-        <translation>Συμπληρώθηκε το μέγιστο πλήθος των 9999 εικόνων· εγκαταλήπεται η προσπάθεια.</translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Saving images failed.</source>
         <translation>Αποτυχία αποθήκευσης των εικόνων.</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+25"/>
         <source>PNG</source>
         <translation>PNG</translation>
     </message>
@@ -2764,21 +2775,17 @@
     <message>
         <location line="+67"/>
         <source>Cannot get tinyPy script engine</source>
-        <translation type="unfinished"></translation>
+        <translation>Αδυναμία λήψης της μηχανής σεναρίων tinyPy</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Output file not specified</source>
-        <translation type="unfinished"></translation>
+        <translation>Το αρχείο εξόδου δεν έχει οριστεί</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Job script %s already exists. Overwrite?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot get tinyPÿ script engine</source>
-        <translation type="vanished">Αδυναμία λήψης της μηχανής σεναρίων tinyPÿ</translation>
+        <translation>Το σενάριο διαδικασίας %s υπάρχει ήδη. Να αντικατασταθεί;</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2786,78 +2793,88 @@
         <translation>Αδυναμία προσθήκης της διαδικασίας %s</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-207"/>
+        <location filename="../../common/gui_savenew.cpp" line="-210"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
-        <translation>Να επανα-χρησιμοποιηθούν τα προηγούμενα δεδομένα 
+        <translation>Να επαναχρησιμοποιηθούν τα προηγούμενα δεδομένα
 του πρώτου περάσματος;
 Προειδοποίηση: οι ρυθμίσεις θα πρέπει να κλείσουν.</translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+182"/>
         <source>Cannot instantiate video chain</source>
-        <translation>Αδυναμία παράστασης της αλυσίδας του βίντεου</translation>
+        <translation>Αδυναμία αρχικοποίησης της αλυσίδας του βίντεο</translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+24"/>
         <source>Cannot create encoder</source>
         <translation>Αδυναμία δημιουργίας κωδικοποιητή</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>Cannot setup codec. Bitrate too low?</source>
-        <translation>Αδυναμία στησίματος του κώδικα. Ρυθμός μπιτιών, μήπως, πολύ χαμηλός;</translation>
+        <translation type="vanished">Αδυναμία ρύθμισης του κωδικοποιητή. Ο δυφιορυθμός είναι πολύ χαμηλός;</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+57"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
-        <translation>Αδυναμία στησίματος του κωδικοποιητή ήχου. 
-Βεβαιώσου πως η ροή δεδομένων είναι συμβατή με τον κωδικοποιητή ήχου
-(πλήθος καναλιών, ρυθμός μπιτιών, μορφή)</translation>
+        <translation>Αδυναμία ρύθμισης του κωδικοποιητή ήχου. Βεβαιωθείτε πως η ροή δεδομένων είναι συμβατή με τον κωδικοποιητή ήχου (πλήθος καναλιών, δυφιορυθμός, μορφή)</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>The video is in copy mode but the cut points are not on keyframes.
 The video will be saved but there will be corruption at cut point(s).
 Do you want to continue anyway ?</source>
-        <translation>Αυτό το βίντεο είναι σε κατάσταση λειτουργία αντιγραφής,
+        <translation>Αυτό το βίντεο είναι σε λειτουργία αντιγραφής,
 αλλά τα σημεία αποκοπής δεν είναι σε κλειδοστιγμιότυπα.
 Το βίντεο θα αποθηκευθεί,
-αλλά θα υπάρχει απόκλιση στα σημεία αποκοπής.
+αλλά θα υπάρχει αλλοίωση στα σημεία αποκοπής.
 
-Να συνεχιστεί, έτσι κι αλλιώς;</translation>
+Επιθυμείτε να συνεχίσετε ούτως ή άλλως;</translation>
     </message>
     <message>
-        <location line="-253"/>
-        <location line="+286"/>
+        <location line="-257"/>
+        <location line="+290"/>
         <location line="+26"/>
         <source>Muxer</source>
         <translation>Πολυπλέκτης</translation>
     </message>
     <message>
-        <location line="-312"/>
-        <location line="+286"/>
+        <location line="-326"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation>Αδύνατη ή ρύθμιση ενός κωδικοποιητή για το πρώτο πέρασμα. Η παρασχεθείσα διαμόρφωση για τον κωδικοποιητή μπορεί να μην είναι συμβατή ή ο κωδικοποιητής μπορεί να εξαρτάται από χαρακτηριστικά μη διαθέσιμα σε αυτό το σύστημα.</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+290"/>
         <source>Cannot instantiate muxer</source>
-        <translation>Αδυναμία παράστασης του πολυπλέκτη</translation>
+        <translation>Αδυναμία αρχικοποίησης του πολυπλέκτη</translation>
+    </message>
+    <message>
+        <location line="-102"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation>Αδύνατη ή ρύθμιση ενός κωδικοποιητή Η παρασχεθείσα διαμόρφωση για τον κωδικοποιητή μπορεί να μην είναι συμβατή ή ο κωδικοποιητής μπορεί να εξαρτάται από χαρακτηριστικά μη διαθέσιμα σε αυτό το σύστημα.</translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+74"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The choice of cut points may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Do you want to continue anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>Αυτό το βίντεο χρησιμοποιεί μη IDR σημεία επαναφοράς αντί για IDR ως κλειδοστιγμιότυπα. Η επαναταξινόμηση εικόνων στη ροή του βίντεο δεν είναι αρχικοποιημένη σε μη IDR στιγμιότυπα. Η επιλογή σημείων αποκοπής μπορεί να προκαλέσει διακοπές στην αναπαραγωγή λόγω της αντιστραμμένης σειράς προβολής των στιγμιότυπων αν αποθηκευθεί σε λειτουργία αντιγραφής.
+Να συνεχίσω ούτως ή άλλως;</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Codec or codec settings across a cut point do not match. Playback of the video saved in copy mode may stop at this point.
 Do you want to continue anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>Ο αποκωδικοποιητής ή οι ρυθμίσεις του αποκωδικοποιητή δια μέσου ενός σημείου αποκοπής δεν ταιριάζουν.
+Η αναπαραγωγή του βίντεο αποθηκευμένου σε λειτουργία αντιγραφής μπορεί να διακοπεί σε αυτό το σημείο.
+Να συνεχίσω ούτως ή άλλως;</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Cut points could not be checked. This indicates an issue with a source video, the state of editing or a bug in the program. Please check the application log file or console output for details.
 Try anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>Τα σημεία αποκοπής δεν μπόρεσαν να ελεγχθούν. Αυτό δείχνει ότι υπάρχει ένα πρόβλημα με το πηγαίο βίντεο, την κατάσταση επεξεργασίας ή ένα σφάλμα στο πρόγραμμα. Παρακαλώ ελέγξτε το αρχείο καταγραφών της εφαρμογής ή την έξοδο του τερματικού για τις λεπτομέρειες.
+Να γίνει προσπάθεια ούτως ή άλλως;</translation>
     </message>
     <message>
         <location line="+42"/>
@@ -2877,7 +2894,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-12"/>
         <source>_Interlaced</source>
-        <translation>_Παράλληλα Πλεγμένο</translation>
+        <translation>_Πεπλεγμένο</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2887,17 +2904,17 @@
     <message>
         <location line="+1"/>
         <source>_Greyscale</source>
-        <translation>_Διαβαθμίσεις του γκρι</translation>
+        <translation>_Κλίμακα του γκρι</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Turbo mode</source>
-        <translation>Κατάσταση λειτουργίας υπερτροφοδότησης</translation>
+        <translation>Λειτουργίας υπερτροφοδότησης</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>C_hroma optimizer</source>
-        <translation>Βελτίωση Χ_ρωματισμού</translation>
+        <translation>Βελτιστοποιητής χ_ρωματισμού</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -2907,22 +2924,22 @@
     <message>
         <location line="+4"/>
         <source>Very Low</source>
-        <translation>Πολύ Χαμηλή</translation>
+        <translation>Πολύ χαμηλή</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Very High</source>
-        <translation>Πολύ Υψηλή</translation>
+        <translation>Πολύ υψηλή</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ultra High</source>
-        <translation>Εξαιρετικά Υψηλό</translation>
+        <translation>Εξαιρετικά υψηλή</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Motion Search Precision</source>
-        <translation>Ακρίβεια Αναζήτησης Κίνησης</translation>
+        <translation>Ακρίβεια αναζήτησης κίνησης</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -2932,37 +2949,37 @@
     <message>
         <location line="+1"/>
         <source>Mode Decision</source>
-        <translation>Απόφαση Κατάστασης Λειτουργίας</translation>
+        <translation>Απόφαση λειτουργίας</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Limited Search</source>
-        <translation>Περιορισμένη Αναζήτηση</translation>
+        <translation>Περιορισμένη αναζήτηση</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Medium Search</source>
-        <translation>Μεσαία Αναζήτηση</translation>
+        <translation>Μεσαία αναζήτηση</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Wide Search</source>
-        <translation>Ευρεία Αναζήτηση</translation>
+        <translation>Ευρεία αναζήτηση</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>VHQ Mode</source>
-        <translation>Κατάσταση Λειτουργίας ΒίντεουΥψ.Ποι.</translation>
+        <translation>Λειτουργία VHQ</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Max B Frames</source>
-        <translation>Μέγ. Β΄ Στιγμιότυπα</translation>
+        <translation>Μέγ. Β Στιγμιότυπα</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Quarter Pixel</source>
-        <translation>Εικονοστοιχείο Τεταρτημόριου</translation>
+        <translation>Εικονοστοιχείο τεταρτημόριου</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2972,12 +2989,12 @@
     <message>
         <location line="+1"/>
         <source>BVHQ</source>
-        <translation>BVΥψ.Ποιότ.</translation>
+        <translation>BVHQ</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Advanced Simple Profile</source>
-        <translation>Προχωρημένο Απλό Προφίλ</translation>
+        <translation>Προχωρημένο απλό προφίλ</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -2987,32 +3004,32 @@
     <message>
         <location line="+1"/>
         <source>Chroma ME</source>
-        <translation>Ε.Κ. Χρωματισμού</translation>
+        <translation>Χρωματισμός ME</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>HQ AC</source>
-        <translation>Υψ.Ποι. AC</translation>
+        <translation>HQ AC</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>More Search</source>
-        <translation>Επιπλέον Αναζήτηση</translation>
+        <translation>Επιπλέον αναζήτηση</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Min Gop Size</source>
-        <translation>Ελάχιστο Μέγεθος ΟμάδαςΕικόνων</translation>
+        <translation>Ελάχιστο μέγεθος Ομάδας Εικόνων (GOP)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max Gop Size</source>
-        <translation>Μέγιστο Μέγεθος ΟμάδαςΕικόνων</translation>
+        <translation>Μέγιστο μέγεθος Ομάδας Εικόνων (GOP)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>GOP Size</source>
-        <translation>Μέγεθος ΟμάδαςΕικόνων</translation>
+        <translation>Μέγεθος Ομάδας Εικόνων (GOP)</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -3032,12 +3049,12 @@
     <message>
         <location line="+1"/>
         <source>Quantization Matrix</source>
-        <translation>Πλαίσιο Κβαντισμού</translation>
+        <translation>Πίνακας Κβαντισμού</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Trellis Quantization</source>
-        <translation>Ανιχνευτικός Κβαντισμός</translation>
+        <translation>Ανιχνευτικός κβαντισμός</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -3047,17 +3064,17 @@
     <message>
         <location line="+4"/>
         <source>Two Pass Tuning</source>
-        <translation>Συντονισμός Διπλού Περάσματος</translation>
+        <translation>Συντονισμός διπλού περάσματος</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Key Frame Boost(%)</source>
-        <translation>Ενίσχυση Κλειδοστιγμιότυπων(%)</translation>
+        <translation>Ενίσχυση κλειδοστιγμιότυπων(%)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>I-frames closer than...</source>
-        <translation>Ι΄-στιγμιότυπα εγγύτερα από...</translation>
+        <translation>Ι-στιγμιότυπα εγγύτερα από...</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3067,37 +3084,37 @@
     <message>
         <location line="+1"/>
         <source>Max Overflow Improvement(%)</source>
-        <translation>Βελτίωση Μέγιστης Υπερχείλισης (%)</translation>
+        <translation>Βελτίωση μέγιστης υπερχείλισης (%)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max Overglow Degradation(%)</source>
-        <translation>Υποτίμηση Μέγιστης Υπερλάμψης(%)</translation>
+        <translation>Υποτίμηση μέγιστης υπερλάμψης(%)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Curve Compression</source>
-        <translation>Συμπίεση Καμπύλης</translation>
+        <translation>Συμπίεση καμπύλης</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>High Bitrate Scenes (%)</source>
-        <translation>Σκηνές Υψηλού Ρυθμού Μπιτιών (%)</translation>
+        <translation>Σκηνές υψηλού δυφιορυθμού (%)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Low Bitrate Scenes (%)</source>
-        <translation>Σκηνές Χαμηλού Ρυθμού Μπιτιών (%)</translation>
+        <translation>Σκηνές χαμηλού δυφιορυθμού (%)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Overflow Control Strength</source>
-        <translation>Ένταση Ελέγχου Υπερχείλισης</translation>
+        <translation>Ένταση ελέγχου υπερχείλισης</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Two Pass</source>
-        <translation>Διπλού Περάσματος</translation>
+        <translation>Διπλού περάσματος</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -3177,7 +3194,7 @@
     <message>
         <location line="+1"/>
         <source>Float PCM</source>
-        <translation type="unfinished"></translation>
+        <translation>PCM κινητής υποδιαστολής</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3190,7 +3207,7 @@
         <translation>MP4</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>AAC</source>
         <translation>AAC</translation>
     </message>
@@ -3222,17 +3239,17 @@
     <message>
         <location line="+1"/>
         <source>8-bit PCM</source>
-        <translation>8-μπιτιών PCM</translation>
+        <translation>8-bit PCM</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Unknown codec</source>
-        <translation>Άγνωστος κώδικας</translation>
+        <translation>Άγνωστος κωδικοποιητής</translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
         <source>Building time map</source>
-        <translation>Χτίζεται ο χάρτης του χρόνου</translation>
+        <translation>Χτίζεται ο χρονοχάρτης</translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
@@ -3246,7 +3263,7 @@
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
-        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+374"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+382"/>
         <source>Unknown</source>
         <translation>Άγνωστο</translation>
     </message>
@@ -3256,13 +3273,14 @@
 %s
 </source>
         <translation>αδυναμία ανοίγματος του &quot;%s&quot;: %s
-%s</translation>
+%s
+</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+85"/>
         <source>filesystem full</source>
-        <translation>γεμάτο το σύστημα αρχείων</translation>
+        <translation>το σύστημα αρχείων είναι πλήρες</translation>
     </message>
     <message>
         <location line="-85"/>
@@ -3274,7 +3292,7 @@
         <location line="-84"/>
         <location line="+85"/>
         <source>Please free up some space and press RETRY to try again.</source>
-        <translation>Παρακαλώ ελευθέρωσε κάποιο χώρο, και πίεσε το «ΞΑΝΑΠΡΟΣΠΑΘΗΣΕ» για να επιχειρήσεις ξανά.</translation>
+        <translation>Παρακαλώ ελευθερώστε κάποιο χώρο, και πίεσε το «ΞΑΝΑΠΡΟΣΠΑΘΗΣΤΕ» για να επιχειρήσετε ξανά.</translation>
     </message>
     <message>
         <location line="-78"/>
@@ -3301,12 +3319,12 @@
     <message>
         <location line="-8"/>
         <source>Ignore</source>
-        <translation>Αγνόησε</translation>
+        <translation>Αγνόηση</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Retry</source>
-        <translation>Ξαναπροσπάθησε</translation>
+        <translation>Ξαναπροσπαθήστε</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -3342,20 +3360,20 @@
         <translation>1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
-        <location line="+30"/>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
-        <location line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
         <source>Codec</source>
-        <translation>Κώδικας</translation>
+        <translation>Κωδικοποιητής</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
         <source>Internal error finding codec 0x%x</source>
-        <translation>Εσωτερικό σφάλμα στην εύρεση του κώδικα 0x%x</translation>
+        <translation>Εσωτερικό σφάλμα στην εύρεση του κωδικοποιητή 0x%x</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Internal error opening 0x%x</source>
         <translation>Εσωτερικό σφάλμα στο άνοιγμα του 0x%x</translation>
     </message>
@@ -3363,8 +3381,8 @@
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+0"/>
         <source>Core has been compiled without DXVA2 support, but the application has been compiled with it.
 Installation mismatch</source>
-        <translation>Ο πυρήνας έχει συντεθεί χωρίς υποστήριξη του DXVA2, όμως, η εφαρμογή έχει συντεθεί με αυτήν.
-Αταίριαστη η εγκατάσταση.</translation>
+        <translation>Το avidemux_core έχει μεταγλωττιστεί χωρίς υποστήριξη του XVBA, όμως το avidemux_app έχει μεταγλωττιστεί με αυτήν.
+Αναντιστοιχία εγκατάστασης</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="+246"/>
@@ -3372,50 +3390,14 @@
         <translation>Αδυναμία σύνθεσης των σκιάσεων</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+812"/>
-        <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
-Dropping a keyframe will result in severely corrupted video.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
-Dropping a frame may result in some video corruption.
-Proceed anyway?</source>
-        <translation>Εντοπίστηκε σύγκρουση Χρονοσφραγίδων Αποκωδικοποίησης (DTS). 
-Αυτή επιρρεάζει ένα κλειδοστιγμιότυπο στα %s .
-Η απόρριψη ενός κλειδοστιγμιότυπου θα έχει ως αποτέλεσμα 
-τη δημιουργία ένός ιδιαίτερα φθαρμένου βίντεου.
-
-Να συνεχιστεί, έτσι κι αλλιώς;</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Do not warn again and drop frames silently while saving this video?</source>
-        <translation>Να μην ξαναγίνει προειδοποίηση, και να παραληφθούν, σιωπηλά, τα στιγμιότυπα, κατά την αποθκευση του βίντεου;</translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
-        <translation>Κατά την αποθήκευση, κάποια στιγμιότυπα του βίντεου, 
-πριν το %s, 
-έπρεπε να οριστούν με καθυστέρηση. 
-Σαν αποτέλεσμα, υπάρχει προσωρινή απώλεια συγχρονισμού 
-μεταξύ του Ήχου και του Βίντεου. 
-
-Θα ήθελες να συνιστεί, έτσι κι αλλιώς;</translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
-        <translation>Σφάλμα Δικαιωμάτων</translation>
+        <translation>Σφάλμα δικαιωμάτων</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot open script &quot;%s&quot;.</source>
-        <translation>Αδυναμία ανοίγματος του σεναρίου
- &quot;%s&quot; .</translation>
+        <translation>Αδυναμία ανοίγματος του σεναρίου &quot;%s&quot;.</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -3425,11 +3407,7 @@
     <message>
         <location line="+0"/>
         <source>Script &quot;%s&quot; does not exist.</source>
-        <translation variants="yes">
-            <lengthvariant>Δεν υπάρχει το σενάριο
- &quot;%s&quot;</lengthvariant>
-            <lengthvariant></lengthvariant>
-        </translation>
+        <translation>Το σενάριο «%s» δεν υπάρχει.</translation>
     </message>
 </context>
 <context>
@@ -3442,7 +3420,7 @@
     <message>
         <location line="+1"/>
         <source>All in one ivtc.</source>
-        <translation>Όλα μαζί, Αντίστροφη Τηλεοκινηματογραφία.</translation>
+        <translation>Όλα μαζί, αντίστροφη τηλεοκινηματογραφία.</translation>
     </message>
 </context>
 <context>
@@ -3450,12 +3428,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
         <source>_Bitrate:</source>
-        <translation>Ρυθμός _Μπιτιών:</translation>
+        <translation>_Δυφιορυθμός:</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Aften Configuration</source>
-        <translation>Ρύθμιση Aften</translation>
+        <translation>Διαμόρφωση του Aften</translation>
     </message>
 </context>
 <context>
@@ -3476,13 +3454,14 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp" line="+158"/>
         <source>File Error.</source>
-        <translation>Σφάλμα Αρχείου.</translation>
+        <translation>Σφάλμα αρχείου.</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot open file
 </source>
-        <translation>Αδυναμία ανοίγματος του αρχείου</translation>
+        <translation>Αδυναμία ανοίγματος του αρχείου
+</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfHeaders.cpp" line="+468"/>
@@ -3513,7 +3492,7 @@
     <message>
         <location line="-13"/>
         <source>Threshold</source>
-        <translation>Κατώφλι</translation>
+        <translation>Κατώτατο όριο</translation>
     </message>
     <message>
         <location line="-110"/>
@@ -3523,7 +3502,7 @@
     <message>
         <location line="+90"/>
         <source>Block Adaptative</source>
-        <translation>Προσαρμόσιμο ως προς τα Τμήματα</translation>
+        <translation>Προσαρμόσιμο ως προς τα τμήματα</translation>
     </message>
     <message>
         <location line="-27"/>
@@ -3556,7 +3535,7 @@
     <message>
         <location line="+1"/>
         <source>Botto_m margin:</source>
-        <translation>Περιθώριο _πάτου</translation>
+        <translation>Περιθώριο _βάσης:</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -3581,27 +3560,27 @@
     <message>
         <location line="+0"/>
         <source>Are you sure this is an ASS/SSA file ?</source>
-        <translation>Είναι σίγουρα αυτό ένα αρχείο ASS/SSA ;</translation>
+        <translation>Πρόκειται σίγουρα για ένα αρχείο ASS/SSA;</translation>
     </message>
     <message>
         <location line="+40"/>
         <source>Select Subtitle File</source>
-        <translation>Επιλογή αρχείου  Υποτίτλων</translation>
+        <translation>Επιλογή αρχείου υποτίτλων</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Do not adjust</source>
-        <translation type="unfinished"></translation>
+        <translation>Χωρίς προσαρμογή</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Adjust for display aspect ratio:</source>
-        <translation type="unfinished"></translation>
+        <translation>Προσαρμογή για προβολή της αναλογίας διαστάσεων:</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>This is a SRT file. Convert to SSA ?</source>
-        <translation>Αυτό είναι ένα αρχείο SRT . Να μετατραπεί σε SSA ;</translation>
+        <translation>Αυτό είναι ένα αρχείο SRT. Να μετατραπεί σε SSA ;</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -3613,7 +3592,7 @@
     <message>
         <location line="-14"/>
         <source>Cannot load this SRT file.</source>
-        <translation>Αδυναμία φορτώματος αυτού του αρχείου SRT.</translation>
+        <translation>Αδυναμία φόρτωσης του αρχείου SRT.</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -3634,7 +3613,7 @@
         <location line="+0"/>
         <source>Preparing the fonts can take a few minutes the first time.
 This message will not be displayed again.</source>
-        <translation>Η προετοιμασία των γραμματοσειρών, ίσως να διαρκέσει μερικά λεπτά της ώρας, κατά την πρώτη φορά.
+        <translation>Η προετοιμασία των γραμματοσειρών, ίσως να διαρκέσει μερικά λεπτά την πρώτη φορά.
 Αυτό το μήνυμα δεν θα επανεμφανιστεί.</translation>
     </message>
     <message>
@@ -3645,22 +3624,22 @@
     <message>
         <location line="+0"/>
         <source>ass_read_file() failed for %s</source>
-        <translation>Αδυναμία ανάγνωσης_αρχείου για το %s</translation>
+        <translation>Αδυναμία ανάγνωσης αρχείου ass για το %s</translation>
     </message>
 </context>
 <context>
     <name>avimuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+75"/>
         <source>Bad Idea</source>
-        <translation>Κακή Επιλογή</translation>
+        <translation>Κακή επιλογή</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Using H264/H265 in AVI is a bad idea, MKV is better for that.
  Do you want to continue anyway ?</source>
-        <translation>Η χρήση του H264 ή του H265 σε AVI δεν είναι καλή ιδέα· το MKV είναι καλύτερη επιλογή.
- Να συνεχιστεί έτσι κι αλλιώς ;</translation>
+        <translation>Η χρήση H264/H265 σε AVI δεν είναι καλή ιδέα, το MKV είναι καλύτερη επιλογή.
+ Επιθυμείτε να συνεχίσετε ούτως ή άλλως;</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -3675,7 +3654,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
         <source>Muxing Format</source>
-        <translation>Μορφή Πολυπλεξίματος</translation>
+        <translation>Μορφή πολυπλεξίας</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -3693,7 +3672,7 @@
     <message>
         <location line="+1"/>
         <source>Select wine filename[wine/cedega/etc.]</source>
-        <translation>Επέλεξε όνομα αρχείου wine[wine/cedega/κλπ.]</translation>
+        <translation>Επιλέξτε το όνομα αρχείου wine[wine/cedega/κλπ.]</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3718,60 +3697,60 @@
     <message>
         <location line="+1"/>
         <source>_pipe timeout:</source>
-        <translation>χρονικό όριο _διοχέτευσης:</translation>
+        <translation>χρονικό όριο _διασωλήνωσης:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>AvsFilter config</source>
-        <translation>Ρύθμιση AvsΜεταμορφωτή</translation>
+        <translation>Ρύθμιση Avs Μεταμορφωτή</translation>
     </message>
 </context>
 <context>
     <name>bitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+51"/>
         <source>Constant Bitrate</source>
-        <translation>Σταθερός Ρυθμός Μπιτιών</translation>
+        <translation>Σταθερός δυφιορυθμός</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Constant Quantiser</source>
-        <translation>Σταθερός Κβαντιστής</translation>
+        <translation>Σταθερός κβαντιστής</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Same Quantiser as Input</source>
-        <translation>Ίδιος Κβαντιστής όπως το Εισηγμένο</translation>
+        <translation>Ίδιος κβαντιστής όπως το εισηγμένο</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Constant Rate Factor</source>
-        <translation>Παράγοντας Σταθερού Ρυθμού</translation>
+        <translation>Παράγοντας σταθερού ρυθμού</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Two Pass - Video Size</source>
-        <translation>Διπλού Περάσματος - Μέγεθος Αρχείου</translation>
+        <translation>Διπλού περάσματος - Μέγεθος αρχείου</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Two Pass - Average Bitrate</source>
-        <translation>Διπλού Περάσματος - Μέσος Όρος Ρυθμού Μπιτιών</translation>
+        <translation>Διπλού Περάσματος - Μέσος όρος δυφιορυθμού</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Encoding mode</source>
-        <translation>Κατάσταση λειτουργίας κωδικοποίησης</translation>
+        <translation>Λειτουργία κωδικοποίησης</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Bitrate</source>
-        <translation>Ρυθμός μπιτιών</translation>
+        <translation>Δυφιορυθμός</translation>
     </message>
     <message>
         <location line="+86"/>
         <source>Target bitrate (kb/s)</source>
-        <translation>Ρυθμός μπιτ προορισμού (χιλιομπίτια/δευτ.)</translation>
+        <translation>Δυφιορυθμός προορισμού (kb/s)</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -3782,12 +3761,12 @@
     <message>
         <location line="-14"/>
         <source>Target video size (MB)</source>
-        <translation>Μέγεθος Βίντεου Προορισμού (ΜέγαΜπάιτια)</translation>
+        <translation>Μέγεθος βίντεο προορισμού (MB)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Average bitrate (kb/s)</source>
-        <translation>Μέσος ρυθμός μπιτιών (χιλιομπίτια/δευτ.)</translation>
+        <translation>Μέσος δυφιορυθμός (kb/s)</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -3820,7 +3799,7 @@
     <message>
         <location line="+3"/>
         <source>Replace by Black</source>
-        <translation>Αντικατάσταση με Μαύρο</translation>
+        <translation>Αντικατάσταση με μαύρο</translation>
     </message>
 </context>
 <context>
@@ -3828,12 +3807,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
         <source>Blacken Borders</source>
-        <translation>Μαύρισμα των Ορίων</translation>
+        <translation>Μαύρισμα των ορίων</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Remove noisy edge by turning them to black.</source>
-        <translation>Απομάκρυνση της θορυβώδους ζωντάνιας, με τη μετατροπή της σε μαύρο.</translation>
+        <translation>Απομάκρυνση των κατεστραμμένων περιθωρίων, με τη μετατροπή τους σε μαύρο.</translation>
     </message>
 </context>
 <context>
@@ -3842,55 +3821,83 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/blackenBorders.ui" line="+14"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+14"/>
         <source>Blacken Borders</source>
-        <translation>Μαύρισμα των Ορίων</translation>
+        <translation>Μαύρισμα των ορίων</translation>
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
         <source>Right:</source>
         <translation>Δεξιά:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+23"/>
         <source>Top:</source>
         <translation>Κορυφή:</translation>
     </message>
     <message>
         <location line="+43"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
         <source>Reset</source>
         <translation>Επαναφορά</translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
         <source>Bottom:</source>
-        <translation>Πάτος:</translation>
+        <translation>Βάση:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+51"/>
         <source>Left:</source>
         <translation>Αριστερά:</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation>Απόκρυψη του &amp;περιγράμματος</translation>
+    </message>
 </context>
 <context>
     <name>blackframes</name>
     <message>
         <location filename="../../common/gui_blackframes.cpp" line="+105"/>
         <source>BlackFrame</source>
-        <translation>ΜαύροΣτιγμιότυπο</translation>
+        <translation>Μαύρο στιγμιότυπο</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>This function is unsupported at the moment</source>
-        <translation>Αυτή η λειτουργία δεν υποστηρίζεται, για την ώρα</translation>
+        <translation>Αυτή η λειτουργία δεν υποστηρίζεται για την ώρα</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Searching black frame..</source>
-        <translation>Αναζητείται μαύρο στιγμιότυπο...</translation>
+        <translation>Αναζήτηση μαύρου στιγμιότυπου...</translation>
+    </message>
+</context>
+<context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation>Ανάμειξη στιγμιότυπων</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation>Ανάμειξη ομάδων N στιγμιότυπων σε ένα στιγμιότυπο. Χρήσιμο για την επίσπευση σκηνών αργής κίνησης ή για την δημιουργία περιοδικών λήψεων (timelapse).</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation>Στιγμιότυπα</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation>Ανάμειξη</translation>
     </message>
 </context>
 <context>
@@ -3903,7 +3910,7 @@
     <message>
         <location line="+1"/>
         <source>25  (PAL)</source>
-        <translation>25  (PAL)</translation>
+        <translation>25 (PAL)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3922,45 +3929,45 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
-        <translation>59.93  (NTSC)</translation>
+        <source>59.94  (NTSC)</source>
+        <translation>59.94  (NTSC)</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>Change FPS</source>
-        <translation>Αλλαγή ΣτιγΑνάΔευτ</translation>
+        <translation>Αλλαγή του FPS</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Speed up/slow down the video as if altering fps. This filter changes duration.</source>
-        <translation>Επιτάχυνση η αργοπορία του βίντεου σαν να μεταβάλλονται τα στιγμιότυπα ανά δευτερόλεπτο. 
+        <translation>Επιτάχυνση η αργοπορία του βίντεο σαν να μεταβάλλονται τα στιγμιότυπα ανά δευτερόλεπτο.
 
 Αυτός ο μεταμορφωτής αλλάζει τη διάρκεια.</translation>
     </message>
     <message>
-        <location line="+141"/>
+        <location line="+146"/>
         <source>Source Fps:</source>
-        <translation>Στιγ.ΑνάΔευτ. Πηγής:</translation>
+        <translation>FPS πηγής:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Source frame rate:</source>
-        <translation>Ρυθμός στιγμιότυπων πηγής:</translation>
+        <translation>FPS πηγής:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Destination Fps:</source>
-        <translation>Στιγ.ΑνάΔευτ. Προορισμού:</translation>
+        <translation>FPS προορισμού:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Destination frame rate:</source>
-        <translation>Ρυθμός στιγμιότυπων προορισμού:</translation>
+        <translation>FPS προορισμού:</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Change fps</source>
-        <translation>Αλλαγή στιγ.ανάδευτ.</translation>
+        <translation>Αλλαγή του FPS</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -3970,7 +3977,7 @@
     <message>
         <location line="+0"/>
         <source>Invalid fps</source>
-        <translation>Μη έγκυρα στιγ.ανά.δευτ.</translation>
+        <translation>Μη έγκυρος ρυθμός στιγμιοτύπων FPS</translation>
     </message>
 </context>
 <context>
@@ -3978,7 +3985,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp" line="+35"/>
         <source>ChromaShift</source>
-        <translation>ΜεταβολήΧρωματισμού</translation>
+        <translation>Μετατόπιση χρωματισμού</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3991,17 +3998,17 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/chromashift.ui" line="+14"/>
         <source>ChromaShift</source>
-        <translation>ΜεταβολήΧρωματισμού</translation>
+        <translation>Μετατόπιση χρωματισμού</translation>
     </message>
     <message>
         <location line="+47"/>
         <source>V Shift</source>
-        <translation>Αντίθεση Μετατόπιση</translation>
+        <translation>Μετατόπιση του V</translation>
     </message>
     <message>
         <location line="-23"/>
         <source>U Shift</source>
-        <translation>U Μετατόπιση</translation>
+        <translation>Μετατόπιση του U</translation>
     </message>
 </context>
 <context>
@@ -4024,17 +4031,17 @@
     <message>
         <location line="+12"/>
         <source>AutoWhite</source>
-        <translation>ΑυτόματηΛεύκανση</translation>
+        <translation>Αυτόματη λεύκανση</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>AutoGain</source>
-        <translation>ΑυτόματοΚέρδος</translation>
+        <translation>Αυτόματη απολαβή</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Clip to Tv Range (16-235)</source>
-        <translation>Το Απόσπασμα σε Εύρος Τηλεόρασης (16-235)</translation>
+        <translation>Περιορισμός σε εύρος τηλεόρασης (16-235)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -4054,52 +4061,52 @@
     <message>
         <location line="+7"/>
         <source>Y gain</source>
-        <translation>Y κέρδος</translation>
+        <translation>Απολαβή Y</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Y Brightness</source>
-        <translation>Y Φωτεινότητα</translation>
+        <translation>Φωτεινότητα Y</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Y Gamma</source>
-        <translation>Y Γάμμα</translation>
+        <translation>Γάμμα Y</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Y Contrast</source>
-        <translation>Y Αντίθεση</translation>
+        <translation>Αντίθεση Y</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>U gain</source>
-        <translation>U κέρδος</translation>
+        <translation>Απολαβή U</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>U Brightness</source>
-        <translation>U Φωτεινότητα</translation>
+        <translation>Φωτεινότητα U</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>U Contrast</source>
-        <translation>U Αντίθεση</translation>
+        <translation>Αντίθεση U</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>V gain</source>
-        <translation>V κέρδος</translation>
+        <translation>Απολαβή V</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>V Brightness</source>
-        <translation>V Φωτεινότητα</translation>
+        <translation>Φωτεινότητα V</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>V Contrast</source>
-        <translation>V Αντίθεση</translation>
+        <translation>Αντίθεση V</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -4124,7 +4131,7 @@
     <message>
         <location line="+3"/>
         <source>colorYuv</source>
-        <translation>colorYuv</translation>
+        <translation>Χρώματα YUV</translation>
     </message>
 </context>
 <context>
@@ -4159,7 +4166,7 @@
     <message>
         <location line="+94"/>
         <source>Luma</source>
-        <translation>Φωτεινότητα</translation>
+        <translation>Ασπρόμαυρη φωτεινότητα (Luma)</translation>
     </message>
     <message>
         <location line="-53"/>
@@ -4179,12 +4186,12 @@
     <message>
         <location line="+46"/>
         <source>ChromaU</source>
-        <translation>ΧρωματισμόςU</translation>
+        <translation>Χρωματισμός U</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>ChromaV</source>
-        <translation>ΧρωματισμόςV</translation>
+        <translation>Χρωματισμός V</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -4202,7 +4209,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp" line="+136"/>
         <source>_Process luma</source>
-        <translation>Ε_πεξεργασία φωτεινότητας</translation>
+        <translation>Ε_πεξεργασία της ασπρόμαυρης φωτεινότητας (luma)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -4212,12 +4219,12 @@
     <message>
         <location line="+4"/>
         <source>Fast Convolution</source>
-        <translation>Γρήγορη Περιέλιξη</translation>
+        <translation>Γρήγορη περιέλιξη</translation>
     </message>
     <message>
         <location line="-5"/>
         <source>Process luma plane</source>
-        <translation>Επεξεργασία του επίπεδου φωτεινότητας</translation>
+        <translation>Επεξεργασία του επίπεδου ασπρόμαυρης φωτεινότητας (luma)</translation>
     </message>
 </context>
 <context>
@@ -4237,9 +4244,15 @@
         <source>I have detected a crash file. 
 Do you want to load it  ?
 (It will be deleted in all cases, you should save it if you want to keep it)</source>
-        <translation>Έχω ανιχνεύσει ένα αρχείο κατάρρευσης. 
-Θέλεις να φορτωθεί ;
-(σε κάθε περίπτωση, θα διαγραφεί, θα πρέπει να το αποθηκεύσεις, αν θες να το διατηρήσεις)</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>I have detected a crash file.
+Do you want to load it  ?
+(It will be deleted in all cases, you should save it if you want to keep it)</source>
+        <translation type="vanished">Έχω ανιχνεύσει ένα αρχείο κατάρρευσης.
+Θέλετε να φορτωθεί ;
+(σε κάθε περίπτωση θα διαγραφεί, θα πρέπει να το αποθηκεύσετε, αν θέλετε να διατηρηθεί)</translation>
     </message>
 </context>
 <context>
@@ -4247,27 +4260,29 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
         <source>Crop</source>
-        <translation>Περιτομή</translation>
+        <translation>Περικοπή</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Crop filter</source>
-        <translation>Φίλτρο περιτομής</translation>
+        <translation>Φίλτρο περικοπής</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
-        <translation>Προειδοποίηση! : Υπερβολικά μεγάλη περιτομή κατά πλάτος. Έγινε επαναφορά του πλάτους.</translation>
+        <translation>Προειδοποίηση : Υπερβολικά μεγάλη περικοπή κατά πλάτος. Έγινε επαναφορά του πλάτους!
+</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Warning Cropping too much height ! Height reseted !
 </source>
-        <translation>Προειδοποίηση! : Υπερβολικά μεγάλη περιτομή κατά ύψος. Έγινε επαναφορά του ύψους.</translation>
+        <translation>Προειδοποίηση : Υπερβολικά μεγάλη περικοπή κατά ύψος. Έγινε επαναφορά του ύψους!
+</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
         <source>Size: </source>
         <translation>Μέγεθος: </translation>
     </message>
@@ -4278,7 +4293,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
         <source>Crop</source>
-        <translation>Περιτομή</translation>
+        <translation>Περικοπή</translation>
     </message>
     <message>
         <location line="+88"/>
@@ -4302,7 +4317,7 @@
         <location line="+64"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
         <source>Bottom:</source>
-        <translation>Κάτω:</translation>
+        <translation>Βάση:</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -4314,7 +4329,7 @@
         <location line="+30"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
         <source>Auto Crop</source>
-        <translation>Αυτόματη Περιτομή</translation>
+        <translation>Αυτόματη περικοπή</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
@@ -4324,7 +4339,7 @@
     <message>
         <location line="+26"/>
         <source>&amp;Hide Rubber Band</source>
-        <translation>Απόκ&amp;ρυψη του Ράμπερμπαντ</translation>
+        <translation>Απόκρυψη του &amp;περιγράμματος</translation>
     </message>
 </context>
 <context>
@@ -4332,7 +4347,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.cpp" line="+272"/>
         <source>_Bitrate:</source>
-        <translation>Ρυθμός _Μπιτιών:</translation>
+        <translation>_Δυφιορυθμός:</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -4355,7 +4370,7 @@
     <message>
         <location line="+12"/>
         <source>_Mode:</source>
-        <translation>_Κατάσταση Λειτουργίας:</translation>
+        <translation>_Λειτουργία:</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -4365,27 +4380,27 @@
     <message>
         <location line="+1"/>
         <source>_Threshold 1:</source>
-        <translation>_Κατώφλι 1:</translation>
+        <translation>_Κατώτατο όριο 1:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>T_hreshold 2:</source>
-        <translation>Κα_τώφλι 2:</translation>
+        <translation>Κα_τώτατο όριο 2:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>C_ycle:</source>
-        <translation>_Κύλιση:</translation>
+        <translation>_Κύκλος:</translation>
     </message>
     <message>
         <location line="-35"/>
         <source>Decomb decimate</source>
-        <translation>Αποχτένισμα του αποδεκατισμού</translation>
+        <translation>Decomb decimate</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Donald Graft decimate. Remove duplicate after telecide.</source>
-        <translation>Αποδεκατισμός από τον Ντόναλντ Γκραφτ (Donald Graft). Απομάκρυνση διπλότυπων μετά από τηλεκινηματογράφηση (telecide).</translation>
+        <translation>Φίλτρο decimate από τον Donald Graft. Απομάκρυνση διπλότυπων μετά από το telecide.</translation>
     </message>
     <message>
         <location line="+19"/>
@@ -4395,17 +4410,17 @@
     <message>
         <location line="+1"/>
         <source>Pulldown dupe removal</source>
-        <translation>Αφαίρεση του επεκταμένου διπλότυπου</translation>
+        <translation>Αφαίρεση του pulldown</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Fastest (no chroma, partial luma)</source>
-        <translation>Το γρηγορότερο (χωρίς χρωματισμό, μερική φωτεινότητα)</translation>
+        <translation>Το τάχιστο (χωρίς χρωματισμό, μερική ασπρόμαυρη φωτεινότητα (luma))</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Medium (full luma, no chroma)</source>
-        <translation>Μέτριο (πλήρης φωτεινότητα, χωρίς χρωματισμό)</translation>
+        <translation>Μέτριο (πλήρης ασπρόμαυρη φωτεινότητα (luma), χωρίς χρωματισμό)</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -4415,7 +4430,7 @@
     <message>
         <location line="+3"/>
         <source>Decomb Decimate</source>
-        <translation>Αποχτένισμα του αποδεκατισμού</translation>
+        <translation>Decomb Decimate</translation>
     </message>
 </context>
 <context>
@@ -4423,12 +4438,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp" line="+41"/>
         <source>MPlayer delogo2</source>
-        <translation>MPlayer Αφαιρετής Λογότυπου2</translation>
+        <translation>MPlayer delogo2</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Blend a logo by interpolating its surrounding box.</source>
-        <translation>Ομαλή μείξη ενός λογότυπου με παρεμβολή του πλαισίου που ,το περιβάλει.</translation>
+        <translation>Ανάμειξη ενός λογότυπου με παρεμβολή του πλαισίου που το περιβάλει.</translation>
     </message>
 </context>
 <context>
@@ -4441,17 +4456,17 @@
     <message>
         <location line="+1"/>
         <source>Bottom</source>
-        <translation>Πάτος</translation>
+        <translation>Βάση</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Keep nb of frames and fps</source>
-        <translation>Διατήρηση του πλήθος των στιγμιότυπων και των στιγ.ανα.δευτ.</translation>
+        <translation>Διατήρηση του πλήθος των στιγμιότυπων και του fps</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Double nb of frames and fps</source>
-        <translation>Διπλάσιο πλήθος από στιγμιότυπα και στιγ.ανα.δευτ.</translation>
+        <translation>Διπλάσιο πλήθος από στιγμιότυπα και του fps</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -4461,12 +4476,12 @@
     <message>
         <location line="+4"/>
         <source>_Mode:</source>
-        <translation>_Κατάσταση Λειτουργίας:</translation>
+        <translation>_Λειτουργία:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Threshold:</source>
-        <translation>_Κατώφλι:</translation>
+        <translation>_Κατώτατο όριο:</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -4476,7 +4491,7 @@
     <message>
         <location line="+0"/>
         <source>Extra check, avoid using it</source>
-        <translation>Επιπλέον έλεγχος· απέφυγε τη χρήση του</translation>
+        <translation>Επιπλέον έλεγχος· αποφύγετε τη χρήση του</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -4491,12 +4506,12 @@
     <message>
         <location line="+1"/>
         <source>Donald Graft Bob.</source>
-        <translation>Ντόναλντ Γκραφτ Μπομπ (Donald Graft Bob).</translation>
+        <translation>Donald Graft Bob.</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>_Top Field First:</source>
-        <translation>Πρώτα _το Επάνω Πεδίο:</translation>
+        <translation>Πρώτα _το επάνω πεδίο:</translation>
     </message>
 </context>
 <context>
@@ -4517,7 +4532,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
         <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
-        <translation>Το DV υποστηρίζει μόνο 720 x 576 με 25σ.α.δ., και 720 x 480 με 29.97σ.α.δ.</translation>
+        <translation>Το DV υποστηρίζει μόνο 720*576*25fps, και 720*480*29.97fps</translation>
     </message>
 </context>
 <context>
@@ -4525,50 +4540,55 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+26"/>
         <source>Encoding...</source>
-        <translation>Γίνεται Κωδικοποίηση...</translation>
+        <translation>Γίνεται κωδικοποίηση...</translation>
     </message>
     <message>
-        <location line="+44"/>
-        <location line="+220"/>
+        <location line="+41"/>
+        <location line="+247"/>
         <location line="+21"/>
         <source>None</source>
         <translation>Κανένα</translation>
     </message>
     <message>
-        <location line="-258"/>
-        <location line="+251"/>
+        <location line="-261"/>
+        <location line="+254"/>
         <source>Unknown</source>
         <translation>Άγνωστο</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-157"/>
+        <source>Keep dialog open when finished</source>
+        <translation>Διατήρηση του διαλόγου ανοιχτού μετά τον τερματισμό</translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>Audio Codec:</source>
-        <translation>Κώδικας του Ήχου:</translation>
+        <translation>Κωδικοποιητής ήχου:</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Container:</source>
-        <translation>Σκεύος:</translation>
+        <translation>Υποδοχέας:</translation>
     </message>
     <message>
         <location line="+50"/>
         <source>Audio Size:</source>
-        <translation>Μέγεθος Ήχου:</translation>
+        <translation>Μέγεθος του ήχου:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Total Size:</source>
-        <translation>Συνολικό Μέγεθος:</translation>
+        <translation>Συνολικό μέγεθος:</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Video Size:</source>
-        <translation>Μέγεθος του Βίντεου:</translation>
+        <translation>Μέγεθος του βίντεο:</translation>
     </message>
     <message>
         <location line="+53"/>
         <source>Average Bitrate:</source>
-        <translation>Μέσος Ρυθμός Μπιτιών:</translation>
+        <translation>Μέσος δυφιορυθμός:</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -4580,7 +4600,7 @@
     <message>
         <location line="-78"/>
         <source>Processed Frames:</source>
-        <translation>Επεξεργασμένα Στιγμιότυπα:</translation>
+        <translation>Επεξεργασμένα στιγμιότυπα:</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -4590,7 +4610,7 @@
     <message>
         <location line="+57"/>
         <source>Elapsed:</source>
-        <translation>Πέρασαν:</translation>
+        <translation>Διανύθηκαν:</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -4600,44 +4620,44 @@
     <message>
         <location line="+14"/>
         <source>Frames/sec:</source>
-        <translation>Στιγμιότυπα/δευτ.:</translation>
+        <translation>Στιγμιότυπα/δευτ:</translation>
     </message>
     <message>
         <location line="-169"/>
         <location line="+7"/>
         <location line="+14"/>
         <source>0 MB</source>
-        <translation>0 ΜέγαΜπάιτια</translation>
+        <translation>0 MB</translation>
     </message>
     <message>
         <location line="+77"/>
         <source>0 kB/s</source>
-        <translation>0 χιλιομπίτια/δευτ</translation>
+        <translation>0 kB/s</translation>
     </message>
     <message>
-        <location line="-385"/>
+        <location line="-396"/>
         <source>Shut down computer when finished</source>
-        <translation>Κλείσιμο του υπολογιστή, όταν τελειώσει</translation>
+        <translation>Κλείσιμο του υπολογιστή όταν τερματιστεί</translation>
     </message>
     <message>
-        <location line="-11"/>
+        <location line="-58"/>
         <source>Time Remaining:</source>
-        <translation>Απομένων Χρόνος:</translation>
+        <translation>Εναπομένων χρόνος:</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+78"/>
         <source>Priority:</source>
         <translation>Προτεραιότητα:</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>High</source>
-        <translation>Υψηλό</translation>
+        <translation>Υψηλή</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Above Normal</source>
-        <translation>Πάνω από το Κανονικό</translation>
+        <translation>Πάνω από το κανονικό</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -4647,7 +4667,7 @@
     <message>
         <location line="+5"/>
         <source>Below Normal</source>
-        <translation>Κάτω από το Κανονικό</translation>
+        <translation>Κάτω από το κανονικό</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -4655,34 +4675,34 @@
         <translation>Χαμηλή</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+69"/>
         <source>Pause / Abort</source>
         <translation>Παύση / Εγκατάλειψη</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+13"/>
         <source>Advanced</source>
         <translation>Προχωρημένα</translation>
     </message>
     <message>
-        <location line="-175"/>
+        <location line="-199"/>
         <source>Main</source>
         <translation>Κύριο</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Phase:</source>
         <translation>Φάση:</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+127"/>
         <source>Minimize to Tray</source>
-        <translation>Ελαχιστοποίηση στο Ραφάκι</translation>
+        <translation>Ελαχιστοποίηση στο πλαίσιο συστήματος</translation>
     </message>
     <message>
-        <location line="+154"/>
+        <location line="+141"/>
         <source>Video Codec:</source>
-        <translation>Κώδικας του Βίντεου:</translation>
+        <translation>Κωδικοποιητής βίντεο:</translation>
     </message>
 </context>
 <context>
@@ -4690,12 +4710,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
         <source>MPlayer eq2</source>
-        <translation>MPlayer ισοσταθμιστής2</translation>
+        <translation>MPlayer eq2</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Adjust contrast, brightness, saturation and gamma.</source>
-        <translation>Προσαρμογή της αντίθεσης, της φωτεινότητας, της πληρότητας και του γάμμα.</translation>
+        <translation>Προσαρμογή της αντίθεσης, της φωτεινότητας, του κορεσμού και του γάμμα.</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
@@ -4724,17 +4744,17 @@
     <message>
         <location line="+37"/>
         <source>Saturation</source>
-        <translation>Πληρότητα</translation>
+        <translation>Κορεσμός</translation>
     </message>
     <message>
         <location line="+106"/>
         <source>Blue</source>
-        <translation>Μπλε</translation>
+        <translation>Κυανό</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Red</source>
-        <translation>Κόκκινο</translation>
+        <translation>Ερυθρό</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -4757,55 +4777,80 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/faac/audioencoder_faac.cpp" line="+292"/>
         <source>_Bitrate:</source>
-        <translation>Ρυθμός _Μπιτιών:</translation>
+        <translation>Δ_υφιορυθμός:</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Faac Configuration</source>
-        <translation>Ρύθμιση του Faac</translation>
+        <translation>Διαμόρφωση του Faac</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
         <source>Opus Configuration</source>
-        <translation>Ρύθμιση του Opus</translation>
+        <translation>Διαμόρφωση του Opus</translation>
     </message>
 </context>
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
         <location line="+23"/>
         <source>Fade</source>
-        <translation>Ομαλή μετάβαση</translation>
+        <translation>Εξασθένιση</translation>
     </message>
     <message>
         <location line="-22"/>
         <source>Fade.</source>
-        <translation>Ομαλή μετάβαση.</translation>
+        <translation>Τέχνασμα εξασθένισης.</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+13"/>
+        <source>From</source>
+        <translation>Από</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation>Εξασθένιση από την πρώτη εικόνα στην ταινία</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation>Προς</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation>Εξασθένιση από την ταινία στην πρώτη εικόνα</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation>_Κατεύθυνση εξασθένισης:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Start time:</source>
-        <translation>_Χρόνος έναρξης (χιλ.τουδευτ..):</translation>
+        <translation>_Χρόνος έναρξης:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_End time:</source>
-        <translation>_Χρόνος λήξης (χιλ.τουδευτ..):</translation>
+        <translation>Χ_ρόνος λήξης:</translation>
     </message>
 </context>
 <context>
     <name>fadeToBlack</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
-        <location line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+55"/>
+        <location line="+20"/>
         <source>Fade to black</source>
-        <translation>Φθίνουσα μετάβαση στο μαύρο</translation>
+        <translation>Εξασθένιση στο μαύρο</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-19"/>
         <source>Fade to black in/out.</source>
-        <translation>Φθίνουσα μετάβαση στο μαύρο, είσοδος/έξοδος.</translation>
+        <translation>Εξασθένιση στο μαύρο είσοδος/έξοδος.</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -4815,7 +4860,7 @@
     <message>
         <location line="+0"/>
         <source>Fade out</source>
-        <translation>Φθίνουσα έξοδος</translation>
+        <translation>Εξασθένιση εξόδου</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -4825,12 +4870,12 @@
     <message>
         <location line="+0"/>
         <source>Fade in</source>
-        <translation>Αύξουσα είσοδος</translation>
+        <translation>Εξασθένιση εισόδου</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>_Fade type:</source>
-        <translation>_Τύπος μετάβασης:</translation>
+        <translation>_Τύπος εξασθένισης:</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -4846,9 +4891,9 @@
 <context>
     <name>ffVAEncH264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
-        <translation>Βασική Τιμή</translation>
+        <translation>Γραμμή βάσης</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -4861,88 +4906,140 @@
         <translation>Υψηλό</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
+        <translation>Παράγοντας σταθερού ρυθμού</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation>Σταθερός δυφιορυθμός</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation>Μεταβλητός δυφιορυθμός</translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Profile:</source>
         <translation>Προφίλ:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation>Έλεγχος ρυθμού:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>GOP Size:</source>
-        <translation>Μέγεθος ΟμάδαςΕικόνων:</translation>
+        <translation>Μέγεθος Ομάδας Εικόνων (GOP):</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Maximum Consecutive B-Frames:</source>
-        <translation>Μέγιστο Πλήθος Συνεχόμενων Β΄-Στιγμιότυπων:</translation>
+        <translation>Μέγιστο πλήθος συνεχόμενων Β-στιγμιότυπων:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Bitrate (kbps):</source>
-        <translation>Ρυθμός Μπιτιών (χιλιομπίτιαναδευτ):</translation>
+        <source>Quality:</source>
+        <translation>Ποιότητα:</translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation>Δυφιορυθμός (kbps):</translation>
+    </message>
+    <message>
+        <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
-        <translation>Μέγιστος Ρυθμός Μπιτιών (χιλιομπίτιαναδευτ):</translation>
+        <translation>Μέγιστος δυφιορυθμός (kbps):</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Rate Control</source>
-        <translation>Έλεγχος Ρυθμού</translation>
+        <translation>Έλεγχος ρυθμού</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Frame Control</source>
-        <translation>Έλεγχος Στιγμιότυπων</translation>
+        <translation>Έλεγχος στιγμιότυπων</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
-        <translation>Ρύθμιση του κωδικοποιητή FFmpeg VA-API H.264</translation>
+        <translation>Διαμόρφωση του κωδικοποιητή FFmpeg VA-API H.264</translation>
     </message>
 </context>
 <context>
     <name>ffVAEncHEVC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+343"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Μέγεθος Ομάδας Εικόνων (GOP):</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
-        <translation type="unfinished"></translation>
+        <translation>Μέγιστο πλήθος συνεχόμενων Β-στιγμιότυπων:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Bitrate (kbps):</source>
-        <translation type="unfinished"></translation>
+        <translation>Δυφιορυθμός (kbps):</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
-        <translation type="unfinished"></translation>
+        <translation>Μέγιστος δυφιορυθμός (kbps):</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation>Παράγοντας σταθερού ρυθμού</translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation>Σταθερός δυφιορυθμός</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation>Μεταβλητός δυφιορυθμός</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation>Έλεγχος ρυθμού:</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation>Ποιότητα:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Rate Control</source>
-        <translation type="unfinished"></translation>
+        <translation>Έλεγχος ρυθμού</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Frame Control</source>
-        <translation type="unfinished"></translation>
+        <translation>Έλεγχος στιγμιοτύπων</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Διαμόρφωση του κωδικοποιητή FFmpeg VA-API HEVC</translation>
     </message>
 </context>
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+223"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+256"/>
         <source>Default</source>
         <translation>Προεπιλεγμένο</translation>
     </message>
@@ -4959,12 +5056,12 @@
     <message>
         <location line="+50"/>
         <source>Interlacing</source>
-        <translation>Παράλληλη Πλέξη</translation>
+        <translation>Πλέξη</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Rate Control</source>
-        <translation>Έλεγχος Ρυθμού</translation>
+        <translation>Έλεγχος ρυθμού</translation>
     </message>
     <message>
         <location line="-85"/>
@@ -4984,17 +5081,17 @@
     <message>
         <location line="+1"/>
         <source>Animes</source>
-        <translation>Κινούμενα Σχέδια</translation>
+        <translation>Κινούμενα σχέδια</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>MB comparison</source>
-        <translation>Σύγκριση ΜέγαΜπάιτιων</translation>
+        <translation>Σύγκριση MB</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Fewest bits (vhq)</source>
-        <translation>Τα λιγότερα μπίτια (vhq)</translation>
+        <translation>Τα λιγότερα δυφία (vhq)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5004,17 +5101,17 @@
     <message>
         <location line="+3"/>
         <source>One thread</source>
-        <translation>Μία κλωστή</translation>
+        <translation>Ένα νήμα</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Two threads)</source>
-        <translation>Δύο κλωστές)</translation>
+        <translation>Δύο νήματα</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Three threads</source>
-        <translation>Τρεις κλωστές</translation>
+        <translation>Τρία νήματα</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5024,22 +5121,22 @@
     <message>
         <location line="+5"/>
         <source>Interlaced</source>
-        <translation>Παράλληλα Πλεγμένο</translation>
+        <translation>Πεπλεγμένο (Interlaced)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Top Field First</source>
-        <translation>Πρώτα το Επάνω Πεδίο</translation>
+        <translation>Πρώτα το επάνω πεδίο</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bottom Field First</source>
-        <translation>Πρώτα το Κάτω Πεδίο</translation>
+        <translation>Πρώτα το κάτω πεδίο</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Threading</source>
-        <translation>Γνέσιμο</translation>
+        <translation>Νημάτωση</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5059,12 +5156,12 @@
     <message>
         <location line="+1"/>
         <source>VBV Buffer Size:</source>
-        <translation>Μέγεθος Μικροαποθήκευσης VBV:</translation>
+        <translation>Μέγεθος της ενδιάμεσης μνήμης VBV:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max bitrate (kb/s):</source>
-        <translation>Μέγιστος ρυθμός μπιτιών (χιλιομπίτια/δευτ.)</translation>
+        <translation>Μέγιστος δυφιορυθμός (kb/s):</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -5074,7 +5171,7 @@
     <message>
         <location line="+2"/>
         <source>_Number of B frames:</source>
-        <translation>_Πλήθος από Β΄ στιγμιότυπα:</translation>
+        <translation>_Πλήθος Β στιγμιότυπων:</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -5094,7 +5191,7 @@
     <message>
         <location line="+1"/>
         <source>_Filesize tolerance (kb):</source>
-        <translation>_Ανοχή μεγέθους αρχείου (χιλιομπίτια):</translation>
+        <translation>_Ανοχή μεγέθους αρχείου (kb):</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -5104,32 +5201,32 @@
     <message>
         <location line="+1"/>
         <source>Quantizer _blur:</source>
-        <translation>_Θόλωμα καβαντιστή:</translation>
+        <translation>_Θόλωση κβαντιστή:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Gop Size:</source>
-        <translation>Μέ_γεθος ΟμάδαςΕικόνων:</translation>
+        <translation>Μέ_γεθος Ομάδας Εικόνων (GOP):</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Interlaced:</source>
-        <translation>_Παράλληλα Πλεγμένο:</translation>
+        <translation>_Πεπλεγμένο:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Field Order:</source>
-        <translation>Σειρά Πεδίων:</translation>
+        <translation>Σειρά πεδίων:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Basic Settings</source>
-        <translation>Βασικές Ρυθμίσεις</translation>
+        <translation>Βασικές ρυθμίσεις</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Adv. Settings</source>
-        <translation>Προχ. Ρυθμίσεις</translation>
+        <translation>Προχ. ρυθμίσεις</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -5139,7 +5236,7 @@
     <message>
         <location line="+8"/>
         <source>libavcodec MPEG-2 configuration</source>
-        <translation>libavcodec MPEG-2 ρύθμιση</translation>
+        <translation>Διαμόρφωση του libavcodec MPEG-2</translation>
     </message>
 </context>
 <context>
@@ -5157,27 +5254,27 @@
     <message>
         <location line="+44"/>
         <source>User Interface</source>
-        <translation>Περιβάλλον Χρήσης</translation>
+        <translation>Περιβάλλον χρήστη</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Motion Estimation</source>
-        <translation>Εκτίμηση Κίνησης</translation>
+        <translation>Εκτίμηση κίνησης</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Rate Control</source>
-        <translation>Έλεγχος Ρυθμού</translation>
+        <translation>Έλεγχος ρυθμού</translation>
     </message>
     <message>
         <location line="-58"/>
         <source>MB comparison</source>
-        <translation>Σύγκριση ΜέγαΜπάιτιων</translation>
+        <translation>Σύγκριση MB</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Fewest bits (vhq)</source>
-        <translation>Τα λιγότερα μπίτια (vhq)</translation>
+        <translation>Τα λιγότερα δυφία (vhq)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5187,17 +5284,17 @@
     <message>
         <location line="+3"/>
         <source>One thread</source>
-        <translation>Μία κλωστή</translation>
+        <translation>Ένα νήμα</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Two threads)</source>
-        <translation>Δύο κλωστές)</translation>
+        <translation>Δύο νήματα</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Three threads</source>
-        <translation>Τρεις κλωστές</translation>
+        <translation>Τρία νήματα</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5207,7 +5304,7 @@
     <message>
         <location line="+9"/>
         <source>Threading</source>
-        <translation>Γνέσιμο</translation>
+        <translation>Νημάτωση</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5242,7 +5339,7 @@
     <message>
         <location line="+2"/>
         <source>_Number of B frames:</source>
-        <translation>_Πλήθος από Β΄ στιγμιότυπα:</translation>
+        <translation>_Πλήθος από Β στιγμιότυπα:</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5257,7 +5354,7 @@
     <message>
         <location line="+2"/>
         <source>_Filesize tolerance (kb):</source>
-        <translation>_Ανοχή μεγέθους αρχείου (χιλιομπίτια):</translation>
+        <translation>_Ανοχή μεγέθους αρχείου (kb):</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -5267,17 +5364,17 @@
     <message>
         <location line="+1"/>
         <source>Quantizer _blur:</source>
-        <translation>_Θόλωμα καβαντιστή:</translation>
+        <translation>_Θόλωση κβαντιστή:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Gop Size:</source>
-        <translation>Μέ_γεθος ΟμάδαςΕικόνων:</translation>
+        <translation>Μέ_γεθος Ομάδας Εικόνων (GOP):</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Advanced Simple Profile</source>
-        <translation>Προχωρημένο Απλό Προφίλ</translation>
+        <translation>Προχωρημένο απλό προφίλ</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -5287,7 +5384,7 @@
     <message>
         <location line="+8"/>
         <source>libavcodec MPEG-4 configuration</source>
-        <translation>libavcodec MPEG-4 ρύθμιση</translation>
+        <translation>Διαμόρφωση του libavcodec MPEG-4</translation>
     </message>
 </context>
 <context>
@@ -5295,7 +5392,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="+224"/>
         <source>None</source>
-        <translation>Κανένα</translation>
+        <translation>Καμία</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5330,12 +5427,12 @@
     <message>
         <location line="+27"/>
         <source>User Interface</source>
-        <translation>Περιβάλλον Χρήσης</translation>
+        <translation>Περιβάλλον χρήστη</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Rate Control</source>
-        <translation>Έλεγχος Ρυθμού</translation>
+        <translation>Έλεγχος ρυθμού</translation>
     </message>
     <message>
         <location line="-42"/>
@@ -5345,12 +5442,12 @@
     <message>
         <location line="+9"/>
         <source>MB comparison</source>
-        <translation>Σύγκριση ΜέγαΜπάιτιων</translation>
+        <translation>Σύγκριση MB</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Fewest bits (vhq)</source>
-        <translation>Τα λιγότερα μπίτια (vhq)</translation>
+        <translation>Τα λιγότερα δυφία (vhq)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5380,7 +5477,7 @@
     <message>
         <location line="+1"/>
         <source>_Filesize tolerance (kb):</source>
-        <translation>_Ανοχή μεγέθους αρχείου (χιλιομπίτια):</translation>
+        <translation>_Ανοχή μεγέθους αρχείου (kb):</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -5390,12 +5487,12 @@
     <message>
         <location line="+1"/>
         <source>Quantizer _blur:</source>
-        <translation>_Θόλωμα καβαντιστή:</translation>
+        <translation>_Θόλωση κβαντιστή:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Gop Size:</source>
-        <translation>Μέ_γεθος ΟμάδαςΕικόνων:</translation>
+        <translation>Μέ_γεθος Ομάδας Εικόνων (GOP):</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -5405,22 +5502,46 @@
     <message>
         <location line="+8"/>
         <source>libavcodec MPEG-4 configuration</source>
-        <translation>libavcodec MPEG-4 ρύθμιση</translation>
+        <translation>Διαμόρφωση του libavcodec MPEG-4</translation>
     </message>
 </context>
 <context>
     <name>ffnvenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+229"/>
+        <source>Controlled by Preset</source>
+        <translation>Ελεγχόμενο από προρύθμιση</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation>Σταθερή ποιότητα</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation>Σταθερός δυφιορυθμός</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation>Μεταβλητός δυφιορυθμός</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
         <source>Low Quality</source>
-        <translation>Χαμηλής Ποιότητας</translation>
+        <translation>Χαμηλή ποιότητα</translation>
     </message>
     <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>High Quality</source>
-        <translation>Υψηλή Ποιότητα</translation>
+        <translation>Υψηλή ποιότητα</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5432,24 +5553,24 @@
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Low Latency</source>
-        <translation>Χαμηλή Καθυστέρηση</translation>
+        <translation>Χαμηλή καθυστέρηση</translation>
     </message>
     <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Low Latency (LQ)</source>
-        <translation>Χαμηλή Καθυστέρηση (Χαμ.Ποιότ.)</translation>
+        <translation>Χαμηλή καθυστέρηση (LQ)</translation>
     </message>
     <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Low Latency (HQ)</source>
-        <translation>Χαμηλή Καθυστέρηση (Υψ.Ποι.)</translation>
+        <translation>Χαμηλή καθυστέρηση (HQ)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Baseline</source>
-        <translation>Βασική Τιμή</translation>
+        <translation>Γραμμή βάσης</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5464,6 +5585,12 @@
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+        <source>RC Mode:</source>
+        <translation>Λειτουργία RC:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Preset:</source>
         <translation>Προρύθμιση:</translation>
     </message>
@@ -5473,46 +5600,68 @@
         <translation>Προφίλ:</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>Quality:</source>
+        <translation>Ποιότητα:</translation>
+    </message>
+    <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Bitrate (kbps):</source>
-        <translation>Ρυθμός Μπιτιών (χιλιομπίτιαναδευτ):</translation>
+        <translation>Δυφιορυθμός (kbps):</translation>
     </message>
     <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Max Bitrate (kbps):</source>
-        <translation>Μέγιστος Ρυθμός Μπιτιών (χιλιομπίτιαναδευτ):</translation>
+        <translation>Μέγιστος δυφιορυθμός (kbps):</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>GOP Size:</source>
-        <translation>Μέγεθος ΟμάδαςΕικόνων:</translation>
+        <translation>Μέγεθος Ομάδας Εικόνων (GOP):</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
-        <translation>Μέγιστο Πλήθος Συνεχόμενων Β΄-Στιγμιότυπων:</translation>
+        <translation>Μέγιστο πλήθος συνεχόμενων Β-στιγμιότυπων:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation>Λειτουργία 2 περασμάτων</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation>Οι προρυθμίσεις χαμηλής καθυστέρησης χρησιμοποιούν πάντα τη λειτουργία των 2 περασμάτων</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
         <source>Rate Control</source>
-        <translation>Έλεγχος Ρυθμού</translation>
+        <translation>Έλεγχος ρυθμού</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Frame Control</source>
-        <translation>Έλεγχος Στιγμιότυπων</translation>
+        <translation>Έλεγχος στιγμιότυπων</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>NVENC H.264 configuration</source>
-        <translation>Ρύθμιση  του NVENC H.264</translation>
+        <translation>Διαμόρφωση του NVENC H.264</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
-        <source>nvEnc HEVC  configuration</source>
-        <translation>ρύθμιση  του nvEnc HEVC</translation>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+28"/>
+        <source>NVENC HEVC configuration</source>
+        <translation>Διαμόρφωση του NVENC HEVC</translation>
     </message>
 </context>
 <context>
@@ -5520,10 +5669,10 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+64"/>
         <source>[Mismatch]</source>
-        <translation>[Αταίριαστα]</translation>
+        <translation>[Αναντιστοιχία]</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+87"/>
         <source>Saving mpeg PS (ff)</source>
         <translation>Αποθηκεύεται το mpeg PS (ff)</translation>
     </message>
@@ -5531,49 +5680,56 @@
         <location line="+45"/>
         <source> video not compatible
 </source>
-        <translation> το βίντεο είναι μη συμβατό</translation>
+        <translation> το βίντεο είναι μη συμβατό
+</translation>
     </message>
     <message>
         <location line="+9"/>
         <source> Bad width/height for VCD
 </source>
-        <translation> Λάθος πλάτος ή ύψος για ΒίντεοΣιΝτί</translation>
+        <translation> Λανθασμένο πλάτος/ύψος για VCD
+</translation>
     </message>
     <message>
         <location line="+6"/>
         <source> Bad width/height for SVCD
 </source>
-        <translation> Λάθος πλάτος ή ύψος για ΣούπερΒίντεοΣιΝτί</translation>
+        <translation> Λανθασμένο πλάτος/ύψος για SVCD
+</translation>
     </message>
     <message>
         <location line="+6"/>
         <source> Bad width/height for DVD
 </source>
-        <translation> Λάθος πλάτος ή ύψος για ΝτιΒιΝτί</translation>
+        <translation> Λανθασμένο πλάτος/ύψος για DVD
+</translation>
     </message>
     <message>
         <location line="+17"/>
         <source> VCD : only MP2 audio accepted
 </source>
-        <translation> ΒίντεοΣιΝτί : αποδεκτός μόνο ήχος MP2</translation>
+        <translation> VCD : αποδεκτός μόνο ο ήχος MP2
+</translation>
     </message>
     <message>
         <location line="+5"/>
         <source> VCD : only 44.1 khz audio accepted
 </source>
-        <translation> ΒίντεοΣιΝτί : αποδεκτός μόνο ήχος των 44,1 χιλιοΧέρτζ</translation>
+        <translation> VCD : αποδεκτός μόνο ο ήχος των 44.1 khz
+</translation>
     </message>
     <message>
         <location line="+7"/>
         <source> DVD : only 48 khz audio accepted
 </source>
-        <translation> ΝτιΒιΝτί : αποδεκτός μόνο ήχος των 48 χιλιοΧέρτζ</translation>
+        <translation> DVD : αποδεκτός μόνο ο ήχος των 48 khz
+</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>[ffPS] DVD : only MP2/AC3/DTS audio accepted
 </source>
-        <translation>[ffPS] DVD : αποδεκτές  μορφές ήχου μόνο MP2 ή AC3 ή DTS
+        <translation>[ffPS] DVD : αποδεκτές μορφές ήχου μόνο οι MP2/AC3/DTS
 </translation>
     </message>
     <message>
@@ -5584,27 +5740,27 @@
     <message>
         <location line="+2"/>
         <source>Muxing Format</source>
-        <translation>Μορφή Πολυπλεξίματος</translation>
+        <translation>Μορφή πολυπλεξίας</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Allow non compliant stream</source>
-        <translation>Να επιτρέπεται μη συμμορφωμένη ροή δεδομένων</translation>
+        <translation>Να επιτρέπεται η μη συμμορφωμένη ροή</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Total Muxrate (kbits)</source>
-        <translation>Συνολικός Ρυθμός Πολυπλέξης (χιλιμπίτια)</translation>
+        <translation>Συνολικός ρυθμός πολυπλεξίας (kbits)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Video Muxrate (kbits)</source>
-        <translation>Ρυθμός Πολυπλεξίματος Βίντεου (χιλιομπίτια)</translation>
+        <translation>Ρυθμός πολυπλεξίας βίντεο (kbits)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>VBV size (kBytes)</source>
-        <translation>Μέγεθος VBV (χιλιοΜπάιτια)</translation>
+        <translation>Μέγεθος VBV (kByte)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5620,19 +5776,19 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
         <source>Saving mpeg TS (ff)</source>
         <translation>Αποθηκεύεται το mpeg TS (ff)</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTSConfig.cpp" line="+28"/>
         <source>VBR muxing</source>
-        <translation>Πολυπλέξη Μεταβ.Ρυθ.Μπιτ.</translation>
+        <translation>Πολυπλεξία VBR</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Mux rate (MBits/s)</source>
-        <translation>Ρυθμός Πολυπλεξίματος (ΜέγαΜπίτια/δευτ.)</translation>
+        <translation>Ρυθμός πολυπλεξίας (MBits/s)</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -5645,7 +5801,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
         <source>Baseline</source>
-        <translation>Βασική Τιμή</translation>
+        <translation>Γραμμή βάσης</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5665,37 +5821,37 @@
     <message>
         <location line="+1"/>
         <source>GOP Size:</source>
-        <translation>Μέγεθος ΟμάδαςΕικόνων:</translation>
+        <translation>Μέγεθος Ομάδας Εικόνων (GOP):</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
-        <translation>Μέγιστο Πλήθος Συνεχόμενων Β΄-Στιγμιότυπων:</translation>
+        <translation>Μέγιστο πλήθος συνεχόμενων Β-στιγμιότυπων:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bitrate (kbps):</source>
-        <translation>Ρυθμός Μπιτιών (χιλιομπίτιαναδευτ):</translation>
+        <translation>Δυφιορυθμός (kbps):</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max Bitrate (kbps):</source>
-        <translation>Μέγιστος Ρυθμός Μπιτιών (χιλιομπίτιαναδευτ):</translation>
+        <translation>Μέγιστος δυφιορυθμός (kbps):</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Rate Control</source>
-        <translation>Έλεγχος Ρυθμού</translation>
+        <translation>Έλεγχος ρυθμού</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Frame Control</source>
-        <translation>Έλεγχος Στιγμιότυπων</translation>
+        <translation>Έλεγχος στιγμιότυπων</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
-        <translation>Ρύθμιση του Κωδικοποιητή VideoToolbox H.264</translation>
+        <translation>Διαμόρφωση του κωδικοποιητή VideoToolbox H.264</translation>
     </message>
 </context>
 <context>
@@ -5708,8 +5864,7 @@
     <message>
         <location line="+0"/>
         <source>Cannot open &quot;%s&quot;.</source>
-        <translation>Αδυναμία ανοίγματος του
- &quot;%s&quot; .</translation>
+        <translation>Αδυναμία ανοίγματος του &quot;%s&quot; .</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -5718,13 +5873,13 @@
 Do you want to replace it?</source>
         <translation>Το %s υπάρχει ήδη.
 
-Θέλεις να αντικατασταθεί;</translation>
+Θέλετε να αντικατασταθεί;</translation>
     </message>
     <message>
         <location line="+27"/>
         <location line="+14"/>
         <source>It is possible that you are trying to overwrite an input file!</source>
-        <translation>Είναι πιθανό να προσπαθείς να επανογράψεις ένα αρχείο εισόδου.</translation>
+        <translation>Πιθανώς να προσπαθείτε να αντικαταστήσετε ένα αρχείο εισόδου!</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -5742,23 +5897,23 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+88"/>
         <source>_Temporal threshold:</source>
-        <translation>_Χρονικό κατώφλι:</translation>
+        <translation>_Χρονικό κατώτατο όριο:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Spatial threshold:</source>
-        <translation>_Χωρικό κατώφλι:</translation>
+        <translation>_Χωρικό κατώτατο όριο:</translation>
     </message>
     <message>
         <location line="-52"/>
         <location line="+56"/>
         <source>FluxSmooth</source>
-        <translation>FluxΟμαλοποίηση</translation>
+        <translation>FluxSmooth</translation>
     </message>
     <message>
         <location line="-55"/>
         <source>Spatio-temporal cleaner by Ross Thomas.</source>
-        <translation>Χωρο-χρονικός καθαριστής, από τον Ρος Τόμας (Ross Thomas).</translation>
+        <translation>Χωρο-χρονικός καθαριστής από τον Ross Thomas.</translation>
     </message>
 </context>
 <context>
@@ -5776,22 +5931,22 @@
     <message>
         <location line="+26"/>
         <source>User Interface</source>
-        <translation>Περιβάλλον Χρήσης</translation>
+        <translation>Περιβάλλον χρήστη</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Rate Control</source>
-        <translation>Έλεγχος Ρυθμού</translation>
+        <translation>Έλεγχος ρυθμού</translation>
     </message>
     <message>
         <location line="-32"/>
         <source>MB comparison</source>
-        <translation>Σύγκριση ΜέγαΜπάιτιων</translation>
+        <translation>Σύγκριση MB</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Fewest bits (vhq)</source>
-        <translation>Τα λιγότερα μπίτια (vhq)</translation>
+        <translation>Τα λιγότερα δυφία (vhq)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5821,7 +5976,7 @@
     <message>
         <location line="+1"/>
         <source>_Filesize tolerance (kb):</source>
-        <translation>_Ανοχή μεγέθους αρχείου (χιλιομπίτια):</translation>
+        <translation>_Ανοχή μεγέθους αρχείου (kb):</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -5831,12 +5986,12 @@
     <message>
         <location line="+1"/>
         <source>Quantizer _blur:</source>
-        <translation>_Θόλωμα καβαντιστή:</translation>
+        <translation>_Θόλωση κβαντιστή:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Gop Size:</source>
-        <translation>Μέ_γεθος ΟμάδαςΕικόνων:</translation>
+        <translation>Μέ_γεθος Ομάδας Εικόνων (GOP):</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -5846,13 +6001,13 @@
     <message>
         <location line="+8"/>
         <source>libavcodec FLV1 configuration</source>
-        <translation>libavcodec FLV1 ρύθμιση</translation>
+        <translation>Διαμόρφωση του libavcodec FLV1</translation>
     </message>
 </context>
 <context>
     <name>flvdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>Warning</source>
         <translation>Προειδοποίηση</translation>
     </message>
@@ -5860,8 +6015,8 @@
         <location line="+0"/>
         <source>This FLV file says it has no video.
 I will assume it has and try to continue</source>
-        <translation>Αυτό το FLV ισχυρίζεται πως δεν έχει βίντεο.
-Θα θεωρήσω πως έχει, και θα προσπαθήσω να συνεχίσω.</translation>
+        <translation>Αυτό το αρχείο FLV αναφέρει ότι δεν έχει βίντεο.
+Θα θεωρήσω πως έχει, και θα προσπαθήσω να συνεχίσω</translation>
     </message>
 </context>
 <context>
@@ -5876,17 +6031,17 @@
     <message>
         <location line="-16"/>
         <source>Only FLV1 &amp; VP6 supported for video</source>
-        <translation>Μόνο FLV1 κ΄ VP6 υποστηρίζονται για βίντεο</translation>
+        <translation>Μόνο τα FLV1 &amp; VP6 υποστηρίζονται για το βίντεο</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Only AAC &amp; mpegaudio supported for audio</source>
-        <translation>Μόνο AAC κ΄ mpegaudio υποστηρίζονται για ήχο</translation>
+        <translation>Μόνο τα AAC &amp; mpegaudio υποστηρίζονται για τον ήχο</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Only 44.1, 22.050 and 11.025 kHz supported</source>
-        <translation>Υποστηρίζονται μόνο 44,1 , 22,050 και 11,025 χιλιοΧέρτζ</translation>
+        <translation>Υποστηρίζονται μόνο 44.1 22.050 και 11.025 kHz</translation>
     </message>
 </context>
 <context>
@@ -5907,12 +6062,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glBenchmark/benchGl.cpp" line="+61"/>
         <source>OpenGl ReadBack benchmark</source>
-        <translation>OpenGl βαθμολόγηση ΠισωΔιαβάσματος</translation>
+        <translation>OpenGl οριοκριτήριο επανανάγνωσης</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Check how fast readback is.</source>
-        <translation>Έλεγχος του πόσο γρήγορη η πισω-ανάγνωση είναι.</translation>
+        <translation>Έλεγχος του πόσο γρήγορη είναι η επανανάγνωση.</translation>
     </message>
 </context>
 <context>
@@ -5920,12 +6075,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.cpp" line="+68"/>
         <source>OpenGl Fragment Shader Sample</source>
-        <translation>OpenGl Αποσπασματικό Δείγμα Σκίασης</translation>
+        <translation>OpenGl αποσπασματικό δείγμα σκίασης</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Run a fragment shader.</source>
-        <translation>Τρέξιμο μιας αποσπασματικής σκίασης.</translation>
+        <translation>Εκτέλεση μιας αποσπασματικής σκίασης.</translation>
     </message>
 </context>
 <context>
@@ -5933,12 +6088,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.cpp" line="+66"/>
         <source>OpenGl Fragment Shader Sample2</source>
-        <translation>OpenGl Αποσπασματικό Δείγμα Σκίασης 2</translation>
+        <translation>OpenGl αποσπασματικό δείγμα σκίασης 2</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Run a fragment shader.</source>
-        <translation>Τρέξιμο μιας αποσπασματικής σκίασης.</translation>
+        <translation>Εκτέλεση μιας αποσπασματικής σκίασης.</translation>
     </message>
 </context>
 <context>
@@ -5946,7 +6101,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="+66"/>
         <source>OpenGl Resize</source>
-        <translation>Αλλαγή Διαστάσεων OpenGl</translation>
+        <translation>Αλλαγή διαστάσεων OpenGl</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5966,7 +6121,7 @@
     <message>
         <location line="+4"/>
         <source>glResize</source>
-        <translation>glΑλλαγήΔιαστάσεων</translation>
+        <translation>gl αλλαγή διαστάσεων</translation>
     </message>
 </context>
 <context>
@@ -5989,7 +6144,7 @@
     <message>
         <location line="+5"/>
         <source>glRotate</source>
-        <translation>glΠεριστροφή</translation>
+        <translation>gl περιστροφή</translation>
     </message>
 </context>
 <context>
@@ -5997,12 +6152,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.cpp" line="+68"/>
         <source>OpenGl Fragment Shader Sample</source>
-        <translation>OpenGl Αποσπασματικό Δείγμα Σκίασης</translation>
+        <translation>OpenGl αποσπασματικό δείγμα σκίασης</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Run a fragment shader.</source>
-        <translation>Τρέξιμο μιας αποσπασματικής σκίασης.</translation>
+        <translation>Εκτέλεση μιας αποσπασματικής σκίασης.</translation>
     </message>
 </context>
 <context>
@@ -6010,22 +6165,22 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="-182"/>
         <source>Shader Loader</source>
-        <translation>Φορτωτής Σκίασης</translation>
+        <translation>Φορτωτής σκίασης</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Run an external shader program.</source>
-        <translation>Τρέξιμο ενός εξωτερικού προγράμματος σκίασης.</translation>
+        <translation>Εκτέλεση ενός εξωτερικού προγράμματος σκίασης.</translation>
     </message>
     <message>
         <location line="+192"/>
         <source>ShaderFile to load</source>
-        <translation>ΑρχείοΣκίασης προς φόρτωση</translation>
+        <translation>Αρχείο σκίασης προς φόρτωση</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>ShaderLoader</source>
-        <translation>ΦορτωτήςΣκίασης</translation>
+        <translation>Φορτωτής σκίασης</translation>
     </message>
 </context>
 <context>
@@ -6038,7 +6193,7 @@
     <message>
         <location line="+1"/>
         <source>Smooth image while preserving edge.</source>
-        <translation>Ομαλοποίηση της εικόνας διατηρώντας, συγχρόνως, την ζωντάνια.</translation>
+        <translation>Ομαλοποίηση της εικόνας διατηρώντας, συγχρόνως, τα όρια.</translation>
     </message>
 </context>
 <context>
@@ -6046,22 +6201,22 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="+84"/>
         <source>vdpauDeintGl</source>
-        <translation>vdpauΠαράλληλοΑποπλέξιμοGl</translation>
+        <translation>vdpau απόπλεξη Gl</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>VDPAU deinterlacer+resize, openGl version (faster).</source>
-        <translation>VDPAU παράλληλη πλέξη κ΄ αλλαγή-διαστάσεων, έκδοση openGl (γρηγορότερο).</translation>
+        <translation>VDPAU απόπλεξη+αλλαγή-διαστάσεων, έκδοση openGl (γρηγορότερο).</translation>
     </message>
     <message>
         <location line="+178"/>
         <source>Keep Top Field</source>
-        <translation>Διατήρηση του Άνω Πεδίου</translation>
+        <translation>Διατήρηση του άνω πεδίου</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Keep Bottom Field</source>
-        <translation>Διατήρηση του Κάτω Πεδίου</translation>
+        <translation>Διατήρηση του κάτω πεδίου</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6071,12 +6226,12 @@
     <message>
         <location line="+4"/>
         <source>_Resize:</source>
-        <translation>Α_λλαγή Μεγέθους:</translation>
+        <translation>Α_λλαγή μεγέθους:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Deint Mode:</source>
-        <translation>Λειτουργία Α_ποπλεξίματος:</translation>
+        <translation>Λειτουργία α_πόπλεξης:</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6099,12 +6254,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.cpp" line="+59"/>
         <source>OpenGl Vertex Shader</source>
-        <translation>OpenGl Διανυσματική Σκίαση</translation>
+        <translation>OpenGl διανυσματική σκίαση</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Run a simple vertex shader.</source>
-        <translation>Τρέξιμο μιας απλής διανυσματικής σκίασης.</translation>
+        <translation>Εκτέλεση μιας απλής διανυσματικής σκίασης.</translation>
     </message>
 </context>
 <context>
@@ -6125,12 +6280,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.cpp" line="+260"/>
         <source>Temporal &amp; spatial check</source>
-        <translation>Χρονικός κ΄ χωρικός έλεγχος</translation>
+        <translation>Χρονικός &amp; χωρικός έλεγχος</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Skip spatial temporal check</source>
-        <translation>Παράβλεψη χωρικού χρονικού ελέγχου</translation>
+        <translation>Παράλειψη του χωρικού χρονικού ελέγχου</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -6145,7 +6300,7 @@
     <message>
         <location line="+3"/>
         <source>_Mode:</source>
-        <translation>_Κατάσταση Λειτουργίας:</translation>
+        <translation>_Λειτουργία:</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6160,17 +6315,17 @@
     <message>
         <location line="+1"/>
         <source>Yet another deinterlacer, using shaders.</source>
-        <translation>Ακόμη ένας παράλληλος αποπλέκτης, που χρησιμοποιεί σκιάσεις.</translation>
+        <translation>Ακόμη ένας αποπλέκτης, που χρησιμοποιεί σκιάσεις.</translation>
     </message>
     <message>
         <location line="+183"/>
         <source>Bob, temporal &amp; spatial check</source>
-        <translation>Bob, χρονικός κ&apos; χωρικός έλεγχος</translation>
+        <translation>Bob, χρονικός &amp; χωρικός έλεγχος</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Bob, skip spatial temporal check</source>
-        <translation>Bob, παράληψη χωρικού κ&apos; χρονικού ελέγχου</translation>
+        <translation>Bob, παράλειψη χωρικού &amp; χρονικού ελέγχου</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -6183,12 +6338,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/horizontalFlip/horizontalFlip.cpp" line="+44"/>
         <source>Horizontal Flip</source>
-        <translation>Οριζόντιο Αναποδογύρισμα</translation>
+        <translation>Οριζόντια αναστροφή</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Horizontally flip the image.</source>
-        <translation>Περιστροφή της εικόνας οριζόντια.</translation>
+        <translation>Οριζόντια αναστροφή της εικόνας.</translation>
     </message>
 </context>
 <context>
@@ -6197,42 +6352,42 @@
         <location filename="../../common/ADM_commonUI/DIA_bitrateHisto.cpp" line="+56"/>
         <location line="+75"/>
         <source>No data</source>
-        <translation>Καθόλου δεδομένα</translation>
+        <translation>Χωρίς δεδομένα</translation>
     </message>
     <message>
         <location line="+71"/>
         <source>Max. bitrate:</source>
-        <translation>Μέγιστος ρυθμός μπιτιών:</translation>
+        <translation>Μέγ. δυφιορυθμός:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Average bitrate:</source>
-        <translation>Μέσος ρυθμός μπιτιών:</translation>
+        <translation>Μέσος δυφιορυθμός:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Number of I frames:</source>
-        <translation>Το πλήθος των I΄ στιγμιότυπων:</translation>
+        <translation>Το πλήθος των I στιγμιότυπων:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Number of P frames:</source>
-        <translation>Το πλήθος των Π΄ στιγμιότυπων:</translation>
+        <translation>Το πλήθος των P στιγμιότυπων:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Number of B frames:</source>
-        <translation>Το πλήθος των Β΄ στιγμιότυπων:</translation>
+        <translation>Το πλήθος των B στιγμιότυπων:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max. B frames:</source>
-        <translation>Μέγιστα Β΄ Στιγμιότυπα:</translation>
+        <translation>Μέγιστα Β στιγμιότυπα:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Bitrate Histogram</source>
-        <translation>Ιστόγραμμα Ρυθμού Μπιτιών</translation>
+        <translation>Ιστόγραμμα δυφιορυθμού</translation>
     </message>
 </context>
 <context>
@@ -6240,12 +6395,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+61"/>
         <source>Adjust hue and saturation.</source>
-        <translation>Προσαρμογή της απόχρωσης και της πληρότητας.</translation>
+        <translation>Προσαρμογή της απόχρωσης και της κορεσμού.</translation>
     </message>
     <message>
         <location line="-1"/>
         <source>Mplayer Hue</source>
-        <translation>Απόχρωσ MPlayer</translation>
+        <translation>Απόχρωση MPlayer</translation>
     </message>
 </context>
 <context>
@@ -6282,7 +6437,7 @@
     <message>
         <location line="+3"/>
         <source>HuffYUV Configuration</source>
-        <translation>Ρυθμίση HuffYUV</translation>
+        <translation>Διαμόρφωση του HuffYUV</translation>
     </message>
 </context>
 <context>
@@ -6290,7 +6445,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/hzStackField.cpp" line="+52"/>
         <source>Horizontal Stack Fields</source>
-        <translation>Οριζόντιο Στοίβαγμα Πεδίων</translation>
+        <translation>Οριζόντιο στοίβαγμα πεδίων</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6308,17 +6463,17 @@
     <message>
         <location line="+0"/>
         <source>Abort Requested</source>
-        <translation>Εγκατάλειψη της Αίτησης</translation>
+        <translation>Εγκατάλειψη της αίτησης</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Do you want to abort indexing ?</source>
-        <translation>Θέλεις να εγκαταλειφθεί η δημιουργία ευρετηρίου;</translation>
+        <translation>Θέλετε να εγκαταλειφθεί η δημιουργία ευρετηρίου;</translation>
     </message>
     <message>
         <location line="+76"/>
         <source>Time Left :%02d:%02d:%02d</source>
-        <translation>Απομείναντας Χρόνος:%02d:%02d:%02d</translation>
+        <translation>Εναπομένων χρόνος: %02d:%02d:%02d</translation>
     </message>
 </context>
 <context>
@@ -6366,7 +6521,7 @@
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>VeryFast</source>
-        <translation>ΠολύΓρήγορη</translation>
+        <translation>Πολύ γρήγορο</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -6378,23 +6533,23 @@
         <location line="+3"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>DupeRemover</source>
-        <translation>ΑπομάκρυνσηΔιπλότυπου</translation>
+        <translation>Απομάκρυνση διπλότυπου</translation>
     </message>
 </context>
 <context>
     <name>jobs</name>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Oops</source>
-        <translation>Ώπα της</translation>
+        <translation>Ωχ</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Something very wrong happened when building joblist.</source>
-        <translation>Κάτι πολύ λάθος συνέβει κατά τη σύνθεση του κατάστιχου διαδικασιών.</translation>
+        <translation>Κάτι πήγε πολύ στραβά κατά την κατασκευή του κατάστιχου διαδικασιών.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>There are no jobs stored</source>
         <translation>Δεν υπάρχουν αποθηκευμένες διαδικασίες</translation>
     </message>
@@ -6406,27 +6561,27 @@
     <message>
         <location line="+11"/>
         <source>Run all pending jobs</source>
-        <translation>Τρέξιμο όλων των εκκρεμών διαδικασιών</translation>
+        <translation>Εκτέλεση όλων των εκκρεμών διαδικασιών</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Run jobs</source>
-        <translation>Τρέξιμο των διαδικασιών</translation>
+        <translation>Εκτέλεση των διαδικασιών</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Delete already executed jobs</source>
-        <translation>Διαγραφή ήδη εκτελέσιμων διαδικασιών</translation>
+        <translation>Διαγραφή των ήδη εκτελεσμένων διαδικασιών</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Cleanup</source>
-        <translation>Ξεκαθάρισμα</translation>
+        <translation>Εκκαθάριση</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>If you use VDPAU you cannot use CLI version</source>
-        <translation>Αν χρησιμοποιήσεις VDPAU, δεν μπορείς να χρησιμοποιείς την έκδοση Διάδρασης Γραμμής Εντολών (CLI)</translation>
+        <translation>Αν χρησιμοποιείτε VDPAU, δεν μπορείτε να χρησιμοποιήσετε την έκδοση CLI</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -6436,7 +6591,7 @@
     <message>
         <location line="+20"/>
         <source>Quit</source>
-        <translation>Τερματισμός</translation>
+        <translation>Έξοδος</translation>
     </message>
 </context>
 <context>
@@ -6449,22 +6604,22 @@
     <message>
         <location line="+44"/>
         <source>Delete All Jobs</source>
-        <translation>Διαγραφή Όλων των Διαδικασιών</translation>
+        <translation>Διαγραφή όλων των διαδικασιών</translation>
     </message>
     <message>
         <location line="-7"/>
         <source>Delete Sel. Job</source>
-        <translation>Διαγραφή των Επιλ. Διαδικ.</translation>
+        <translation>Διαγραφή των επιλεγμένων διαδικασιών</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Run All Jobs</source>
-        <translation>Τρέξιμο Όλων των Διαδικασιών</translation>
+        <translation>Εκτέλεση όλων των διαδικασιών</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Run Selected Job</source>
-        <translation>Τρέξιμο των Επιλεγμένων Διαδικασιών</translation>
+        <translation>Εκτέλεση των επιλεγμένων διαδικασιών</translation>
     </message>
 </context>
 <context>
@@ -6487,12 +6642,12 @@
     <message>
         <location line="+12"/>
         <source>_ColorSpace:</source>
-        <translation>_ΧρωματικόΔιάστημα</translation>
+        <translation>_Χρωματικό διάστημα:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Mjpeg Configuration</source>
-        <translation>Ρύθμιση Mjpeg</translation>
+        <translation>Διαμόρφωση του Mjpeg</translation>
     </message>
 </context>
 <context>
@@ -6505,7 +6660,7 @@
     <message>
         <location line="+1"/>
         <source>Bottom</source>
-        <translation>Πάτος</translation>
+        <translation>Βάση</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -6515,7 +6670,7 @@
     <message>
         <location line="+1"/>
         <source>_Threshold:</source>
-        <translation>_Κατώφλι:</translation>
+        <translation>_Κατώτατο όριο:</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6530,7 +6685,7 @@
     <message>
         <location line="+1"/>
         <source>T_woway</source>
-        <translation>_Διπλής Κατεύθυνσης</translation>
+        <translation>_Διπλής κατεύθυνσης</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6540,32 +6695,32 @@
     <message>
         <location line="-24"/>
         <source>Kernel Deint.</source>
-        <translation>Αποπλέξιμο Πυρήνα</translation>
+        <translation>Απόπλεξη πυρήνα</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Port of Donald Graft Kernel Deinterlacer.</source>
-        <translation>Προσαρμογή του Παράλληλου Αποπλέκτη Πυρήνα του Ντόναλντ Γκραφτ (Donald Graft).</translation>
+        <translation>Προσαρμογή του αποπλέκτη πυρήνα του Donald Graft.</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Smaller means more deinterlacing</source>
-        <translation>Μικρότερο σημαίνει περισσότερο παράλληλο αποπλέξιμο</translation>
+        <translation>Μικρότερο σημαίνει περισσότερη απόπλεξη</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Extrapolate better (better not to use it)</source>
-        <translation>Καλύτερη προβολή εκτιμήσεων (καλύτερα να μην το χρησιμοποιήσεις)</translation>
+        <translation>Καλύτερη παρεκβολή (καλύτερα μην το χρησιμοποιήσετε)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Show interlaced areas (for test!)</source>
-        <translation>Προβολή των παράλληλα  πλεγμένων περιοχών (για δοκιμή!)</translation>
+        <translation>Προβολή των πεπλεγμένων περιοχών (για δοκιμή!)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>KernelDeint</source>
-        <translation>ΑποπλέξιμοΠυρήνα</translation>
+        <translation>Απόπλεξη πυρήνα</translation>
     </message>
 </context>
 <context>
@@ -6573,22 +6728,22 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="+310"/>
         <source>CBR</source>
-        <translation>Σταθερού Ρυθμού Μπιτιών (CBR)</translation>
+        <translation>Σταθερού δυφιορυθμού (CBR)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>ABR</source>
-        <translation>Μέσου Ρυθμού Μπιτιών (ABR)</translation>
+        <translation>Μέσου δυφιορυθμού (ABR)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Bit_rate mode:</source>
-        <translation>Κατάσταση λειτουργίας του _ρυθμού των μπιτιών:</translation>
+        <translation>Λειτουργία του δυφιορυθμού:</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>_Bitrate:</source>
-        <translation>Ρυθμός των _Μπιτιών:</translation>
+        <translation>_Δυφιορυθμός:</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -6598,7 +6753,7 @@
     <message>
         <location line="+6"/>
         <source>LAME Configuration</source>
-        <translation>Ρύθμιση του LAME</translation>
+        <translation>Διαμόρφωση του LAME</translation>
     </message>
     <message>
         <location line="-4"/>
@@ -6611,7 +6766,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.cpp" line="+71"/>
         <source>_Process luma</source>
-        <translation>Ε_πεξεργασία φωτεινότητας</translation>
+        <translation>Ε_πεξεργασία της ασπρόμαυρης φωτεινότητας (luma)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6621,22 +6776,22 @@
     <message>
         <location line="+4"/>
         <source>Fast Convolution</source>
-        <translation>Γρήγορη Περιέλιξη</translation>
+        <translation>Γρήγορη περιέλιξη</translation>
     </message>
     <message>
         <location line="-40"/>
         <source>Large Median (5x5).</source>
-        <translation>Μεγάλο, Μεσαία των Τιμών (5x5).</translation>
+        <translation>Μεγάλου διάμεσου (5x5).</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Median filter on 5x5 matrix.</source>
-        <translation>Μεταμορφωτής μεσαίας των τιμών σε πλαίσιο 5x5.</translation>
+        <translation>Μεταμορφωτής διάμεσου σε πίνακα 5x5.</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Process luma plane</source>
-        <translation>Επεξεργασία του επίπεδου φωτεινότητας</translation>
+        <translation>Επεξεργασία του επίπεδου ασπρόμαυρης φωτεινότητας (luma)</translation>
     </message>
 </context>
 <context>
@@ -6644,7 +6799,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
         <source>_Bitrate:</source>
-        <translation>Ρυθμός _Μπιτιών:</translation>
+        <translation>_Δυφιορυθμός:</translation>
     </message>
 </context>
 <context>
@@ -6657,7 +6812,7 @@
     <message>
         <location line="+2"/>
         <source>Decoder Options</source>
-        <translation>Επιλογές Αποκωδικοποιητή</translation>
+        <translation>Επιλογές αποκωδικοποιητή</translation>
     </message>
 </context>
 <context>
@@ -6670,7 +6825,7 @@
     <message>
         <location line="+1"/>
         <source>Linear blend</source>
-        <translation>Γραμμική ομαλή μείξη</translation>
+        <translation>Γραμμική ανάμειξη</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6680,42 +6835,42 @@
     <message>
         <location line="+1"/>
         <source>Cubic interpolate</source>
-        <translation>Κυβική Παρεμβολή</translation>
+        <translation>Κυβική παρεμβολή</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Median interpolate</source>
-        <translation>Μεσαία των τιμών παρεμβολή</translation>
+        <translation>Διάμεσος παρεμβολή</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>FFmpeg deint</source>
-        <translation>Αποπλέξιμο FFmpeg</translation>
+        <translation>Απόπλεξη FFmpeg</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>_Deinterlacing:</source>
-        <translation>_Παράλληλο Αποπλέξιμο:</translation>
+        <translation>_Απόπλεξη:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Autolevel</source>
-        <translation>_ΑυτόματοΕπίπεδο</translation>
+        <translation>_Αυτόματο επίπεδο</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>libavcodec deinterlacer</source>
-        <translation>παράλληλος αποπλέκτης libavcodec</translation>
+        <translation>Αποπλέκτης libavcodec</translation>
     </message>
     <message>
         <location line="-131"/>
         <source>Libavdec Deinterlacers</source>
-        <translation>Παράλληλοι Αποπλέκτες Libavdec</translation>
+        <translation>Αποπλέκτες Libavdec</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Lavcodec deinterlacer family.</source>
-        <translation>Οικογένεια παράλληλων αποπλεκτών Lavcodec.</translation>
+        <translation>Οικογένεια αποπλεκτών Lavcodec.</translation>
     </message>
 </context>
 <context>
@@ -6723,7 +6878,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/license.ui" line="+16"/>
         <source>License</source>
-        <translation>Άδεια</translation>
+        <translation>Άδεια χρήσης</translation>
     </message>
     <message>
         <location line="+46"/>
@@ -6741,12 +6896,12 @@
     <message>
         <location line="+1"/>
         <source>Put a logo on top of video, with alpha blending.</source>
-        <translation>Τοποθέτηση ενός λογότυπου πάνω από το βίντεο, με ομαλή μείξη διαφάνειας.</translation>
+        <translation>Τοποθέτηση ενός λογότυπου πάνω από το βίντεο, με ανάμειξη άλφα.</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
         <source>Select Logo Image</source>
-        <translation>Επιλογή Εικόνας Λογότυπου</translation>
+        <translation>Επιλογή εικόνας λογότυπου</translation>
     </message>
     <message>
         <location line="+72"/>
@@ -6790,7 +6945,7 @@
     <message>
         <location line="+65"/>
         <source>You can click in the image to approximately position the logo</source>
-        <translation>Μπορείς να κλικάρεις στην εικόνα για να ορίσεις το λογότυπο, στο περίπου</translation>
+        <translation>Μπορείτε να κάνετε κλικ στην εικόνα για να τοποθετήσετε κατά προσέγγιση το λογότυπο</translation>
     </message>
     <message>
         <location line="-85"/>
@@ -6803,7 +6958,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
         <source>GreyScale</source>
-        <translation>ΚλίμακαΤουΓκρι</translation>
+        <translation>Κλίμακα του γκρι</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6816,7 +6971,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="+20"/>
         <source>Video Filter Manager</source>
-        <translation>Διαχειριστής Μεταμορφωτών Βίντεου</translation>
+        <translation>Διαχειριστής μεταμορφωτών βίντεο</translation>
     </message>
     <message>
         <location line="+180"/>
@@ -6826,7 +6981,7 @@
     <message>
         <location line="+9"/>
         <source>Interlacing</source>
-        <translation>Παράλληλη Πλέξη</translation>
+        <translation>Πλέξη</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -6861,12 +7016,12 @@
     <message>
         <location line="-244"/>
         <source>&lt;big&gt;&lt;b&gt;Active Filters&lt;/b&gt;&lt;/big&gt;</source>
-        <translation>&lt;big&gt;&lt;b&gt;Ενεργός Μεταμορφωτής&lt;/b&gt;&lt;/big&gt;</translation>
+        <translation>&lt;big&gt;&lt;b&gt;Ενεργοί μεταμορφωτές&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
     <message>
         <location line="+78"/>
         <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
-        <translation>&lt;big&gt;&lt;b&gt;Διαθέσιμοι Μεταμορφωτές&lt;/b&gt;&lt;/big&gt;</translation>
+        <translation>&lt;big&gt;&lt;b&gt;Διαθέσιμοι μεταμορφωτές&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
     <message>
         <location line="+95"/>
@@ -6882,12 +7037,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
         <source>Matroska Images</source>
         <translation>Εικόνες Matroska</translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+523"/>
         <source>Matroska clusters</source>
         <translation>Συστάδες Matroska</translation>
     </message>
@@ -6897,7 +7052,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="+82"/>
         <source>Motion compensation deinterlacer. Ported from MPlayer.</source>
-        <translation>Παράλληλος αποπλέκτης αποζημίωσης κίνησης. Προσαρμογή από τον MPlayer.</translation>
+        <translation>Παράλληλος αποπλέκτης αποζημίωσης κίνησης. Προσαρμογή από το MPlayer.</translation>
     </message>
     <message>
         <location line="+38"/>
@@ -6917,7 +7072,7 @@
     <message>
         <location line="+4"/>
         <source>_Mode:</source>
-        <translation>_Κατάσταση Λειτουργίας:</translation>
+        <translation>_Λειτουργία:</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -6927,12 +7082,12 @@
     <message>
         <location line="+4"/>
         <source>mcDeinterlace</source>
-        <translation>mcΠαράλληλοΑποπλέξιμο</translation>
+        <translation>Απόπλεξη mc</translation>
     </message>
     <message>
         <location line="-51"/>
         <source>MCDeint</source>
-        <translation>MCΑποπλέξιμο</translation>
+        <translation>Απόπλεξη MC</translation>
     </message>
     <message>
         <location line="+42"/>
@@ -6942,7 +7097,7 @@
     <message>
         <location line="+4"/>
         <source>Bottom :</source>
-        <translation>Πάτος :</translation>
+        <translation>Βάση :</translation>
     </message>
 </context>
 <context>
@@ -6955,7 +7110,7 @@
     <message>
         <location line="+1"/>
         <source>3x3 convolution filter :mean.</source>
-        <translation>3x3 μεταμορφωτής περιέλιξης  :μέσος όρος.</translation>
+        <translation>3x3 μεταμορφωτής περιέλιξης: μέσος όρος.</translation>
     </message>
 </context>
 <context>
@@ -6963,12 +7118,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Median.cpp" line="+28"/>
         <source>Median convolution.</source>
-        <translation>Μεσαία των τιμών περιέλιξη</translation>
+        <translation>Περιέλιξη διαμέσου.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>3x3 convolution filter :median.</source>
-        <translation>3x3 μεταμορφωτής περιέλιξης  :μεσαία των τιμών.</translation>
+        <translation>3x3 μεταμορφωτής περιέλιξης: διάμεσος.</translation>
     </message>
 </context>
 <context>
@@ -6976,7 +7131,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidMergeField.cpp" line="+52"/>
         <source>Merge Fields</source>
-        <translation>Συγχώνευση Πεδίων</translation>
+        <translation>Συγχώνευση πεδίων</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6987,9 +7142,9 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+167"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
         <source>Saving Mkv</source>
-        <translation>Αποθηκεύεται το Mkv</translation>
+        <translation>Αποθήκευση του Mkv</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
@@ -7004,7 +7159,7 @@
     <message>
         <location line="+2"/>
         <source>Force Aspect Ratio (DAR)</source>
-        <translation>Εξαναγκασμός της Αναλογίας Διαστάσεων (DAR)</translation>
+        <translation>Εξαναγκασμός της αναλογίας διαστάσεων (DAR)</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -7017,17 +7172,17 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+201"/>
         <source>Mplayer Denoise 3D HQ</source>
-        <translation>Αποθορυβοτής MPlayer 3Δ Υψ.Ποι.</translation>
+        <translation>Μείωση θορύβου Mplayer 3D HQ</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
-        <translation>Μείωση του θορύβου, ομαλοποίηση της εικόνας, αύξηση της συμπιεστικότητας· Υψηλής Ποιότητας Έκδοση.</translation>
+        <translation>Μείωση του θορύβου, ομαλοποίηση της εικόνας, αύξηση της συμπιεστικότητας. Έκδοση HQ.</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>_Spatial luma strength:</source>
-        <translation>Έντα_ση χωρικής φωτεινότητας:</translation>
+        <translation>Έντα_ση χωρικής ασπρόμαυρης φωτεινότητας (luma):</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -7037,7 +7192,7 @@
     <message>
         <location line="+1"/>
         <source>_Temporal luma strength:</source>
-        <translation>Χωρική ένταση φω_τεινότητας:</translation>
+        <translation>Χωρική ένταση _ασπρόμαυρης φωτεινότητας (luma):</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -7047,7 +7202,7 @@
     <message>
         <location line="+4"/>
         <source>MPlayer Denoise 3D HQ</source>
-        <translation>Αποθορυβοτής MPlayer 3Δ Υψ.Ποι.</translation>
+        <translation>Μείωση θορύβου MPlayer 3D HQ</translation>
     </message>
 </context>
 <context>
@@ -7060,7 +7215,7 @@
     <message>
         <location line="-35"/>
         <source>Mplayer Denoise 3D</source>
-        <translation>Αποθορυβοτής 3Δ MPlayer </translation>
+        <translation>Μείωση θορύβου Mplayer 3D HQ</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -7070,7 +7225,7 @@
     <message>
         <location line="+32"/>
         <source>_Spatial luma strength:</source>
-        <translation>Έντα_ση χωρικής φωτεινότητας:</translation>
+        <translation>Έντα_ση χωρικής ασπρόμαυρης φωτεινότητας (luma):</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -7080,73 +7235,84 @@
     <message>
         <location line="+5"/>
         <source>MPlayer Denoise 3D</source>
-        <translation>Αποθορυβοτής 3Δ MPlayer</translation>
+        <translation>Μείωση θορύβου MPlayer 3D HQ</translation>
     </message>
 </context>
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
         <source>Problem reading SVQ3 headers</source>
         <translation>Πρόβλημα στην ανάγνωση των κεφαλίδων SVQ3</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation>Τύπος αποκωδικοποίησης του στιγμιότυπου</translation>
+    </message>
 </context>
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+67"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <location line="+17"/>
         <source>Unsupported</source>
         <translation>Μη υποστηριζόμενη</translation>
     </message>
     <message>
-        <location line="-9"/>
-        <source>Only MP4Video, H264, and H265 supported for video</source>
-        <translation>Μόνοy MP4Video, H264, κ΄ H265 υποστηρίζονται για βίντεο</translation>
+        <location line="-17"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
+        <translation>Μόνο τα MP4Video, H264, H265 και AV1 υποστηρίζονται για το βίντεο</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
-        <translation>Για ήχο, υποστηρίζονται μόνο τα AAC, AC3, E-AC3, και mpegaudio</translation>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
+        <translation>Μόνο τα AAC, AC3, E-AC3, LPCM, MP2, MP3 και Vorbis υποστηρίζονται για τον ήχο</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation>Μη συμβατή μορφή</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation>Η μορφή PSP δεν είναι συμβατή με τον ήχο LPCM</translation>
+    </message>
+    <message>
+        <location line="+182"/>
         <source>Saving mp4</source>
-        <translation>Αποθηκεύεται το mp4</translation>
+        <translation>Αποθήκευση του mp4</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Saving PSP</source>
-        <translation>Αποθηκεύεται το PSP</translation>
+        <translation>Αποθήκευση του PSP</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
         <source>Muxing Format</source>
-        <translation>Μορφή Πολυπλεξίματος</translation>
-    </message>
-    <message>
-        <source>Use alternate MP3 tag</source>
-        <translation type="vanished">Χρήση εναλλακτικών καρτελών MP3</translation>
+        <translation>Μορφή πολυπλεξίας</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>No optimization</source>
-        <translation type="unfinished"></translation>
+        <translation>Χωρίς βελτιστοποίηση</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Move index to the beginning of the file</source>
-        <translation type="unfinished"></translation>
+        <translation>Μετακίνηση του ευρετηρίου στην αρχή του αρχείου</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Use fragmentation</source>
-        <translation type="unfinished"></translation>
+        <translation>Χρήση τεμαχισμού</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Optimize for Streaming</source>
-        <translation type="unfinished"></translation>
+        <translation>Βελτιστοποίηση για ροοθήκευση</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -7156,35 +7322,80 @@
     <message>
         <location line="+2"/>
         <source>Aspect Ratio (DAR)</source>
-        <translation>Αναλογία Διαστάσεων (DAR)</translation>
+        <translation>Αναλογία διαστάσεων (DAR)</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Do not rotate</source>
-        <translation type="unfinished"></translation>
+        <translation>Να μην γίνει περιστροφή</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>90°</source>
-        <translation type="unfinished"></translation>
+        <translation>90°</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>180°</source>
-        <translation type="unfinished"></translation>
+        <translation>180°</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>270°</source>
-        <translation type="unfinished"></translation>
+        <translation>270°</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Rotate video</source>
-        <translation type="unfinished"></translation>
+        <translation>Περιστροφή του βίντεο</translation>
     </message>
     <message>
         <location line="+3"/>
+        <source>Auto</source>
+        <translation>Αυτόματο</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation>24 kHz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation>25 kHz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation>30 kHz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation>50 kHz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation>60 kHz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation>90 kHz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation>180 kHz</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation>Κλίμακα χρόνου</translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>MP4 Muxer</source>
         <translation>Πολυπλέκτης MP4</translation>
     </message>
@@ -7199,7 +7410,7 @@
     <message>
         <location line="+0"/>
         <source>Audio format not supported, only AAC/MP3/AC3</source>
-        <translation>Αυτή η μορφή ήχου δεν υποστηρίζεται, μόνο οι AAC,MP3 και AC3</translation>
+        <translation>Αυτή η μορφή ήχου δεν υποστηρίζεται, μόνο οι AAC/MP3/AC3</translation>
     </message>
     <message>
         <location line="+46"/>
@@ -7214,7 +7425,7 @@
     <message>
         <location line="+0"/>
         <source>Video does not have enough timing information. Are you copying from AVI?</source>
-        <translation>Το βίντεο δεν έχει αρκετές πληροφορίες χρονισμού. Μήπως κάνεις αντιγραφή από AVI ;</translation>
+        <translation>Το βίντεο δεν έχει αρκετές πληροφορίες χρονισμού. Μήπως κάνετε αντιγραφή από AVI;</translation>
     </message>
     <message>
         <location line="+65"/>
@@ -7224,12 +7435,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp" line="+53"/>
         <source>Invalid frequency for AC3. Only 32, 44.1 &amp; 48 kHz</source>
-        <translation>Μη έγκυρη συχνότητα για AC3. Αποδεκτά μόνο 32 ή 44,1 ή 48 χιλιοΧέρτζ</translation>
+        <translation>Μη έγκυρη συχνότητα για AC3. Αποδεκτά μόνο 32, 44.1 &amp; 48 kHz</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Invalid bitrate for AC3</source>
-        <translation>Μη έγκυρος ρυθμός μπιτιών για AC3</translation>
+        <translation>Μη έγκυρος δυφιορυθμός για AC3</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -7240,13 +7451,13 @@
         <location line="+48"/>
         <source>Cannot get AAC Extra data
 </source>
-        <translation>Αδυναμία λήψης Επιπρόσθετων δεδομένων AAC
+        <translation>Αδυναμία λήψης επιπρόσθετων δεδομένων AAC
 </translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Config.cpp" line="+31"/>
         <source>Optimize for streaming (SLOW)</source>
-        <translation>Βελτιστοποίηση για ροή (αργότερο)</translation>
+        <translation>Βελτιστοποίηση για ροοθήκευση (ΑΡΓΟ)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -7265,7 +7476,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/mpdelogo.ui" line="+14"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+14"/>
         <source>Mplayer Delogo</source>
-        <translation>MPlayer Αφαιρετής Λογότυπου</translation>
+        <translation>MPlayer Αφαιρετής λογότυπου</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -7295,17 +7506,17 @@
         <location line="+20"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="-14"/>
         <source>Border Width</source>
-        <translation>Πλάτος Ορίων</translation>
+        <translation>Πλάτος περιθωρίου</translation>
     </message>
     <message>
         <location line="+50"/>
         <source>Preview. Click in the image above to coarsly set the box coordinates</source>
-        <translation>Προεπισκόπηση. Κλίκαρε στην από πάνω εικόνα, για να ορίσεις στο περίπου τις συντεταγμένες του παραλληλόγραμμου</translation>
+        <translation>Προεπισκόπηση. Κάντε κλικ στην ανωτέρω εικόνα για να ορίσετε κατά προσέγγιση τις συντεταγμένες του παραλληλόγραμμου</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+59"/>
         <source>You can resize the red rectangle using the grips </source>
-        <translation>Μπορείς να αλλάξεις το μέγεθος του κόκκινου τετράγωνου χρεισιμοποιώντας τα πιαστράκια </translation>
+        <translation>Μπορείτε να αλλάξετε το μέγεθος του κόκκινου ορθογωνίου χρησιμοποιώντας τις λαβές </translation>
     </message>
     <message>
         <location line="+58"/>
@@ -7318,12 +7529,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+48"/>
         <source>Msharpen</source>
-        <translation>M-οξύτητα</translation>
+        <translation>Msharpen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Sharpen edges without amplifying noise. By Donald Graft.</source>
-        <translation>Όξυνση των ακμών χωρίς ενίσχυση του θορύβου. Από τον Ντόναλντ Γκραφτ (Donald Graft).</translation>
+        <translation>Όξυνση των ακμών χωρίς ενίσχυση του θορύβου. Από τον Donald Graft.</translation>
     </message>
 </context>
 <context>
@@ -7346,18 +7557,18 @@
     <message>
         <location line="+10"/>
         <source>Threshold</source>
-        <translation>Κατώφλι</translation>
+        <translation>Κατώτατο όριο</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>HighQuality</source>
-        <translation>ΥψηλήΠοιότητα</translation>
+        <translation>Υψηλή ποιότητα</translation>
     </message>
 </context>
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+242"/>
+        <location filename="../../common/gui_navigate.cpp" line="+232"/>
         <source>Cannot go to next keyframe</source>
         <translation>Αδυναμία μετάβασης στο επόμενο κλειδοστιγμιότυπο</translation>
     </message>
@@ -7382,12 +7593,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/nvEnc/ADM_nvEnc.cpp" line="+136"/>
         <source>Low Quality</source>
-        <translation>Χαμηλής Ποιότητας</translation>
+        <translation>Χαμηλή ποιότητα</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>High Quality</source>
-        <translation>Υψηλή Ποιότητα</translation>
+        <translation>Υψηλή ποιότητα</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -7397,17 +7608,17 @@
     <message>
         <location line="+1"/>
         <source>Low Latency</source>
-        <translation>Χαμηλή Καθυστέρηση</translation>
+        <translation>Χαμηλή καθυστέρηση</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Low Latency (LQ)</source>
-        <translation>Χαμηλή Καθυστέρηση (Χαμ.Ποιότ.)</translation>
+        <translation>Χαμηλή καθυστέρηση (LQ)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Low Latency (HQ)</source>
-        <translation>Χαμηλή Καθυστέρηση (Υψ.Ποι.)</translation>
+        <translation>Χαμηλή καθυστέρηση (HQ)</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -7417,17 +7628,17 @@
     <message>
         <location line="+1"/>
         <source>Bitrate (kbps):</source>
-        <translation>Ρυθμός Μπιτιών (χιλιομπίτιαναδευτ):</translation>
+        <translation>Δυφιορυθμός (kbps):</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max Bitrate (kbps):</source>
-        <translation>Μέγιστος Ρυθμός Μπιτιών (χιλιομπίτιαναδευτ):</translation>
+        <translation>Μέγιστος δυφιορυθμός (kbps):</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Nvidia H264 Encoder configuration</source>
-        <translation>Nvidia H264 Ρύθμιση κωδικοποιητή</translation>
+        <translation>Διαμόρφωση του κωδικοποιητή Nvidia H264</translation>
     </message>
 </context>
 <context>
@@ -7442,7 +7653,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
         <source>Unpacking bitstream</source>
-        <translation>Ξεπακετάρεται η ροή των δεδομένων</translation>
+        <translation>Αποσυμπίεση του δυφιορρεύματος</translation>
     </message>
 </context>
 <context>
@@ -7450,22 +7661,22 @@
     <message>
         <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
         <source>_Start time:</source>
-        <translation>Χρόνος έναρξης (χιλ.τουδευτ..):</translation>
+        <translation>_Χρόνος έναρξης:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_End time:</source>
-        <translation>Χρόνος Λήξης (χιλ.τουδευτ.):</translation>
+        <translation>_Χρόνος λήξης:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Configure filter</source>
-        <translation>Ρύθμιση μεταμορφωτή</translation>
+        <translation>Διαμόρφωση του μεταμορφωτή</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Partial Filter</source>
-        <translation>Μερικός Μεταμορφωτής</translation>
+        <translation>Μερικός μεταμορφωτής</translation>
     </message>
 </context>
 <context>
@@ -7473,12 +7684,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/printInfo/printInfo.cpp" line="+44"/>
         <source>PrintInfo</source>
-        <translation>ΕκτύπωσηΠληροφοριών</translation>
+        <translation>Εκτύπωση πληροφοριών</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Display some informations on Screen.</source>
-        <translation>Εμφάνιση κάποιων πληροφοριών στην Οθόνη.</translation>
+        <translation>Εμφάνιση ορισμένων πληροφοριών στην οθόνη.</translation>
     </message>
 </context>
 <context>
@@ -7496,28 +7707,28 @@
     <message>
         <location line="+31"/>
         <source>Frame Rate:</source>
-        <translation>Ταχύτητα Στιγμιότυπων:</translation>
+        <translation>Ταχύτητα στιγμιότυπων:</translation>
     </message>
     <message>
         <location line="+14"/>
         <location line="+135"/>
         <source>Total Duration:</source>
-        <translation>Συνολική Διάρκεια:</translation>
+        <translation>Συνολική διάρκεια:</translation>
     </message>
     <message>
         <location line="-121"/>
         <source>Aspect Ratio:</source>
-        <translation>Αναλογία Διαστάσεων:</translation>
+        <translation>Αναλογία διαστάσεων:</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Image Size:</source>
-        <translation>Μέγεθος Εικόνας:</translation>
+        <translation>Μέγεθος εικόνας:</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Codec 4CC:</source>
-        <translation>Κώδικας 4CC:</translation>
+        <translation>Κωδικοποιητής 4CC:</translation>
     </message>
     <message>
         <location line="+62"/>
@@ -7532,12 +7743,12 @@
     <message>
         <location line="+14"/>
         <source>Variable Bitrate:</source>
-        <translation>Μεταβλητός Ρυθμός Μπιτιών:</translation>
+        <translation>Μεταβλητός δυφιορυθμός:</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Bitrate:</source>
-        <translation>Ρυθμός Μπιτιών:</translation>
+        <translation>Δυφιορυθμός:</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -7547,7 +7758,7 @@
     <message>
         <location line="+14"/>
         <source>Codec:</source>
-        <translation>Κώδικας:</translation>
+        <translation>Κωδικοποιητής:</translation>
     </message>
     <message>
         <location line="-226"/>
@@ -7556,27 +7767,27 @@
         <location line="+14"/>
         <location line="+14"/>
         <source>TextLabel</source>
-        <translation>ΕτικέταΚειμένου</translation>
+        <translation>Ετικέτα κειμένου</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Extra Video Properties</source>
-        <translation>Επιπρόσθετες Ιδιότητες Βίντεου</translation>
+        <translation>Επιπρόσθετες ιδιότητες βίντεο</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>ExtraDataSize:</source>
-        <translation>Μέγεθος Επιπρόσθετων Δεδομένων:</translation>
+        <translation>Μέγεθος επιπρόσθετων δεδομένων:</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Extra data :</source>
-        <translation>Επιπρόσθετα Δεδομένα :</translation>
+        <translation>Επιπρόσθετα δεδομένα :</translation>
     </message>
     <message>
         <location line="+123"/>
         <source>Copy to Clipboard</source>
-        <translation>Αντιγραφή στο Πρόχειρο</translation>
+        <translation>Αντιγραφή στο πρόχειρο</translation>
     </message>
     <message>
         <location line="+29"/>
@@ -7587,30 +7798,21 @@
 <context>
     <name>psdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="vanished">Σφάλμα</translation>
-    </message>
-    <message>
-        <source>This file&apos;s index has been created with an older version of avidemux.
-Please delete the idx2 file and reopen.</source>
-        <translation type="vanished">Τα περιεχόμενα αυτού του φακέλου έχουν δημιουργηθεί με μια παλαιότερη έκδοση του Αβιντεμούξιου.
-Παρακαλώ, διέγραψε το αρχείο idx2, και κάνε ξανά άνοιγμα.</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
         <translation>Δημιουργία ευρετηρίου</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>Υπάρχουν αρκετά αρχεία με συνεχόμενες ονομασίες. Να φορτωθούν όλα μαζί;</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
-        <translation type="unfinished"></translation>
+        <translation>Τα περιεχόμενα αυτού του φακέλου έχουν δημιουργηθεί με μια παλαιότερη έκδοση του avidemux.
+Το αρχείο πρέπει να επαναδεικτοδοτηθεί. Να συνεχίσω;</translation>
     </message>
 </context>
 <context>
@@ -7618,7 +7820,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
         <source>Select audio file</source>
-        <translation>Επέλεξε αρχείο ήχου</translation>
+        <translation>Επιλέξτε αρχείο ήχου</translation>
     </message>
     <message>
         <location line="+22"/>
@@ -7639,7 +7841,7 @@
     <message>
         <location line="+126"/>
         <source>Track </source>
-        <translation>Κομμάτι </translation>
+        <translation>Κανάλι </translation>
     </message>
     <message>
         <location line="+0"/>
@@ -7654,7 +7856,7 @@
     <message>
         <location line="+34"/>
         <source>.... Add audio track</source>
-        <translation>.... Προσθήκη καναλιού Ήχου</translation>
+        <translation>.... Προσθήκη καναλιού ήχου</translation>
     </message>
     <message>
         <location line="+34"/>
@@ -7668,33 +7870,33 @@
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="+65"/>
         <location line="+20"/>
         <source>Privileges Required</source>
-        <translation>Απαιτούνται Δικαιώματα</translation>
+        <translation>Απαιτούνται δικαιώματα</translation>
     </message>
     <message>
         <location line="-20"/>
         <location line="+20"/>
         <source>Root privileges are required to perform this operation.</source>
-        <translation>Απαιτούνται δικαιώματα Υπερχρήστη για να εκτελεστεί αυτή η λειτουργία.</translation>
+        <translation>Απαιτούνται δικαιώματα υπερχρήστη για να εκτελεστεί αυτή η λειτουργία.</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+126"/>
         <source>First Pass</source>
-        <translation>Πρώτο Πέρασμα</translation>
+        <translation>Πρώτο πέρασμα</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Pass 1</source>
-        <translation>Πέρασμα 1ο</translation>
+        <translation>Πέρασμα 1</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Encoding...</source>
-        <translation>Γίνεται Κωδικοποίηση...</translation>
+        <translation>Γίνεται κωδικοποίηση...</translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+185"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
-        <translation>Η κωδικοποίηση έχει παυθεί. Θέλεις να συνεχιστεί ή να εγκαταλειφθεί;</translation>
+        <translation>Η κωδικοποίηση ανεστάλη. Θέλετε να συνεχιστεί ή να εγκαταλείψετε;</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -7724,30 +7926,30 @@
     <message>
         <location line="-82"/>
         <source>Overwrite file </source>
-        <translation>Επανωγραφή του αρχείου </translation>
+        <translation>Αντικατάσταση αρχείου </translation>
     </message>
 </context>
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+212"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+206"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
-        <translation>&lt;b&gt;Διαθέσιμη νέα έκδοση&lt;/b&gt;&lt;br&gt; Έκδοση %1&lt;br&gt;Εκδόθηκε στις %2.&lt;br&gt;Μπορείς να το κατεβάσεις από εδώ&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; Μπορείς να απενεργοποιήσεις την αυτόματη ενημέρωση στις προτιμήσεις.&lt;/small&gt;</translation>
+        <translation>&lt;b&gt;Διαθέσιμη νέα έκδοση&lt;/b&gt;&lt;br&gt; Έκδοση %1&lt;br&gt;Εκδόθηκε στις %2.&lt;br&gt;Μπορείτε να την κάνετε λήψη από εδώ&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; Μπορείτε να απενεργοποιήσετε την αυτόματη ενημέρωση από τις προτιμήσεις.&lt;/small&gt;</translation>
     </message>
     <message>
         <location line="+245"/>
         <source>Recent Files</source>
-        <translation>Πρόσφατα Αρχεία</translation>
+        <translation>Πρόσφατα αρχεία</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Recent Projects</source>
-        <translation>Πρόσφατες Εργασίες</translation>
+        <translation>Πρόσφατες εργασίες</translation>
     </message>
     <message>
         <location line="+671"/>
         <source>Play/Stop</source>
-        <translation>Αναπαραγωγή ή Σταμάτημα</translation>
+        <translation>Εκτέλεση/Διακοπή</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -7772,12 +7974,12 @@
     <message>
         <location line="+3"/>
         <source>Set start marker</source>
-        <translation>Όρισε το δείκτη της αρχής</translation>
+        <translation>Ορίστε τον σημαδευτή της αρχής</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Set end marker</source>
-        <translation>Όρισε το δείκτη του τέλους</translation>
+        <translation>Ορίστε τον σημαδευτή του τέλους</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -7792,17 +7994,17 @@
     <message>
         <location line="+3"/>
         <source>Go to marker A</source>
-        <translation>Μετάβαση στο Δείκτη Α΄</translation>
+        <translation>Μετάβαση στον σημαδευτή Α</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Go to marker B</source>
-        <translation>Μετάβαση στο Δείκτη Β΄</translation>
+        <translation>Μετάβαση στον σημαδευτή Β</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Backward one minute</source>
-        <translation>Προς τα πίσω, για ένα λεπτό</translation>
+        <translation>Προς τα πίσω, κατά ένα λεπτό</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -7810,21 +8012,30 @@
         <translation>Προς τα εμπρός, κατά ένα λεπτό</translation>
     </message>
     <message>
-        <location line="+626"/>
+        <location line="+681"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>Η εφαρμογή αντιμετώπισε ένα μοιραίο πρόβλημα
-Η τωρινή επεξεργασία έχει αποθηκευθεί και θα ξαναφορτωθεί στην επόμενη εκκίνηση</translation>
+Η τρέχουσα επεξεργασία έχει αποθηκευθεί και θα ξαναφορτωθεί στην επόμενη εκκίνηση</translation>
     </message>
     <message>
-        <location line="+262"/>
+        <location line="+230"/>
         <source>%c-%s (%02d)</source>
         <translation>%c-%s (%02d)</translation>
     </message>
     <message>
-        <location line="+334"/>
-        <source> (%d track(s))</source>
-        <translation> (κανάλια:%d )</translation>
+        <location line="+70"/>
+        <source>Selection: </source>
+        <translation>Επιλογή: </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation>
+            <numerusform> (%n κανάλι)</numerusform>
+            <numerusform> (%n κανάλια)</numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -7832,7 +8043,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp" line="+51"/>
         <source>Project Script</source>
-        <translation>Σενάριο Εργασίας</translation>
+        <translation>Σενάριο εργασίας</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -7842,22 +8053,22 @@
     <message>
         <location line="+6"/>
         <source>&amp;Run Project...</source>
-        <translation>Τ&amp;ρέξιμο Εργασίας...</translation>
+        <translation>&amp;Εκτέλεση εργασίας...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Debug Project...</source>
-        <translation>Αποσ&amp;φαλμάτωση Εργασίας...</translation>
+        <translation>Αποσ&amp;φαλμάτωση εργασίας...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Save &amp;As Project...</source>
-        <translation>&amp;Αποθήκευση Ως Εργασία...</translation>
+        <translation>&amp;Αποθήκευση ως εργασία...</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Scripting Shell</source>
-        <translation>Κέλυφος Δημιουργίας Σεναρίου</translation>
+        <translation>Κέλυφος δημιουργίας σεναρίου</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -7867,7 +8078,7 @@
     <message>
         <location line="+22"/>
         <source>Scripting Reference</source>
-        <translation>Αναφορά Δημιουργίας Σεναρίου</translation>
+        <translation>Αναφορά δημιουργίας σεναρίου</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -7895,7 +8106,7 @@
     <message>
         <location line="+0"/>
         <source>Failed</source>
-        <translation>Αποτυχία</translation>
+        <translation>Απέτυχε</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -7910,7 +8121,7 @@
     <message>
         <location line="+24"/>
         <source>Job Name</source>
-        <translation>Όνομα Διαδικασίας</translation>
+        <translation>Όνομα διαδικασίας</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -7920,12 +8131,12 @@
     <message>
         <location line="+0"/>
         <source>Start Time</source>
-        <translation>Χρόνος Έναρξης</translation>
+        <translation>Χρόνος έναρξης</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>End Time</source>
-        <translation>Χρόνος Λήξης</translation>
+        <translation>Χρόνος λήξης</translation>
     </message>
     <message>
         <location line="+64"/>
@@ -7961,7 +8172,7 @@
     <message>
         <location line="+0"/>
         <source>This script has already been successfully executed.</source>
-        <translation>Αυτό το σενάριο εντολών έχει, ήδη, εκτελεστεί, επιτυχώς.</translation>
+        <translation>Αυτό το σενάριο εντολών έχει ήδη εκτελεστεί επιτυχώς.</translation>
     </message>
 </context>
 <context>
@@ -7982,7 +8193,7 @@
     <message>
         <location line="+0"/>
         <source>This filter cannot be made partial</source>
-        <translation>Αυτός ε μεταμορφωτής δεν μπορεί να γίνει μερικός</translation>
+        <translation>Αυτός ο μεταμορφωτής δεν μπορεί να γίνει μερικός</translation>
     </message>
     <message>
         <location line="+244"/>
@@ -7992,12 +8203,12 @@
     <message>
         <location line="-96"/>
         <source>Remove</source>
-        <translation>Απομάκρυνση</translation>
+        <translation>Αφαίρεση</translation>
     </message>
     <message>
         <location line="-1"/>
         <source>Configure</source>
-        <translation>Ρύθμιση</translation>
+        <translation>Διαμόρφωση</translation>
     </message>
     <message>
         <location line="-2"/>
@@ -8017,12 +8228,12 @@
     <message>
         <location line="+225"/>
         <source>Load video filters..</source>
-        <translation>Φόρτωση μεταμορφωτών βίντεου...</translation>
+        <translation>Φόρτωση μεταμορφωτών βίντεο...</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Save video filters..</source>
-        <translation>Αποθήκευση των μεταμορφωτών του βίντεου...</translation>
+        <translation>Αποθήκευση των μεταμορφωτών του βίντεο...</translation>
     </message>
 </context>
 <context>
@@ -8040,12 +8251,12 @@
     <message>
         <location line="+1"/>
         <source>The processing is paused.</source>
-        <translation>Η επεξεργασία έχει παυθεί.</translation>
+        <translation>Η επεξεργασία ανεστάλη.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel it ?</source>
-        <translation>Να ακυρωθεί ;</translation>
+        <translation>Να ακυρωθεί;</translation>
     </message>
 </context>
 <context>
@@ -8060,10 +8271,19 @@
         <source>Yes</source>
         <translation>Ναι</translation>
     </message>
+    <message numerus="yes">
+        <location line="+72"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
+        <translation>
+            <numerusform>Ήχος (%n ενεργό κανάλι)</numerusform>
+            <numerusform>Ήχος (%n ενεργά κανάλια)</numerusform>
+        </translation>
+    </message>
     <message>
-        <location line="+98"/>
+        <location line="+34"/>
         <source>Mono</source>
-        <translation>Μονοφωνικό</translation>
+        <translation>Μονοφωνικός</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8078,87 +8298,87 @@
     <message>
         <location line="+2"/>
         <source>Codec 4CC:	</source>
-        <translation type="unfinished"></translation>
+        <translation>Κωδικοποιητής 4CC:	</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Image Size:	</source>
-        <translation type="unfinished"></translation>
+        <translation>Μέγεθος εικόνας:	</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Aspect Ratio:	</source>
-        <translation type="unfinished"></translation>
+        <translation>Αναλογία διαστάσεων:	</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Frame Rate:	</source>
-        <translation type="unfinished"></translation>
+        <translation>Ταχύτητα στιγμιότυπων:	</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+27"/>
+        <location line="+33"/>
         <source>Total Duration:	</source>
-        <translation type="unfinished"></translation>
+        <translation>Συνολική διάρκεια:	</translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-31"/>
         <source>Extra Video Properties</source>
-        <translation>Επιπρόσθετες Ιδιότητες Βίντεου</translation>
+        <translation>Επιπρόσθετες ιδιότητες βίντεο</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>ExtraDataSize:	</source>
-        <translation type="unfinished"></translation>
+        <translation>Μέγεθος επιπρόσθετων δεδομένων:	</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Extra data:	</source>
-        <translation type="unfinished"></translation>
+        <translation>Επιπρόσθετα δεδομένα :	</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Audio</source>
         <translation>Ήχος</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Codec:		</source>
-        <translation type="unfinished"></translation>
+        <translation>Κωδικοποιητής:		</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Channels:	</source>
-        <translation type="unfinished"></translation>
+        <translation>Κανάλια:	</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Bitrate:	</source>
-        <translation type="unfinished"></translation>
+        <translation>Δυφιορυθμός:	</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Frequency:	</source>
-        <translation type="unfinished"></translation>
+        <translation>Συχνότητα:	</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>No Audio</source>
-        <translation>Χωρίς Ήχο</translation>
+        <translation>Χωρίς ήχο</translation>
     </message>
     <message>
-        <location line="-155"/>
+        <location line="-170"/>
         <source>%2.3f fps</source>
-        <translation>%2.3f στιγ.ανάδευτ.</translation>
+        <translation>%2.3f fps</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+81"/>
+        <location line="+90"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation>%02d:%02d:%02d.%03d</translation>
     </message>
     <message>
-        <location line="-87"/>
+        <location line="-96"/>
         <source>%s (%u:%u)</source>
         <translation>%s (%u:%u)</translation>
     </message>
@@ -8166,18 +8386,36 @@
 <context>
     <name>qshell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+53"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
-        <translation>Εισήγαγε τις εντολές σου και πίεσε του κουμπί εκτίμησης ή τα CTRL+ENTER.</translation>
+        <translation>Εισαγάγετε τις εντολές σας και πιέστε στο κουμπί υπολογισμού ή CTRL+ENTER.
+</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You can use CTRL+PageUP and CTRL+Page Down to recall previous commands
 Ready.
 </source>
-        <translation>Μπορείς να χρησιμοποιήσεις τα CTRL+PageUP και CTRL+Page Down για να επαναλάβεις προηγούμενες εντολές
-Έτοιμος.</translation>
+        <translation>Μπορείτε να χρησιμοποιήσετε CTRL+PageUP και CTRL+Page Down για να επαναλάβετε τις προηγούμενες εντολές
+Έτοιμο.
+</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation>Εισαγάγετε τις εντολές σας και πιέστε στο κουμπί υπολογισμού ή ⌘⏎.
+</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation>Μπορείτε να χρησιμοποιήσετε ⌥⌘▲ και ⌥⌘▼ για να επαναλάβετε τις προηγούμενες εντολές.
+Έτοιμο.
+</translation>
     </message>
 </context>
 <context>
@@ -8185,7 +8423,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
         <source>Alert</source>
-        <translation>Συναγερμός</translation>
+        <translation>Προειδοποίηση</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -8217,7 +8455,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_gui/ADM_qtray.cpp" line="+82"/>
         <source>Open Avidemux</source>
-        <translation>Άνοιγμα του Αβυντειμαξίου</translation>
+        <translation>Άνοιγμα του Avidemux</translation>
     </message>
 </context>
 <context>
@@ -8233,12 +8471,22 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRawConfig.cpp" line="+29"/>
         <source>Prefer Annex B type stream</source>
-        <translation type="unfinished"></translation>
+        <translation>Προτίμηση ροής τύπου Annex B</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Video Only Muxer Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Ρυθμίσεις πολυπλέκτη μόνο βίντεο</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation>Αποθήκευση του ακατέργαστου βίντεο</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation>Κανένα</translation>
     </message>
 </context>
 <context>
@@ -8246,7 +8494,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp" line="+45"/>
         <source>Remove  Plane</source>
-        <translation>Απομάκρυνση του Επίπεδου</translation>
+        <translation>Απομάκρυνση του επίπεδου</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8256,45 +8504,45 @@
     <message>
         <location line="+105"/>
         <source>Keep Y Plane</source>
-        <translation>Διατήρηση του Επίπεδου Y</translation>
+        <translation>Διατήρηση του επίπεδου Y</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Process luma plane</source>
-        <translation>Επεξεργασία του επίπεδου φωτεινότητας</translation>
+        <translation>Επεξεργασία του επίπεδου ασπρόμαυρης φωτεινότητας (luma)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Keep U Plane</source>
-        <translation>Διατήρηση του Επίπεδου U</translation>
+        <translation>Διατήρηση του επίπεδου U</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Process chromaU plane</source>
-        <translation>Επεξεργασία του επίπεδου chromaU</translation>
+        <translation>Επεξεργασία του επίπεδου χρωματισμού U</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Keep V Plane</source>
-        <translation>Διατήρηση του Επίπεδου V</translation>
+        <translation>Διατήρηση του επίπεδου V</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Process chromaV plane</source>
-        <translation>Επεξεργασία του επίπεδου chromaV</translation>
+        <translation>Επεξεργασία του επίπεδου χρωματισμού V</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Remove plane</source>
-        <translation>Απομάκρυνση του επίπεδου</translation>
+        <translation>Αφαίρεση του επίπεδου</translation>
     </message>
 </context>
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
         <source>_Mode:</source>
-        <translation>_Κατάσταση Λειτουργίας:</translation>
+        <translation>_Λειτουργία:</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8304,17 +8552,17 @@
     <message>
         <location line="+6"/>
         <source>Resample fps</source>
-        <translation>Επαναδειγματοληψία στιγ.ανάδευτ.</translation>
+        <translation>Επαναδειγματοληψία fps</translation>
     </message>
     <message>
-        <location line="-325"/>
+        <location line="-329"/>
         <source>Custom</source>
         <translation>Προσαρμοσμένο</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>25  (PAL)</source>
-        <translation>25  (PAL)</translation>
+        <translation>25 (PAL)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8333,36 +8581,36 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
-        <translation>59.93  (NTSC)</translation>
+        <source>59.94  (NTSC)</source>
+        <translation>59.94 (NTSC)</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Resample FPS</source>
-        <translation>Επαναδειγματοληψία Στιγ.ΑνάΔευτ.</translation>
+        <translation>Επαναδειγματοληψία FPS</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Change and enforce FPS. Keep duration and sync.</source>
-        <translation>Αλλαγή και εξαναγκασμός των Στιγμιότυπων Ανά Δευτερόλεπτα. Διατήρηση της διάρκειας και του συγχρονισμού.</translation>
+        <translation>Αλλαγή και εξαναγκασμός του FPS. Διατήρηση της διάρκειας και του συγχρονισμού.</translation>
     </message>
 </context>
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
         <source>Width and height cannot be odd</source>
         <translation>Το πλάτος και το ύψος δεν μπορούν να είναι μονοί αριθμοί</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+80"/>
         <source>swsResize</source>
-        <translation>swsΑλλαγήΜεγέθους</translation>
+        <translation>Αλλαγή μεγέθους swsResize</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>swScale Resizer.</source>
-        <translation>swScale Μετατροπέας Μεγέθους. </translation>
+        <translation>Μετατροπέας μεγέθους swScale.</translation>
     </message>
 </context>
 <context>
@@ -8455,17 +8703,31 @@
         <translation>16:9</translation>
     </message>
     <message>
+        <location line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+338"/>
+        <source>Lanzcos3</source>
+        <translation>Lanzcos3</translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+251"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+172"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-166"/>
         <source>1%</source>
         <translation>1%</translation>
     </message>
@@ -8527,7 +8789,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-423"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-423"/>
         <source>Aspect Ratio</source>
-        <translation>Αναλογία Διαστάσεων</translation>
+        <translation>Αναλογίες διαστάσεων</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -8542,7 +8804,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+12"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+12"/>
         <source>Lock Aspect Ratio</source>
-        <translation>Κλείδωμα της Αναλογίας Διαστάσεων</translation>
+        <translation>Κλείδωμα της αναλογίας διαστάσεων</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
@@ -8575,7 +8837,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
         <source>Source PAR:</source>
-        <translation>Αναλογία Διαστάσεων των Πίξελων της πηγής:</translation>
+        <translation>Αναλογία διαστάσεων των εικονοστοιχείων της πηγής:</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -8586,7 +8848,7 @@
     <message>
         <location line="-8"/>
         <source>Destination PAR:</source>
-        <translation>Αναλογία Διαστάσεων των Πίξελων του προορισμού:</translation>
+        <translation>Αναλογία διαστάσεων των εικονοστοιχείων του προορισμού:</translation>
     </message>
     <message>
         <location line="+34"/>
@@ -8601,7 +8863,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+44"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+44"/>
         <source>Resize Dimensions</source>
-        <translation>Αλλαγή των Διαστάσεων</translation>
+        <translation>Αλλαγή των διαστάσεων</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -8646,7 +8908,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+35"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+35"/>
         <source>Round to the Nearest Multiple of 16</source>
-        <translation>Στρογγυλοποίηση προς το Κοντινότερο Πολλαπλάσιο του 16</translation>
+        <translation>Στρογγυλοποίηση προς το εγγύτερο πολλαπλάσιο του 16</translation>
     </message>
     <message>
         <location line="+75"/>
@@ -8706,22 +8968,12 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+51"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+51"/>
         <source>Resize Method:</source>
-        <translation>Μέθοδος Αλλαγής των Διαστάσεων:</translation>
+        <translation>Μέθοδος αλλαγής των διαστάσεων:</translation>
     </message>
     <message>
         <location line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+18"/>
-        <source>Lanzcos3</source>
-        <translation>Lanzcos3</translation>
+        <source>Lanczos-3</source>
+        <translation>Lanczos-3</translation>
     </message>
 </context>
 <context>
@@ -8775,7 +9027,7 @@
     <message>
         <location line="-158"/>
         <source>Rotate the image by 90/180/270 degrees.</source>
-        <translation>Περιστροφή της εικόνας κατά 90 ή 180 ή 270 μοίρες.</translation>
+        <translation>Περιστροφή της εικόνας 90/180/270 μοιρών.</translation>
     </message>
 </context>
 <context>
@@ -8803,7 +9055,7 @@
     <message>
         <location line="+1"/>
         <source>Next image</source>
-        <translation>Επόμενη Εικόνα</translation>
+        <translation>Επόμενη εικόνα</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8826,7 +9078,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidSeparateField.cpp" line="+53"/>
         <source>Separate Fields</source>
-        <translation>Διαχωρισμός των Πεδίων</translation>
+        <translation>Διαχωρισμός των πεδίων</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8852,7 +9104,7 @@
     <message>
         <location line="+1"/>
         <source>3x3 convolution filter :sharpen.</source>
-        <translation>3x3 μεταμορφωτής περιέλιξης :όξυνση.</translation>
+        <translation>3x3 μεταμορφωτής περιέλιξης: όξυνση.</translation>
     </message>
 </context>
 <context>
@@ -8860,12 +9112,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/stackField.cpp" line="+47"/>
         <source>Stack Fields</source>
-        <translation>Στοίβαγμα Πεδίων</translation>
+        <translation>Στοίβαγμα πεδίων</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Put even lines on top, odd lines at bottom.</source>
-        <translation>Τοποθέτηση των μονών γραμμών στην κορυφή, και των ζυγών στον πάτο.</translation>
+        <translation>Τοποθέτηση των μονών γραμμών στην κορυφή, και των ζυγών στην βάση.</translation>
     </message>
 </context>
 <context>
@@ -8874,12 +9126,12 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
         <location line="+186"/>
         <source>Still Image</source>
-        <translation>Ακίνητη Εικόνα</translation>
+        <translation>Ακίνητη εικόνα</translation>
     </message>
     <message>
         <location line="-185"/>
         <source>Duplicate frames for a given duration.</source>
-        <translation>Διπλογραφή στιγμιότυπων, για μια δωσμένη διάρκεια.</translation>
+        <translation>Διπλογραφή στιγμιότυπων, για μια δοθείσα διάρκεια.</translation>
     </message>
     <message>
         <location line="+181"/>
@@ -8910,12 +9162,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide.cpp" line="+45"/>
         <source>Decomb telecide</source>
-        <translation>Αποχτένισμα της Τηλεκινηματογράφησης</translation>
+        <translation>Decomb telecide</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Donald Graft Telecide. Replace ivtc pattern by progressive frames. Video stays at 30 fps.</source>
-        <translation>Τηλεκινηματογράφηση από τον Ντόναλντ Γκραφτ (Donald Graft). Αντικατάσταση ivtc ακολουθιών από προοδευτικά στιγμιότυπα. Το βίντεο μένει στα 30 στιγ.ανάδευτ.</translation>
+        <translation>Telecide από τον Donald Graft. Αντικατάσταση των σχηματομορφών ivtc από προοδευτικά στιγμιότυπα. Το βίντεο μένει στα 30 fps.</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="+186"/>
@@ -8925,7 +9177,7 @@
     <message>
         <location line="+1"/>
         <source>3:2 pulldown</source>
-        <translation>3:2 επέκταση (pulldown)</translation>
+        <translation>3:2 pulldown</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8945,7 +9197,7 @@
     <message>
         <location line="+1"/>
         <source>Bottom</source>
-        <translation>Πάτος</translation>
+        <translation>Βάση</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -8955,7 +9207,7 @@
     <message>
         <location line="+1"/>
         <source>If still combed</source>
-        <translation>Αν είναι ακόμη χτενισμένο</translation>
+        <translation>Αν είναι ακόμη πεπλεγμένο</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8975,12 +9227,12 @@
     <message>
         <location line="+1"/>
         <source>Postproc on best match</source>
-        <translation>Μετεπεξεργασία στο καλύτερο ταίριασμα</translation>
+        <translation>Μεταεπεξεργασία στο καλύτερο ταίριασμα</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Postproc and show zones (debug)</source>
-        <translation>Μετεπεξεργασία και προβολή ζωνών (απασφαλμάτωση)</translation>
+        <translation>Μεταεπεξεργασία και προβολή ζωνών (αποσφαλμάτωση)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8990,7 +9242,7 @@
     <message>
         <location line="+1"/>
         <source>Process image (not fields), debug</source>
-        <translation>Επεξεργασία εικόνας (όχι πεδίων), απασφαλμάτωση</translation>
+        <translation>Επεξεργασία εικόνας (όχι πεδίων), αποσφαλμάτωση</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -9015,22 +9267,22 @@
     <message>
         <location line="+2"/>
         <source>_Direct threshold:</source>
-        <translation>_Απευθείας κατώφλι:</translation>
+        <translation>_Άμεσο κατώτατο όριο:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Backward threshold:</source>
-        <translation>Κατώφλι προς τα _πίσω:</translation>
+        <translation>_Κατώτατο όριο προς τα _πίσω:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Noise threshold:</source>
-        <translation>Κατώφλι _Θορύβου:</translation>
+        <translation>Κατώτατο όριο _θορύβου:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Postp_rocessing threshold:</source>
-        <translation>Κατώφλι μετεπεξε_ργασίας:</translation>
+        <translation>Κατώτατο όριο μεταεπεξε_ργασίας:</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -9045,17 +9297,17 @@
     <message>
         <location line="+1"/>
         <source>Debu_g</source>
-        <translation>_Απασφαλμάτωση</translation>
+        <translation>_Αποσφαλμάτωση</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bl_end</source>
-        <translation>Ομαλή Μ_είξη</translation>
+        <translation>Α_νάμειξη</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Decomb Telecide</source>
-        <translation>Αποχτένισμα της Τηλεκινηματογράφησης</translation>
+        <translation>Decomb Telecide</translation>
     </message>
 </context>
 <context>
@@ -9063,7 +9315,7 @@
     <message>
         <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
         <source> h</source>
-        <translation> ώρ.</translation>
+        <translation> ώ</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9079,35 +9331,36 @@
 <context>
     <name>tsdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="vanished">Σφάλμα</translation>
-    </message>
-    <message>
-        <source>This file&apos;s index has been created with an older version of avidemux.
-Please delete the idx2 file and reopen.</source>
-        <translation type="vanished">Τα περιεχόμενα αυτού του φακέλου έχουν δημιουργηθεί με μια παλαιότερη έκδοση του Αβιντεμούξιου.
-Παρακαλώ, διέγραψε το αρχείο idx2, και κάνε ξανά άνοιγμα.</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+183"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+325"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+84"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+207"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>Υπάρχουν αρκετά αρχεία με συνεχόμενες ονομασίες. Να φορτωθούν όλα μαζί;</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+19"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
         <translation>Δημιουργία ευρετηρίου</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation>Αλλαγή μεγέθους</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation>Το μέγεθος του βίντεο αλλάζει στο στιγμιότυπο %u από %ux%u σε %ux%u. Αυτό δεν υποστηρίζεται· διακόπτεται εδώ.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
-        <translation type="unfinished"></translation>
+        <translation>Τα περιεχόμενα αυτού του φακέλου έχουν δημιουργηθεί με μια παλαιότερη έκδοση του avidemux.
+Το αρχείο πρέπει να επαναδεικτοδοτηθεί. Να συνεχίσω;</translation>
     </message>
 </context>
 <context>
@@ -9115,12 +9368,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/twolame/audioencoder_twolame.cpp" line="+205"/>
         <source>_Bitrate:</source>
-        <translation>Ρυθμός _Μπιτιών:</translation>
+        <translation>_Δυφιορυθμός:</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>TwoLame Configuration</source>
-        <translation>Ρύθμιση TwoLame</translation>
+        <translation>Διαμόρφωση του TwoLame</translation>
     </message>
 </context>
 <context>
@@ -9138,12 +9391,12 @@
     <message>
         <location line="+2"/>
         <source>Mac OS X Quartz 2D</source>
-        <translation>Mac OS X Χαλαζίας 2Δ</translation>
+        <translation>Mac OS X Quartz 2D</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Mac OS X QuickDraw</source>
-        <translation>Mac OS X ΓρήγορηΣχεδίαση</translation>
+        <translation>Mac OS X QuickDraw</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -9158,7 +9411,7 @@
     <message>
         <location line="+3"/>
         <source>Default Raster</source>
-        <translation>Προεπιλεγμένη Σήτα</translation>
+        <translation>Προεπιλεγμένο Raster</translation>
     </message>
 </context>
 <context>
@@ -9166,7 +9419,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/unstackField.cpp" line="+47"/>
         <source>Unstack Fields</source>
-        <translation>Από-στοίβαγμα Πεδίων</translation>
+        <translation>Από-στοίβαγμα πεδίων</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9179,7 +9432,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
         <source>vaH264 Configuration</source>
-        <translation>Ρύθμιση vaH264</translation>
+        <translation>Διαμόρφωση του vaH264</translation>
     </message>
 </context>
 <context>
@@ -9192,23 +9445,141 @@
     <message>
         <location line="+1"/>
         <source>_Bitrate(kbps)</source>
-        <translation>Ρυθμός _Μπιτιών (χιλιομπίτιαναδευτ)</translation>
+        <translation>_Δυφιορυθμός (kbps)</translation>
+    </message>
+</context>
+<context>
+    <name>vaapiDeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
+        <translation>Αποπλέκτης VA-API</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation>Απόπλεξη και προαιρετικά αλλαγή μεγέθους του βίντεο μέσω VA-API.</translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
+        <translation>Bob</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave</source>
+        <translation>Ύφανση</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Adaptive</source>
+        <translation>Προσαρμοστική κίνηση</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Compensated</source>
+        <translation>Επανόρθωση κίνησης</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation>Πρώτα το επάνω πεδίο</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation>Πρώτα το κάτω πεδίο</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation>Στιγμιότυπο ανά στιγμιότυπο</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation>Διπλός ρυθμός στιγμιότυπων</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation>_Λειτουργία:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation>_Σειρά πεδίων:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation>_Έξοδος:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation>Απόπλεξη</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation>Α_λλαγή μεγέθους</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation>Πλάτος:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation>Ύψος:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation>Μετασχηματισμός</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation>Αποπλέκτης και επεξεργαστής μεγέθους VA-API</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation>Μη υποστηριζόμενη λειτουργία</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation>Η καθορισμένη λειτουργία απόπλεξης %s δεν υποστηρίζεται· αντικατεστάθη με %s.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation>Σφάλμα ρύθμισης VA-API</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation>Αδύνατη η ρύθμιση του VA-API· καθαρά διεργασία διέλευσης.</translation>
     </message>
 </context>
 <context>
     <name>vaapiResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
-        <source>vaapi: Resize</source>
-        <translation>vaapi: Αλλαγή διαστάσεων</translation>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
+        <translation>Αλλαγή διαστάσεων VA-API</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>vaapi: Resize image using vaapi.</source>
-        <translation>vaapi: Αλλαγή των διαστάσεων της εικόνας με τη χρήση του vaapi.</translation>
+        <source>Resize image using VA-API.</source>
+        <translation>Αλλαγή των διαστάσεων της εικόνας μέσω VA-API.</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+129"/>
         <source>Width :</source>
         <translation>Πλάτος :</translation>
     </message>
@@ -9219,8 +9590,8 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>mpeg-&gt;PC:</source>
-        <translation>mpeg-&gt;PC:</translation>
+        <source>mpeg-&gt;PC</source>
+        <translation>mpeg-&gt;PC</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -9233,22 +9604,22 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+131"/>
         <source>vdpauDeint</source>
-        <translation>vdpauΠαράλληλοΑποπλέξιμο</translation>
+        <translation>Απόπλεξη vdpau</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>VDPAU deinterlacer (+resize).</source>
-        <translation>VDPAU παράλληλος αποπλέκτης (κ΄ αλλαγή-διαστάσεων).</translation>
+        <translation>VDPAU αποπλέκτης (+ αλλαγή-διαστάσεων).</translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+197"/>
         <source>Keep Top Field</source>
-        <translation>Διατήρηση του Άνω Πεδίου</translation>
+        <translation>Διατήρηση του άνω πεδίου</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Keep Bottom Field</source>
-        <translation>Διατήρηση του Κάτω Πεδίου</translation>
+        <translation>Διατήρηση του κάτω πεδίου</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9257,30 +9628,34 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>_Ivtc:</source>
-        <translation>_Ivtc:</translation>
+        <source>_IVTC</source>
+        <translation>_IVTC</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Resize:</source>
-        <translation>Α_λλαγή Μεγέθους:</translation>
+        <source>_Resize</source>
+        <translation>Α_λλαγή μεγέθους</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Deint Mode:</source>
-        <translation>Λειτουργία Α_ποπλεξίματος:</translation>
+        <translation>Λειτουργία α_πόπλεξης:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Width :</source>
-        <translation>Πλάτος :</translation>
+        <source>Width:</source>
+        <translation>Πλάτος:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation>Ύψος:</translation>
     </message>
     <message>
+        <source>Height :</source>
+        <translation type="vanished">Ύψος:</translation>
+    </message>
+    <message>
         <location line="+4"/>
         <source>vdpau</source>
         <translation>vdpau</translation>
@@ -9299,13 +9674,13 @@
         <translation>vdpau: Αλλαγή των διαστάσεων της εικόνας με τη χρήση του vdpau.</translation>
     </message>
     <message>
-        <location line="+133"/>
-        <source>Width :</source>
-        <translation>Πλάτος :</translation>
+        <location line="+131"/>
+        <source>Width:</source>
+        <translation>Πλάτος:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation>Ύψος:</translation>
     </message>
     <message>
@@ -9319,7 +9694,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/verticalFlip/verticalFlip.cpp" line="+47"/>
         <source>Vertical Flip</source>
-        <translation>Κατακόρυφη Αναστροφή</translation>
+        <translation>Κατακόρυφη αναστροφή</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9332,7 +9707,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/vobsub.ui" line="+13"/>
         <source>Subtitle Font Size and Position</source>
-        <translation>Μέγεθος και Θέση Γραμματοσειράς Υποτίτλων</translation>
+        <translation>Μέγεθος γραμματοσειράς και θέση υποτίτλων</translation>
     </message>
     <message>
         <location line="+37"/>
@@ -9342,7 +9717,7 @@
     <message>
         <location line="+10"/>
         <source>Select File</source>
-        <translation>Επιλογή Αρχείου</translation>
+        <translation>Επιλογή αρχείου</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -9360,22 +9735,22 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp" line="+331"/>
         <source>VBR</source>
-        <translation>Μεταβλητού Ρυθού Μπιτιών</translation>
+        <translation>VBR</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Quality based</source>
-        <translation>Με βάση την ποιότητα</translation>
+        <translation>Βάσει ποιότητας</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Mode:</source>
-        <translation>_Κατάσταση Λειτουργίας:</translation>
+        <translation>_Λειτουργία:</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>_Bitrate:</source>
-        <translation>Ρυθμός _Μπιτιών:</translation>
+        <translation>_Δυφιορυθμός:</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -9385,7 +9760,85 @@
     <message>
         <location line="+7"/>
         <source>Vorbis Configuration</source>
-        <translation>Ρύθμιση Vorbis</translation>
+        <translation>Διαμόρφωση του Vorbis</translation>
+    </message>
+</context>
+<context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation>Σε πραγματικό χρόνο</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation>Καλή ποιότητα</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation>Κάλλιστη ποιότητα</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation>Για βέλτιστη ποιότητα, επιλέξτε την λειτουργία μέσου δυφιορυθμού 2 περασμάτων και ορίστε τον δυφιορυθμό προορισμού σε μηδέν</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation>Χρονικό όριο</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation>Ταχύτητα</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation>Νήματα</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation>Χρήση τόσων νημάτων όσων των πυρήνων της CPU</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation>Μέγεθος Ομάδας Εικόνων (GOP)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation>Χρήση εύρους πλήρους χρωματισμού</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation>Λειτουργία κωδικοποίησης</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation>Ταχύτητα εναντίον Ποιότητας</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation>Κλειδοστιγμιότυπα</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation>Διάφορα</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation>Διαμόρφωση του κωδικοποιητή libvpx VP9</translation>
     </message>
 </context>
 <context>
@@ -9393,34 +9846,34 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
         <source>Open VapourSynth File</source>
-        <translation type="unfinished"></translation>
+        <translation>Άνοιγμα αρχείου VapourSynth</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>VS Script Files (*.vpy)</source>
-        <translation type="unfinished"></translation>
+        <translation>Αρχεία σεναρίων VS (*.vpy)</translation>
     </message>
 </context>
 <context>
     <name>webmmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+68"/>
         <source>Unsupported Video.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
-        <translation>Μη υποστηριζόμενος Ήχος.
-Υποστηρίζονται μόνο βίντεο VP8 και VP9, καθώς και ήχος Vorbis και Opus</translation>
+        <translation>Μη υποστηριζόμενο βίντεο.
+Υποστηρίζονται μόνο VP8/VP9 βίντεο, και ήχος Vorbis/Opus</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Unsupported Audio.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
-        <translation>Μη υποστηριζόμενος Ήχος.
-Υποστηρίζονται μόνο βίντεο VP8 και VP9, καθώς και ήχος Vorbis και Opus</translation>
+        <translation>Μη υποστηριζόμενος ήχος.
+Υποστηρίζονται μόνο VP8/VP9 βίντεο, και ήχος Vorbis/Opus</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+89"/>
         <source>Saving Webm</source>
-        <translation>Αποθηκεύεται το Webm</translation>
+        <translation>Αποθήκευση του Webm</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebmConfig.cpp" line="+27"/>
@@ -9441,30 +9894,30 @@
 <context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
         <source>Processing</source>
         <translation>Επεξεργασία</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+33"/>
         <source>00:00:00</source>
         <translation>00:00:00</translation>
     </message>
     <message>
-        <location line="-13"/>
+        <location line="-27"/>
         <source>Elapsed:</source>
-        <translation>Πέρασαν:</translation>
+        <translation>Διανύθηκαν:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+14"/>
         <source>Time Remaining:</source>
-        <translation>Απομένων Χρόνος:</translation>
+        <translation>Εναπομένων χρόνος:</translation>
     </message>
 </context>
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
         <source>Not coded</source>
         <translation>Δεν κωδικοποιήθηκε</translation>
     </message>
@@ -9472,7 +9925,8 @@
         <location line="+0"/>
         <source>this mode has not been implemented
 </source>
-        <translation>αυτή η κατάσταση λειτουργίας δεν έχει υλοποιηθεί</translation>
+        <translation>αυτή η λειτουργία δεν έχει υλοποιηθεί
+</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
@@ -9480,20 +9934,20 @@
         <translation>κανένα</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation>Προσαρμοσμένο</translation>
     </message>
     <message>
         <location line="+412"/>
         <source>Target Bitrate:</source>
-        <translation>Ρυθμός Μπιτιών Προορισμού:</translation>
+        <translation>Δυφιορυθμός προορισμού:</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+19"/>
         <source>kbit/s</source>
-        <translation>χιλιομπίτια/δευτ.</translation>
+        <translation>kbit/s</translation>
     </message>
     <message>
         <location line="-15"/>
@@ -9508,37 +9962,37 @@
     <message>
         <location line="+5"/>
         <source>Target Video Size:</source>
-        <translation>Μέγεθος Βίντεου Προορισμού:</translation>
+        <translation>Μέγεθος του βίντεο προορισμού:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>MB</source>
-        <translation>ΜέγαΜπάιτια</translation>
+        <translation>MB</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Average Bitrate:</source>
-        <translation>Μέσος Ρυθμός Μπιτιών:</translation>
+        <translation>Μέσος δυφιορυθμός:</translation>
     </message>
     <message>
         <location line="+74"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
-        <translation>Η βελτιστοποίηση Μακροτμήματος-Δέντρου απαιτεί να είναι ενεργή η Διακύμανση Προσαρμοζόμενου Κβαντισμού.
-Η Διακύμανση Προσαρμοζόμενου Κβαντισμού θα ενεργοποιηθεί αυτόματα.
+        <translation>Η βελτιστοποίηση μακροτμήματος-δέντρου απαιτεί να είναι ενεργή η διακύμανση προσαρμοζόμενου κβαντισμού.
+Η διακύμανση προσαρμοζόμενου κβαντισμού θα ενεργοποιηθεί αυτόματα.
 
-Θες να συνεχίσεις;</translation>
+Επιθυμείτε να συνεχίσετε;</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Macroblock-Tree optimisation will automatically be disabled.
 
 Do you wish to continue?</source>
-        <translation>Η βελτιστοποίηση Μακροτμήματος-Δέντρου απαιτεί να είναι ενεργή η Διακύμανση Προσαρμοζόμενου Κβαντισμού.
-Η βελτιστοποίηση Μακροτμήματος-Δέντρου θα απενεργοποιηθεί αυτόματα.
+        <translation>Η βελτιστοποίηση μακροτμήματος-δέντρου απαιτεί να είναι ενεργή η διακύμανση προσαρμοζόμενου κβαντισμού.
+Η βελτιστοποίηση μακροτμήματος-δέντρου θα απενεργοποιηθεί αυτόματα.
 
-Θες να συνεχίσεις;</translation>
+Επιθυμείτε να συνεχίσετε;</translation>
     </message>
     <message>
         <location line="+61"/>
@@ -9555,21 +10009,17 @@
     <message>
         <location line="+15"/>
         <source>Save Profile</source>
-        <translation>Αποθήκευση του Προφίλ</translation>
-    </message>
-    <message>
-        <source>my profile</source>
-        <translation type="vanished">το προφίλ μου</translation>
+        <translation>Αποθήκευση του προφίλ</translation>
     </message>
     <message>
         <location line="+46"/>
         <source>Overwrite</source>
-        <translation>Επανωγραφή</translation>
+        <translation>Αντικατάσταση</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Replace the following preset ?:</source>
-        <translation>Να αντικατασταθεί η ακόλουθη προρύθμιση;  :</translation>
+        <translation>Να αντικατασταθεί η ακόλουθη προρύθμιση; :</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -9579,12 +10029,12 @@
     <message>
         <location line="+14"/>
         <source>Cannot delete custom profile</source>
-        <translation>Αδυναμία διαγραφής του προσαρμοσμένο προφίλ</translation>
+        <translation>Αδυναμία διαγραφής του προσαρμοσμένου προφίλ</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Do you really want to delete the </source>
-        <translation>Θέλεις πραγματικά να διαγράψεις το </translation>
+        <translation>Θέλετε πραγματικά να διαγράψετε το </translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9609,10 +10059,10 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui" line="+375"/>
         <source>Rate Control</source>
-        <translation>Έλεγχος Ρυθμού</translation>
+        <translation>Έλεγχος ρυθμού</translation>
     </message>
     <message>
-        <location line="+2882"/>
+        <location line="+2887"/>
         <source>Disable</source>
         <translation>Απενεργοποίηση</translation>
     </message>
@@ -9622,38 +10072,38 @@
         <translation>Αυτόματη ανίχνευση</translation>
     </message>
     <message>
-        <location line="-2298"/>
+        <location line="-2303"/>
         <source>Motion Estimation</source>
-        <translation>Εκτίμηση Κίνησης</translation>
+        <translation>Εκτίμηση κίνησης</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Diamond Search</source>
-        <translation>Αναζήτηση σε Διαμάντι</translation>
+        <translation>Αναζήτηση σε διαμάντι</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hexagonal Search</source>
-        <translation>Αναζήτηση σε Εξάγωνο</translation>
+        <translation>Αναζήτηση σε εξάγωνο</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Exhaustive Search</source>
-        <translation>Αναζήτηση Εξοντωτική</translation>
+        <translation>Εξαντλητική αναζήτηση</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hadamard Exhaustive Search</source>
-        <translation>Εξονυχιστική Έρευνα Hadamard</translation>
+        <translation>Εξαντλητική αναζήτηση Hadamard</translation>
     </message>
     <message>
         <location line="+351"/>
-        <location line="+2596"/>
+        <location line="+2601"/>
         <source>None</source>
         <translation>Καμία</translation>
     </message>
     <message>
-        <location line="-2591"/>
+        <location line="-2596"/>
         <source>Spatial</source>
         <translation>Χωρική</translation>
     </message>
@@ -9671,7 +10121,7 @@
     <message>
         <location line="+143"/>
         <source>CABAC</source>
-        <translation>Παράπλευρων Προσαρμόσιμη Δυαδική Αριθμητική Κωδικοποίηση (CABAC)</translation>
+        <translation>Δυαδική κωδικοποίηση γενικευμένου πλαισίου (CABAC)</translation>
     </message>
     <message>
         <location line="+280"/>
@@ -9681,25 +10131,25 @@
     <message>
         <location line="+527"/>
         <source>Flat Matrix</source>
-        <translation>Επίπεδο Πλαίσιο</translation>
+        <translation>Επίπεδος πίνακας</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>JVT Matrix</source>
-        <translation>Πλαίσιο JVT</translation>
+        <translation>Πίνακας JVT</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Custom Matrix</source>
-        <translation>Προσαρμοσμένο Πλαίσιο</translation>
+        <translation>Προσαρμοσμένος πίνακας</translation>
     </message>
     <message>
-        <location line="+1052"/>
+        <location line="+1057"/>
         <source>Output</source>
         <translation>Έξοδος</translation>
     </message>
     <message>
-        <location line="-3165"/>
+        <location line="-3170"/>
         <location line="+669"/>
         <source>1</source>
         <translation>1</translation>
@@ -9798,7 +10248,7 @@
     <message>
         <location line="+171"/>
         <source>11 (Best)</source>
-        <translation>(Καλύτερο) 11</translation>
+        <translation>(Κάλλιστο) 11</translation>
     </message>
     <message>
         <location line="+1745"/>
@@ -9806,14 +10256,24 @@
         <translation>Κανονικό</translation>
     </message>
     <message>
-        <location line="+590"/>
+        <location line="+5"/>
+        <source>Auto Variance</source>
+        <translation>Αυτόματη διακύμανση</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
+        <translation>Με έμφαση στην αυτόματη διακύμανση</translation>
+    </message>
+    <message>
+        <location line="+585"/>
         <source>Pixel Aspect Ratio</source>
-        <translation>Αναλογία Διαστάσεων των Εικονοστοιχείων</translation>
+        <translation>Αναλογία διαστάσεων των εικονοστοιχείων</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>As Input</source>
-        <translation>Ως Δεδομένα Εισόδου</translation>
+        <translation>Ως δεδομένα εισόδου</translation>
     </message>
     <message>
         <location line="+49"/>
@@ -9823,53 +10283,53 @@
     <message>
         <location line="+165"/>
         <source>Crop</source>
-        <translation>Περιτομή</translation>
+        <translation>Περικοπή</translation>
     </message>
     <message>
         <location line="+303"/>
         <source>VBR</source>
-        <translation>Μεταβλητός Ρυθμός Μπιτιών</translation>
+        <translation>Μεταβλητός δυφιορυθμός</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>CBR</source>
-        <translation>Σταθ.Ρυθ.Μπιτ.</translation>
+        <translation>Σταθερός δυφιορυθμός</translation>
     </message>
     <message>
-        <location line="-3949"/>
+        <location line="-3954"/>
         <source>x264 Configuraton</source>
-        <translation>x264 Ρύθμιση</translation>
+        <translation>Διαμόρφωση του x264</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Configuration:</source>
-        <translation>Ρύθμιση:</translation>
+        <translation>Διαμόρφωση:</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Save As</source>
-        <translation>Αποθήκευση Ως</translation>
+        <translation>Αποθήκευση ως</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location line="+3152"/>
+        <location line="+3157"/>
         <source>Delete</source>
         <translation>Διαγραφή</translation>
     </message>
     <message>
-        <location line="-3110"/>
+        <location line="-3115"/>
         <source>General</source>
-        <translation>Γενικό</translation>
+        <translation>Γενικά</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Basic</source>
-        <translation>Βασικό</translation>
+        <translation>Βασικά</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Use advanced configuration</source>
-        <translation>Χρήση προχωρημένων ρυθμίσεων</translation>
+        <translation>Χρήση προχωρημένης διαμόρφωσης</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -9894,68 +10354,68 @@
     <message>
         <location line="+133"/>
         <source>Fast Decode</source>
-        <translation>Γρήγορη Αποκωδικοποίηση</translation>
+        <translation>Γρήγορη αποκωδικοποίηση</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Zero Latency</source>
-        <translation>Μηδενική Καθυστέρηση</translation>
+        <translation>Μηδενική καθυστέρηση</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Fast First Pass</source>
-        <translation>Γρήγορο Πρώτο Πέρασμα</translation>
+        <translation>Γρήγορο πρώτο πέρασμα</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Threads </source>
-        <translation>Κλωστές </translation>
+        <translation>Νήματα </translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Target Video Size:</source>
-        <translation>Μέγεθος Βίντεου Προορισμού:</translation>
+        <translation>Μέγεθος του βίντεο προορισμού:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Constant Bitrate (Single Pass)</source>
-        <translation>Σταθερός Ρυθμός Μπιτιών (Ένα Πέρασμα)</translation>
+        <translation>Σταθερός δυφιορυθμός (Ένα πέρασμα)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Constant Quantiser (Single Pass)</source>
-        <translation>Σταθερός Κβαντιστής (Ένα Πέρασμα)</translation>
+        <translation>Σταθερός κβαντιστής (Ένα πέρασμα)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Constant Rate Factor (Single Pass)</source>
-        <translation>Παράγοντας Σταθερού Ρυθμού (Μονό Πέρασμα)</translation>
+        <translation>Παράγοντας σταθερού ρυθμού (Μονό πέρασμα)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Video Size (Two Pass)</source>
-        <translation>Μέγεθος Βίντεου (Διπλού Περάσματος)</translation>
+        <translation>Μέγεθος βίντεο (Διπλό πέρασμα)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Average Bitrate (Two Pass)</source>
-        <translation>Μέσος Ρυθμός Μπιτιών (Διπλού Περάσματος)</translation>
+        <translation>Μέσος δυφιορυθμός (Διπλού περάσματος)</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Encoding Mode:</source>
-        <translation>Κατάσταση Λειτουργίας Κωδικοποίησης:</translation>
+        <translation>Λειτουργίας κωδικοποίησης:</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>MB</source>
-        <translation>ΜέγαΜπάιτια</translation>
+        <translation>MB</translation>
     </message>
     <message>
         <location line="+60"/>
         <location line="+200"/>
         <source>0 (High Quality)</source>
-        <translation>0 (Υψηλή Ποιότητα)</translation>
+        <translation>0 (Υψηλή ποιότητα)</translation>
     </message>
     <message>
         <location line="-177"/>
@@ -9968,43 +10428,43 @@
         <location line="-1826"/>
         <location line="+200"/>
         <source>51 (Low Quality)</source>
-        <translation>51 (Χαμηλή Ποιότητα)</translation>
+        <translation>51 (Χαμηλή ποιότητα)</translation>
     </message>
     <message>
         <location line="-101"/>
         <source>Advanced RC</source>
-        <translation>Προχωρημένος Έλεγχος Ρυθμού</translation>
+        <translation>Προχωρημένος έλεγχος ρυθμού</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Advanced Rate Control</source>
-        <translation>Προχωρημένος Έλεγχος Ρυθμού</translation>
+        <translation>Προχωρημένος έλεγχος ρυθμού</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Maximum Constant Rate Factor</source>
-        <translation>Μέγιστος Παράγοντας Σταθερού Ρυθμού</translation>
+        <translation>Μέγιστος παράγοντας σταθερού ρυθμού</translation>
     </message>
     <message>
         <location line="+158"/>
         <source>Macroblock-tree Rate Control</source>
-        <translation>Έλεγχος Ρυθμού Μακροτμήματος-δέντρου</translation>
+        <translation>Έλεγχος ρυθμού μακροτμήματος-δέντρου</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Frametype Lookahead:</source>
-        <translation>Τύπος-στιγμιότυπου Κοιτάγματος-πιο-Μπροστά:</translation>
+        <translation>Τύπος-στιγμιότυπου κοιτάγματος-πιο-μπροστά:</translation>
     </message>
     <message>
         <location line="+14"/>
-        <location line="+2490"/>
+        <location line="+2495"/>
         <source>frames</source>
         <translation>στιγμιότυπα</translation>
     </message>
     <message>
-        <location line="-2466"/>
+        <location line="-2471"/>
         <source>Sequence Parameter Set Identifer:</source>
-        <translation>Αναγνωριστικό της Ομάδας Παραμέτρων Συχνότητας:</translation>
+        <translation>Αναγνωριστικό της ομάδας παραμέτρων συχνότητας:</translation>
     </message>
     <message>
         <location line="+77"/>
@@ -10014,12 +10474,12 @@
     <message>
         <location line="+14"/>
         <source>Motion Estimation Method:</source>
-        <translation>Μέθοδος Εκτίμησης Κίνησης:</translation>
+        <translation>Μέθοδος εκτίμησης κίνησης:</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Uneven Multi-hexagonal Search</source>
-        <translation>Άνιση Πολυ-εξαγωνική Αναζήτηση</translation>
+        <translation>Άνιση πολυ-εξαγωνική αναζήτηση</translation>
     </message>
     <message>
         <location line="+52"/>
@@ -10029,32 +10489,32 @@
     <message>
         <location line="+20"/>
         <source>Subpixel Refinement</source>
-        <translation>Λαγάρισμα Υπο-εικονοστοιχείου</translation>
+        <translation>Λαγάρισμα υπο-εικονοστοιχείου</translation>
     </message>
     <message>
         <location line="+98"/>
         <source>Motion Vector</source>
-        <translation>Διάνυσμα Κίνησης</translation>
+        <translation>Διάνυσμα κίνησης</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>Maximum Motion Vector Length:</source>
-        <translation>Μέγιστο Μήκος της Διανύσματος Κίνησης:</translation>
+        <translation>Μέγιστο μήκος του διανύσματος κίνησης:</translation>
     </message>
     <message>
         <location line="+70"/>
         <source>Minimum Buffer Between Threads:</source>
-        <translation>Ελάχιστη Μικροαποθήκευση Μεταξύ των Κλωστών:</translation>
+        <translation>Ελάχιστη μικροαποθήκευση μεταξύ των νημάτων:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Maximum Motion Vector Search Range:</source>
-        <translation>Μέγιστο Εύρος της Αναζήτησης Διανύσματος Κίνησης:</translation>
+        <translation>Μέγιστο εύρος της αναζήτησης διανύσματος κίνησης:</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Prediction</source>
-        <translation>Πρόβλεψη</translation>
+        <translation>Πρόρρηση</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -10066,32 +10526,32 @@
     <message>
         <location line="-481"/>
         <source>Weighted References</source>
-        <translation>Ζυγισμένες Αναφορές</translation>
+        <translation>Ζυγισμένες αναφορές</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Weighted References + Duplicates</source>
-        <translation>Ζυγισμένες Αναφορές + Διπλότυπα</translation>
+        <translation>Ζυγισμένες αναφορές + διπλότυπα</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Direct Prediction Mode:</source>
-        <translation>Λειτουργία Απευθείας Πρόβλεψης:</translation>
+        <translation>Λειτουργία απευθείας πρόρρησης:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Weighted Prediction for P-frames:</source>
-        <translation>Ζυγισμένη Πρόβλεψη για Π΄-στιγμιότυπα:</translation>
+        <translation>Ζυγισμένη πρόρρηση για P-στιγμιότυπα:</translation>
     </message>
     <message>
         <location line="+53"/>
         <source>Weighted Prediction for B-frames</source>
-        <translation>Ζυγισμένη Πρόβλεψη για Β΄-στιγμιότυπα</translation>
+        <translation>Ζυγισμένη πρόρρηση για Β-στιγμιότυπα</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Constrained Intra Prediction</source>
-        <translation>Περιορισμένη Εσωτερική Πρόβλεψη</translation>
+        <translation>Περιορισμένη εσωτερική πρόρρηση</translation>
     </message>
     <message>
         <location line="+24"/>
@@ -10101,37 +10561,37 @@
     <message>
         <location line="+6"/>
         <source>Partition Search</source>
-        <translation>Αναζήτηση Κατάτμησης</translation>
+        <translation>Αναζήτηση κατάτμησης</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>8x8 DCT Spatial Transform</source>
-        <translation>8x8 DCT Χωρική Μεταμόρφωση</translation>
+        <translation>8x8 DCT Χωρική μεταμόρφωση</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>8x8, 8x16 and 16x8 P-frame Intra-predicted Blocks</source>
-        <translation>8x8, 8x16 και 16x8 Τμήματα Π΄-στιγμιότυπου, Έσωθεν-πρόβλεψης</translation>
+        <translation>8x8, 8x16 και 16x8 τμήματα P-στιγμιότυπου ενδοπρόρρησης</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>8x8, 8x16 and 16x8 B-frame Intra-predicted Blocks</source>
-        <translation>8x8, 8x16 και 16x8 Τμήματα Β΄-στιγμιότυπου, Έσωθεν-πρόβλεψης</translation>
+        <translation>8x8, 8x16 και 16x8 τμήματα B-στιγμιότυπου ενδοπρόρρησης</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>4x4, 4x8 and 8x4 P-frame Intra-predicted Blocks</source>
-        <translation>4x4, 4x8 και 8x4 Τμήματα Π΄-στιγμιότυπου, Έσωθεν-πρόβλεψης</translation>
+        <translation>4x4, 4x8 και 8x4 τμήματα P-στιγμιότυπου ενδοπρόρρησης</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>8x8 Intra-predicted Blocks</source>
-        <translation>8x8 Τμήματα, Έσωθεν-πρόβλεψης</translation>
+        <translation>8x8 τμήματα, ενδοπρόρρησης</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>4x4 Intra-predicted Blocks</source>
-        <translation>4x4 Τμήματα, Έσωθεν-πρόβλεψης</translation>
+        <translation>4x4 τμήματα ενδοπρόρρησης</translation>
     </message>
     <message>
         <location line="+26"/>
@@ -10141,33 +10601,33 @@
     <message>
         <location line="+6"/>
         <source>Frame Encoding</source>
-        <translation>Κωδικοποίηση Στιγμιότυπων</translation>
+        <translation>Κωδικοποίηση στιγμιότυπων</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Loop Filter:</source>
-        <translation>Μεταμορφωτής Ανακύκλωσης:</translation>
+        <translation>Μεταμορφωτής ανακύκλωσης:</translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+1328"/>
+        <location line="+1333"/>
         <source>Strength:</source>
         <translation>Ισχύς:</translation>
     </message>
     <message>
-        <location line="-1289"/>
+        <location line="-1294"/>
         <source>Threshold:</source>
-        <translation>Κατώφλι:</translation>
+        <translation>Κατώτατο όριο:</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Open GOP:</source>
-        <translation>Άνοιγμα ΟμάδαςΕικόνων:</translation>
+        <translation>Άνοιγμα Ομάδας Εικόνων (GOP):</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Normal Mode</source>
-        <translation>Κανονική Κατάσταση Λειτουργίας</translation>
+        <translation>Κανονική λειτουργία</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -10177,42 +10637,42 @@
     <message>
         <location line="+23"/>
         <source>Interlaced:</source>
-        <translation>Παράλληλα Πλεγμένο:</translation>
+        <translation>Πεπλεγμένο:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Bottom Field First</source>
-        <translation>Πρώτα το Κάτω Πεδίο</translation>
+        <translation>Πρώτα το κάτω πεδίο</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Top Field First</source>
-        <translation>Πρώτα το Επάνω Πεδίο</translation>
+        <translation>Πρώτα το επάνω πεδίο</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Maximum Reference Frames:</source>
-        <translation>Μέγιστο Πλήθος Στιγμιότυπων Αναφοράς:</translation>
+        <translation>Μέγιστο πλήθος στιγμιότυπων αναφοράς:</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>B-frames</source>
-        <translation>Β΄-στιγμιότυπα</translation>
+        <translation>B-στιγμιότυπα</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>B-frames as References:</source>
-        <translation>Β΄-στιγμιότυπα ως Αναφορές:</translation>
+        <translation>Β-στιγμιότυπα ως αναφορές:</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Strictly Hierarchical Pyramid</source>
-        <translation>Αυστηρώς Ιεραρχική Πυραμίδα</translation>
+        <translation>Αυστηρώς ιεραρχική πυραμίδα</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Non-strict (Not Blu-ray Compatible)</source>
-        <translation>Μη-ορθόδοξη (Μη Συμβατό με Blu-ray)</translation>
+        <translation>Μη-αυστηρό (Μη συμβατό με Blu-ray)</translation>
     </message>
     <message>
         <location line="+36"/>
@@ -10222,27 +10682,27 @@
     <message>
         <location line="+74"/>
         <source>B-frame Bias:</source>
-        <translation>Προκατάληψη Β΄-στιγμιότυπου:</translation>
+        <translation>Προκατάληψη Β-στιγμιότυπου:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Maximum Consecutive B-frames:</source>
-        <translation>Μέγιστο Πλήθος Συνεχόμενων Β΄-στιγμιότυπων:</translation>
+        <translation>Μέγιστο πλήθος συνεχόμενων Β-στιγμιότυπων:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Adaptive B-frame Decision:</source>
-        <translation>Προσαρμοζόμενη Απόφαση Β΄-στιγμιότυπων:</translation>
+        <translation>Προσαρμοζόμενη απόφαση Β-στιγμιότυπων:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>I-frames</source>
-        <translation>Ι΄-στιγμιότυπα</translation>
+        <translation>Ι-στιγμιότυπα</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>GOP Size:</source>
-        <translation>Μέγεθος της Ομάδας Εικόνων:</translation>
+        <translation>Μέγεθος Ομάδας Εικόνων (GOP):</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -10257,12 +10717,12 @@
     <message>
         <location line="+32"/>
         <source>I-frame Threshold:</source>
-        <translation>Κατώφλι Ι΄-στιγμιότυπου:</translation>
+        <translation>Κατώτατο όριο Ι-στιγμιότυπου:</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Periodic Intra Refresh</source>
-        <translation>Περιοδική Έσωθεν Ανανέωση</translation>
+        <translation>Περιοδική ενδοανανέωση</translation>
     </message>
     <message>
         <location line="+24"/>
@@ -10273,220 +10733,215 @@
     <message>
         <location line="+6"/>
         <source>Mixed References</source>
-        <translation>Ανάμικτες Αναφορές</translation>
+        <translation>Ανάμικτες αναφορές</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Chroma Motion Estimation</source>
-        <translation>Εκτίμηση Κίνησης του Χρωματισμού</translation>
+        <translation>Εκτίμηση κίνησης του χρωματισμού</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Trellis Quantization:</source>
-        <translation>Ανιχνευτικός Κβαντισμός</translation>
+        <translation>Ανιχνευτικός κβαντισμός:</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Final Macroblock Only</source>
-        <translation>Τελικό Μακροτμήμα Μόνο</translation>
+        <translation>Τελικό μακροτμήμα μόνο</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Always On</source>
-        <translation>Πάντα Ενεργό</translation>
+        <translation>Πάντα ενεργό</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Fast Skip Detection on P-frames</source>
-        <translation>Γρήγορο Προσπέρασμα Εντοπισμού στα Π&apos;-στιγμιότυπα</translation>
+        <translation>Γρήγορο προσπέρασμα εντοπισμού στα P-στιγμιότυπα</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>DCT Decimation on P-frames</source>
-        <translation>DCT Αποδεκατισμός στα Π΄-στιγμιότυπα</translation>
+        <translation>DCT αποδεκατισμός στα P-στιγμιότυπα</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Psychovisual Rate Distortion Optimisation:</source>
-        <translation>Βελτιστοποίηση Ψυχο-οπτικής Παραμόρφωσης Ρυθμού:</translation>
+        <translation>Βελτιστοποίηση ψυχο-οπτικής παραμόρφωσης ρυθμού:</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Psychovisual Trellis:</source>
-        <translation>Ψυχο-οπτική Ανίχνευση</translation>
+        <translation>Ψυχο-οπτική ανίχνευση:</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Noise Reduction:</source>
-        <translation>Μείωση Θορύβου:</translation>
+        <translation>Μείωση του θορύβου:</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Luma Quantisation Deadzone</source>
-        <translation>ΝεκρήΖώνη Κβαντισμού Φωτεινότητας</translation>
+        <translation>Νεκρή ζώνη κβαντισμού ασπρόμαυρης φωτεινότητας (luma)</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Intra Luma Quantisation Deadzone:</source>
-        <translation>ΝεκρήΖώνη Έσωθεν Κβαντισμού Φωτεινότητας:</translation>
+        <translation>Νεκρή ζώνη ενδοκβαντισμού ασπρόμαυρης φωτεινότητας (luma):</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Inter Luma Quantisation Deadzone:</source>
-        <translation>ΝεκρήΖώνη Δια-στιγμιοτυπικού Κβαντισμού Φωτεινότητας:</translation>
+        <translation>Νεκρή ζώνη διαστιγμιοτυπικού κβαντισμού ασπρόμαυρης φωτεινότητας (luma):</translation>
     </message>
     <message>
         <location line="+66"/>
         <source>Quantisation Matrix</source>
-        <translation>Πλαίσιο Κβαντισμού</translation>
+        <translation>Πίνακας κβαντισμού</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+856"/>
+        <location line="+861"/>
         <source>Edit</source>
         <translation>Επεξεργασία</translation>
     </message>
     <message>
-        <location line="-809"/>
+        <location line="-814"/>
         <source>Quantiser Control</source>
-        <translation>Έλεγχος Κβαντιστή</translation>
+        <translation>Έλεγχος κβαντιστή</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Maximum Quantiser:</source>
-        <translation>Μέγιστος Κβαντιστής:</translation>
+        <translation>Μέγιστος κβαντιστής:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>I and P-frame Quantiser Ratio:</source>
-        <translation>Αναλογία Κβαντιστή Ι΄ και Π΄ στιγμιότυπων:</translation>
+        <translation>Αναλογία κβαντιστή Ι και P στιγμιότυπων:</translation>
     </message>
     <message>
         <location line="+85"/>
         <location line="+179"/>
-        <location line="+302"/>
+        <location line="+307"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location line="-459"/>
+        <location line="-464"/>
         <source>Maximum Quantiser Step:</source>
-        <translation>Μέγιστο Βήμα Κβαντιστή:</translation>
+        <translation>Μέγιστο βήμα κβαντιστή:</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>P and B-frame Quantiser Ratio:</source>
-        <translation>Αναλογία Διαστάσεων Κβαντιστή Π΄ κ΄ Β΄-στιγμιότυπων:</translation>
+        <translation>Αναλογία διαστάσεων κβαντιστή P και B-στιγμιότυπων:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Average Bitrate Tolerance:</source>
-        <translation>Ανοχή Μέσου Ρυθμού Μπιτιών:</translation>
+        <translation>Ανοχή μέσου δυφιορυθμού:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Chroma to Luma Quantiser Offset:</source>
-        <translation>Απόκλιση του Κβαντιστή, από Χρωματισμό σε Φωτεινότητα:</translation>
+        <translation>Απόκλιση του κβαντιστή από χρωματισμό σε φωτεινότητα:</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Minimum Quantiser:</source>
-        <translation>Ελάχιστος Κβαντιστής:</translation>
+        <translation>Ελάχιστος κβαντιστής:</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Quantiser Curve Compression</source>
-        <translation>Συμπίεση Καμπύλης Κβαντιστή</translation>
+        <translation>Συμπίεση καμπύλης κβαντιστή</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Quantiser Curve Compression:</source>
-        <translation>Συμπίεση Καμπύλης Κβαντιστή</translation>
+        <translation>Συμπίεση καμπύλης κβαντιστή:</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>Reduce Fluctuation Before Curve Compression:</source>
-        <translation>Μείωση της Διακύμανσης Πριν την Συμπίεση Καμπύλης:</translation>
+        <translation>Μείωση της διακύμανσης πριν την συμπίεση καμπύλης:</translation>
     </message>
     <message>
         <location line="+70"/>
         <source>Reduce Fluctuation After Curve Compression:</source>
-        <translation>Μείωση της Διακύμανσης Μετά την Συμπίεση Καμπύλης:</translation>
+        <translation>Μείωση της διακύμανσης μετά την συμπίεση καμπύλης:</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Adaptive Quantisation</source>
-        <translation>Προσαρμοζόμενος Κβαντισμός</translation>
+        <translation>Προσαρμοζόμενος κβαντισμός</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Variance AQ:</source>
-        <translation>Διακύμανσης Προσαρμοζόμενος Κβαντισμός (VAQ):</translation>
+        <translation>Διακύμανσης προσαρμοζόμενος κβαντισμός (VAQ):</translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Auto Variance AQ</source>
-        <translation>Αυτόματης Διακύμανσης AQ</translation>
-    </message>
-    <message>
-        <location line="+91"/>
+        <location line="+114"/>
         <source>Advanced 1</source>
-        <translation>Προχωρημένα 1</translation>
+        <translation>Προχωρημένες 1</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Video Buffer Verifier</source>
-        <translation>Επιβεβαιωτής Μικροαποθήκευσης Βίντεου</translation>
+        <translation>Επαλήθευση της ενδιάμεσης μνήμης βίντεο</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Maximum VBV Bitrate:</source>
-        <translation>Μέγιστος Ρυθμός Μπιτιών VBV:</translation>
+        <translation>Μέγιστος δυφιορυθμός VBV:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Initial VBV Buffer Occupancy:</source>
-        <translation>Αρχική Κατάληψη Μικροαποθήκευσης VBV:</translation>
+        <translation>Αρχική κατάληψη μικροαποθήκευσης VBV:</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>kbit</source>
-        <translation>χιλιομπίτια</translation>
+        <translation>kbit</translation>
     </message>
     <message>
         <location line="+65"/>
         <source>kbit/s</source>
-        <translation>χιλιομπίτια/δευτ.</translation>
+        <translation>kbit/s</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>VBV Buffer Size:</source>
-        <translation>Μέγεθος Μικροαποθήκευσης VBV:</translation>
+        <translation>Μέγεθος της ενδιάμεσης μνήμης VBV:</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Slicing</source>
-        <translation>Κόψιμο σε Φέτες</translation>
+        <translation>Τεμαχισμός σε φέτες</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Slices per Frame:</source>
-        <translation>Φέτες ανά Στιγμιότυπο:</translation>
+        <translation>Φέτες ανά στιγμιότυπο:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Maximum Size per Slice:</source>
-        <translation>Μέγιστο Μέγεθος ανά Φέτα:</translation>
+        <translation>Μέγιστο μέγεθος ανά φέτα:</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>bytes</source>
-        <translation>μπάιτια</translation>
+        <translation>byte</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Maximum Macroblocks per Slice:</source>
-        <translation>Μέγιστα Μακροτμήματα ανά Φέτα:</translation>
+        <translation>Μέγιστα μακροτμήματα ανά φέτα:</translation>
     </message>
     <message>
         <location line="+58"/>
@@ -10501,12 +10956,12 @@
     <message>
         <location line="+42"/>
         <source>Advanced 2</source>
-        <translation>Advanced 2</translation>
+        <translation>Προχωρημένες 2</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Multithreading</source>
-        <translation>Πολυγνέσιμο</translation>
+        <translation>Πολυνημάτωση</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -10517,17 +10972,17 @@
     <message>
         <location line="+37"/>
         <source>Enforce Repeatability</source>
-        <translation>Εξαναγκασμός Επαναληψιμότητας</translation>
+        <translation>Εξαναγκασμός επαναληψιμότητας</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Slice-based Threading</source>
-        <translation>Γνέσιμο κατά φέτες</translation>
+        <translation>Νημάτωση κατά φέτες</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Custom Threaded Lookahead Buffer:</source>
-        <translation>Προσαρμοσμένη Μικροαποθήκευση Κοιτάγματος-πιο-Μπροστά με Σπείρωμα:</translation>
+        <translation>Προσαρμοσμένη μικροαποθήκευση κοιτάγματος-πιο-μπροστά με σπείρωμα:</translation>
     </message>
     <message>
         <location line="+59"/>
@@ -10537,7 +10992,7 @@
     <message>
         <location line="+12"/>
         <source>Generate Access Unit Delimiters</source>
-        <translation>Παραγωγή Διαχωριστικών Μονάδας Πρόσβασης</translation>
+        <translation>Παραγωγή διαχωριστικών μονάδας πρόσβασης</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -10547,18 +11002,18 @@
     <message>
         <location line="+7"/>
         <source>Generate fake interlaced</source>
-        <translation>Παραγωγή ψευδούς παράλληλα πλεγμένου</translation>
+        <translation>Παραγωγή ψευδο-πεπλεγμένου</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Custom:</source>
         <comment>PAR</comment>
-        <translation>Προσαρμοσμένος:</translation>
+        <translation>Προσαρμοσμένο:</translation>
     </message>
     <message>
         <location line="+94"/>
         <source>Predefined Aspect Ratio:</source>
-        <translation>Προεπιλεγμένη Αναλογία Διαστάσεων:</translation>
+        <translation>Προεπιλεγμένη αναλογία διαστάσεων:</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -10588,12 +11043,12 @@
     <message>
         <location line="+6"/>
         <source>Video Usability Information</source>
-        <translation>Πληροφορίες Χρηστικότητας Βίντεου</translation>
+        <translation>Πληροφορίες χρηστικότητας βίντεο</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>These settings are only suggestions for the playback equipment.  Use at your own risk.</source>
-        <translation>Αυτές οι ρυθμίσεις είναι μοναχά προτάσεις για τον εξοπλισμός αναπαραγωγής. Χρησιμοποίησέ τες με δική σου ευθύνη.</translation>
+        <translation>Αυτές οι ρυθμίσεις είναι μοναχά προτάσεις για τον εξοπλισμό αναπαραγωγής. Χρησιμοποιήστε τες με δική σας ευθύνη.</translation>
     </message>
     <message>
         <location line="+28"/>
@@ -10617,7 +11072,7 @@
     <message>
         <location line="+28"/>
         <source>Video Format:</source>
-        <translation>Μορφή Βίντεου:</translation>
+        <translation>Μορφή του βίντεο:</translation>
     </message>
     <message>
         <location line="+18"/>
@@ -10647,7 +11102,7 @@
     <message>
         <location line="+23"/>
         <source>Colour Primaries:</source>
-        <translation>Βασικά Χρώματα:</translation>
+        <translation>Βασικά χρώματα:</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -10690,7 +11145,7 @@
     <message>
         <location line="+23"/>
         <source>Transfer Characteristics:</source>
-        <translation>Μεταφορά Χαρακτηριστικών:</translation>
+        <translation>Μεταφορά χαρακτηριστικών:</translation>
     </message>
     <message>
         <location line="+30"/>
@@ -10715,7 +11170,7 @@
     <message>
         <location line="+28"/>
         <source>Colour Matrix:</source>
-        <translation>Πλαίσιο Χρώματος:</translation>
+        <translation>Χρωματικός πίνακας:</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -10740,12 +11195,12 @@
     <message>
         <location line="+43"/>
         <source>Chroma Sample Location:</source>
-        <translation>Τοποθεσία Δείγματος Χρωματισμού:</translation>
+        <translation>Τοποθεσία δείγματος χρωματισμού:</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Full Range Samples</source>
-        <translation>Δείγματα Πλήρους Εύρους</translation>
+        <translation>Δείγματα πλήρους εύρους</translation>
     </message>
 </context>
 <context>
@@ -10753,7 +11208,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264CustomMatrixDialog.ui" line="+16"/>
         <source>x264 Custom Matrix</source>
-        <translation>x264 Προσαρμοσμένο Πλαίσιο</translation>
+        <translation>x264 Προσαρμοσμένος πίνακας</translation>
     </message>
     <message>
         <location line="+16"/>
@@ -10766,7 +11221,7 @@
         <location line="+446"/>
         <location line="+703"/>
         <source>Luma:</source>
-        <translation>Φωτεινότητα :</translation>
+        <translation>Ασπρόμαυρη φωτεινότητα (luma):</translation>
     </message>
     <message>
         <location line="-1385"/>
@@ -10792,7 +11247,7 @@
     <message>
         <location line="+727"/>
         <source>Load File</source>
-        <translation>Φόρτωση Αρχείου</translation>
+        <translation>Φόρτωση αρχείου</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -10816,7 +11271,8 @@
         <location line="+0"/>
         <source>this mode has not been implemented
 </source>
-        <translation>αυτή η κατάσταση λειτουργίας δεν έχει υλοποιηθεί</translation>
+        <translation>αυτή η λειτουργία δεν έχει υλοποιηθεί
+</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
@@ -10824,20 +11280,20 @@
         <translation>κανένα</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation>Προσαρμοσμένο</translation>
     </message>
     <message>
         <location line="+362"/>
         <source>Target Bitrate:</source>
-        <translation>Ρυθμός Μπιτιών Προορισμού:</translation>
+        <translation>Δυφιορυθμός προορισμού:</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+20"/>
         <source>kbit/s</source>
-        <translation>χιλιομπίτια/δευτ.</translation>
+        <translation>kbit/s</translation>
     </message>
     <message>
         <location line="-15"/>
@@ -10852,37 +11308,37 @@
     <message>
         <location line="+5"/>
         <source>Target Video Size:</source>
-        <translation>Μέγεθος Βίντεου Προορισμού:</translation>
+        <translation>Μέγεθος του βίντεο προορισμού:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>MB</source>
-        <translation>ΜέγαΜπάιτια</translation>
+        <translation>MB</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Average Bitrate:</source>
-        <translation>Μέσος Ρυθμός Μπιτιών:</translation>
+        <translation>Μέσος δυφιορυθμός:</translation>
     </message>
     <message>
         <location line="+101"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
-        <translation>Η βελτιστοποίηση Μακροτμήματος-Δέντρου απαιτεί να είναι ενεργή η Διακύμανση Προσαρμοζόμενου Κβαντισμού.
-Η Διακύμανση Προσαρμοζόμενου Κβαντισμού θα ενεργοποιηθεί αυτόματα.
+        <translation>Η βελτιστοποίηση μακροτμήματος-δέντρου απαιτεί να είναι ενεργή η διακύμανση προσαρμοζόμενου κβαντισμού.
+Η διακύμανση προσαρμοζόμενου κβαντισμού θα ενεργοποιηθεί αυτόματα.
 
-Θες να συνεχίσεις;</translation>
+Επιθυμείτε να συνεχίσετε;</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Macroblock-Tree optimisation will automatically be disabled.
 
 Do you wish to continue?</source>
-        <translation>Η βελτιστοποίηση Μακροτμήματος-Δέντρου απαιτεί να είναι ενεργή η Διακύμανση Προσαρμοζόμενου Κβαντισμού.
-Η βελτιστοποίηση Μακροτμήματος-Δέντρου θα απενεργοποιηθεί αυτόματα.
+        <translation>Η βελτιστοποίηση μακροτμήματος-δέντρου απαιτεί να είναι ενεργή η διακύμανση προσαρμοζόμενου κβαντισμού.
+Η βελτιστοποίηση μακροτμήματος-δέντρου θα απενεργοποιηθεί αυτόματα.
 
-Θες να συνεχίσεις;</translation>
+Επιθυμείτε να συνεχίσετε;</translation>
     </message>
     <message>
         <location line="+41"/>
@@ -10899,17 +11355,17 @@
     <message>
         <location line="+15"/>
         <source>Save Profile</source>
-        <translation>Αποθήκευση του Προφίλ</translation>
+        <translation>Αποθήκευση του προφίλ</translation>
     </message>
     <message>
         <location line="+46"/>
         <source>Overwrite</source>
-        <translation>Επανωγραφή</translation>
+        <translation>Αντικατάσταση</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Replace the following preset ?:</source>
-        <translation>Να αντικατασταθεί η ακόλουθη προρύθμιση;  :</translation>
+        <translation>Να αντικατασταθεί η ακόλουθη προρύθμιση; :</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -10919,12 +11375,12 @@
     <message>
         <location line="+14"/>
         <source>Cannot delete custom profile</source>
-        <translation>Αδυναμία διαγραφής του προσαρμοσμένο προφίλ</translation>
+        <translation>Αδυναμία διαγραφής του προσαρμοσμένου προφίλ</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Do you really want to delete the </source>
-        <translation>Θέλεις πραγματικά να διαγράψεις το </translation>
+        <translation>Θέλετε πραγματικά να διαγράψετε το </translation>
     </message>
     <message>
         <location line="+1"/>
@@ -10949,17 +11405,17 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
         <source>x265 Configuraton</source>
-        <translation>x265 Ρύθμιση</translation>
+        <translation>Διαμόρφωση του x265</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Configuration:</source>
-        <translation>Ρύθμιση:</translation>
+        <translation>Διαμόρφωση:</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Save As</source>
-        <translation>Αποθήκευση Ως</translation>
+        <translation>Αποθήκευση ως</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -10970,12 +11426,12 @@
     <message>
         <location line="-2696"/>
         <source>General</source>
-        <translation>Γενικό</translation>
+        <translation>Γενικά</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Basic</source>
-        <translation>Βασικό</translation>
+        <translation>Βασικά</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -11087,63 +11543,63 @@
     <message>
         <location line="+27"/>
         <source>Pool Threads </source>
-        <translation>Κλωστές Ομαδοποίησης </translation>
+        <translation>Νήματα ομαδοποίησης </translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Frame Threads </source>
-        <translation>Κλωστές Στιγμιότυπων </translation>
+        <translation>Νήματα στιγμιότυπων </translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Rate Control</source>
-        <translation>Έλεγχος Ρυθμού</translation>
+        <translation>Έλεγχος ρυθμού</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Target Video Size:</source>
-        <translation>Μέγεθος του Βίντεου Προορισμού:</translation>
+        <translation>Μέγεθος του βίντεο προορισμού:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Constant Bitrate (Single Pass)</source>
-        <translation>Σταθερός Ρυθμός Μπιτιών (Μονό Πέρασμα)</translation>
+        <translation>Σταθερός δυφιορυθμός (Ένα πέρασμα)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Constant Quantiser (Single Pass)</source>
-        <translation>Σταθερός Κβαντιστής (Μονό Πέρασμα)</translation>
+        <translation>Σταθερός κβαντιστής (Ένα πέρασμα)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Constant Rate Factor (Single Pass)</source>
-        <translation>Παράγοντας Σταθερού Ρυθμού (Μονό Πέρασμα)</translation>
+        <translation>Παράγοντας σταθερού ρυθμού (Μονό πέρασμα)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Video Size (Two Pass)</source>
-        <translation>Μέγεθος Βίντεου (Διπλό Πέρασμα)</translation>
+        <translation>Μέγεθος βίντεο (Διπλό πέρασμα)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Average Bitrate (Two Pass)</source>
-        <translation>Μέσος Ρυθμός Μπιτιών (Διπλό Πέρασμα)</translation>
+        <translation>Μέσος δυφιορυθμός (Διπλού περάσματος)</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Encoding Mode:</source>
-        <translation>Κατάσταση Λειτουργίας Κωδικοποίησης:</translation>
+        <translation>Λειτουργίας κωδικοποίησης:</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>MB</source>
-        <translation>ΜέγαΜπάιτια</translation>
+        <translation>MB</translation>
     </message>
     <message>
         <location line="+44"/>
         <location line="+213"/>
         <source>0 (High Quality)</source>
-        <translation>0 (Υψηλή Ποιότητα)</translation>
+        <translation>0 (Υψηλή ποιότητα)</translation>
     </message>
     <message>
         <location line="-190"/>
@@ -11156,12 +11612,12 @@
         <location line="-1464"/>
         <location line="+213"/>
         <source>51 (Low Quality)</source>
-        <translation>(Χαμηλή Ποιότητα) 51</translation>
+        <translation>51 (Χαμηλή ποιότητα)</translation>
     </message>
     <message>
         <location line="-143"/>
         <source>Use Strict Constant Bitrate Mode</source>
-        <translation>Χρήση Λειτουργίας Σταθερού Ρυθμού Μπιτιών</translation>
+        <translation>Χρήση λειτουργίας σταθερού δυφιορυθμού</translation>
     </message>
     <message>
         <location line="+42"/>
@@ -11171,22 +11627,22 @@
     <message>
         <location line="+6"/>
         <source>Advanced Rate Control</source>
-        <translation>Προχωρημένος Έλεγχος Ρυθμού</translation>
+        <translation>Προχωρημένος έλεγχος ρυθμού</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Maximum Constant Rate Factor</source>
-        <translation>Μέγιστος Παράγοντας Σταθερού Ρυθμού</translation>
+        <translation>Μέγιστος παράγοντας σταθερού ρυθμού</translation>
     </message>
     <message>
         <location line="+158"/>
         <source>Coding Unit-tree Rate Control</source>
-        <translation>Έλεγχος Ρυθμού Κωδικοποίησης Μονάδων-δέντρου</translation>
+        <translation>Έλεγχος ρυθμού κωδικοποίησης μονάδων-δέντρου</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Frametype Lookahead:</source>
-        <translation>Τύπος-στιγμιότυπου Κοιτάγματος-πιο-Μπροστά:</translation>
+        <translation>Τύπος-στιγμιότυπου κοιτάγματος-πιο-μπροστά:</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -11197,7 +11653,7 @@
     <message>
         <location line="-2053"/>
         <source>Sequence Parameter Set Identifer:</source>
-        <translation>Αναγνωριστικό Ομάδας Παραμέτρων Συχνότητας:</translation>
+        <translation>Αναγνωριστικό της ομάδας παραμέτρων συχνότητας:</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -11227,82 +11683,82 @@
     <message>
         <location line="+6"/>
         <source>Motion Estimation</source>
-        <translation>Εκτίμηση Κίνησης</translation>
+        <translation>Εκτίμηση κίνησης</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Motion Estimation Method:</source>
-        <translation>Μέθοδος της Εκτίμησης Κίνησης:</translation>
+        <translation>Μέθοδος εκτίμησης κίνησης:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Diamond Search</source>
-        <translation>Αναζήτηση σε Διαμάντι</translation>
+        <translation>Αναζήτηση σε διαμάντι</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hexagonal Search</source>
-        <translation>Αναζήτηση σε Εξάγωνο</translation>
+        <translation>Αναζήτηση σε εξάγωνο</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Uneven Multi-hexagonal Search</source>
-        <translation>Άνιση Πολυ-εξαγωνική Αναζήτηση</translation>
+        <translation>Άνιση πολυεξαγωνική αναζήτηση</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Star Search</source>
-        <translation>Αστρική Αναζήτηση</translation>
+        <translation>Αστρική αναζήτηση</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Exhaustive Search</source>
-        <translation>Αναζήτηση Εξοντωτική</translation>
+        <translation>Εξαντλητική αναζήτηση</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>1 (Fast)</source>
-        <translation>1 (Fast)</translation>
+        <translation>1 (Γρήγορο)</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Subpixel Refinement</source>
-        <translation>Λαγάρισμα Υπο-εικονοστοιχείου</translation>
+        <translation>Λαγάρισμα υπο-εικονοστοιχείου</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>7 (Best)</source>
-        <translation>7 (Καλύτερο)</translation>
+        <translation>7 (Κάλλιστο)</translation>
     </message>
     <message>
         <location line="+78"/>
         <source>Motion Vector</source>
-        <translation>Διάνυσμα Κίνησης</translation>
+        <translation>Διάνυσμα κίνησης</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Maximum Motion Vector Search Range:</source>
-        <translation>Μέγιστο Εύρος Αναζήτησης Διανύσματος Κίνησης:</translation>
+        <translation>Μέγιστο εύρος της αναζήτησης διανύσματος κίνησης:</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Prediction</source>
-        <translation>Πρόβλεψη</translation>
+        <translation>Πρόρρηση</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Weighted Prediction for B-frames</source>
-        <translation>Ζυγισμένη Πρόβλεψη για Β΄-στιγμιότυπα</translation>
+        <translation>Ζυγισμένη πρόρρηση για Β-στιγμιότυπα</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Constrained Intra Prediction</source>
-        <translation>Περιορισμένη Εσωτερική Πρόβλεψη</translation>
+        <translation>Περιορισμένη εσωτερική πρόρρηση</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Weighted Prediction for P-frames:</source>
-        <translation>Ζυγισμένη Πρόβλεψη για Π΄-στιγμιότυπα:</translation>
+        <translation>Ζυγισμένη πρόρρηση για P-στιγμιότυπα:</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -11314,12 +11770,12 @@
     <message>
         <location line="-248"/>
         <source>Weighted References</source>
-        <translation>Ζυγισμένες Αναφορές</translation>
+        <translation>Ζυγισμένες αναφορές</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Weighted References + Duplicates</source>
-        <translation>Ζυγισμένες Αναφορές + Διπλότυπα</translation>
+        <translation>Ζυγισμένες αναφορές + διπλότυπα</translation>
     </message>
     <message>
         <location line="+42"/>
@@ -11329,22 +11785,22 @@
     <message>
         <location line="+6"/>
         <source>Frame Encoding</source>
-        <translation>Κωδικοποίηση Στιγμιότυπων</translation>
+        <translation>Κωδικοποίηση στιγμιότυπων</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Loop Filter:</source>
-        <translation>Μεταμορφωτής Ανακύκλωσης:</translation>
+        <translation>Μεταμορφωτής ανακύκλωσης:</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Open GOP:</source>
-        <translation>Άνοιγμα ΟμάδαςΕικόνων:</translation>
+        <translation>Άνοιγμα Ομάδας Εικόνων (GOP):</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Normal Mode</source>
-        <translation>Κανονική Κατάσταση Λειτουργίας</translation>
+        <translation>Κανονική κατάσταση λειτουργίας</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -11354,42 +11810,42 @@
     <message>
         <location line="+23"/>
         <source>Interlaced:</source>
-        <translation>Παράλληλα Πλεγμένο:</translation>
+        <translation>Πεπλεγμένο:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Top Field First</source>
-        <translation>Πρώτα το Επάνω Πεδίο</translation>
+        <translation>Πρώτα το επάνω πεδίο</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Bottom Field First</source>
-        <translation>Πρώτα το Κάτω Πεδίο</translation>
+        <translation>Πρώτα το κάτω πεδίο</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Maximum Reference Frames:</source>
-        <translation>Μέγιστο Πλήθος Στιγμιότυπων Αναφοράς:</translation>
+        <translation>Μέγιστο πλήθος στιγμιότυπων αναφοράς:</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>B-frames</source>
-        <translation>Β΄-στιγμιότυπα</translation>
+        <translation>Β-στιγμιότυπα</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>B-frames as References:</source>
-        <translation>Β΄-στιγμιότυπα ως Αναφορές:</translation>
+        <translation>Β-στιγμιότυπα ως αναφορές:</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Strictly Hierarchical Pyramid</source>
-        <translation>Αυστηρώς Ιεραρχική Πυραμίδα</translation>
+        <translation>Αυστηρώς ιεραρχική πυραμίδα</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Non-strict (Not Blu-ray Compatible)</source>
-        <translation>Μη-ορθόδοξο (Μη Συμβατό με Blu-ray)</translation>
+        <translation>Μη-αυστηρό (Μη Συμβατό με Blu-ray)</translation>
     </message>
     <message>
         <location line="+31"/>
@@ -11404,27 +11860,27 @@
     <message>
         <location line="+74"/>
         <source>B-frame Bias:</source>
-        <translation>Προκατάληψη Β΄-στιγμιότυπου:</translation>
+        <translation>Προκατάληψη Β-στιγμιότυπου:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Maximum Consecutive B-frames:</source>
-        <translation>Μέγιστο Πλήθος Συνεχόμενων Β΄-στιγμιότυπων:</translation>
+        <translation>Μέγιστο πλήθος συνεχόμενων Β-στιγμιότυπων:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Adaptive B-frame Decision:</source>
-        <translation>Προσαρμοζόμενη Απόφαση Β΄-στιγμιότυπων:</translation>
+        <translation>Προσαρμοζόμενη απόφαση Β-στιγμιότυπων:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>I-frames</source>
-        <translation>Ι΄-στιγμιότυπα</translation>
+        <translation>Ι-στιγμιότυπα</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>GOP Size:</source>
-        <translation>Μέγεθος ΟμάδαςΕικόνων:</translation>
+        <translation>Μέγεθος Ομάδας Εικόνων (GOP):</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -11439,7 +11895,7 @@
     <message>
         <location line="+32"/>
         <source>I-frame Threshold:</source>
-        <translation>Κατώφλι Ι΄-στιγμιότυπου:</translation>
+        <translation>Κατώτατο όριο Ι-στιγμιότυπου:</translation>
     </message>
     <message>
         <location line="+53"/>
@@ -11450,72 +11906,72 @@
     <message>
         <location line="+8"/>
         <source>Trellis Quantization:</source>
-        <translation>Ανιχνευτικός Κβαντισμός</translation>
+        <translation>Ανιχνευτικός κβαντισμός:</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Final Macroblock Only</source>
-        <translation>Τελικό Μακροτμήμα Μόνο</translation>
+        <translation>Τελικό μακροτμήμα μόνο</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Always On</source>
-        <translation>Πάντα Ενεργό</translation>
+        <translation>Πάντα ενεργό</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Fast Skip Detection on P-frames</source>
-        <translation>Γρήγορο Προσπέρασμα Εντοπισμού στα Π&apos;-στιγμιότυπα</translation>
+        <translation>Γρήγορο προσπέρασμα εντοπισμού στα P-στιγμιότυπα</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>DCT Decimation on P-frames</source>
-        <translation>DCT Αποδεκατισμός στα Π΄-στιγμιότυπα</translation>
+        <translation>DCT αποδεκατισμός στα P-στιγμιότυπα</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Psychovisual Rate Distortion Optimisation:</source>
-        <translation>Βελτιστοποίηση Ψυχο-οπτικής Παραμόρφωσης Ρυθμού:</translation>
+        <translation>Βελτιστοποίηση ψυχο-οπτικής παραμόρφωσης ρυθμού:</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Noise Reduction:</source>
-        <translation>Μείωση Θορύβου:</translation>
+        <translation>Μείωση του θορύβου:</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Noise Reduction Intra:</source>
-        <translation>Μείωση Θορύβου Έσωθεν:</translation>
+        <translation>Μείωση του θορύβου έσωθεν:</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Noise Reduction Inter:</source>
-        <translation>Μείωση Θορύβου Δια-στιγμιοτυπική:</translation>
+        <translation>Μείωση του θορύβου δια-στιγμιοτυπική:</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Strong Intra Smoothing</source>
-        <translation>Έντωνη «Έσωθεν» Ομαλοποίηση</translation>
+        <translation>Έντονη έσωθεν ομαλοποίηση</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Quantisation Matrix</source>
-        <translation>Πλαίσιο Κβαντισμού</translation>
+        <translation>Πίνακας κβαντισμού</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Flat Matrix</source>
-        <translation>Επίπεδο Πλαίσιο</translation>
+        <translation>Επίπεδος πίνακας</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>JVT Matrix</source>
-        <translation>Πλαίσιο JVT</translation>
+        <translation>Πίνακας JVT</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Custom Matrix</source>
-        <translation>Προσαρμοσμένο Πλαίσιο</translation>
+        <translation>Προσαρμοσμένος πίνακας</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -11526,17 +11982,17 @@
     <message>
         <location line="-771"/>
         <source>Quantiser Control</source>
-        <translation>Έλεγχος Κβαντιστή</translation>
+        <translation>Έλεγχος κβαντιστή</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Chroma to Luma Quantiser Offset:</source>
-        <translation>Απόκλιση του Κβαντιστή από Χρωματισμό σε Φωτεινότητα:</translation>
+        <translation>Απόκλιση του κβαντιστή από χρωματισμό σε ασπρόμαυρη φωτεινότητα (luma):</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>I and P-frame Quantiser Ratio:</source>
-        <translation>Αναλογία Κβαντιστή Ι΄ και Π΄ στιγμιότυπων:</translation>
+        <translation>Αναλογία κβαντιστή Ι και P στιγμιότυπων:</translation>
     </message>
     <message>
         <location line="+58"/>
@@ -11548,7 +12004,7 @@
     <message>
         <location line="-448"/>
         <source>Maximum Quantiser Step:</source>
-        <translation>Μέγιστο Βήμα Κβαντιστή:</translation>
+        <translation>Μέγιστο βήμα κβαντιστή:</translation>
     </message>
     <message>
         <location line="+19"/>
@@ -11563,37 +12019,37 @@
     <message>
         <location line="+22"/>
         <source>P and B-frame Quantiser Ratio:</source>
-        <translation>Αναλογία Διαστάσεων Κβαντιστή Π΄ κ΄ Β΄-στιγμιότυπων:</translation>
+        <translation>Αναλογία διαστάσεων κβαντιστή P και B-στιγμιότυπων:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Average Bitrate Tolerance:</source>
-        <translation>Ανοχή Μέσου Ρυθμού Μπιτιών:</translation>
+        <translation>Ανοχή μέσου δυφιορυθμού:</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Quantiser Curve Compression</source>
-        <translation>Συμπίεση Καμπύλης Κβαντιστή</translation>
+        <translation>Συμπίεση καμπύλης κβαντιστή</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Quantiser Curve Compression:</source>
-        <translation>Συμπίεση Καμπύλης Κβαντιστή</translation>
+        <translation>Συμπίεση καμπύλης κβαντιστή</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>Reduce Fluctuation Before Curve Compression:</source>
-        <translation>Μείωση της Διακύμανσης Πριν την Συμπίεση Καμπύλης:</translation>
+        <translation>Μείωση της διακύμανσης πριν την συμπίεση καμπύλης:</translation>
     </message>
     <message>
         <location line="+70"/>
         <source>Reduce Fluctuation After Curve Compression:</source>
-        <translation>Μείωση της Διακύμανσης Μετά την Συμπίεση Καμπύλης:</translation>
+        <translation>Μείωση της διακύμανσης μετά την συμπίεση καμπύλης:</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Adaptive Quantisation</source>
-        <translation>Προσαρμοζόμενος Κβαντισμός</translation>
+        <translation>Προσαρμοζόμενος κβαντισμός</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -11608,7 +12064,7 @@
     <message>
         <location line="+5"/>
         <source>Auto Variance AQ</source>
-        <translation>Αυτόματη Διακύμανση AQ</translation>
+        <translation>Αυτόματης διακύμανσης AQ</translation>
     </message>
     <message>
         <location line="+26"/>
@@ -11623,57 +12079,57 @@
     <message>
         <location line="+12"/>
         <source>Video Buffer Verifier</source>
-        <translation>Επιβεβαιωτής Μικροαποθήκευσης Βίντεου</translation>
+        <translation>Επαλήθευση της ενδιάμεσης μνήμης βίντεο</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Maximum VBV Bitrate:</source>
-        <translation>Μέγιστος Ρυθμός Μπιτιών VBV:</translation>
+        <translation>Μέγιστος δυφιορυθμός VBV:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Initial VBV Buffer Occupancy:</source>
-        <translation>Αρχική Κατάληψη Μικροαποθήκευσης VBV:</translation>
+        <translation>Αρχική κατάληψη μικροαποθήκευσης VBV:</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>kbit</source>
-        <translation>χιλιομπίτια</translation>
+        <translation>kbit</translation>
     </message>
     <message>
         <location line="+65"/>
         <source>kbit/s</source>
-        <translation>χιλιομπίτια/δευτ.</translation>
+        <translation>kbit/s</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>VBV Buffer Size:</source>
-        <translation>Μέγεθος Μικροαποθήκευσης VBV:</translation>
+        <translation>Μέγεθος της ενδιάμεσης μνήμης VBV:</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Slicing</source>
-        <translation>Κόψιμο σε Φέτες</translation>
+        <translation>Τεμαχισμός σε φέτες</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Slices per Frame:</source>
-        <translation>Φέτες ανά Στιγμιότυπο:</translation>
+        <translation>Φέτες ανά στιγμιότυπο:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Maximum Size per Slice:</source>
-        <translation>Μέγιστο Μέγεθος ανά Φέτα:</translation>
+        <translation>Μέγιστο μέγεθος ανά φέτα:</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>bytes</source>
-        <translation>μπάιτια</translation>
+        <translation>byte</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Maximum Macroblocks per Slice:</source>
-        <translation>Μέγιστα Μακροτμήματα ανά Φέτα:</translation>
+        <translation>Μέγιστα μακροτμήματα ανά φέτα:</translation>
     </message>
     <message>
         <location line="+58"/>
@@ -11688,12 +12144,12 @@
     <message>
         <location line="+42"/>
         <source>Advanced 2</source>
-        <translation>Advanced 2</translation>
+        <translation>Προχωρημένα 2</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Multithreading</source>
-        <translation>Πολυγνέσιμο</translation>
+        <translation>Πολυνημάτωση</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -11714,17 +12170,17 @@
     <message>
         <location line="+37"/>
         <source>Enforce Repeatability</source>
-        <translation>Εξαναγκασμός Επαναληψιμότητας</translation>
+        <translation>Εξαναγκασμός επαναληψιμότητας</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Slice-based Threading</source>
-        <translation>Γνέσιμο κατά φέτες</translation>
+        <translation>Νημάτωση κατά φέτες</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Custom Threaded Lookahead Buffer:</source>
-        <translation>Προσαρμοσμένη Μικροαποθήκευση Κοιτάγματος-πιο-Μπροστά με Σπείρωμα:</translation>
+        <translation>Προσαρμοσμένη μικροαποθήκευση κοιτάγματος-πιο-μπροστά με σπείρωμα:</translation>
     </message>
     <message>
         <location line="+59"/>
@@ -11739,12 +12195,12 @@
     <message>
         <location line="+6"/>
         <source>Generate Access Unit Delimiters</source>
-        <translation>Παραγωγή Διαχωριστικών Μονάδας Πρόσβασης</translation>
+        <translation>Παραγωγή διαχωριστικών μονάδας πρόσβασης</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Pixel Aspect Ratio</source>
-        <translation>Λόγος Διαστάσεων σε Εικονοστοιχεία</translation>
+        <translation>Αναλογία διαστάσεων σε εικονοστοιχεία</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -11755,7 +12211,7 @@
     <message>
         <location line="+10"/>
         <source>As Input</source>
-        <translation>Ως Δεδομένα Εισόδου</translation>
+        <translation>Ως δεδομένα εισόδου</translation>
     </message>
     <message>
         <location line="+49"/>
@@ -11765,7 +12221,7 @@
     <message>
         <location line="+35"/>
         <source>Predefined Aspect Ratio:</source>
-        <translation>Προεπιλεγμένη Αναλογία Διαστάσεων:</translation>
+        <translation>Προεπιλεγμένη αναλογία διαστάσεων:</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -11795,7 +12251,7 @@
     <message>
         <location line="+6"/>
         <source>Video Usability Information</source>
-        <translation>Πληροφορίες Χρηστικότητας Βίντεου</translation>
+        <translation>Πληροφορίες χρηστικότητας βίντεο</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -11824,12 +12280,12 @@
     <message>
         <location line="+5"/>
         <source>Crop</source>
-        <translation>Περιτομή</translation>
+        <translation>Περικοπή</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Video Format:</source>
-        <translation>Μορφή Βίντεου:</translation>
+        <translation>Μορφή βίντεο:</translation>
     </message>
     <message>
         <location line="+18"/>
@@ -11859,7 +12315,7 @@
     <message>
         <location line="+23"/>
         <source>Colour Primaries:</source>
-        <translation>Βασικά Χρώματα:</translation>
+        <translation>Βασικά χρώματα:</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -11902,7 +12358,7 @@
     <message>
         <location line="+23"/>
         <source>Transfer Characteristics:</source>
-        <translation>Μεταφορά Χαρακτηριστικών:</translation>
+        <translation>Μεταφορά χαρακτηριστικών:</translation>
     </message>
     <message>
         <location line="+30"/>
@@ -11927,7 +12383,7 @@
     <message>
         <location line="+28"/>
         <source>Colour Matrix:</source>
-        <translation>Πλαίσιο Χρώματος:</translation>
+        <translation>Χρωματικός πίνακας:</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -11947,7 +12403,7 @@
     <message>
         <location line="+23"/>
         <source>HRD Parameters:</source>
-        <translation>Παράμετροι HRD: </translation>
+        <translation>Παράμετροι HRD:</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -11957,22 +12413,22 @@
     <message>
         <location line="+5"/>
         <source>VBR</source>
-        <translation>Μεταβλητός Ρυθμός Μπιτιών</translation>
+        <translation>Μεταβλητός δυφιορυθμός</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>CBR</source>
-        <translation>Σταθ.Ρυθ.Μπιτ.</translation>
+        <translation>Σταθερός δυφιορυθμός</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Chroma Sample Location:</source>
-        <translation>Τοποθεσία Δείγματος Χρωματισμού:</translation>
+        <translation>Τοποθεσία δείγματος χρωματισμού:</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Full Range Samples</source>
-        <translation>Δείγματα Πλήρους Εύρους</translation>
+        <translation>Δείγματα πλήρους εύρους</translation>
     </message>
 </context>
 <context>
@@ -11980,7 +12436,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265CustomMatrixDialog.ui" line="+14"/>
         <source>x265 Custom Matrix</source>
-        <translation>x265 Προσαρμοσμένο Πλαίσιο</translation>
+        <translation>x265 Προσαρμοσμένος πίνακας</translation>
     </message>
     <message>
         <location line="+16"/>
@@ -11993,7 +12449,7 @@
         <location line="+446"/>
         <location line="+703"/>
         <source>Luma:</source>
-        <translation>Φωτεινότητα :</translation>
+        <translation>Ασπρόμαυρη φωτεινότητα (luma):</translation>
     </message>
     <message>
         <location line="-1385"/>
@@ -12019,7 +12475,7 @@
     <message>
         <location line="+727"/>
         <source>Load File</source>
-        <translation>Φόρτωση Αρχείου</translation>
+        <translation>Φόρτωση αρχείου</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -12035,7 +12491,7 @@
 <context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+37"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+32"/>
         <location line="+24"/>
         <source>None</source>
         <translation>Κανένα</translation>
@@ -12091,22 +12547,48 @@
         <translation>16:9 (NTSC)</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+7"/>
         <source>Motion Estimation</source>
-        <translation>Εκτίμηση Κίνησης</translation>
+        <translation>Εκτίμηση κίνησης</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+12"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation>_Απόρριψη πανομοιότυπων στιγμιοτύπων (θα απενεργοποιήσει τα B-στιγμιότυπα)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation>Λόγος απόρριψης στιγμιότυπων:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation>Λειτουργία κωδικοποίησης</translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
+        <translation>Ρυθμίσεις στιγμιότυπου</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Miscellaneous</source>
+        <translation>Διάφορα</translation>
+    </message>
+    <message>
+        <location line="+25"/>
         <source>Rate Control</source>
-        <translation>Έλεγχος Ρυθμού</translation>
+        <translation>Έλεγχος ρυθμού</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-52"/>
         <source>Aspect Ratio:</source>
-        <translation>Αναλογία Διαστάσεων:</translation>
+        <translation>Αναλογία διαστάσεων:</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-46"/>
         <source>DCT</source>
         <translation>DCT</translation>
     </message>
@@ -12128,17 +12610,17 @@
     <message>
         <location line="+4"/>
         <source>One thread</source>
-        <translation>Μία κλωστή</translation>
+        <translation>Ένα νήμα</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Two threads)</source>
-        <translation>Δύο κλωστές)</translation>
+        <translation>Δύο νήματα</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Three threads</source>
-        <translation>Τρεις κλωστές</translation>
+        <translation>Τρία νήματα</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -12151,14 +12633,9 @@
         <translation>1:1 (Υπολογιστής)</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>MotionEstimation</source>
-        <translation>ΕκτίμησηΚίνησης</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+13"/>
         <source>Threading</source>
-        <translation>Γνέσιμο</translation>
+        <translation>Νημάτωση</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -12178,10 +12655,10 @@
     <message>
         <location line="+1"/>
         <source>_Number of B frames:</source>
-        <translation>_Πλήθος από Β΄ στιγμιότυπα:</translation>
+        <translation>_Πλήθος Β στιγμιότυπων:</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+5"/>
         <source>_Quantization type:</source>
         <translation>Τύπος _κβαντισμού:</translation>
     </message>
@@ -12198,7 +12675,7 @@
     <message>
         <location line="+10"/>
         <source>_Gop Size:</source>
-        <translation>Μέ_γεθος ΟμάδαςΕικόνων:</translation>
+        <translation>Μέ_γεθος Ομάδας Εικόνων (GOP):</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -12206,29 +12683,24 @@
         <translation>Χρήση XVID fcc (ή διαφορετικά DIVX)</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Advanced Simple Profile</source>
-        <translation>Προχωρημένο Απλό Προφίλ</translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+25"/>
         <source>Quantization</source>
         <translation>Κβαντισμός</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Threads</source>
-        <translation>Κλωστές</translation>
+        <translation>Νήματα</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Aspect Ratio</source>
-        <translation>Αναλογία Διαστάσεων</translation>
+        <translation>Αναλογία διαστάσεων</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Xvid4 MPEG-4 ASP configuration</source>
-        <translation>Ρύθμιση Xvid4 MPEG-4 ASP \</translation>
+        <translation>Διαμόρφωση Xvid4 MPEG-4 ASP</translation>
     </message>
 </context>
 <context>
@@ -12244,23 +12716,7 @@
         <translation>Yadif, προσαρμογή της έκδοσης avisynth (c) Fizick.</translation>
     </message>
     <message>
-        <source>Temporal &amp; spatial check</source>
-        <translation type="vanished">Χρονικός κ΄ χωρικός έλεγχος</translation>
-    </message>
-    <message>
-        <source>Bob, temporal &amp; spatial check</source>
-        <translation type="vanished">Bob, χρονικός κ&apos; χωρικός έλεγχος</translation>
-    </message>
-    <message>
-        <source>Skip spatial temporal check</source>
-        <translation type="vanished">Παράβλεψη χωρικού χρονικού ελέγχου</translation>
-    </message>
-    <message>
-        <source>Bob, skip spatial temporal check</source>
-        <translation type="vanished">Bob, παράληψη χωρικού κ&apos; χρονικού ελέγχου</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+70"/>
         <source>Bottom field first</source>
         <translation>Πρώτα το κάτω πεδίο</translation>
     </message>
@@ -12272,42 +12728,42 @@
     <message>
         <location line="-7"/>
         <source>Frame : Temporal &amp; spatial check</source>
-        <translation type="unfinished"></translation>
+        <translation>Στιγμιότυπο: Χρονικός &amp; χωρικός έλεγχος</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Field :  Temporal &amp; spatial check</source>
-        <translation type="unfinished"></translation>
+        <translation>Πεδίο: Χρονικός &amp; χωρικός έλεγχος</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Frame : Skip spatial temporal check</source>
-        <translation type="unfinished"></translation>
+        <translation>Στιγμιότυπο: Παράλειψη του χωρικού χρονικού ελέγχου</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Field : Skip spatial temporal check</source>
-        <translation type="unfinished"></translation>
+        <translation>Πεδίο: Παράλειψη του χωρικού χρονικού ελέγχου</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Deint all</source>
-        <translation type="unfinished"></translation>
+        <translation>Απόπλεξη όλων</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Deint interlaced</source>
-        <translation type="unfinished"></translation>
+        <translation>Απόπλεξη πεπλεγμένου</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>_Mode:</source>
-        <translation>_Κατάσταση Λειτουργίας:</translation>
+        <translation>_Λειτουργία:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Deint:</source>
-        <translation type="unfinished"></translation>
+        <translation>_Απόπλεξη:</translation>
     </message>
     <message>
         <location line="+1"/>

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_en.ts -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_en.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+194"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+425"/>
         <source>Cannot find a demuxer for %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51,12 +51,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+47"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -375,32 +375,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+6"/>
         <source>TimeLeft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
+        <location line="+13"/>
         <source>00:00:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+28"/>
         <source>ProcessImages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+23"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="-30"/>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-14"/>
         <source>0 fps</source>
         <translation type="unfinished"></translation>
     </message>
@@ -436,30 +436,28 @@
 <context>
     <name>FDK-AAC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
-        <source>_Profile::</source>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+9"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+2"/>
         <source>SBR enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+7"/>
-        <source>After burner</source>
+        <location line="+2"/>
+        <source>Afterburner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>FDK-AAC Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -578,12 +576,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>   (0 track(s))</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+145"/>
+        <location line="+155"/>
         <source>&amp;Shift:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,12 +592,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+946"/>
+        <location line="+931"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-871"/>
+        <location line="-856"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -753,17 +746,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+210"/>
         <source>Play filtered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-169"/>
         <source>Vol&amp;ume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-1006"/>
+        <source> (0 tracks)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+981"/>
         <source>Selection: 000000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -788,11 +786,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Alt+Return</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location line="+9"/>
         <source>Save &amp;Video...</source>
         <translation type="unfinished"></translation>
@@ -826,16 +819,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>&amp;Calculator...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>F7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location line="+15"/>
         <source>&amp;Input</source>
         <translation type="unfinished"></translation>
@@ -909,7 +892,7 @@
 <context>
     <name>Opus</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -931,11 +914,6 @@
         <source>Evaluate</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+3"/>
-        <source>Ctrl+Return</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>VapourSynthProxy</name>
@@ -984,7 +962,7 @@
     </message>
     <message>
         <location line="+10"/>
-        <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1152,12 +1130,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
+        <location line="+2"/>
         <source>Save current settings as default</source>
         <translation>Save current settings as de&amp;fault</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Load saved settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1233,7 +1212,7 @@
         <translation>Go to &amp;Time</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1253,6 +1232,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+34"/>
         <source>R_esampling (Hz):</source>
         <translation type="unfinished"></translation>
@@ -1296,7 +1280,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+381"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+389"/>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1503,10 +1487,10 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+277"/>
+        <location line="+283"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+423"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1608,7 +1592,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-177"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1785,12 +1769,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Auto-Append Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1862,7 +1856,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+213"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1985,7 +1979,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-107"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-114"/>
         <source>Save as BMP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2010,7 +2004,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+34"/>
         <source>&amp;Advanced</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2060,8 +2054,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
@@ -2071,8 +2065,8 @@
         <location line="+24"/>
         <location line="+8"/>
         <location line="+4"/>
-        <location filename="../../common/gui_save.cpp" line="+199"/>
-        <location line="+99"/>
+        <location filename="../../common/gui_save.cpp" line="+205"/>
+        <location line="+92"/>
         <location line="+7"/>
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
@@ -2080,8 +2074,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-44"/>
-        <location line="+44"/>
+        <location line="-43"/>
+        <location line="+43"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished"></translation>
@@ -2111,7 +2105,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
-        <location filename="../../common/gui_save.cpp" line="-638"/>
+        <location filename="../../common/gui_save.cpp" line="-643"/>
         <source>No audio track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2170,7 +2164,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1449"/>
+        <location filename="../../common/gui_main.cpp" line="-1447"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2195,18 +2189,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+115"/>
         <source>Not coded in this version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
-        <location line="+68"/>
+        <location line="+73"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-48"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2216,7 +2210,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2374,8 +2368,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+321"/>
+        <location line="+320"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2464,7 +2457,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+144"/>
         <source>AvsProxy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2510,7 +2503,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+51"/>
+        <location filename="../../common/gui_save.cpp" line="+54"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2520,7 +2513,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Job</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2530,7 +2523,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Output file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2545,7 +2538,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Select Workbench to Save</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2617,22 +2610,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Maximum number of 9999 images reached, aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Saving images failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+25"/>
         <source>PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2657,23 +2645,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
-        <location line="+83"/>
+        <location line="-114"/>
+        <location line="+76"/>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-583"/>
+        <location line="-588"/>
         <source>Audio encoder index out of bounds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+500"/>
+        <location line="+510"/>
+        <source>Maximum number of 99999 images reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Saved %d images.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+56"/>
         <source>BMP op failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2703,37 +2696,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-244"/>
+        <location filename="../../common/gui_savenew.cpp" line="-251"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+12"/>
+        <location line="+170"/>
         <location line="+12"/>
         <location line="+16"/>
-        <location line="+8"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-28"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+24"/>
         <source>Cannot create encoder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-8"/>
-        <source>Cannot setup codec. Bitrate too low?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+57"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2745,20 +2732,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-253"/>
-        <location line="+286"/>
+        <location line="-257"/>
+        <location line="+290"/>
         <location line="+26"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-312"/>
-        <location line="+286"/>
+        <location line="-326"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+290"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="-102"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The choice of cut points may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Do you want to continue anyway?</source>
         <translation type="unfinished"></translation>
@@ -3116,7 +3113,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>AAC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3166,12 +3163,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+495"/>
         <source>Saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+181"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3182,7 +3179,7 @@
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
-        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+374"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+382"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3273,20 +3270,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
-        <location line="+30"/>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
-        <location line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
         <source>Codec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
         <source>Internal error finding codec 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Internal error opening 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3302,31 +3299,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+812"/>
-        <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
-Dropping a keyframe will result in severely corrupted video.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
-Dropping a frame may result in some video corruption.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Do not warn again and drop frames silently while saving this video?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3564,7 +3537,7 @@
 <context>
     <name>avimuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+75"/>
         <source>Bad Idea</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3641,7 +3614,7 @@
 <context>
     <name>bitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+51"/>
         <source>Constant Bitrate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3758,34 +3731,39 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+23"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+51"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>blackframes</name>
@@ -3806,6 +3784,29 @@
     </message>
 </context>
 <context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -3834,7 +3835,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
+        <source>59.94  (NTSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3848,7 +3849,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+141"/>
+        <location line="+146"/>
         <source>Source Fps:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4175,7 +4176,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4441,30 +4442,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+251"/>
+        <location line="+32"/>
+        <location line="+254"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-234"/>
-        <location line="+220"/>
+        <location line="-261"/>
+        <location line="+247"/>
         <location line="+21"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-254"/>
         <source>Phase:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-31"/>
         <source>Time Remaining:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+58"/>
         <source>Shut down computer when finished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4499,7 +4500,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+12"/>
+        <source>Keep dialog open when finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4509,7 +4515,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+13"/>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4681,7 +4687,7 @@
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished"></translation>
@@ -4692,7 +4698,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+13"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4705,13 +4736,13 @@
 <context>
     <name>fadeToBlack</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
-        <location line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+55"/>
+        <location line="+20"/>
         <source>Fade to black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-19"/>
         <source>Fade to black in/out.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4736,7 +4767,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>_Fade type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4754,7 +4785,7 @@
 <context>
     <name>ffVAEncH264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4769,12 +4800,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Profile:</source>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4785,16 +4837,21 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Bitrate (kbps):</source>
+        <source>Quality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4804,7 +4861,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4812,27 +4869,53 @@
 <context>
     <name>ffVAEncHEVC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+343"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4842,7 +4925,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4850,7 +4933,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+217"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+250"/>
         <source>Normal (4:3)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5319,8 +5402,32 @@
 <context>
     <name>ffnvenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+229"/>
+        <source>Controlled by Preset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
         <source>Low Quality</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5372,6 +5479,12 @@
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+        <source>RC Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Preset:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5381,6 +5494,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Bitrate (kbps):</source>
@@ -5394,32 +5513,48 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Frame Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>NVENC H.264 configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
-        <source>nvEnc HEVC  configuration</source>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+28"/>
+        <source>NVENC HEVC configuration</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5431,7 +5566,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+87"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5527,7 +5662,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5600,7 +5735,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5756,7 +5891,7 @@
 <context>
     <name>flvdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6327,7 +6462,7 @@
         <translation type="unfinished">&amp;Quit</translation>
     </message>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Oops</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6337,7 +6472,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>There are no jobs stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6785,12 +6920,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+523"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6890,7 +7025,7 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+167"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
         <source>Saving Mkv</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6989,31 +7124,46 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+67"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <location line="+17"/>
         <source>Unsupported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
-        <source>Only MP4Video, H264, and H265 supported for video</source>
+        <location line="-17"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+182"/>
         <source>Saving mp4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7023,7 +7173,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7058,7 +7208,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Do not rotate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7084,6 +7234,51 @@
     </message>
     <message>
         <location line="+3"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>MP4 Muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7255,7 +7450,7 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+242"/>
+        <location filename="../../common/gui_navigate.cpp" line="+232"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7485,17 +7680,17 @@
 <context>
     <name>psdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -7565,7 +7760,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+126"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7580,7 +7775,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+185"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7618,7 +7813,7 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+212"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+206"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7698,21 +7893,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+626"/>
+        <location line="+681"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+262"/>
+        <location line="+230"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+334"/>
-        <source> (%d track(s))</source>
+        <location line="+70"/>
+        <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation>
+            <numerusform> (%n track)</numerusform>
+            <numerusform> (%n tracks)</numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>qgui2menu</name>
@@ -7948,18 +8152,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+33"/>
         <source>%2.3f fps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+81"/>
+        <location line="+90"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation type="unfinished"></translation>
     </message>
+    <message numerus="yes">
+        <location line="-55"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
+        <translation>
+            <numerusform>Audio (%n active track)</numerusform>
+            <numerusform>Audio (%n active tracks)</numerusform>
+        </translation>
+    </message>
     <message>
-        <location line="+30"/>
+        <location line="+83"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7985,12 +8198,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+27"/>
+        <location line="+33"/>
         <source>Total Duration:	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-31"/>
         <source>Extra Video Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8005,12 +8218,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Codec:		</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8035,12 +8248,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-172"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+77"/>
         <source>Mono</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8053,7 +8266,7 @@
 <context>
     <name>qshell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+53"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
         <translation type="unfinished"></translation>
@@ -8065,6 +8278,19 @@
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>qtalert</name>
@@ -8126,6 +8352,16 @@
         <source>Video Only Muxer Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>removeplane</name>
@@ -8204,7 +8440,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
+        <source>59.94  (NTSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8218,7 +8454,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+281"/>
         <source>_Mode:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8236,7 +8472,7 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8399,6 +8635,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+356"/>
+        <source>Lanzcos3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
         <source>Source PAR:</source>
         <translation type="unfinished"></translation>
@@ -8416,16 +8666,16 @@
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+44"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-312"/>
         <source>Resize Dimensions</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8596,17 +8846,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+5"/>
-        <source>Lanzcos3</source>
+        <source>Lanczos-3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8965,22 +9205,32 @@
 <context>
     <name>tsdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+183"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+325"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+84"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+207"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+19"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -9072,19 +9322,137 @@
     </message>
 </context>
 <context>
+    <name>vaapiDeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Adaptive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Compensated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vaapiResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
-        <source>vaapi: Resize</source>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>vaapi: Resize image using vaapi.</source>
+        <source>Resize image using VA-API.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+129"/>
         <source>Width :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9095,7 +9463,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>mpeg-&gt;PC:</source>
+        <source>mpeg-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9117,7 +9485,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+197"/>
         <source>Keep Top Field</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9133,31 +9501,31 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>_Ivtc:</source>
+        <source>_IVTC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Resize:</source>
+        <source>_Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>_Deint Mode:</source>
+        <location line="+2"/>
+        <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Width :</source>
+        <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Height :</source>
+        <location line="-2"/>
+        <source>_Deint Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>vdpau</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9175,13 +9543,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
-        <source>Width :</source>
+        <location line="+131"/>
+        <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9265,6 +9633,84 @@
     </message>
 </context>
 <context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vsWindow</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
@@ -9280,7 +9726,7 @@
 <context>
     <name>webmmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+68"/>
         <source>Unsupported Video.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
         <translation type="unfinished"></translation>
@@ -9292,7 +9738,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+89"/>
         <source>Saving Webm</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9315,7 +9761,7 @@
 <context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
         <source>Processing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9325,12 +9771,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+14"/>
         <source>Time Remaining:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+13"/>
         <source>00:00:00</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9338,7 +9784,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9354,7 +9800,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9486,12 +9932,12 @@
     </message>
     <message>
         <location line="+7"/>
-        <location line="+3152"/>
+        <location line="+3157"/>
         <source>Delete</source>
         <translation type="unfinished">&amp;Delete</translation>
     </message>
     <message>
-        <location line="-3110"/>
+        <location line="-3115"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9719,12 +10165,12 @@
     </message>
     <message>
         <location line="+14"/>
-        <location line="+2490"/>
+        <location line="+2495"/>
         <source>frames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2466"/>
+        <location line="-2471"/>
         <source>Sequence Parameter Set Identifer:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9857,12 +10303,12 @@
     </message>
     <message>
         <location line="+13"/>
-        <location line="+2596"/>
+        <location line="+2601"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2591"/>
+        <location line="-2596"/>
         <source>Spatial</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9943,12 +10389,12 @@
     </message>
     <message>
         <location line="+12"/>
-        <location line="+1328"/>
+        <location line="+1333"/>
         <source>Strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1289"/>
+        <location line="-1294"/>
         <source>Threshold:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10155,12 +10601,12 @@
     </message>
     <message>
         <location line="+10"/>
-        <location line="+856"/>
+        <location line="+861"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-809"/>
+        <location line="-814"/>
         <source>Quantiser Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10177,12 +10623,12 @@
     <message>
         <location line="+85"/>
         <location line="+179"/>
-        <location line="+302"/>
+        <location line="+307"/>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-459"/>
+        <location line="-464"/>
         <source>Maximum Quantiser Step:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10243,7 +10689,12 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>Auto Variance AQ</source>
+        <source>Auto Variance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -10687,7 +11138,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11891,7 +12342,7 @@
 <context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+37"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+32"/>
         <location line="+24"/>
         <source>None</source>
         <translation type="unfinished"></translation>
@@ -11992,12 +12443,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>MotionEstimation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+9"/>
         <source>Threading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12023,6 +12469,16 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>_Quantization type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12052,17 +12508,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Advanced Simple Profile</source>
+        <location line="-32"/>
+        <source>Motion Estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Motion Estimation</source>
+        <source>Miscellaneous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Quantization</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12100,7 +12567,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+70"/>
         <source>Bottom field first</source>
         <translation type="unfinished"></translation>
     </message>

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_es.ts -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_es.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
         <source>Attempt to open %s failed!</source>
         <translation>¡Error al intentar abrir %s!</translation>
     </message>
@@ -53,12 +53,12 @@
 2) concatenarlos</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
         <source>Checking if timestamps are valid..</source>
         <translation>Comprobando si las marcas de tiempo son válidas..</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+47"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation>Este vídeo contiene fotogramas-B, pero las marcas de tiempo de presentación (PTS) faltan o aumentan monotónicamente. Avidemux puede intentar reconstruir las PTS correctas decodificando el vídeo entero. Esto puede llevar mucho tiempo. ¿Quiere proceder?</translation>
     </message>
@@ -378,27 +378,27 @@
 <context>
     <name>DialogProcessing</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+26"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+33"/>
         <source>00:00:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+51"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-19"/>
+        <location line="-70"/>
         <source>Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+6"/>
         <source>TimeLeft</source>
         <translation>Tiempo restante</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+41"/>
         <source>ProcessImages</source>
         <translation>Imágenes procesadas</translation>
     </message>
@@ -408,7 +408,7 @@
         <translation>Velocidad</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-14"/>
         <source>0 fps</source>
         <translation type="unfinished"></translation>
     </message>
@@ -444,30 +444,28 @@
 <context>
     <name>FDK-AAC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
-        <source>_Profile::</source>
-        <translation>_Perfil:</translation>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+9"/>
         <source>_Bitrate:</source>
         <translation>Tasa de _bits:</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+2"/>
         <source>SBR enabled</source>
         <translation>SBR habilitado</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+7"/>
-        <source>After burner</source>
+        <location line="+2"/>
+        <source>Afterburner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>FDK-AAC Configuration</source>
         <translation>Configuración de FDK-AAC</translation>
     </message>
@@ -617,12 +615,7 @@
         <translation>&lt;b&gt;Salida de audio&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>   (0 track(s))</source>
-        <translation>   (0 pista(s))</translation>
-    </message>
-    <message>
-        <location line="+145"/>
+        <location line="+155"/>
         <source>&amp;Shift:</source>
         <translation>De&amp;splazar:</translation>
     </message>
@@ -638,12 +631,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+946"/>
+        <location line="+931"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navegación</translation>
     </message>
     <message>
-        <location line="-871"/>
+        <location line="-856"/>
         <source>Play [SPACE]</source>
         <translation>Reproducir [ESPACIO]</translation>
     </message>
@@ -761,17 +754,22 @@
         <translation>Ir al marcador B [Av Pág]</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+210"/>
         <source>Play filtered</source>
         <translation>Reproducir con filtros</translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-169"/>
         <source>Vol&amp;ume</source>
         <translation>Vol&amp;umen</translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-1006"/>
+        <source> (0 tracks)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+981"/>
         <source>Selection: 000000</source>
         <translation>Selección: 000000</translation>
     </message>
@@ -796,9 +794,8 @@
         <translation>&amp;Información...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Alt+Return</source>
-        <translation>Alt+Entrar</translation>
+        <translation type="vanished">Alt+Entrar</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -834,14 +831,8 @@
         <translation>Guardar proyecto</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>&amp;Calculator...</source>
-        <translation>&amp;Calculadora...</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>F7</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">&amp;Calculadora...</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -917,7 +908,7 @@
 <context>
     <name>Opus</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
         <translation>Tasa de _bits:</translation>
     </message>
@@ -940,9 +931,8 @@
         <translation>Evaluar</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Ctrl+Return</source>
-        <translation>Ctrl+Entrar</translation>
+        <translation type="vanished">Ctrl+Entrar</translation>
     </message>
 </context>
 <context>
@@ -997,7 +987,7 @@
     </message>
     <message>
         <location line="+10"/>
-        <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1058,7 +1048,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>Decodificar vídeos usando DXVA2 (windows)</translation>
     </message>
@@ -1200,21 +1190,27 @@
         <translation>Priorización</translation>
     </message>
     <message>
-        <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="vanished">_Usar una etiqueta alternativa para MP3 en .mp4</translation>
-    </message>
-    <message>
         <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation>Usar por _defecto el diretorio del último archivo leído para guardar</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Auto-Append Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
-        <translation>_Sanear las marcas de tiempo de decodificación (DTS) en modo de copia</translation>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>XVideo (best)</source>
         <translation>XVideo (mejor)</translation>
     </message>
@@ -1255,7 +1251,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+213"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1349,18 +1345,18 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+277"/>
+        <location line="+283"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+423"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-73"/>
+        <location filename="../../common/gui_savenew.cpp" line="-239"/>
+        <location line="+170"/>
         <location line="+12"/>
         <location line="+16"/>
-        <location line="+8"/>
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
@@ -1509,7 +1505,7 @@
         <translation>Reiniciar los marcadores</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Load saved settings</source>
         <translation>Cargar configuración guardada</translation>
     </message>
@@ -1625,7 +1621,7 @@
         <translation>Ir a la posición</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation>Zum 1:4</translation>
     </message>
@@ -1645,6 +1641,11 @@
         <translation>Zum 2:1</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-15"/>
         <source>R_esampling (Hz):</source>
         <translation>R_emuestreo (Hz):</translation>
@@ -1827,12 +1828,12 @@
         <translation>Guardar tarea</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-283"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-289"/>
         <source>Enable openGl support</source>
         <translation>Activar el soporte para openGL</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+79"/>
         <source>VDPAU (best)</source>
         <translation>VDPAU (mejor)</translation>
     </message>
@@ -1843,7 +1844,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
-        <location filename="../../common/gui_save.cpp" line="-313"/>
+        <location filename="../../common/gui_save.cpp" line="-319"/>
         <source>No audio track</source>
         <translation>No hay pistas de audio</translation>
     </message>
@@ -1900,17 +1901,17 @@
 Se necesita para crear vídeos compatibles con PSP.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+186"/>
+        <location filename="../../common/gui_main.cpp" line="+188"/>
         <source>Select script to save</source>
         <translation>Seleccionar script a guardar</translation>
     </message>
     <message>
-        <location line="+183"/>
+        <location line="+182"/>
         <source>Not coded in this version</source>
         <translation>Sin codificar en esta versión</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+214"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
@@ -2050,8 +2051,7 @@
         <translation>Algo ha fallado al anexar</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+321"/>
+        <location line="+320"/>
         <source>Something bad happened (II)</source>
         <translation>Algo malo ha sucedido (II)</translation>
     </message>
@@ -2110,7 +2110,7 @@
         <translation>Pista de audio principal</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+264"/>
         <source>AvsProxy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2162,7 +2162,7 @@
         <translation>Eliminar ban_das</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+66"/>
+        <location filename="../../common/gui_save.cpp" line="+71"/>
         <source>Output file</source>
         <translation>Archivo de salida</translation>
     </message>
@@ -2177,7 +2177,7 @@
         <translation>Añadir tarea a la cola</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Select Workbench to Save</source>
         <translation>Seleccionar la zona de trabajo a guardar</translation>
     </message>
@@ -2218,30 +2218,35 @@
         <translation>Guardando audio</translation>
     </message>
     <message>
-        <location line="+318"/>
-        <location line="+83"/>
+        <location line="+322"/>
+        <source>Maximum number of 99999 images reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+76"/>
         <source>Done</source>
         <translation>Hecho</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-76"/>
         <source>Saved %d images.</source>
         <translation>Guardadas %d imágenes.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="-250"/>
+        <location filename="../../common/gui_main.cpp" line="-251"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
         <location line="+4"/>
         <location filename="../../common/gui_save.cpp" line="+2"/>
-        <location line="+99"/>
+        <location line="+92"/>
         <location line="+7"/>
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
@@ -2444,12 +2449,12 @@
         <translation>Ganancia</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+495"/>
         <source>Saving</source>
         <translation>Guardando</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+181"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
         <translation>El vídeo guardado está incompleto. El error ha ocurrido en %s (%d%). Puede haber sucedido como resultado de marcas de tiempo inválidas en el vídeo.</translation>
     </message>
@@ -2554,15 +2559,11 @@
         <translation>Información de complementos</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-86"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-92"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation>Decodificar vídeos usando VDPAU (NVIDIA)</translation>
     </message>
     <message>
-        <source>Decode video using XVBA (AMD)</source>
-        <translation type="vanished">Decodificar vídeos usando XVBA (AMD)</translation>
-    </message>
-    <message>
         <location line="+1"/>
         <source>Decode video using LIBVA (INTEL)</source>
         <translation>Decodificar vídeos usando LIBVA (INTEL)</translation>
@@ -2583,7 +2584,7 @@
         <translation>_Comprobar si hay versiones nuevas</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2656,12 +2657,13 @@
         <translation>Puerto a usar por defecto</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-62"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-68"/>
+        <location line="+2"/>
         <source>Save current settings as default</source>
         <translation>Guardar la configuación actual como predefinida</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+26"/>
         <source>Plugins</source>
         <translation>Complementos</translation>
     </message>
@@ -2671,8 +2673,8 @@
         <translation>Reproducir/Detener</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-43"/>
+        <location line="+43"/>
         <source>You cannot remove *all* the video
 </source>
         <translation>No puede eliminar *todo* el vídeo
@@ -2710,7 +2712,7 @@
         <translation>No se puede seleccionar el códec MPEG-4 SP.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1449"/>
+        <location filename="../../common/gui_main.cpp" line="-1447"/>
         <source>Select script/project to run</source>
         <translation>Seleccionar script/proyecto a ejecutar</translation>
     </message>
@@ -2730,13 +2732,13 @@
         <translation>Está a punto de vaciar la lista de archivos y proyectos recientes. Esto no se puede deshacer. ¿Procecer?</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+68"/>
+        <location line="+126"/>
+        <location line="+73"/>
         <source>Select Video File...</source>
         <translation>Seleccionar archivo de vídeo...</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-48"/>
         <source>No engine</source>
         <translation>No hay ningún motor</translation>
     </message>
@@ -2746,7 +2748,7 @@
         <translation>El script tinyPy no se habilitó al compilar el programa</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Select Video File to Append...</source>
         <translation>Seleccionar archivo de vídeo a anexar...</translation>
     </message>
@@ -2771,7 +2773,7 @@
         <translation>Error al cortar.</translation>
     </message>
     <message>
-        <location line="+795"/>
+        <location line="+789"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation>Se ha dado un índice de audio no válido</translation>
@@ -2802,7 +2804,7 @@
         <translation>No es posible establecer el idioma para la pista del índice dado: ¡índice de pista no válido!</translation>
     </message>
     <message>
-        <location line="+297"/>
+        <location line="+298"/>
         <source>Oops</source>
         <translation>Huy</translation>
     </message>
@@ -2817,12 +2819,12 @@
         <translation>Problemas al inicializar el dispositivo de audio</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-587"/>
+        <location filename="../../common/gui_save.cpp" line="-592"/>
         <source>Audio encoder index out of bounds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>No</source>
         <translation>No</translation>
     </message>
@@ -2832,7 +2834,7 @@
         <translation>No hay ningún archivo cargado</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Job</source>
         <translation>Tarea</translation>
     </message>
@@ -2842,7 +2844,7 @@
         <translation>No se puede acceder a la base de datos. ¿Tiene el control de tareas en ejecución?</translation>
     </message>
     <message>
-        <location line="+227"/>
+        <location line="+229"/>
         <source>Function not implemented
 </source>
         <translation>Función no implementada
@@ -2874,22 +2876,17 @@
         <translation>Guardando la selección como un conjunto de imágenes JPEG</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Maximum number of 9999 images reached, aborting.</source>
-        <translation>Número máximo de 9999 imágenes alcanzado; cancelando.</translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Saving images failed.</source>
         <translation>Error al guardar las imágenes.</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+25"/>
         <source>PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2914,39 +2911,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cannot get tinyPÿ script engine</source>
-        <translation type="vanished">No se puede obtener el motor de script tinyPÿ</translation>
-    </message>
-    <message>
         <location line="+7"/>
         <source>Cannot add job %s</source>
         <translation>No se puede añadir la tarea %s</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-207"/>
+        <location filename="../../common/gui_savenew.cpp" line="-210"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation>¿Quiere reutilizar los datos de la anterior primera pasada?
 Aviso: la configuración debe ser parecida.</translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+182"/>
         <source>Cannot instantiate video chain</source>
         <translation>No se puede instanciar la cadena de vídeo</translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+24"/>
         <source>Cannot create encoder</source>
         <translation>No se puede crear el codificador</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>Cannot setup codec. Bitrate too low?</source>
-        <translation>No se puede configurar el códec. ¿Tasa de bits demasiado baja?</translation>
+        <translation type="vanished">No se puede configurar el códec. ¿Tasa de bits demasiado baja?</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+57"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
         <translation>No se puede configurar el codificador de audio; asegúrese de que el flujo es compatible con el codificador de audio (número de canales, tasa de bits, formato)</translation>
     </message>
@@ -2960,20 +2951,30 @@
 ¿Quiere continuar de todas formas?</translation>
     </message>
     <message>
-        <location line="-253"/>
-        <location line="+286"/>
+        <location line="-257"/>
+        <location line="+290"/>
         <location line="+26"/>
         <source>Muxer</source>
         <translation>Multiplexor</translation>
     </message>
     <message>
-        <location line="-312"/>
-        <location line="+286"/>
+        <location line="-326"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+290"/>
         <source>Cannot instantiate muxer</source>
         <translation>No se puede instanciar el multiplexor</translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="-102"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The choice of cut points may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Do you want to continue anyway?</source>
         <translation type="unfinished"></translation>
@@ -3168,7 +3169,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>AAC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3224,7 +3225,7 @@
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
-        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+374"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+382"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
@@ -3321,20 +3322,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
-        <location line="+30"/>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
-        <location line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
         <source>Codec</source>
         <translation>Códec</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
         <source>Internal error finding codec 0x%x</source>
         <translation>Error interno al buscar el códec 0x%x</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Internal error opening 0x%x</source>
         <translation>Error interno al abrir 0x%x</translation>
     </message>
@@ -3351,35 +3352,7 @@
         <translation>No se puede compilar el sombreador</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+812"/>
-        <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
-Dropping a keyframe will result in severely corrupted video.
-Proceed anyway?</source>
-        <translation>Colisión de la marca de tiempo de decodificación (DTS) que afecta a un fotograma clave en %s detectada.
-Descartar un fotograma clave da como resultado un vídeo severamente corrupto.
-¿Quiere proceder de todas formas?</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
-Dropping a frame may result in some video corruption.
-Proceed anyway?</source>
-        <translation>Colisión de la marca de tiempo de decodificación (DTS) que afecta a un fotograma en %s detectada.
-Descartar un fotograma da como resultado un vídeo severamente corrupto.
-¿Quiere proceder de todas formas?</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Do not warn again and drop frames silently while saving this video?</source>
-        <translation>¿No avisar de nuevo y saltar fotogramas en silencio al guardar este vídeo?</translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
-        <translation>Al guardar, algunos fotogramas de vídeo anteriores a %s han tenido que ser retrasados, dando como resultado una pérdida temporal de sincronización de A/V. ¿Quiere continuar de todas formas?</translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
         <translation>Error de permisos</translation>
     </message>
@@ -3619,7 +3592,7 @@
 <context>
     <name>avimuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+75"/>
         <source>Bad Idea</source>
         <translation>Mala idea</translation>
     </message>
@@ -3697,7 +3670,7 @@
 <context>
     <name>bitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+51"/>
         <source>Constant Bitrate</source>
         <translation>Tasa de bits constante</translation>
     </message>
@@ -3814,34 +3787,39 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
         <source>Right:</source>
         <translation>Derecho:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+23"/>
         <source>Top:</source>
         <translation>Superior:</translation>
     </message>
     <message>
         <location line="+43"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
         <source>Reset</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
         <source>Bottom:</source>
         <translation>Inferior:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+51"/>
         <source>Left:</source>
         <translation>Izquierdo:</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>blackframes</name>
@@ -3862,6 +3840,29 @@
     </message>
 </context>
 <context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -3869,6 +3870,11 @@
         <translation>Personalizado</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <source>59.94  (NTSC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+179"/>
         <source>Source Fps:</source>
         <translation>FPS de origen:</translation>
@@ -3899,7 +3905,7 @@
         <translation>FPS no válido</translation>
     </message>
     <message>
-        <location line="-197"/>
+        <location line="-202"/>
         <source>25  (PAL)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3919,12 +3925,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>59.93  (NTSC)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
+        <location line="+33"/>
         <source>Change FPS</source>
         <translation>Cambiar los FPS</translation>
     </message>
@@ -3934,7 +3935,7 @@
         <translation>Acelerar/enlentecer el vídeo como si se alterasen los FPS. Este filtro cambia la duración del vídeo.</translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+165"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
@@ -4235,7 +4236,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
         <source>Size: </source>
         <translation>Tamaño: </translation>
     </message>
@@ -4496,20 +4497,25 @@
         <translation>Codificando...</translation>
     </message>
     <message>
-        <location line="+44"/>
-        <location line="+220"/>
+        <location line="+41"/>
+        <location line="+247"/>
         <location line="+21"/>
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
     <message>
-        <location line="-258"/>
-        <location line="+251"/>
+        <location line="-261"/>
+        <location line="+254"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-157"/>
+        <source>Keep dialog open when finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>Audio Codec:</source>
         <translation>Códec de audio:</translation>
     </message>
@@ -4583,17 +4589,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-385"/>
+        <location line="-396"/>
         <source>Shut down computer when finished</source>
         <translation>Apagar el ordenador al terminar</translation>
     </message>
     <message>
-        <location line="-11"/>
+        <location line="-58"/>
         <source>Time Remaining:</source>
         <translation>Tiempo restante:</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+78"/>
         <source>Priority:</source>
         <translation>Prioridad:</translation>
     </message>
@@ -4623,32 +4629,32 @@
         <translation>Baja</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+69"/>
         <source>Pause / Abort</source>
         <translation>Pausar / Cancelar</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="-147"/>
         <source>Phase:</source>
         <translation>Fase:</translation>
     </message>
     <message>
-        <location line="+248"/>
+        <location line="+268"/>
         <source>Video Codec:</source>
         <translation>Códec de vídeo:</translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-307"/>
         <source>Main</source>
         <translation>Principal</translation>
     </message>
     <message>
-        <location line="+175"/>
+        <location line="+199"/>
         <source>Advanced</source>
         <translation>Avanzado</translation>
     </message>
     <message>
-        <location line="-46"/>
+        <location line="-33"/>
         <source>Minimize to Tray</source>
         <translation>Minimizar a la bandeja</translation>
     </message>
@@ -4741,7 +4747,7 @@
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation>Fundido</translation>
@@ -4752,7 +4758,32 @@
         <translation>Fundido.</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+13"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Start time:</source>
         <translation>_Comienzo:</translation>
     </message>
@@ -4765,13 +4796,13 @@
 <context>
     <name>fadeToBlack</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
-        <location line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+55"/>
+        <location line="+20"/>
         <source>Fade to black</source>
         <translation>Fundido a negro</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-19"/>
         <source>Fade to black in/out.</source>
         <translation>Fundido a/desde negro.</translation>
     </message>
@@ -4796,7 +4827,7 @@
         <translation>Fundido a negro</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>_Fade type:</source>
         <translation>Tipo de fundido:</translation>
     </message>
@@ -4814,7 +4845,7 @@
 <context>
     <name>ffVAEncH264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4829,12 +4860,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Profile:</source>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4845,16 +4897,21 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Bitrate (kbps):</source>
+        <source>Quality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4864,7 +4921,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4872,27 +4929,53 @@
 <context>
     <name>ffVAEncHEVC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+343"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4902,7 +4985,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4910,7 +4993,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+218"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+251"/>
         <source>Wide (16:9)</source>
         <translation>Ancho (16:9)</translation>
     </message>
@@ -5379,8 +5462,32 @@
 <context>
     <name>ffnvenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+229"/>
+        <source>Controlled by Preset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
         <source>Low Quality</source>
         <translation>Calidad baja</translation>
     </message>
@@ -5432,6 +5539,12 @@
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+        <source>RC Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Preset:</source>
         <translation>Preajuste:</translation>
     </message>
@@ -5441,6 +5554,12 @@
         <translation>Perfil:</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Bitrate (kbps):</source>
@@ -5454,33 +5573,49 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>GOP Size:</source>
         <translation>Tamaño del GOP:</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation>Máximo de fotogramas-B consecutivos:</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
         <source>Rate Control</source>
         <translation>Control de la tasa</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Frame Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>NVENC H.264 configuration</source>
         <translation>Configuración de NVENC H.264</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
-        <source>nvEnc HEVC  configuration</source>
-        <translation>Configuración de nvEnc HEVC</translation>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+28"/>
+        <source>NVENC HEVC configuration</source>
+        <translation type="unfinished">Configuración de NVENC HEVC</translation>
     </message>
 </context>
 <context>
@@ -5491,7 +5626,7 @@
         <translation>[Incongruencia]</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+87"/>
         <source>Saving mpeg PS (ff)</source>
         <translation>Guardando mpeg PS (ff)</translation>
     </message>
@@ -5596,7 +5731,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
         <source>Saving mpeg TS (ff)</source>
         <translation>Guardando mpeg TS (ff)</translation>
     </message>
@@ -5669,7 +5804,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
         <translation>Configuración del codificador VideoToolbox H.264</translation>
     </message>
@@ -5827,7 +5962,7 @@
 <context>
     <name>flvdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
@@ -6399,7 +6534,7 @@
         <translation>Salir</translation>
     </message>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Oops</source>
         <translation>Huy</translation>
     </message>
@@ -6409,7 +6544,7 @@
         <translation>Algo muy malo ha ocurrido al construir la lista de tareas.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>There are no jobs stored</source>
         <translation>No hay tareas guardadas</translation>
     </message>
@@ -6857,12 +6992,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
         <source>Matroska Images</source>
         <translation>Imágenes Matroska</translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+523"/>
         <source>Matroska clusters</source>
         <translation>Clústeres Matroska</translation>
     </message>
@@ -6962,7 +7097,7 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+167"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
         <source>Saving Mkv</source>
         <translation>Guardando Mkv</translation>
     </message>
@@ -7061,31 +7196,46 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
         <source>Problem reading SVQ3 headers</source>
         <translation>Ha habido un problema leyendo las cabeceras SVQ3</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+67"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <location line="+17"/>
         <source>Unsupported</source>
         <translation>No soportado</translation>
     </message>
     <message>
-        <location line="-9"/>
-        <source>Only MP4Video, H264, and H265 supported for video</source>
-        <translation>Solo se admiten MP4Video, H264 y H265 para el vídeo</translation>
+        <location line="-17"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
-        <translation>Solo se admiten AAC, AC3, E-AC3 y mpegaudio para el audio</translation>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+182"/>
         <source>Saving mp4</source>
         <translation>Guardando mp4</translation>
     </message>
@@ -7095,15 +7245,11 @@
         <translation>Guardando PSP</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
         <source>Muxing Format</source>
         <translation>Formato de multiplexado</translation>
     </message>
     <message>
-        <source>Use alternate MP3 tag</source>
-        <translation type="vanished">_Usar etiqueta alternativa para MP3</translation>
-    </message>
-    <message>
         <location line="+2"/>
         <source>No optimization</source>
         <translation type="unfinished"></translation>
@@ -7134,7 +7280,7 @@
         <translation>Relación de aspecto (DAR)</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Do not rotate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7160,6 +7306,51 @@
     </message>
     <message>
         <location line="+3"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>MP4 Muxer</source>
         <translation>Multiplexor para MP4</translation>
     </message>
@@ -7332,7 +7523,7 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+242"/>
+        <location filename="../../common/gui_navigate.cpp" line="+232"/>
         <source>Cannot go to next keyframe</source>
         <translation>No se puede ir al fotograma siguiente</translation>
     </message>
@@ -7562,27 +7753,17 @@
 <context>
     <name>psdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="vanished">Error</translation>
-    </message>
-    <message>
-        <source>This file&apos;s index has been created with an older version of avidemux.
-Please delete the idx2 file and reopen.</source>
-        <translation type="vanished">El archivo de índices fue creado con una versión antigua de avidemux.
-Borre el archivo idx2 y vuelva a abrir.</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
         <translation>Indexando</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>Hay varios archivos con nombres de archivo secuenciales. ¿Debería cargarlos todos?</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -7652,7 +7833,7 @@
         <translation>Se necesitan privilegios de administrador para llevar a cabo esta operación.</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+126"/>
         <source>First Pass</source>
         <translation>Primera pasada</translation>
     </message>
@@ -7667,7 +7848,7 @@
         <translation>Codificando...</translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+185"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>La codificación está detenida. ¿Quiere continuar o cancelarla?</translation>
     </message>
@@ -7705,7 +7886,7 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+212"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+206"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;Nueva versión disponible&lt;/b&gt;&lt;br&gt; Versión %1&lt;br&gt;Publicada el %2.&lt;br&gt;Puede descargarla aquí&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; Puede deshabilitar las actualizaciones automáticas en Preferencias.&lt;/small&gt;</translation>
     </message>
@@ -7785,21 +7966,30 @@
         <translation>Avanzar un minuto</translation>
     </message>
     <message>
-        <location line="+626"/>
+        <location line="+681"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>La aplicación ha encontrado un problema fatal.
 Se ha guardado la edición actual y se volverá a cargar en el siguiente inicio</translation>
     </message>
     <message>
-        <location line="+262"/>
+        <location line="+230"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+334"/>
-        <source> (%d track(s))</source>
-        <translation> (%d pista(s))</translation>
+        <location line="+70"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -8035,8 +8225,17 @@
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
+    <message numerus="yes">
+        <location line="+72"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
     <message>
-        <location line="+98"/>
+        <location line="+34"/>
         <source>Mono</source>
         <translation>Mono</translation>
     </message>
@@ -8072,12 +8271,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+27"/>
+        <location line="+33"/>
         <source>Total Duration:	</source>
         <translation>Duración total:	</translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-31"/>
         <source>Extra Video Properties</source>
         <translation>Propiedades extra del vídeo</translation>
     </message>
@@ -8092,12 +8291,12 @@
         <translation>Datos extra:	</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Codec:		</source>
         <translation>Códec:		</translation>
     </message>
@@ -8122,18 +8321,18 @@
         <translation>No hay audio</translation>
     </message>
     <message>
-        <location line="-155"/>
+        <location line="-170"/>
         <source>%2.3f fps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+81"/>
+        <location line="+90"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-87"/>
+        <location line="-96"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8141,7 +8340,7 @@
 <context>
     <name>qshell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+53"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
         <translation>Introduzca sus órdenes y pulse el botón de evaluar o CTRL+Entrar.
@@ -8156,6 +8355,19 @@
 Listo.
 </translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>qtalert</name>
@@ -8217,6 +8429,16 @@
         <source>Video Only Muxer Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>removeplane</name>
@@ -8269,7 +8491,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
         <source>_Mode:</source>
         <translation>_Modo:</translation>
     </message>
@@ -8284,12 +8506,17 @@
         <translation>Cambiar los FPS</translation>
     </message>
     <message>
-        <location line="-325"/>
+        <location line="-329"/>
         <source>Custom</source>
         <translation>Personalizado</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+5"/>
+        <source>59.94  (NTSC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Resample FPS</source>
         <translation>Remuestrear los FPS</translation>
     </message>
@@ -8318,11 +8545,6 @@
         <source>50 (Pal)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>59.93  (NTSC)</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>resize</name>
@@ -8332,7 +8554,7 @@
         <translation>Redimensionador swScale.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
         <source>Width and height cannot be odd</source>
         <translation>Anchura y altura no pueden tener valor impar</translation>
     </message>
@@ -8432,17 +8654,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+338"/>
+        <source>Lanzcos3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+251"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+172"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-166"/>
         <source>1%</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8688,17 +8924,7 @@
     </message>
     <message>
         <location line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+18"/>
-        <source>Lanzcos3</source>
+        <source>Lanczos-3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -9057,32 +9283,32 @@
 <context>
     <name>tsdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="vanished">Error</translation>
-    </message>
-    <message>
-        <source>This file&apos;s index has been created with an older version of avidemux.
-Please delete the idx2 file and reopen.</source>
-        <translation type="vanished">El archivo de índices fue creado con una versión antigua de avidemux.
-Borre el archivo idx2 y vuelva a abrir.</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+183"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+325"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+84"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+207"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>Hay varios archivos con nombres de archivo secuenciales. ¿Debería cargarlos todos?</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+19"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
         <translation>Indexando</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -9174,19 +9400,137 @@
     </message>
 </context>
 <context>
+    <name>vaapiDeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Adaptive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Compensated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vaapiResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
-        <source>vaapi: Resize</source>
-        <translation>vaapi: Redimensionar</translation>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
+        <translation type="unfinished">VA-API Redimensionar</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>vaapi: Resize image using vaapi.</source>
-        <translation>vaapi: Redimensionar la imagen usando vaapi.</translation>
+        <source>Resize image using VA-API.</source>
+        <translation type="unfinished">Redimensionar la imagen usando VA-API.</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+129"/>
         <source>Width :</source>
         <translation>Anchura:</translation>
     </message>
@@ -9197,7 +9541,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>mpeg-&gt;PC:</source>
+        <source>mpeg-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9219,7 +9563,7 @@
         <translation>Desentrelazador de VDPAU (+redimensión).</translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+197"/>
         <source>Keep Top Field</source>
         <translation>Mantener el campo superior</translation>
     </message>
@@ -9235,13 +9579,13 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>_Ivtc:</source>
+        <source>_IVTC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Resize:</source>
-        <translation>_Redimensionar:</translation>
+        <source>_Resize</source>
+        <translation>_Redimensionar</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9250,12 +9594,12 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Width :</source>
+        <source>Width:</source>
         <translation>Anchura:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation>Altura:</translation>
     </message>
     <message>
@@ -9277,13 +9621,13 @@
         <translation>vdpau: Redimensionar la imagen utilizando vdpau.</translation>
     </message>
     <message>
-        <location line="+133"/>
-        <source>Width :</source>
+        <location line="+131"/>
+        <source>Width:</source>
         <translation>Anchura:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation>Altura:</translation>
     </message>
     <message>
@@ -9367,6 +9711,84 @@
     </message>
 </context>
 <context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vsWindow</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
@@ -9382,7 +9804,7 @@
 <context>
     <name>webmmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+68"/>
         <source>Unsupported Video.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
         <translation>Vídeo no compatible.
@@ -9396,7 +9818,7 @@
 Solo se admite vídeo VP8/VP9 y audio Vorbis/Opus</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+89"/>
         <source>Saving Webm</source>
         <translation>Guardando Webm</translation>
     </message>
@@ -9419,22 +9841,22 @@
 <context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
         <source>Processing</source>
         <translation>Procesando</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+33"/>
         <source>00:00:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-13"/>
+        <location line="-27"/>
         <source>Elapsed:</source>
         <translation>Transcurrido:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+14"/>
         <source>Time Remaining:</source>
         <translation>Tiempo restante:</translation>
     </message>
@@ -9442,7 +9864,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
         <source>Not coded</source>
         <translation>No implementado</translation>
     </message>
@@ -9459,7 +9881,7 @@
         <translation>ninguno</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation>Personalizado</translation>
     </message>
@@ -9535,10 +9957,6 @@
         <translation>Guardar perfil</translation>
     </message>
     <message>
-        <source>my profile</source>
-        <translation type="vanished">mi perfil</translation>
-    </message>
-    <message>
         <location line="+46"/>
         <source>Overwrite</source>
         <translation>Sobrescribir</translation>
@@ -9589,7 +10007,7 @@
         <translation>Control de la tasa</translation>
     </message>
     <message>
-        <location line="+2882"/>
+        <location line="+2887"/>
         <source>Disable</source>
         <translation>Deshabilitar</translation>
     </message>
@@ -9599,7 +10017,7 @@
         <translation>Autodetectar</translation>
     </message>
     <message>
-        <location line="-2298"/>
+        <location line="-2303"/>
         <source>Motion Estimation</source>
         <translation>Estimación de movimiento</translation>
     </message>
@@ -9625,12 +10043,12 @@
     </message>
     <message>
         <location line="+351"/>
-        <location line="+2596"/>
+        <location line="+2601"/>
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
     <message>
-        <location line="-2591"/>
+        <location line="-2596"/>
         <source>Spatial</source>
         <translation>Espacial</translation>
     </message>
@@ -9671,12 +10089,12 @@
         <translation>Matriz personalizada</translation>
     </message>
     <message>
-        <location line="+1052"/>
+        <location line="+1057"/>
         <source>Output</source>
         <translation>Salida</translation>
     </message>
     <message>
-        <location line="-3165"/>
+        <location line="-3170"/>
         <location line="+669"/>
         <source>1</source>
         <translation type="unfinished"></translation>
@@ -9783,7 +10201,17 @@
         <translation>Normal</translation>
     </message>
     <message>
-        <location line="+590"/>
+        <location line="+5"/>
+        <source>Auto Variance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+585"/>
         <source>Pixel Aspect Ratio</source>
         <translation>Relación de aspecto del píxel</translation>
     </message>
@@ -9813,7 +10241,7 @@
         <translation>Constante (CBR)</translation>
     </message>
     <message>
-        <location line="-3949"/>
+        <location line="-3954"/>
         <source>x264 Configuraton</source>
         <translation>Configuración de x264</translation>
     </message>
@@ -9829,12 +10257,12 @@
     </message>
     <message>
         <location line="+7"/>
-        <location line="+3152"/>
+        <location line="+3157"/>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
-        <location line="-3110"/>
+        <location line="-3115"/>
         <source>General</source>
         <translation>General</translation>
     </message>
@@ -9974,12 +10402,12 @@
     </message>
     <message>
         <location line="+14"/>
-        <location line="+2490"/>
+        <location line="+2495"/>
         <source>frames</source>
         <translation>fotogramas</translation>
     </message>
     <message>
-        <location line="-2466"/>
+        <location line="-2471"/>
         <source>Sequence Parameter Set Identifer:</source>
         <translation>Identificador del conjunto de parámetros de secuencia:</translation>
     </message>
@@ -10127,12 +10555,12 @@
     </message>
     <message>
         <location line="+12"/>
-        <location line="+1328"/>
+        <location line="+1333"/>
         <source>Strength:</source>
         <translation>Intensidad:</translation>
     </message>
     <message>
-        <location line="-1289"/>
+        <location line="-1294"/>
         <source>Threshold:</source>
         <translation>Umbral:</translation>
     </message>
@@ -10319,12 +10747,12 @@
     </message>
     <message>
         <location line="+37"/>
-        <location line="+856"/>
+        <location line="+861"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
-        <location line="-809"/>
+        <location line="-814"/>
         <source>Quantiser Control</source>
         <translation>Control del cuantizador</translation>
     </message>
@@ -10341,12 +10769,12 @@
     <message>
         <location line="+85"/>
         <location line="+179"/>
-        <location line="+302"/>
+        <location line="+307"/>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-459"/>
+        <location line="-464"/>
         <source>Maximum Quantiser Step:</source>
         <translation>Paso máximo del cuantizador:</translation>
     </message>
@@ -10401,12 +10829,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Auto Variance AQ</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+91"/>
+        <location line="+114"/>
         <source>Advanced 1</source>
         <translation>Avanzado 1</translation>
     </message>
@@ -10802,7 +11225,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation>Personalizado</translation>
     </message>
@@ -12011,7 +12434,7 @@
 <context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+37"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+32"/>
         <location line="+24"/>
         <source>None</source>
         <translation>Ninguna</translation>
@@ -12087,12 +12510,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>MotionEstimation</source>
-        <translation>Estimación de movimiento</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+9"/>
         <source>Threading</source>
         <translation>Subprocesos</translation>
     </message>
@@ -12107,7 +12525,7 @@
         <translation>_Número de fotogramas B:</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+5"/>
         <source>_Quantization type:</source>
         <translation>Tipo de _cuantización:</translation>
     </message>
@@ -12127,17 +12545,12 @@
         <translation>Tamaño del _Gop:</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Advanced Simple Profile</source>
-        <translation>Perfil simple avanzado</translation>
-    </message>
-    <message>
-        <location line="+9"/>
+        <location line="-29"/>
         <source>Motion Estimation</source>
         <translation>Estimación de movimiento</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+57"/>
         <source>Quantization</source>
         <translation>Cuantización</translation>
     </message>
@@ -12157,12 +12570,12 @@
         <translation>Configuración de Xvid4 MPEG-4 ASP</translation>
     </message>
     <message>
-        <location line="-48"/>
+        <location line="-55"/>
         <source>Aspect Ratio:</source>
         <translation>Relación de aspecto:</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-46"/>
         <source>DCT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12197,12 +12610,38 @@
         <translation>Cuantizador má_ximo:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+7"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Use XVID fcc (else DIVX)</source>
         <translation>Usar el fcc XVID (si no DIVX)</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+3"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Aspect Ratio</source>
         <translation>Relación de aspecto</translation>
     </message>
@@ -12220,23 +12659,7 @@
         <translation>Yadif, adaptado de la versión de avisynth (c) Fizick.</translation>
     </message>
     <message>
-        <source>Temporal &amp; spatial check</source>
-        <translation type="vanished">Comprobación temporal y espacial</translation>
-    </message>
-    <message>
-        <source>Bob, temporal &amp; spatial check</source>
-        <translation type="vanished">Bob, comprobación temporal y espacial</translation>
-    </message>
-    <message>
-        <source>Skip spatial temporal check</source>
-        <translation type="vanished">Omitir la comprobación espacio-temporal</translation>
-    </message>
-    <message>
-        <source>Bob, skip spatial temporal check</source>
-        <translation type="vanished">Bob, omitir la comprobación espacio-temporal</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+70"/>
         <source>Bottom field first</source>
         <translation>Campo inferior primero</translation>
     </message>

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_eu.ts -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_eu.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+194"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+425"/>
         <source>Cannot find a demuxer for %s</source>
         <translation>Ezin da desmultiplexatzailea aurkitu %s-rako</translation>
     </message>
@@ -44,7 +44,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+102"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+124"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -78,7 +78,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-189"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-193"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -381,22 +381,22 @@
         <translation type="unfinished">Elkarrizketa</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+19"/>
         <source>00:00:00</source>
         <translation type="unfinished">00:00:00</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+51"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="-64"/>
         <source>TimeLeft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+41"/>
         <source>ProcessImages</source>
         <translation type="unfinished"></translation>
     </message>
@@ -406,7 +406,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-14"/>
         <source>0 fps</source>
         <translation type="unfinished"></translation>
     </message>
@@ -442,30 +442,28 @@
 <context>
     <name>FDK-AAC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
-        <source>_Profile::</source>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+9"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+2"/>
         <source>SBR enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+7"/>
-        <source>After burner</source>
+        <location line="+2"/>
+        <source>Afterburner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>FDK-AAC Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -638,12 +636,7 @@
         <translation>&lt;b&gt;Audio Irteera&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>   (0 track(s))</source>
-        <translation>   (0 bide)</translation>
-    </message>
-    <message>
-        <location line="+212"/>
+        <location line="+222"/>
         <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
         <translation>&lt;b&gt;Irteera Heuskarria&lt;/b&gt;</translation>
     </message>
@@ -663,9 +656,8 @@
         <translation>&amp;Argibideak...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Alt+Return</source>
-        <translation>Alt+Sartu</translation>
+        <translation type="vanished">Alt+Sartu</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -701,22 +693,20 @@
         <translation>Gorde Egitasmoa</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+69"/>
         <source>Ctrl+Alt+S</source>
         <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location line="-72"/>
         <source>&amp;Calculator...</source>
-        <translation>&amp;Kalkulagailua...</translation>
+        <translation type="vanished">&amp;Kalkulagailua...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>F7</source>
-        <translation>F7</translation>
+        <translation type="vanished">F7</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="-54"/>
         <source>&amp;Input</source>
         <translation>&amp;Sarrera</translation>
     </message>
@@ -736,18 +726,18 @@
         <translation>Ctrl+Alt+C</translation>
     </message>
     <message>
-        <location line="-935"/>
-        <location line="+946"/>
+        <location line="-920"/>
+        <location line="+931"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Nabigazioa</translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="-276"/>
         <source>Selection: 000000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+294"/>
+        <location line="+279"/>
         <source>Ctrl+Alt+N</source>
         <translation>Ctrl+Alt+N</translation>
     </message>
@@ -792,7 +782,7 @@
         <translation>&amp;Bananduta</translation>
     </message>
     <message>
-        <location line="-1671"/>
+        <location line="-1656"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
@@ -802,7 +792,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+710"/>
+        <location line="+309"/>
+        <source> (0 tracks)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+401"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -892,12 +887,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+210"/>
         <source>Play filtered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-169"/>
         <source>Vol&amp;ume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -915,7 +910,7 @@
 <context>
     <name>Opus</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -938,9 +933,8 @@
         <translation>Aztertu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Ctrl+Return</source>
-        <translation>Ctrl+Sartu</translation>
+        <translation type="vanished">Ctrl+Sartu</translation>
     </message>
 </context>
 <context>
@@ -989,12 +983,7 @@
         <translation>Plataforma-anitzeko Bideo Editatzailea</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>OK</source>
         <translation>Ongi</translation>
     </message>
@@ -1004,7 +993,12 @@
         <translation>http://www.avidemux.org</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-19"/>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
         <source>&amp;License</source>
         <translation>&amp;Baimena</translation>
     </message>
@@ -1099,7 +1093,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+381"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+389"/>
         <source>Stereo</source>
         <translation>Estereoa</translation>
     </message>
@@ -1301,10 +1295,10 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+277"/>
+        <location line="+283"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+423"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
         <source>Audio</source>
         <translation>Audioa</translation>
     </message>
@@ -1406,7 +1400,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-177"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1553,16 +1547,27 @@
         <translation>Lehentasunpena</translation>
     </message>
     <message>
-        <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="vanished">_Erabili aukerazko etiketak MP3-rako .mp4-an</translation>
-    </message>
-    <message>
         <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
+        <source>Auto-Append Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1623,7 +1628,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+213"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
         <translation>PCM</translation>
     </message>
@@ -1688,10 +1693,10 @@
         <translation>Irteera</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-73"/>
+        <location filename="../../common/gui_savenew.cpp" line="-239"/>
+        <location line="+170"/>
         <location line="+12"/>
         <location line="+16"/>
-        <location line="+8"/>
         <source>Video</source>
         <translation>Bideoa</translation>
     </message>
@@ -1757,10 +1762,6 @@
         <translation>Itxi</translation>
     </message>
     <message>
-        <source>-</source>
-        <translation type="vanished">-</translation>
-    </message>
-    <message>
         <location line="+2"/>
         <source>Information</source>
         <translation>Argibideak</translation>
@@ -1833,7 +1834,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Load saved settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1959,7 +1960,7 @@
         <translation>Joan Denborara</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1979,8 +1980,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
-        <location filename="../../common/gui_save.cpp" line="-313"/>
+        <location filename="../../common/gui_save.cpp" line="-319"/>
         <source>No audio track</source>
         <translation>Audio biderik ez</translation>
     </message>
@@ -2037,17 +2043,17 @@
 Hau beharrezkoa da PSP bateragarri bideoa sortzeko.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+186"/>
+        <location filename="../../common/gui_main.cpp" line="+188"/>
         <source>Select script to save</source>
         <translation>Hautatu gordetzeko eskripta</translation>
     </message>
     <message>
-        <location line="+183"/>
+        <location line="+182"/>
         <source>Not coded in this version</source>
         <translation>Kodeatu gabe bertsio honetan</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+214"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
@@ -2183,8 +2189,7 @@
         <translation>Zerbaitek huts egin du eransterakoan</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+321"/>
+        <location line="+320"/>
         <source>Something bad happened (II)</source>
         <translation>Zerbait gaitza gertatu da (II)</translation>
     </message>
@@ -2242,7 +2247,7 @@
         <translation>Audio Bide Nagusia</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+264"/>
         <source>AvsProxy</source>
         <translation>AvsProxy</translation>
     </message>
@@ -2274,7 +2279,7 @@
         <translation>Frame Hex Iraulketa</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+66"/>
+        <location filename="../../common/gui_save.cpp" line="+71"/>
         <source>Output file</source>
         <translation>Irteera agiria</translation>
     </message>
@@ -2289,7 +2294,7 @@
         <translation>Lerrokatu lana lan-zerrendan</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Select Workbench to Save</source>
         <translation>Hautatu Gordtzeko Lanmahaia</translation>
     </message>
@@ -2335,30 +2340,35 @@
         <translation>Jpeg</translation>
     </message>
     <message>
-        <location line="+113"/>
-        <location line="+83"/>
+        <location line="+117"/>
+        <source>Maximum number of 99999 images reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+76"/>
         <source>Done</source>
         <translation>Eginda</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-76"/>
         <source>Saved %d images.</source>
         <translation>%d irudi gordeta.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="-250"/>
+        <location filename="../../common/gui_main.cpp" line="-251"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
         <location line="+4"/>
         <location filename="../../common/gui_save.cpp" line="+2"/>
-        <location line="+99"/>
+        <location line="+92"/>
         <location line="+7"/>
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
@@ -2626,12 +2636,12 @@
         <translation>Xvid4 Itxurapena</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+495"/>
         <source>Saving</source>
         <translation type="unfinished">Gordetzen</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+181"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2641,7 +2651,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-290"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-296"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2666,12 +2676,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+83"/>
         <source>LIBVA (best)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2729,18 +2734,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-64"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-71"/>
         <source>Pr&amp;eferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <location line="+2"/>
         <source>Save current settings as default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-43"/>
+        <location line="+43"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished"></translation>
@@ -2774,7 +2780,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1449"/>
+        <location filename="../../common/gui_main.cpp" line="-1447"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2794,13 +2800,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+68"/>
+        <location line="+126"/>
+        <location line="+73"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-48"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2810,7 +2816,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2833,7 +2839,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+795"/>
+        <location line="+789"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -2864,7 +2870,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+297"/>
+        <location line="+298"/>
         <source>Oops</source>
         <translation type="unfinished">Ustekabea</translation>
     </message>
@@ -2879,12 +2885,12 @@
         <translation type="unfinished">Arazoak audio gailua abiarazterakoan</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-587"/>
+        <location filename="../../common/gui_save.cpp" line="-592"/>
         <source>Audio encoder index out of bounds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>No</source>
         <translation type="unfinished">Ez</translation>
     </message>
@@ -2894,7 +2900,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Job</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2904,7 +2910,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+227"/>
+        <location line="+229"/>
         <source>Function not implemented
 </source>
         <translation type="unfinished"></translation>
@@ -2930,22 +2936,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Maximum number of 9999 images reached, aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Saving images failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+25"/>
         <source>PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2975,29 +2976,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-207"/>
+        <location filename="../../common/gui_savenew.cpp" line="-210"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+182"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+24"/>
         <source>Cannot create encoder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-8"/>
-        <source>Cannot setup codec. Bitrate too low?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+57"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3009,20 +3004,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-253"/>
-        <location line="+286"/>
+        <location line="-257"/>
+        <location line="+290"/>
         <location line="+26"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-312"/>
-        <location line="+286"/>
+        <location line="-326"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+290"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="-102"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The choice of cut points may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Do you want to continue anyway?</source>
         <translation type="unfinished"></translation>
@@ -3145,7 +3150,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>AAC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3201,7 +3206,7 @@
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
-        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+374"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+382"/>
         <source>Unknown</source>
         <translation type="unfinished">Ezezaguna</translation>
     </message>
@@ -3292,20 +3297,20 @@
         <translation type="unfinished">1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
-        <location line="+30"/>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
-        <location line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
         <source>Codec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
         <source>Internal error finding codec 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Internal error opening 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3321,31 +3326,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+812"/>
-        <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
-Dropping a keyframe will result in severely corrupted video.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
-Dropping a frame may result in some video corruption.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Do not warn again and drop frames silently while saving this video?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3583,7 +3564,7 @@
 <context>
     <name>avimuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+75"/>
         <source>Bad Idea</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3660,7 +3641,7 @@
 <context>
     <name>bitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+51"/>
         <source>Constant Bitrate</source>
         <translation type="unfinished">Bitneurri Aldagaitza</translation>
     </message>
@@ -3777,34 +3758,39 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+23"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+51"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>blackframes</name>
@@ -3825,6 +3811,29 @@
     </message>
 </context>
 <context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -3852,12 +3861,7 @@
         <translation>50 (Pal)</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>59.93  (NTSC)</source>
-        <translation>59.93  (NTSC)</translation>
-    </message>
-    <message>
-        <location line="+174"/>
+        <location line="+180"/>
         <source>Source Fps:</source>
         <translation>Iturburu Fs-ko:</translation>
     </message>
@@ -3882,17 +3886,22 @@
         <translation>Aldatu fs-ko</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="-161"/>
         <source>Change FPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-32"/>
+        <source>59.94  (NTSC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
         <source>Speed up/slow down the video as if altering fps. This filter changes duration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+165"/>
         <source>Error</source>
         <translation type="unfinished">Akatsa</translation>
     </message>
@@ -4196,7 +4205,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4457,25 +4466,25 @@
         <translation>Kodeatzen...</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+55"/>
         <source>Phase:</source>
         <translation>Aldia:</translation>
     </message>
     <message>
-        <location line="+248"/>
+        <location line="+268"/>
         <source>Video Codec:</source>
         <translation>Bideo Kodeka:</translation>
     </message>
     <message>
-        <location line="-255"/>
-        <location line="+220"/>
+        <location line="-282"/>
+        <location line="+247"/>
         <location line="+21"/>
         <source>None</source>
         <translation>Ezer ez</translation>
     </message>
     <message>
-        <location line="-258"/>
-        <location line="+251"/>
+        <location line="-261"/>
+        <location line="+254"/>
         <source>Unknown</source>
         <translation>Ezezaguna</translation>
     </message>
@@ -4507,12 +4516,12 @@
         <translation type="unfinished">Igarota:</translation>
     </message>
     <message>
-        <location line="-446"/>
+        <location line="-504"/>
         <source>Time Remaining:</source>
         <translation type="unfinished">Gelditzen dena:</translation>
     </message>
     <message>
-        <location line="+467"/>
+        <location line="+525"/>
         <source>Frames/sec:</source>
         <translation type="unfinished">Frame/seg:</translation>
     </message>
@@ -4559,17 +4568,17 @@
         <translation type="unfinished">Kuantizatzailea:</translation>
     </message>
     <message>
-        <location line="-378"/>
+        <location line="-389"/>
         <source>Shut down computer when finished</source>
         <translation>Itzali ordenagailua amaitutakoan</translation>
     </message>
     <message>
-        <location line="-53"/>
+        <location line="-66"/>
         <source>Main</source>
         <translation type="unfinished">Nagusia</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+86"/>
         <source>Priority:</source>
         <translation>Lehentasuna:</translation>
     </message>
@@ -4599,7 +4608,12 @@
         <translation>Apala</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+12"/>
+        <source>Keep dialog open when finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4609,7 +4623,7 @@
         <translation>Pausatu / Utzi</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+13"/>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4702,7 +4716,7 @@
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished"></translation>
@@ -4713,7 +4727,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+13"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Start time:</source>
         <translation type="unfinished">_Hasiera Denbora:</translation>
     </message>
@@ -4726,13 +4765,13 @@
 <context>
     <name>fadeToBlack</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
-        <location line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+55"/>
+        <location line="+20"/>
         <source>Fade to black</source>
         <translation type="unfinished">Hutsaldu beltzera</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-19"/>
         <source>Fade to black in/out.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4757,7 +4796,7 @@
         <translation type="unfinished">Sarrera baterapena</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>_Fade type:</source>
         <translation type="unfinished">_Hutsaltasun mota:</translation>
     </message>
@@ -4775,7 +4814,7 @@
 <context>
     <name>ffVAEncH264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4790,12 +4829,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Profile:</source>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4806,16 +4866,21 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Bitrate (kbps):</source>
+        <source>Quality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4825,7 +4890,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4833,27 +4898,53 @@
 <context>
     <name>ffVAEncHEVC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+343"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4863,7 +4954,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4871,7 +4962,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+217"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+250"/>
         <source>Normal (4:3)</source>
         <translation>Arrunta (4:3)</translation>
     </message>
@@ -5340,8 +5431,32 @@
 <context>
     <name>ffnvenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+229"/>
+        <source>Controlled by Preset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
         <source>Low Quality</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5393,6 +5508,12 @@
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+        <source>RC Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Preset:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5402,6 +5523,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Bitrate (kbps):</source>
@@ -5415,32 +5542,48 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Frame Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>NVENC H.264 configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
-        <source>nvEnc HEVC  configuration</source>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+28"/>
+        <source>NVENC HEVC configuration</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5452,7 +5595,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+87"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished">mpeg PS (ff) gordetzea</translation>
     </message>
@@ -5548,7 +5691,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished">mpeg TS (ff) gordetzea</translation>
     </message>
@@ -5621,7 +5764,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5777,7 +5920,7 @@
 <context>
     <name>flvdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6348,7 +6491,7 @@
         <translation>Utzi</translation>
     </message>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Oops</source>
         <translation>Ustekabea</translation>
     </message>
@@ -6358,7 +6501,7 @@
         <translation>Zerbait oso okerra gertatu da lan-zerrenda eraikitzerakoan.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>There are no jobs stored</source>
         <translation>Ez dago lanik biltegiratuta</translation>
     </message>
@@ -6806,12 +6949,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+523"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6911,7 +7054,7 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+167"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
         <source>Saving Mkv</source>
         <translation>Mkv gordeketa</translation>
     </message>
@@ -7010,31 +7153,46 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Arazoak SVQ3 idazburuak irakurtzean</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+67"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <location line="+17"/>
         <source>Unsupported</source>
         <translation type="unfinished">Ez-sostengatua</translation>
     </message>
     <message>
-        <location line="-9"/>
-        <source>Only MP4Video, H264, and H265 supported for video</source>
+        <location line="-17"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+182"/>
         <source>Saving mp4</source>
         <translation type="unfinished">mp4 gordetzea</translation>
     </message>
@@ -7044,7 +7202,7 @@
         <translation type="unfinished">PSP gordetzea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7079,7 +7237,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Do not rotate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7105,6 +7263,51 @@
     </message>
     <message>
         <location line="+3"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>MP4 Muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7276,7 +7479,7 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+242"/>
+        <location filename="../../common/gui_navigate.cpp" line="+232"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7506,21 +7709,17 @@
 <context>
     <name>psdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Akatsa</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
         <translation type="unfinished">Aurkibidetzen</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -7590,7 +7789,7 @@
         <translation type="unfinished">Erro eskubideak beharrezkoak dira eragiketa hau burutzeko.</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+126"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7605,7 +7804,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+185"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished">Kodeaketa pausatuta dago. Berrekitea edo uztea nahi duzu?</translation>
     </message>
@@ -7643,7 +7842,7 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+212"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+206"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7723,21 +7922,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+626"/>
+        <location line="+681"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+262"/>
+        <location line="+230"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+334"/>
-        <source> (%d track(s))</source>
+        <location line="+70"/>
+        <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>qgui2menu</name>
@@ -7973,18 +8181,27 @@
         <translation>Bai</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+33"/>
         <source>%2.3f fps</source>
         <translation>%2.3f fs-ko</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+81"/>
+        <location line="+90"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation>%02d:%02d:%02d.%03d</translation>
     </message>
+    <message numerus="yes">
+        <location line="-55"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
     <message>
-        <location line="+30"/>
+        <location line="+83"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8010,12 +8227,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+27"/>
+        <location line="+33"/>
         <source>Total Duration:	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-31"/>
         <source>Extra Video Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8030,12 +8247,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Codec:		</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8060,12 +8277,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-172"/>
         <source>%s (%u:%u)</source>
         <translation>%s (%u:%u)</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+77"/>
         <source>Mono</source>
         <translation>Monoa</translation>
     </message>
@@ -8078,7 +8295,7 @@
 <context>
     <name>qshell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+53"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
         <translation type="unfinished"></translation>
@@ -8090,6 +8307,19 @@
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>qtalert</name>
@@ -8151,6 +8381,16 @@
         <source>Video Only Muxer Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>removeplane</name>
@@ -8228,12 +8468,7 @@
         <translation>50 (Pal)</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>59.93  (NTSC)</source>
-        <translation>59.93  (NTSC)</translation>
-    </message>
-    <message>
-        <location line="+313"/>
+        <location line="+318"/>
         <source>_Mode:</source>
         <translation>_Modua:</translation>
     </message>
@@ -8248,12 +8483,17 @@
         <translation>Birlaginketa fs-ko</translation>
     </message>
     <message>
-        <location line="-285"/>
+        <location line="-289"/>
         <source>Resample FPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-35"/>
+        <source>59.94  (NTSC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Change and enforce FPS. Keep duration and sync.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8261,7 +8501,7 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished">Zabalera eta garaiera ezin dira eta piku izan</translation>
     </message>
@@ -8424,6 +8664,20 @@
         <translation type="unfinished">Helmuga:</translation>
     </message>
     <message>
+        <location line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+356"/>
+        <source>Lanzcos3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
         <source>Source PAR:</source>
         <translation type="unfinished"></translation>
@@ -8441,16 +8695,16 @@
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+44"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-312"/>
         <source>Resize Dimensions</source>
         <translation type="unfinished">Birneurritu Neurriak</translation>
     </message>
@@ -8621,18 +8875,8 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+5"/>
-        <source>Lanzcos3</source>
-        <translation type="unfinished">Lanzcos3</translation>
+        <source>Lanczos-3</source>
+        <translation type="unfinished">Lanczos-3</translation>
     </message>
 </context>
 <context>
@@ -8990,26 +9234,32 @@
 <context>
     <name>tsdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Akatsa</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+183"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+325"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+84"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+207"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+19"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
         <translation type="unfinished">Aurkibidetzen</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -9101,19 +9351,137 @@
     </message>
 </context>
 <context>
+    <name>vaapiDeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Adaptive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Compensated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vaapiResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
-        <source>vaapi: Resize</source>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>vaapi: Resize image using vaapi.</source>
+        <source>Resize image using VA-API.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+129"/>
         <source>Width :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9124,7 +9492,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>mpeg-&gt;PC:</source>
+        <source>mpeg-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9146,7 +9514,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+197"/>
         <source>Keep Top Field</source>
         <translation type="unfinished">Heutsi Goiko Eremuari</translation>
     </message>
@@ -9162,13 +9530,13 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>_Ivtc:</source>
+        <source>_IVTC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Resize:</source>
-        <translation type="unfinished">_Birneurriratu:</translation>
+        <source>_Resize</source>
+        <translation type="unfinished">_Birneurriratu</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9177,13 +9545,13 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Width :</source>
+        <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
-        <translation type="unfinished">Garaiera :</translation>
+        <source>Height:</source>
+        <translation type="unfinished">Garaiera:</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -9204,14 +9572,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
-        <source>Width :</source>
+        <location line="+131"/>
+        <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
-        <translation type="unfinished">Garaiera :</translation>
+        <source>Height:</source>
+        <translation type="unfinished">Garaiera:</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -9294,6 +9662,84 @@
     </message>
 </context>
 <context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vsWindow</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
@@ -9309,7 +9755,7 @@
 <context>
     <name>webmmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+68"/>
         <source>Unsupported Video.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
         <translation type="unfinished"></translation>
@@ -9321,7 +9767,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+89"/>
         <source>Saving Webm</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9344,7 +9790,7 @@
 <context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
         <source>Processing</source>
         <translation>Prozesatzen</translation>
     </message>
@@ -9354,12 +9800,12 @@
         <translation>Igarota:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+14"/>
         <source>Time Remaining:</source>
         <translation>Gelditzen da:</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+13"/>
         <source>00:00:00</source>
         <translation>00:00:00</translation>
     </message>
@@ -9367,7 +9813,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9383,7 +9829,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9519,12 +9965,12 @@
     </message>
     <message>
         <location line="+7"/>
-        <location line="+3152"/>
+        <location line="+3157"/>
         <source>Delete</source>
         <translation type="unfinished">Ezabatu</translation>
     </message>
     <message>
-        <location line="-3110"/>
+        <location line="-3115"/>
         <source>General</source>
         <translation type="unfinished">Orokorra</translation>
     </message>
@@ -9614,12 +10060,12 @@
     </message>
     <message>
         <location line="+14"/>
-        <location line="+2490"/>
+        <location line="+2495"/>
         <source>frames</source>
         <translation type="unfinished">frame</translation>
     </message>
     <message>
-        <location line="-2389"/>
+        <location line="-2394"/>
         <source>Motion</source>
         <translation type="unfinished">Mugimendua</translation>
     </message>
@@ -9722,12 +10168,12 @@
     </message>
     <message>
         <location line="+13"/>
-        <location line="+2596"/>
+        <location line="+2601"/>
         <source>None</source>
         <translation type="unfinished">Ezer ez</translation>
     </message>
     <message>
-        <location line="-2591"/>
+        <location line="-2596"/>
         <source>Spatial</source>
         <translation type="unfinished">Espaziala</translation>
     </message>
@@ -9814,12 +10260,12 @@
     </message>
     <message>
         <location line="+12"/>
-        <location line="+1328"/>
+        <location line="+1333"/>
         <source>Strength:</source>
         <translation type="unfinished">Indartsua:</translation>
     </message>
     <message>
-        <location line="-1289"/>
+        <location line="-1294"/>
         <source>Threshold:</source>
         <translation type="unfinished">Muga:</translation>
     </message>
@@ -10026,12 +10472,12 @@
     </message>
     <message>
         <location line="+10"/>
-        <location line="+856"/>
+        <location line="+861"/>
         <source>Edit</source>
         <translation type="unfinished">Editatu</translation>
     </message>
     <message>
-        <location line="-809"/>
+        <location line="-814"/>
         <source>Quantiser Control</source>
         <translation type="unfinished">Kuantizatzaile Agintea</translation>
     </message>
@@ -10048,12 +10494,12 @@
     <message>
         <location line="+85"/>
         <location line="+179"/>
-        <location line="+302"/>
+        <location line="+307"/>
         <source>%</source>
         <translation type="unfinished">%</translation>
     </message>
     <message>
-        <location line="-459"/>
+        <location line="-464"/>
         <source>Maximum Quantiser Step:</source>
         <translation type="unfinished">Gehienezko Kuantizatzaile Urrats:</translation>
     </message>
@@ -10113,12 +10559,7 @@
         <translation type="unfinished">Arrunta</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Auto Variance AQ</source>
-        <translation type="unfinished">AQ  Berez Aldaera</translation>
-    </message>
-    <message>
-        <location line="+91"/>
+        <location line="+101"/>
         <source>Advanced 1</source>
         <translation type="unfinished">Aurreratua 1</translation>
     </message>
@@ -10239,7 +10680,7 @@
         <translation type="unfinished">Irteera</translation>
     </message>
     <message>
-        <location line="-3165"/>
+        <location line="-3170"/>
         <location line="+669"/>
         <source>1</source>
         <translation type="unfinished">1</translation>
@@ -10351,7 +10792,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2311"/>
+        <location line="+1750"/>
+        <source>Auto Variance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+561"/>
         <source>Generate Access Unit Delimiters</source>
         <translation type="unfinished">Sortu Sarbide Batasun Mugatzaileak</translation>
     </message>
@@ -10584,7 +11035,7 @@
         <translation type="unfinished">Maila Osoko Laginak</translation>
     </message>
     <message>
-        <location line="-3909"/>
+        <location line="-3914"/>
         <source>Basic</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10634,7 +11085,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2735"/>
+        <location line="+2740"/>
         <source>BluRay compatibility</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10720,7 +11171,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11928,7 +12379,7 @@
 <context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+37"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+32"/>
         <location line="+24"/>
         <source>None</source>
         <translation>Ezer ez</translation>
@@ -12024,12 +12475,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>MotionEstimation</source>
-        <translation>MugimenduEstimazioa</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+9"/>
         <source>Threading</source>
         <translation>Hariak</translation>
     </message>
@@ -12055,6 +12501,16 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>_Quantization type:</source>
         <translation>_Kuantizazio mota:</translation>
     </message>
@@ -12079,17 +12535,28 @@
         <translation>_GOP Neurria:</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Advanced Simple Profile</source>
-        <translation>Profil Aurreratu Arrunta</translation>
+        <location line="-29"/>
+        <source>Motion Estimation</source>
+        <translation>Mugimendu Estimazioa</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Motion Estimation</source>
-        <translation>Mugimendu Estimazioa</translation>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Quantization</source>
         <translation>Kuantizazioa</translation>
     </message>
@@ -12114,12 +12581,12 @@
         <translation>Xvid4 MPEG-4 ASP itxurapena</translation>
     </message>
     <message>
-        <location line="-77"/>
+        <location line="-87"/>
         <source>1:1 (PC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+43"/>
         <source>Use XVID fcc (else DIVX)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12137,23 +12604,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Temporal &amp; spatial check</source>
-        <translation type="obsolete">Denbora &amp; espazio hautapena</translation>
-    </message>
-    <message>
-        <source>Bob, temporal &amp; spatial check</source>
-        <translation type="obsolete">Bob, denbora &amp; espazio hautapena</translation>
-    </message>
-    <message>
-        <source>Skip spatial temporal check</source>
-        <translation type="obsolete">Jauzi espazio denbora hautapena</translation>
-    </message>
-    <message>
-        <source>Bob, skip spatial temporal check</source>
-        <translation type="obsolete">Bob, jauzi espazio denbora hautapena</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+70"/>
         <source>Bottom field first</source>
         <translation type="unfinished">Beheko eremua lehenik</translation>
     </message>

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_fr.ts -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_fr.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+102"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+124"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30,7 +30,7 @@
 Ignorer les informations de timing ?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+194"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+425"/>
         <source>Cannot find a demuxer for %s</source>
         <translation>Impossible de trouver un demuxer pour lire %s</translation>
     </message>
@@ -79,7 +79,7 @@
 2) Concaténer ces videos ensembles</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-189"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-193"/>
         <source>Checking if timestamps are valid..</source>
         <translation>Vérification des informations de temps</translation>
     </message>
@@ -382,32 +382,32 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+6"/>
         <source>TimeLeft</source>
         <translation>Temps restant</translation>
     </message>
     <message>
-        <location line="-21"/>
+        <location line="+13"/>
         <source>00:00:00</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+28"/>
         <source>ProcessImages</source>
         <translation>Images Traitées</translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+23"/>
         <source>0</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="-30"/>
         <source>Speed</source>
         <translation>Vitesse</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-14"/>
         <source>0 fps</source>
         <translation></translation>
     </message>
@@ -443,30 +443,28 @@
 <context>
     <name>FDK-AAC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
-        <source>_Profile::</source>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+9"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+2"/>
         <source>SBR enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+7"/>
-        <source>After burner</source>
+        <location line="+2"/>
+        <source>Afterburner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>FDK-AAC Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -534,12 +532,7 @@
         <translation>&lt;b&gt;Sortie Audio&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>   (0 track(s))</source>
-        <translation>   (0 piste(s))</translation>
-    </message>
-    <message>
-        <location line="+145"/>
+        <location line="+155"/>
         <source>&amp;Shift:</source>
         <translation>&amp;Décal.:</translation>
     </message>
@@ -559,7 +552,7 @@
         <translation>&amp;Ouvrir...</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+21"/>
         <source>Save &amp;Video...</source>
         <translation>Sauver la &amp;Vidéo...</translation>
     </message>
@@ -592,12 +585,11 @@
         <translation>Sauver un Projet</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>&amp;Calculator...</source>
-        <translation>&amp;Calculette...</translation>
+        <translation type="vanished">&amp;Calculette...</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+15"/>
         <source>&amp;Input</source>
         <translation>Orig&amp;inal</translation>
     </message>
@@ -627,7 +619,7 @@
         <translation>Cot&amp;e à cote</translation>
     </message>
     <message>
-        <location line="-1797"/>
+        <location line="-1782"/>
         <source>Vi&amp;deo</source>
         <translation></translation>
     </message>
@@ -678,18 +670,23 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+404"/>
+        <location line="+227"/>
+        <source> (0 tracks)</source>
+        <translation> (0 piste)</translation>
+    </message>
+    <message>
+        <location line="+177"/>
         <source>ms</source>
         <translation></translation>
     </message>
     <message>
         <location line="+149"/>
-        <location line="+946"/>
+        <location line="+931"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-871"/>
+        <location line="-856"/>
         <source>Play [SPACE]</source>
         <translation>Lire [SPACE]</translation>
     </message>
@@ -838,12 +835,12 @@
         <translation>Aller au marqueur B [PAGE BAS]</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+210"/>
         <source>Play filtered</source>
         <translation>Jouer post filtrage</translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-169"/>
         <source>Vol&amp;ume</source>
         <translation></translation>
     </message>
@@ -863,17 +860,7 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Alt+Return</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location line="+69"/>
-        <source>F7</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location line="+41"/>
+        <location line="+98"/>
         <source>Ctrl+Alt+C</source>
         <translation></translation>
     </message>
@@ -916,7 +903,7 @@
 <context>
     <name>Opus</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -938,11 +925,6 @@
         <source>Evaluate</source>
         <translation>Evaluer</translation>
     </message>
-    <message>
-        <location line="+3"/>
-        <source>Ctrl+Return</source>
-        <translation></translation>
-    </message>
 </context>
 <context>
     <name>VapourSynthProxy</name>
@@ -991,7 +973,7 @@
     </message>
     <message>
         <location line="+29"/>
-        <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1057,7 +1039,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>Utiliser DXVA2 pour décoder (Windows)</translation>
     </message>
@@ -1194,16 +1176,27 @@
         <translation>Priorités</translation>
     </message>
     <message>
-        <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="vanished">Utiliser un tag alternatif pour les pistes mp3 (.mp4)</translation>
-    </message>
-    <message>
         <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation>Utiliser le répertoire du dernier fichier lu comme répertoire de sauvegarde par défaut</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+2"/>
+        <source>Auto-Append Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>XVideo (best)</source>
         <translation>Xvideo (rapide)</translation>
     </message>
@@ -1432,7 +1425,7 @@
         <translation type="unfinished">Réinitialiser les marqueurs</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Load saved settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1553,7 +1546,7 @@
         <translation>Aller au temps</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1573,6 +1566,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+34"/>
         <source>R_esampling (Hz):</source>
         <translation>R_eéchantillonnage (Hz):</translation>
@@ -1724,12 +1722,12 @@
         <translation>Impossible de choisir le codec FLV1.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+186"/>
+        <location filename="../../common/gui_main.cpp" line="+188"/>
         <source>Select script to save</source>
         <translation>Choisir le script à sauvegarder</translation>
     </message>
     <message>
-        <location line="+464"/>
+        <location line="+468"/>
         <source>Are you sure?</source>
         <translation>Etes vous sur ?</translation>
     </message>
@@ -1754,7 +1752,7 @@
         <translation>Plusieurs pistes audio</translation>
     </message>
     <message>
-        <location line="+425"/>
+        <location line="+419"/>
         <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+120"/>
         <source>Something bad happened</source>
         <translation>Quelque chose d&apos;anormal c&apos;est produit</translation>
@@ -1902,10 +1900,10 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+277"/>
+        <location line="+283"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+423"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
         <source>Audio</source>
         <translation></translation>
     </message>
@@ -1980,15 +1978,11 @@
         <translation>Deringing</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-234"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-240"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation>Utiliser VDPAU pour décoder (NVIDIA)</translation>
     </message>
     <message>
-        <source>Decode video using XVBA (AMD)</source>
-        <translation type="vanished">Utiliser XVBA pour décoder (AMD)</translation>
-    </message>
-    <message>
         <location line="+1"/>
         <source>Decode video using LIBVA (INTEL)</source>
         <translation>Utiliser LIBVA pour décoder (INTEL/...)</translation>
@@ -2019,12 +2013,7 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+28"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2046,7 +2035,7 @@
     </message>
     <message>
         <location line="+15"/>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+213"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
         <translation></translation>
     </message>
@@ -2129,7 +2118,7 @@
         <translation>Préférences</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-109"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-116"/>
         <source>Queue</source>
         <translation>Mettre en queue</translation>
     </message>
@@ -2144,18 +2133,19 @@
         <translation>Préférences</translation>
     </message>
     <message>
+        <location line="+3"/>
         <location line="+2"/>
         <source>Save current settings as default</source>
         <translation>Sauver les réglages courants comme défaut</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+26"/>
         <source>Plugins</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
@@ -2165,8 +2155,8 @@
         <location line="+24"/>
         <location line="+8"/>
         <location line="+4"/>
-        <location filename="../../common/gui_save.cpp" line="+199"/>
-        <location line="+99"/>
+        <location filename="../../common/gui_save.cpp" line="+205"/>
+        <location line="+92"/>
         <location line="+7"/>
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
@@ -2174,8 +2164,8 @@
         <translation>Erreur</translation>
     </message>
     <message>
-        <location line="-44"/>
-        <location line="+44"/>
+        <location line="-43"/>
+        <location line="+43"/>
         <source>You cannot remove *all* the video
 </source>
         <translation>Vous ne pouvez pas *tout* enlever</translation>
@@ -2205,7 +2195,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="-82"/>
-        <location filename="../../common/gui_save.cpp" line="-638"/>
+        <location filename="../../common/gui_save.cpp" line="-643"/>
         <source>No audio track</source>
         <translation>Pas de piste audio</translation>
     </message>
@@ -2227,7 +2217,7 @@
 Il est nécessaire pour créer un fichier compatible PSP</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1449"/>
+        <location filename="../../common/gui_main.cpp" line="-1447"/>
         <source>Select script/project to run</source>
         <translation>Choisir un script/projet à lancer</translation>
     </message>
@@ -2247,18 +2237,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+115"/>
         <source>Not coded in this version</source>
         <translation>Pas disponible dans cette version</translation>
     </message>
     <message>
         <location line="+11"/>
-        <location line="+68"/>
+        <location line="+73"/>
         <source>Select Video File...</source>
         <translation>Choisir un fichier vidéo</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-48"/>
         <source>No engine</source>
         <translation>Pas de moteur de script</translation>
     </message>
@@ -2268,7 +2258,7 @@
         <translation>tinypy n&apos;est pas disponible. C&apos;est anormal.</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Select Video File to Append...</source>
         <translation>Choisir le fichier à concatener</translation>
     </message>
@@ -2401,8 +2391,7 @@
         <translation>Quelque chose a échoué lors de l&apos;ajout</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+321"/>
+        <location line="+320"/>
         <source>Something bad happened (II)</source>
         <translation>Quelque chose d&apos;horrible est arrivé (II)</translation>
     </message>
@@ -2485,7 +2474,7 @@
         <translation>Impossible de choisir la langue, piste audio invalide</translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+144"/>
         <source>AvsProxy</source>
         <translation></translation>
     </message>
@@ -2536,7 +2525,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>No</source>
         <translation>Non</translation>
     </message>
@@ -2546,7 +2535,7 @@
         <translation>Pas de fichier chargé</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Job</source>
         <translation></translation>
     </message>
@@ -2556,7 +2545,7 @@
         <translation>Impossible de se connecter à la base de données. Avidemux_job est il lancé ?</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Output file</source>
         <translation>Fichier de sortie</translation>
     </message>
@@ -2571,7 +2560,7 @@
         <translation>Ajouter à la liste de job</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Select Workbench to Save</source>
         <translation>Choisir le projet à sauver</translation>
     </message>
@@ -2643,22 +2632,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Maximum number of 9999 images reached, aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Saving images failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+25"/>
         <source>PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2683,18 +2667,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
-        <location line="+83"/>
+        <location line="-114"/>
+        <location line="+76"/>
         <source>Done</source>
         <translation>Fait</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-78"/>
+        <source>Maximum number of 99999 images reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Saved %d images.</source>
         <translation>%d images sauvées.</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+56"/>
         <source>BMP op failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2719,47 +2708,41 @@
         <translation>Le fichier %s n&apos;a pas été enregistré correctement.</translation>
     </message>
     <message>
-        <source>Cannot get tinyPÿ script engine</source>
-        <translation type="vanished">Impossible d&apos;obtenir le moteur de script tinyPÿ</translation>
-    </message>
-    <message>
         <location line="+41"/>
         <source>Cannot add job %s</source>
         <translation>Impossible d&apos;ajouter le job %s</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-244"/>
+        <location filename="../../common/gui_savenew.cpp" line="-251"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation>Réutiliser les données précédentes du premier passage ?
 Attention, les paramètres doivent être proche.</translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+12"/>
+        <location line="+170"/>
         <location line="+12"/>
         <location line="+16"/>
-        <location line="+8"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-28"/>
         <source>Cannot instantiate video chain</source>
         <translation>Impossible d&apos;instancier la chaîne vidéo</translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+24"/>
         <source>Cannot create encoder</source>
         <translation>Impossible de créer l&apos;encodeur</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>Cannot setup codec. Bitrate too low?</source>
-        <translation>Impossible de configurer le codec. Bitrate trop bas?</translation>
+        <translation type="vanished">Impossible de configurer le codec. Bitrate trop bas?</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+57"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
         <translation>Impossible de configurer l&apos;encodeur audio, assurez-vous que votre flux est compatible avec l&apos;encodeur audio (nombre de canaux, bitrate, format)</translation>
     </message>
@@ -2773,20 +2756,30 @@
 Voulez-vous continuer ?</translation>
     </message>
     <message>
-        <location line="-253"/>
-        <location line="+286"/>
+        <location line="-257"/>
+        <location line="+290"/>
         <location line="+26"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-312"/>
-        <location line="+286"/>
+        <location line="-326"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+290"/>
         <source>Cannot instantiate muxer</source>
         <translation>Impossible d&apos;instancier muxer</translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="-102"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The choice of cut points may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Do you want to continue anyway?</source>
         <translation type="unfinished"></translation>
@@ -3139,7 +3132,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>AAC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3189,12 +3182,12 @@
         <translation type="unfinished">Impossible d&apos;allouer la mémoire</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+495"/>
         <source>Saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+181"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3205,7 +3198,7 @@
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
-        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+374"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+382"/>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
@@ -3299,20 +3292,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
-        <location line="+30"/>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
-        <location line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
         <source>Codec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
         <source>Internal error finding codec 0x%x</source>
         <translation type="unfinished">Erreur interne pour trouver le codec 0x%x</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Internal error opening 0x%x</source>
         <translation type="unfinished">Erreur interne lors de l&apos;ouverture 0x%x</translation>
     </message>
@@ -3329,31 +3322,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+812"/>
-        <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
-Dropping a keyframe will result in severely corrupted video.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
-Dropping a frame may result in some video corruption.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Do not warn again and drop frames silently while saving this video?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3592,7 +3561,7 @@
 <context>
     <name>avimuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+75"/>
         <source>Bad Idea</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3669,7 +3638,7 @@
 <context>
     <name>bitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+51"/>
         <source>Constant Bitrate</source>
         <translation type="unfinished">Bitrate constant</translation>
     </message>
@@ -3786,34 +3755,39 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+23"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+51"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>blackframes</name>
@@ -3834,6 +3808,29 @@
     </message>
 </context>
 <context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -3841,6 +3838,11 @@
         <translation>Manuel</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <source>59.94  (NTSC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+179"/>
         <source>Source Fps:</source>
         <translation type="unfinished">Source:</translation>
@@ -3871,7 +3873,7 @@
         <translation>i/s invalide</translation>
     </message>
     <message>
-        <location line="-197"/>
+        <location line="-202"/>
         <source>25  (PAL)</source>
         <translation type="unfinished">25  (Pal/Secam)</translation>
     </message>
@@ -3891,12 +3893,7 @@
         <translation type="unfinished">50 (Pal/Secam)</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>59.93  (NTSC)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
+        <location line="+33"/>
         <source>Change FPS</source>
         <translation type="unfinished">Changer le nombre d&apos; I/S</translation>
     </message>
@@ -3906,7 +3903,7 @@
         <translation type="unfinished">Accélère/Ralentit la vidéo en modifiant le nombre d&apos;i/s. La durée est modifiée.</translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+165"/>
         <source>Error</source>
         <translation type="unfinished">Erreur</translation>
     </message>
@@ -4203,7 +4200,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4464,12 +4461,12 @@
         <translation type="unfinished">Encodage...</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+55"/>
         <source>Phase:</source>
         <translation type="unfinished">Phases:</translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+240"/>
         <source>Audio Codec:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4484,25 +4481,25 @@
         <translation type="unfinished">Codec Vidéo:</translation>
     </message>
     <message>
-        <location line="-255"/>
-        <location line="+220"/>
+        <location line="-282"/>
+        <location line="+247"/>
         <location line="+21"/>
         <source>None</source>
         <translation type="unfinished">Aucun</translation>
     </message>
     <message>
-        <location line="-258"/>
-        <location line="+251"/>
+        <location line="-261"/>
+        <location line="+254"/>
         <source>Unknown</source>
         <translation type="unfinished">Inconnu</translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-278"/>
         <source>Time Remaining:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+78"/>
         <source>Priority:</source>
         <translation type="unfinished">Priorité:</translation>
     </message>
@@ -4532,12 +4529,17 @@
         <translation type="unfinished">BAsse</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+12"/>
+        <source>Keep dialog open when finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
         <source>Pause / Abort</source>
         <translation type="unfinished">Pause/Abandon</translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+164"/>
         <source>Audio Size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4577,22 +4579,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-509"/>
+        <location line="-533"/>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+66"/>
         <source>Shut down computer when finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+100"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+33"/>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4709,7 +4711,7 @@
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished"></translation>
@@ -4720,7 +4722,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+13"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Start time:</source>
         <translation type="unfinished">_Début:</translation>
     </message>
@@ -4733,13 +4760,13 @@
 <context>
     <name>fadeToBlack</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
-        <location line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+55"/>
+        <location line="+20"/>
         <source>Fade to black</source>
         <translation type="unfinished">Fondu au noir</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-19"/>
         <source>Fade to black in/out.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4764,7 +4791,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>_Fade type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4782,7 +4809,7 @@
 <context>
     <name>ffVAEncH264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4797,12 +4824,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Profile:</source>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4813,16 +4861,21 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Bitrate (kbps):</source>
+        <source>Quality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4832,7 +4885,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4840,27 +4893,53 @@
 <context>
     <name>ffVAEncHEVC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+343"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4870,7 +4949,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4878,7 +4957,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+292"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+325"/>
         <source>Interlacing</source>
         <translation type="unfinished">Entrelacement</translation>
     </message>
@@ -5347,8 +5426,32 @@
 <context>
     <name>ffnvenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+229"/>
+        <source>Controlled by Preset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
         <source>Low Quality</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5400,6 +5503,12 @@
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+        <source>RC Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Preset:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5409,6 +5518,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Bitrate (kbps):</source>
@@ -5422,32 +5537,48 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Frame Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>NVENC H.264 configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
-        <source>nvEnc HEVC  configuration</source>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+28"/>
+        <source>NVENC HEVC configuration</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5459,7 +5590,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+87"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished">Sauvegarde au format PS (ff)</translation>
     </message>
@@ -5555,7 +5686,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished">Sauvegarde au format TS (ff)</translation>
     </message>
@@ -5628,7 +5759,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5784,7 +5915,7 @@
 <context>
     <name>flvdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6355,7 +6486,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Oops</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6365,7 +6496,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>There are no jobs stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6813,12 +6944,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+523"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6918,7 +7049,7 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+167"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
         <source>Saving Mkv</source>
         <translation type="unfinished">Sauvegarde au format MKV (ff)</translation>
     </message>
@@ -7017,31 +7148,46 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Impossible de lire l&apos;entete SVQ3</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+67"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <location line="+17"/>
         <source>Unsupported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
-        <source>Only MP4Video, H264, and H265 supported for video</source>
+        <location line="-17"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+182"/>
         <source>Saving mp4</source>
         <translation type="unfinished">Sauvegarde au format MP4</translation>
     </message>
@@ -7051,7 +7197,7 @@
         <translation type="unfinished">Sauvegarde au format PSP</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7086,7 +7232,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Do not rotate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7112,6 +7258,51 @@
     </message>
     <message>
         <location line="+3"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>MP4 Muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7283,7 +7474,7 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+242"/>
+        <location filename="../../common/gui_navigate.cpp" line="+232"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7513,27 +7704,17 @@
 <context>
     <name>psdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="vanished">Erreur</translation>
-    </message>
-    <message>
-        <source>This file&apos;s index has been created with an older version of avidemux.
-Please delete the idx2 file and reopen.</source>
-        <translation type="vanished">L&apos;index de ce fichier a été créé avec une version plus ancienne d&apos;avidemux.
-Veuillez supprimer le fichier idx2 et rouvrir.</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
         <translation>Indexation</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>Il existe plusieurs fichiers avec des noms de fichiers séquentiels. Doivent-ils tous être chargés ?</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -7603,7 +7784,7 @@
         <translation>Les privilèges root sont requis pour effectuer cette opération.</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+126"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7618,7 +7799,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+185"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>L&apos;encodage est en pause. Voulez vous reprendre ou abandonner ?</translation>
     </message>
@@ -7656,7 +7837,7 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+212"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+206"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;Nouvelle version disponible&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Publié le %2.&lt;br&gt;Vous pouvez la télécharger ici&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; Vous pouvez désactiver autoupdate dans les préférences.&lt;/small&gt;</translation>
     </message>
@@ -7736,21 +7917,30 @@
         <translation>Avancer d&apos;une minute</translation>
     </message>
     <message>
-        <location line="+626"/>
+        <location line="+681"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>L&apos;application a rencontré un problème fatal
 L&apos;édition en cours a été enregistrée et sera rechargée au prochain démarrage</translation>
     </message>
     <message>
-        <location line="+262"/>
+        <location line="+230"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+334"/>
-        <source> (%d track(s))</source>
-        <translation> (%d piste(s))</translation>
+        <location line="+70"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation>
+            <numerusform> (%n piste)</numerusform>
+            <numerusform> (%n pistes)</numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -7987,18 +8177,27 @@
         <translation>Oui</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+33"/>
         <source>%2.3f fps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+81"/>
+        <location line="+90"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation type="unfinished"></translation>
     </message>
+    <message numerus="yes">
+        <location line="-55"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
+        <translation>
+            <numerusform>Audio (%n piste activée)</numerusform>
+            <numerusform>Audio (%n pistes activées)</numerusform>
+        </translation>
+    </message>
     <message>
-        <location line="+30"/>
+        <location line="+83"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8024,12 +8223,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+27"/>
+        <location line="+33"/>
         <source>Total Duration:	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-31"/>
         <source>Extra Video Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8044,12 +8243,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Codec:		</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8074,12 +8273,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-172"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+77"/>
         <source>Mono</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8092,7 +8291,7 @@
 <context>
     <name>qshell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+53"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
         <translation>Entrez vos commandes, puis appuyez sur le bouton évaluer ou CTRL + ENTRÉE.</translation>
@@ -8105,6 +8304,19 @@
         <translation>Vous pouvez utiliser CTRL + Page Précédente et CTRL + Page Suivante pour rappeler les commandes précédentes
 Prêt.</translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>qtalert</name>
@@ -8166,6 +8378,16 @@
         <source>Video Only Muxer Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>removeplane</name>
@@ -8223,7 +8445,12 @@
         <translation type="unfinished">Manuel</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+5"/>
+        <source>59.94  (NTSC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Resample FPS</source>
         <translation type="unfinished">Re-échantillonner le nombre d&apos;I/S</translation>
     </message>
@@ -8233,12 +8460,12 @@
         <translation type="unfinished">Change le nombre d&apos;i/s, conserve la synchronisation et la durée</translation>
     </message>
     <message>
-        <location line="+278"/>
+        <location line="+282"/>
         <source>_New frame rate:</source>
-        <translation type="unfinished">&amp;Nouveau nombre d&apos;i/s:</translation>
+        <translation type="unfinished">_Nouveau nombre d&apos;i/s:</translation>
     </message>
     <message>
-        <location line="-318"/>
+        <location line="-322"/>
         <source>25  (PAL)</source>
         <translation type="unfinished">25  (PAL/SECAM)</translation>
     </message>
@@ -8258,12 +8485,7 @@
         <translation type="unfinished">50 (PAL/SECAM)</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>59.93  (NTSC)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+313"/>
+        <location line="+318"/>
         <source>_Mode:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8276,7 +8498,7 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
         <source>Width and height cannot be odd</source>
         <translation>La largeur ou la hauteur ne peuvent être impaires</translation>
     </message>
@@ -8491,30 +8713,20 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+5"/>
-        <source>Lanzcos3</source>
-        <translation>Lanzcos3</translation>
+        <source>Lanczos-3</source>
+        <translation>Lanczos-3</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-398"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-398"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-398"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-398"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-398"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-398"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-398"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-398"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-398"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-398"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-393"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-393"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-393"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-393"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-393"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-393"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-393"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-393"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-393"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-393"/>
         <source>Source:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8605,17 +8817,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+356"/>
+        <source>Lanzcos3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="-166"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+190"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+190"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+190"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+190"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+190"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+190"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+190"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+190"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+190"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+190"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-166"/>
         <source>1%</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9005,32 +9231,32 @@
 <context>
     <name>tsdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="vanished">Erreur</translation>
-    </message>
-    <message>
-        <source>This file&apos;s index has been created with an older version of avidemux.
-Please delete the idx2 file and reopen.</source>
-        <translation type="vanished">L&apos;index de ce fichier a été créé avec une version plus ancienne d&apos;avidemux.
-Veuillez supprimer le fichier idx2 et rouvrir.</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+183"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+325"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+84"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+207"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>Il existe plusieurs fichiers avec des noms de fichiers séquentiels. Devraient-ils tous être chargés?</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+19"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
         <translation>Indexation</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -9122,19 +9348,137 @@
     </message>
 </context>
 <context>
+    <name>vaapiDeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Adaptive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Compensated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vaapiResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
-        <source>vaapi: Resize</source>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>vaapi: Resize image using vaapi.</source>
+        <source>Resize image using VA-API.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+129"/>
         <source>Width :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9145,7 +9489,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>mpeg-&gt;PC:</source>
+        <source>mpeg-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9167,7 +9511,7 @@
         <translation>VDPAU de-entrelacement (+redimensionnement).</translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+197"/>
         <source>Keep Top Field</source>
         <translation>Garder le champs supérieur</translation>
     </message>
@@ -9183,12 +9527,12 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>_Ivtc:</source>
+        <source>_IVTC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Resize:</source>
+        <source>_Resize</source>
         <translation>&amp;Redimensionner</translation>
     </message>
     <message>
@@ -9198,12 +9542,12 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Width :</source>
+        <source>Width:</source>
         <translation>Largeur:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation>Hauteur:</translation>
     </message>
     <message>
@@ -9225,13 +9569,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
-        <source>Width :</source>
+        <location line="+131"/>
+        <source>Width:</source>
         <translation>Largeur:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation>Hauteur:</translation>
     </message>
     <message>
@@ -9315,6 +9659,84 @@
     </message>
 </context>
 <context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vsWindow</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
@@ -9330,7 +9752,7 @@
 <context>
     <name>webmmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+68"/>
         <source>Unsupported Video.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
         <translation type="unfinished"></translation>
@@ -9342,7 +9764,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+89"/>
         <source>Saving Webm</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9365,7 +9787,7 @@
 <context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
         <source>Processing</source>
         <translation>En cours</translation>
     </message>
@@ -9375,12 +9797,12 @@
         <translation>Temps écoulé:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+14"/>
         <source>Time Remaining:</source>
         <translation>Temps Restant:</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+13"/>
         <source>00:00:00</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9388,7 +9810,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9404,7 +9826,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation>Manuel</translation>
     </message>
@@ -9541,12 +9963,12 @@
     </message>
     <message>
         <location line="+7"/>
-        <location line="+3152"/>
+        <location line="+3157"/>
         <source>Delete</source>
         <translation>Effacer</translation>
     </message>
     <message>
-        <location line="-3110"/>
+        <location line="-3115"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9774,12 +10196,12 @@
     </message>
     <message>
         <location line="+14"/>
-        <location line="+2490"/>
+        <location line="+2495"/>
         <source>frames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2466"/>
+        <location line="-2471"/>
         <source>Sequence Parameter Set Identifer:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9912,12 +10334,12 @@
     </message>
     <message>
         <location line="+13"/>
-        <location line="+2596"/>
+        <location line="+2601"/>
         <source>None</source>
         <translation type="unfinished">Aucun</translation>
     </message>
     <message>
-        <location line="-2591"/>
+        <location line="-2596"/>
         <source>Spatial</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9998,12 +10420,12 @@
     </message>
     <message>
         <location line="+12"/>
-        <location line="+1328"/>
+        <location line="+1333"/>
         <source>Strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1289"/>
+        <location line="-1294"/>
         <source>Threshold:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10210,12 +10632,12 @@
     </message>
     <message>
         <location line="+10"/>
-        <location line="+856"/>
+        <location line="+861"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-809"/>
+        <location line="-814"/>
         <source>Quantiser Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10232,12 +10654,12 @@
     <message>
         <location line="+85"/>
         <location line="+179"/>
-        <location line="+302"/>
+        <location line="+307"/>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-459"/>
+        <location line="-464"/>
         <source>Maximum Quantiser Step:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10298,7 +10720,12 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>Auto Variance AQ</source>
+        <source>Auto Variance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -10743,7 +11170,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation>Manuel</translation>
     </message>
@@ -11952,7 +12379,7 @@
 <context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+37"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+32"/>
         <location line="+24"/>
         <source>None</source>
         <translation type="unfinished">Aucun</translation>
@@ -12013,22 +12440,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>MotionEstimation</source>
-        <translation type="unfinished">Estimation de mouvement</translation>
-    </message>
-    <message>
-        <location line="+18"/>
+        <location line="+28"/>
         <source>Aspect Ratio:</source>
         <translation type="unfinished">Rapport h/l:</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+47"/>
         <source>Aspect Ratio</source>
         <translation type="unfinished">Rapport hauteur/largeur</translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-111"/>
         <source>H.263</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12094,6 +12516,16 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>_Quantization type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12118,17 +12550,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Advanced Simple Profile</source>
+        <location line="-32"/>
+        <source>Motion Estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Motion Estimation</source>
+        <source>Miscellaneous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Quantization</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12161,7 +12604,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+70"/>
         <source>Bottom field first</source>
         <translation type="unfinished"></translation>
     </message>

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_hu.ts -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_hu.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
         <source>Attempt to open %s failed!</source>
         <translation>A %s megnyitása sikertelen!</translation>
     </message>
@@ -39,7 +39,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+102"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+124"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -78,7 +78,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-189"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-193"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -381,32 +381,32 @@
         <translation type="unfinished">Párbeszédablak</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+6"/>
         <source>TimeLeft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
+        <location line="+13"/>
         <source>00:00:00</source>
         <translation type="unfinished">00:00:00</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+28"/>
         <source>ProcessImages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+23"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="-30"/>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-14"/>
         <source>0 fps</source>
         <translation type="unfinished"></translation>
     </message>
@@ -442,30 +442,28 @@
 <context>
     <name>FDK-AAC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
-        <source>_Profile::</source>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+9"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+2"/>
         <source>SBR enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+7"/>
-        <source>After burner</source>
+        <location line="+2"/>
+        <source>Afterburner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>FDK-AAC Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -607,9 +605,8 @@
         <translation>&amp;Információ...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Alt+Return</source>
-        <translation>Alt+Return</translation>
+        <translation type="vanished">Alt+Return</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -645,22 +642,20 @@
         <translation>Projekt mentése</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+69"/>
         <source>Ctrl+Alt+S</source>
         <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location line="-72"/>
         <source>&amp;Calculator...</source>
-        <translation>&amp;Számológép...</translation>
+        <translation type="vanished">&amp;Számológép...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>F7</source>
-        <translation>F7</translation>
+        <translation type="vanished">F7</translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <location line="-1097"/>
         <source>ms</source>
         <translation>ms</translation>
     </message>
@@ -675,7 +670,7 @@
         <translation>B:</translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+272"/>
         <source>&amp;Input</source>
         <translation>&amp;Bemenet</translation>
     </message>
@@ -695,17 +690,17 @@
         <translation>Fen&amp;t</translation>
     </message>
     <message>
-        <location line="-524"/>
+        <location line="-509"/>
         <source>Frame type:</source>
         <translation>Képkocka típus:</translation>
     </message>
     <message>
-        <location line="+512"/>
+        <location line="+497"/>
         <source>&amp;Separate</source>
         <translation>&amp;Szeparált</translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1744"/>
         <source>&amp;Toolbars</source>
         <translation>Eszköz&amp;tárak</translation>
     </message>
@@ -736,17 +731,12 @@
         <translation>&lt;b&gt;Hang kimenet&lt;b&gt;</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>   (0 track(s))</source>
-        <translation>(0 sáv)</translation>
-    </message>
-    <message>
-        <location line="+212"/>
+        <location line="+222"/>
         <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
         <translation>&lt;b&gt;Kimeneti formátum&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+1046"/>
+        <location line="+1031"/>
         <source>&amp;Codec Options</source>
         <translation>&amp;Kódek beállítás</translation>
     </message>
@@ -756,8 +746,8 @@
         <translation>Alt+Ctrl+C</translation>
     </message>
     <message>
-        <location line="-935"/>
-        <location line="+946"/>
+        <location line="-920"/>
+        <location line="+931"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navigálás</translation>
     </message>
@@ -792,7 +782,7 @@
         <translation>Ctrl+Alt+M</translation>
     </message>
     <message>
-        <location line="-1659"/>
+        <location line="-1644"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
@@ -802,7 +792,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+710"/>
+        <location line="+309"/>
+        <source> (0 tracks)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+401"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -892,12 +887,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+210"/>
         <source>Play filtered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-169"/>
         <source>Vol&amp;ume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -915,7 +910,7 @@
 <context>
     <name>Opus</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -938,9 +933,8 @@
         <translation>Kiértékelés</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Ctrl+Return</source>
-        <translation>Ctrl+Return</translation>
+        <translation type="vanished">Ctrl+Return</translation>
     </message>
 </context>
 <context>
@@ -984,12 +978,7 @@
         <translation>Videószerkesztő több rendszerhez</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -999,7 +988,12 @@
         <translation>http://www.avidemux.org</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-19"/>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
         <source>&amp;License</source>
         <translation>&amp;Licensz</translation>
     </message>
@@ -1056,7 +1050,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1186,21 +1180,27 @@
         <translation>Prioritások beállítása</translation>
     </message>
     <message>
-        <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="vanished">Alternatív MP3 Tag használata .mp4-ben</translation>
-    </message>
-    <message>
         <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Auto-Append Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>XVideo (best)</source>
         <translation>XVideo (legjobb)</translation>
     </message>
@@ -1307,18 +1307,18 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+277"/>
+        <location line="+283"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+423"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
         <source>Audio</source>
         <translation>Hang</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-73"/>
+        <location filename="../../common/gui_savenew.cpp" line="-239"/>
+        <location line="+170"/>
         <location line="+12"/>
         <location line="+16"/>
-        <location line="+8"/>
         <source>Video</source>
         <translation>Videó</translation>
     </message>
@@ -1395,10 +1395,6 @@
         <translation>Bezárás</translation>
     </message>
     <message>
-        <source>-</source>
-        <translation type="vanished">-</translation>
-    </message>
-    <message>
         <location line="+2"/>
         <source>Information</source>
         <translation>Jellemzők</translation>
@@ -1471,7 +1467,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Load saved settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1599,7 +1595,7 @@
         <translation>Időpontra ugrás</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1619,6 +1615,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-15"/>
         <source>R_esampling (Hz):</source>
         <translation>Újra-mintavételezés (Hz):</translation>
@@ -1896,7 +1897,7 @@
         <translation>Bővítmények infó</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-283"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-289"/>
         <source>Enable openGl support</source>
         <translation>OpenGL engedélyezés</translation>
     </message>
@@ -1913,7 +1914,7 @@
         <translation>Alacsony</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>VDPAU (best)</source>
         <translation>VDPAU (legjobb)</translation>
     </message>
@@ -1924,7 +1925,7 @@
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+213"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
         <translation>PCM</translation>
     </message>
@@ -1957,7 +1958,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
-        <location filename="../../common/gui_save.cpp" line="-313"/>
+        <location filename="../../common/gui_save.cpp" line="-319"/>
         <source>No audio track</source>
         <translation>Nincs hangsáv</translation>
     </message>
@@ -2014,17 +2015,17 @@
 A PSP kompatibilis videóhoz szükséges.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+186"/>
+        <location filename="../../common/gui_main.cpp" line="+188"/>
         <source>Select script to save</source>
         <translation>Mentendő szkript választás</translation>
     </message>
     <message>
-        <location line="+183"/>
+        <location line="+182"/>
         <source>Not coded in this version</source>
         <translation>Nem kódolt ebben a verzióban</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+214"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
@@ -2160,8 +2161,7 @@
         <translation>A hozzáfűzésnél valami nem sikerült</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+321"/>
+        <location line="+320"/>
         <source>Something bad happened (II)</source>
         <translation>Valami rossz történt (II)</translation>
     </message>
@@ -2219,7 +2219,7 @@
         <translation>Fő hangsáv</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+264"/>
         <source>AvsProxy</source>
         <translation>AvsProxy</translation>
     </message>
@@ -2271,7 +2271,7 @@
         <translation>Deringing</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+66"/>
+        <location filename="../../common/gui_save.cpp" line="+71"/>
         <source>Output file</source>
         <translation>Kimeneti fájl</translation>
     </message>
@@ -2286,7 +2286,7 @@
         <translation>A feladat nyomtatásához használandó nyomtató</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Select Workbench to Save</source>
         <translation>Mentendő munkamenet</translation>
     </message>
@@ -2332,30 +2332,35 @@
         <translation>Jpeg</translation>
     </message>
     <message>
-        <location line="+113"/>
-        <location line="+83"/>
+        <location line="+117"/>
+        <source>Maximum number of 99999 images reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+76"/>
         <source>Done</source>
         <translation>Kész</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-76"/>
         <source>Saved %d images.</source>
         <translation>%d kép mentve.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="-250"/>
+        <location filename="../../common/gui_main.cpp" line="-251"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
         <location line="+4"/>
         <location filename="../../common/gui_save.cpp" line="+2"/>
-        <location line="+99"/>
+        <location line="+92"/>
         <location line="+7"/>
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
@@ -2633,7 +2638,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-167"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-173"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2658,7 +2663,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2726,13 +2731,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-62"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-68"/>
+        <location line="+2"/>
         <source>Save current settings as default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-43"/>
+        <location line="+43"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished"></translation>
@@ -2766,7 +2772,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1449"/>
+        <location filename="../../common/gui_main.cpp" line="-1447"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2786,13 +2792,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+68"/>
+        <location line="+126"/>
+        <location line="+73"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-48"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2802,7 +2808,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2825,7 +2831,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+795"/>
+        <location line="+789"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -2856,7 +2862,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+297"/>
+        <location line="+298"/>
         <source>Oops</source>
         <translation type="unfinished">Hopp</translation>
     </message>
@@ -2871,12 +2877,12 @@
         <translation type="unfinished">Probléma a hangeszköz inicializálásánál</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-587"/>
+        <location filename="../../common/gui_save.cpp" line="-592"/>
         <source>Audio encoder index out of bounds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>No</source>
         <translation type="unfinished">Nem</translation>
     </message>
@@ -2886,7 +2892,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Job</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2896,7 +2902,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+227"/>
+        <location line="+229"/>
         <source>Function not implemented
 </source>
         <translation type="unfinished"></translation>
@@ -2922,22 +2928,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Maximum number of 9999 images reached, aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Saving images failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+25"/>
         <source>PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2967,29 +2968,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-207"/>
+        <location filename="../../common/gui_savenew.cpp" line="-210"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+182"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+24"/>
         <source>Cannot create encoder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-8"/>
-        <source>Cannot setup codec. Bitrate too low?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+57"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3001,20 +2996,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-253"/>
-        <location line="+286"/>
+        <location line="-257"/>
+        <location line="+290"/>
         <location line="+26"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-312"/>
-        <location line="+286"/>
+        <location line="-326"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+290"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="-102"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The choice of cut points may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Do you want to continue anyway?</source>
         <translation type="unfinished"></translation>
@@ -3137,7 +3142,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>AAC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3187,12 +3192,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+495"/>
         <source>Saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+181"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3203,7 +3208,7 @@
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
-        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+374"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+382"/>
         <source>Unknown</source>
         <translation type="unfinished">Ismeretlen</translation>
     </message>
@@ -3294,20 +3299,20 @@
         <translation type="unfinished">1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
-        <location line="+30"/>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
-        <location line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
         <source>Codec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
         <source>Internal error finding codec 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Internal error opening 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3323,31 +3328,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+812"/>
-        <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
-Dropping a keyframe will result in severely corrupted video.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
-Dropping a frame may result in some video corruption.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Do not warn again and drop frames silently while saving this video?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3585,7 +3566,7 @@
 <context>
     <name>avimuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+75"/>
         <source>Bad Idea</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3662,7 +3643,7 @@
 <context>
     <name>bitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+51"/>
         <source>Constant Bitrate</source>
         <translation type="unfinished">Konstans bitsebesség</translation>
     </message>
@@ -3779,34 +3760,39 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+23"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+51"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>blackframes</name>
@@ -3827,6 +3813,29 @@
     </message>
 </context>
 <context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -3854,12 +3863,7 @@
         <translation>50 (PAL N Argentína)</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>59.93  (NTSC)</source>
-        <translation>59.93 (Filmes NTSC (IVTC))</translation>
-    </message>
-    <message>
-        <location line="+174"/>
+        <location line="+180"/>
         <source>Source Fps:</source>
         <translation>Forrás FPS:</translation>
     </message>
@@ -3889,17 +3893,22 @@
         <translation>Érvénytelen fps</translation>
     </message>
     <message>
-        <location line="-161"/>
+        <location line="-166"/>
         <source>Change FPS</source>
         <translation type="unfinished">Fps valtas</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-32"/>
+        <source>59.94  (NTSC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
         <source>Speed up/slow down the video as if altering fps. This filter changes duration.</source>
         <translation type="unfinished">Az fps valtas gyorsitja/lassítja a filmet.</translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+165"/>
         <source>Error</source>
         <translation type="unfinished">Hiba</translation>
     </message>
@@ -4198,7 +4207,7 @@
         <translation>Figyelem, a levágás túl magas ! Magasság visszáll !</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4459,30 +4468,35 @@
         <translation>Kódolás...</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+55"/>
         <source>Phase:</source>
         <translation>Ffázis:</translation>
     </message>
     <message>
-        <location line="+248"/>
+        <location line="+268"/>
         <source>Video Codec:</source>
         <translation>Videó kodek:</translation>
     </message>
     <message>
-        <location line="-255"/>
-        <location line="+220"/>
+        <location line="-282"/>
+        <location line="+247"/>
         <location line="+21"/>
         <source>None</source>
         <translation>Nincs</translation>
     </message>
     <message>
-        <location line="-258"/>
-        <location line="+251"/>
+        <location line="-261"/>
+        <location line="+254"/>
         <source>Unknown</source>
         <translation>Ismeretlen</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-157"/>
+        <source>Keep dialog open when finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>Audio Codec:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4556,17 +4570,17 @@
         <translation>0 kB/s</translation>
     </message>
     <message>
-        <location line="-385"/>
+        <location line="-396"/>
         <source>Shut down computer when finished</source>
         <translation>Számítógép leállítása befejezés után</translation>
     </message>
     <message>
-        <location line="-11"/>
+        <location line="-58"/>
         <source>Time Remaining:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+78"/>
         <source>Priority:</source>
         <translation>Prioritás:</translation>
     </message>
@@ -4596,22 +4610,22 @@
         <translation>Alacsony</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+69"/>
         <source>Pause / Abort</source>
         <translation>Szünet / Megszakít</translation>
     </message>
     <message>
-        <location line="-149"/>
+        <location line="-186"/>
         <source>Main</source>
         <translation type="unfinished">Általános</translation>
     </message>
     <message>
-        <location line="+129"/>
+        <location line="+166"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+33"/>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4704,7 +4718,7 @@
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished">Elhalvanyodas</translation>
@@ -4715,7 +4729,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+13"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Start time:</source>
         <translation type="unfinished">_Kezdet:</translation>
     </message>
@@ -4728,13 +4767,13 @@
 <context>
     <name>fadeToBlack</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
-        <location line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+55"/>
+        <location line="+20"/>
         <source>Fade to black</source>
         <translation type="unfinished">Eltűnés feketébe</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-19"/>
         <source>Fade to black in/out.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4759,7 +4798,7 @@
         <translation type="unfinished">Fokozatos megjelenítés</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>_Fade type:</source>
         <translation type="unfinished">Átmenet típusa:</translation>
     </message>
@@ -4777,7 +4816,7 @@
 <context>
     <name>ffVAEncH264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4792,12 +4831,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Profile:</source>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4808,16 +4868,21 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Bitrate (kbps):</source>
+        <source>Quality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4827,7 +4892,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4835,27 +4900,53 @@
 <context>
     <name>ffVAEncHEVC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+343"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4865,7 +4956,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4873,7 +4964,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+217"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+250"/>
         <source>Normal (4:3)</source>
         <translation>Normál (4:3)</translation>
     </message>
@@ -5342,8 +5433,32 @@
 <context>
     <name>ffnvenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+229"/>
+        <source>Controlled by Preset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
         <source>Low Quality</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5395,6 +5510,12 @@
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+        <source>RC Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Preset:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5404,6 +5525,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Bitrate (kbps):</source>
@@ -5417,32 +5544,48 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Frame Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>NVENC H.264 configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
-        <source>nvEnc HEVC  configuration</source>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+28"/>
+        <source>NVENC HEVC configuration</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5454,7 +5597,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+87"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished">mpeg PS (ff) mentés</translation>
     </message>
@@ -5550,7 +5693,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished">mpeg TS (ff) mentés</translation>
     </message>
@@ -5623,7 +5766,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5779,7 +5922,7 @@
 <context>
     <name>flvdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6350,7 +6493,7 @@
         <translation>Kilépés</translation>
     </message>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Oops</source>
         <translation>Hopp</translation>
     </message>
@@ -6360,7 +6503,7 @@
         <translation>Valami nagyon rossz történt, a feladatlista generálásánál.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>There are no jobs stored</source>
         <translation>Nincsenek tárolt feladatok</translation>
     </message>
@@ -6808,12 +6951,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+523"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6913,7 +7056,7 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+167"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
         <source>Saving Mkv</source>
         <translation>MKv mentés</translation>
     </message>
@@ -7012,31 +7155,46 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Probléma a SVQ3 fejek olvasásánál</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+67"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <location line="+17"/>
         <source>Unsupported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
-        <source>Only MP4Video, H264, and H265 supported for video</source>
+        <location line="-17"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+182"/>
         <source>Saving mp4</source>
         <translation type="unfinished">mp4 mentés</translation>
     </message>
@@ -7046,7 +7204,7 @@
         <translation type="unfinished">PSP mentés</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7081,7 +7239,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Do not rotate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7107,6 +7265,51 @@
     </message>
     <message>
         <location line="+3"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>MP4 Muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7278,7 +7481,7 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+242"/>
+        <location filename="../../common/gui_navigate.cpp" line="+232"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7508,21 +7711,17 @@
 <context>
     <name>psdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Hiba</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
         <translation type="unfinished">Indexelés</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -7592,7 +7791,7 @@
         <translation type="unfinished">Root jogosultság szükséges a művelet végrehajtásához.</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+126"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7607,7 +7806,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+185"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished">A kódolás szünetel. Folytassuk, vagy hagyjuk abba??</translation>
     </message>
@@ -7645,7 +7844,7 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+212"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+206"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7725,21 +7924,29 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+626"/>
+        <location line="+681"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+262"/>
+        <location line="+230"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+334"/>
-        <source> (%d track(s))</source>
+        <location line="+70"/>
+        <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>qgui2menu</name>
@@ -7975,18 +8182,26 @@
         <translation>Igen</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+33"/>
         <source>%2.3f fps</source>
         <translation>%2.3f fps</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+81"/>
+        <location line="+90"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation>%02d:%02d:%02d.%03d</translation>
     </message>
+    <message numerus="yes">
+        <location line="-55"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
     <message>
-        <location line="+30"/>
+        <location line="+83"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8012,12 +8227,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+27"/>
+        <location line="+33"/>
         <source>Total Duration:	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-31"/>
         <source>Extra Video Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8032,12 +8247,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Codec:		</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8062,12 +8277,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-172"/>
         <source>%s (%u:%u)</source>
         <translation>%s (%u:%u)</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+77"/>
         <source>Mono</source>
         <translation>Monó</translation>
     </message>
@@ -8080,7 +8295,7 @@
 <context>
     <name>qshell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+53"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
         <translation type="unfinished"></translation>
@@ -8092,6 +8307,19 @@
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>qtalert</name>
@@ -8153,6 +8381,16 @@
         <source>Video Only Muxer Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>removeplane</name>
@@ -8205,7 +8443,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
         <source>_Mode:</source>
         <translation>Mód:</translation>
     </message>
@@ -8220,7 +8458,7 @@
         <translation>FPS ujraepites</translation>
     </message>
     <message>
-        <location line="-325"/>
+        <location line="-329"/>
         <source>Custom</source>
         <translation>Egyéni</translation>
     </message>
@@ -8246,8 +8484,8 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
-        <translation>59.93 (Filmes NTSC (IVTC))</translation>
+        <source>59.94  (NTSC)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+35"/>
@@ -8268,7 +8506,7 @@
         <translation>swsResize</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished">A szélesség és magasság nem lehet páratlan szám</translation>
     </message>
@@ -8426,6 +8664,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+356"/>
+        <source>Lanzcos3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
         <source>Source PAR:</source>
         <translation type="unfinished"></translation>
@@ -8443,16 +8695,16 @@
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+44"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-312"/>
         <source>Resize Dimensions</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8623,17 +8875,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+5"/>
-        <source>Lanzcos3</source>
+        <source>Lanczos-3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8992,26 +9234,32 @@
 <context>
     <name>tsdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Hiba</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+183"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+325"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+84"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+207"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+19"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
         <translation type="unfinished">Indexelés</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -9103,19 +9351,137 @@
     </message>
 </context>
 <context>
+    <name>vaapiDeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Adaptive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Compensated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vaapiResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
-        <source>vaapi: Resize</source>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>vaapi: Resize image using vaapi.</source>
+        <source>Resize image using VA-API.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+129"/>
         <source>Width :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9126,7 +9492,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>mpeg-&gt;PC:</source>
+        <source>mpeg-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9148,7 +9514,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+197"/>
         <source>Keep Top Field</source>
         <translation type="unfinished">Felső mező megtartása</translation>
     </message>
@@ -9164,13 +9530,13 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>_Ivtc:</source>
+        <source>_IVTC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Resize:</source>
-        <translation type="unfinished">Átméretezés:</translation>
+        <source>_Resize</source>
+        <translation type="unfinished">Átméretezés</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9179,12 +9545,12 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Width :</source>
+        <source>Width:</source>
         <translation type="unfinished">Szélesség:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation type="unfinished">Magasság:</translation>
     </message>
     <message>
@@ -9206,13 +9572,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
-        <source>Width :</source>
+        <location line="+131"/>
+        <source>Width:</source>
         <translation type="unfinished">Szélesség:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation type="unfinished">Magasság:</translation>
     </message>
     <message>
@@ -9296,6 +9662,84 @@
     </message>
 </context>
 <context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vsWindow</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
@@ -9311,7 +9755,7 @@
 <context>
     <name>webmmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+68"/>
         <source>Unsupported Video.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
         <translation type="unfinished"></translation>
@@ -9323,7 +9767,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+89"/>
         <source>Saving Webm</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9346,7 +9790,7 @@
 <context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
         <source>Processing</source>
         <translation>Feldolgozás</translation>
     </message>
@@ -9356,12 +9800,12 @@
         <translation>eltelt:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+14"/>
         <source>Time Remaining:</source>
         <translation>Hátralévő idő:</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+13"/>
         <source>00:00:00</source>
         <translation>00:00:00</translation>
     </message>
@@ -9369,7 +9813,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9385,7 +9829,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished">Egyéni</translation>
     </message>
@@ -9521,12 +9965,12 @@
     </message>
     <message>
         <location line="+7"/>
-        <location line="+3152"/>
+        <location line="+3157"/>
         <source>Delete</source>
         <translation type="unfinished">Törlés</translation>
     </message>
     <message>
-        <location line="-3110"/>
+        <location line="-3115"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9754,12 +10198,12 @@
     </message>
     <message>
         <location line="+14"/>
-        <location line="+2490"/>
+        <location line="+2495"/>
         <source>frames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2466"/>
+        <location line="-2471"/>
         <source>Sequence Parameter Set Identifer:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9892,12 +10336,12 @@
     </message>
     <message>
         <location line="+13"/>
-        <location line="+2596"/>
+        <location line="+2601"/>
         <source>None</source>
         <translation type="unfinished">Nincs</translation>
     </message>
     <message>
-        <location line="-2591"/>
+        <location line="-2596"/>
         <source>Spatial</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9978,12 +10422,12 @@
     </message>
     <message>
         <location line="+12"/>
-        <location line="+1328"/>
+        <location line="+1333"/>
         <source>Strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1289"/>
+        <location line="-1294"/>
         <source>Threshold:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10190,12 +10634,12 @@
     </message>
     <message>
         <location line="+10"/>
-        <location line="+856"/>
+        <location line="+861"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-809"/>
+        <location line="-814"/>
         <source>Quantiser Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10212,12 +10656,12 @@
     <message>
         <location line="+85"/>
         <location line="+179"/>
-        <location line="+302"/>
+        <location line="+307"/>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-459"/>
+        <location line="-464"/>
         <source>Maximum Quantiser Step:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10278,7 +10722,12 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>Auto Variance AQ</source>
+        <source>Auto Variance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -10722,7 +11171,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished">Egyéni</translation>
     </message>
@@ -11930,7 +12379,7 @@
 <context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+37"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+32"/>
         <location line="+24"/>
         <source>None</source>
         <translation>Nincs</translation>
@@ -12026,12 +12475,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>MotionEstimation</source>
-        <translation>Mozgásbecslés</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+9"/>
         <source>Threading</source>
         <translation>Szálak</translation>
     </message>
@@ -12047,6 +12491,16 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>_Quantization type:</source>
         <translation>Kvantálás típusa:</translation>
     </message>
@@ -12066,17 +12520,12 @@
         <translation>GOP méret:</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Advanced Simple Profile</source>
-        <translation>Advanced Simple Profile</translation>
-    </message>
-    <message>
-        <location line="+9"/>
+        <location line="-29"/>
         <source>Motion Estimation</source>
         <translation>Mozgásbecslés</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+57"/>
         <source>Quantization</source>
         <translation>Kvantálás</translation>
     </message>
@@ -12096,7 +12545,7 @@
         <translation>Xvid4 MPEG-4 ASP beállítás</translation>
     </message>
     <message>
-        <location line="-77"/>
+        <location line="-87"/>
         <source>1:1 (PC)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12111,7 +12560,7 @@
         <translation type="unfinished">Max. kvantáló:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Aspect Ratio:</source>
         <translation type="unfinished">Méretarány:</translation>
     </message>
@@ -12121,7 +12570,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+3"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Aspect Ratio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12139,7 +12604,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+70"/>
         <source>Bottom field first</source>
         <translation type="unfinished"></translation>
     </message>

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_it.ts -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_it.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
         <source>Attempt to open %s failed!</source>
         <translation>Tentativo di aprire %s fallito!</translation>
     </message>
@@ -39,7 +39,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+102"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+124"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -78,7 +78,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-189"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-193"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -381,22 +381,22 @@
         <translation type="unfinished">Finestra</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+19"/>
         <source>00:00:00</source>
         <translation type="unfinished">00:00:00</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+51"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="-64"/>
         <source>TimeLeft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+41"/>
         <source>ProcessImages</source>
         <translation type="unfinished"></translation>
     </message>
@@ -406,7 +406,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-14"/>
         <source>0 fps</source>
         <translation type="unfinished"></translation>
     </message>
@@ -442,30 +442,28 @@
 <context>
     <name>FDK-AAC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
-        <source>_Profile::</source>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+9"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+2"/>
         <source>SBR enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+7"/>
-        <source>After burner</source>
+        <location line="+2"/>
+        <source>Afterburner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>FDK-AAC Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -602,9 +600,8 @@
         <translation>&amp;Informazioni...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Alt+Return</source>
-        <translation>Alt+Invio</translation>
+        <translation type="vanished">Alt+Invio</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -640,22 +637,20 @@
         <translation>Salva progetto</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+69"/>
         <source>Ctrl+Alt+S</source>
         <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location line="-72"/>
         <source>&amp;Calculator...</source>
-        <translation>&amp;Calcolatrice...</translation>
+        <translation type="vanished">&amp;Calcolatrice...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>F7</source>
-        <translation>F7</translation>
+        <translation type="vanished">F7</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="-54"/>
         <source>&amp;Input</source>
         <translation>&amp;Input</translation>
     </message>
@@ -675,17 +670,17 @@
         <translation>Affiancati ver&amp;ticalmente</translation>
     </message>
     <message>
-        <location line="-524"/>
+        <location line="-509"/>
         <source>Frame type:</source>
         <translation>Tipo di fotogramma:</translation>
     </message>
     <message>
-        <location line="+512"/>
+        <location line="+497"/>
         <source>&amp;Separate</source>
         <translation>&amp;Separati</translation>
     </message>
     <message>
-        <location line="-1152"/>
+        <location line="-1137"/>
         <source>ms</source>
         <translation>ms</translation>
     </message>
@@ -731,17 +726,12 @@
         <translation>&lt;b&gt;Output audio&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>   (0 track(s))</source>
-        <translation>   (0 tracce)</translation>
-    </message>
-    <message>
-        <location line="+212"/>
+        <location line="+222"/>
         <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
         <translation>&lt;b&gt;Contenitore output&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+1046"/>
+        <location line="+1031"/>
         <source>&amp;Codec Options</source>
         <translation>Opzioni &amp;codec</translation>
     </message>
@@ -751,18 +741,18 @@
         <translation>Ctrl+Alt+C</translation>
     </message>
     <message>
-        <location line="-935"/>
-        <location line="+946"/>
+        <location line="-920"/>
+        <location line="+931"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navigazione</translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="-276"/>
         <source>Selection: 000000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+294"/>
+        <location line="+279"/>
         <source>Ctrl+Alt+N</source>
         <translation>Ctrl+Alt+N</translation>
     </message>
@@ -792,7 +782,7 @@
         <translation>Ctrl+Alt+M</translation>
     </message>
     <message>
-        <location line="-1659"/>
+        <location line="-1644"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
@@ -802,7 +792,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+710"/>
+        <location line="+309"/>
+        <source> (0 tracks)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+401"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -892,12 +887,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+210"/>
         <source>Play filtered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-169"/>
         <source>Vol&amp;ume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -915,7 +910,7 @@
 <context>
     <name>Opus</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -938,9 +933,8 @@
         <translation>Verifica</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Ctrl+Return</source>
-        <translation>Ctrl+Invio</translation>
+        <translation type="vanished">Ctrl+Invio</translation>
     </message>
 </context>
 <context>
@@ -989,12 +983,7 @@
         <translation>Video editor multi-piattaforma</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -1004,7 +993,12 @@
         <translation>http://www.avidemux.org</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-19"/>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
         <source>&amp;License</source>
         <translation>&amp;Licenza</translation>
     </message>
@@ -1056,7 +1050,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1198,21 +1192,27 @@
         <translation>Prioritizzazione</translation>
     </message>
     <message>
-        <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="vanished">_Usa etichette alternative per gli MP3 in file .mp4</translation>
-    </message>
-    <message>
         <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Auto-Append Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1263,7 +1263,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+213"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
         <translation>PCM</translation>
     </message>
@@ -1362,18 +1362,18 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+277"/>
+        <location line="+283"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+423"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-73"/>
+        <location filename="../../common/gui_savenew.cpp" line="-239"/>
+        <location line="+170"/>
         <location line="+12"/>
         <location line="+16"/>
-        <location line="+8"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
@@ -1450,10 +1450,6 @@
         <translation>Chiudi</translation>
     </message>
     <message>
-        <source>-</source>
-        <translation type="vanished">-</translation>
-    </message>
-    <message>
         <location line="+2"/>
         <source>Information</source>
         <translation>Informazioni</translation>
@@ -1526,7 +1522,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Load saved settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1652,7 +1648,7 @@
         <translation>Vai al tempo</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1672,6 +1668,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-15"/>
         <source>R_esampling (Hz):</source>
         <translation>Ricampionam_ento (Hz):</translation>
@@ -1949,12 +1950,12 @@
         <translation>Info plugin</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-283"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-289"/>
         <source>Enable openGl support</source>
         <translation>Attiva supporto OpenGL</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+79"/>
         <source>VDPAU (best)</source>
         <translation>VDPAU (migliore)</translation>
     </message>
@@ -1965,7 +1966,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
-        <location filename="../../common/gui_save.cpp" line="-313"/>
+        <location filename="../../common/gui_save.cpp" line="-319"/>
         <source>No audio track</source>
         <translation>Nessuna traccia audio</translation>
     </message>
@@ -2022,17 +2023,17 @@
 È necessario per creare un video compatibile con PSP.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+186"/>
+        <location filename="../../common/gui_main.cpp" line="+188"/>
         <source>Select script to save</source>
         <translation>Seleziona lo script da salvare</translation>
     </message>
     <message>
-        <location line="+183"/>
+        <location line="+182"/>
         <source>Not coded in this version</source>
         <translation>Non incluso in questa versione</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+214"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
@@ -2168,8 +2169,7 @@
         <translation>Errore durante l&apos;aggiunta</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+321"/>
+        <location line="+320"/>
         <source>Something bad happened (II)</source>
         <translation>C&apos;è stato qualche errore (II)</translation>
     </message>
@@ -2227,7 +2227,7 @@
         <translation>Traccia audio principale</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+264"/>
         <source>AvsProxy</source>
         <translation>AvsProxy</translation>
     </message>
@@ -2279,7 +2279,7 @@
         <translation>_Deringing</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+66"/>
+        <location filename="../../common/gui_save.cpp" line="+71"/>
         <source>Output file</source>
         <translation>File in uscita</translation>
     </message>
@@ -2294,7 +2294,7 @@
         <translation>Aggiungi attività in coda alla lista</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Select Workbench to Save</source>
         <translation>Seleziona il progetto da salvare</translation>
     </message>
@@ -2340,30 +2340,35 @@
         <translation>Jpeg</translation>
     </message>
     <message>
-        <location line="+113"/>
-        <location line="+83"/>
+        <location line="+117"/>
+        <source>Maximum number of 99999 images reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+76"/>
         <source>Done</source>
         <translation>Fatto</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-76"/>
         <source>Saved %d images.</source>
         <translation>%d immagini salvate.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="-250"/>
+        <location filename="../../common/gui_main.cpp" line="-251"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
         <location line="+4"/>
         <location filename="../../common/gui_save.cpp" line="+2"/>
-        <location line="+99"/>
+        <location line="+92"/>
         <location line="+7"/>
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
@@ -2436,12 +2441,12 @@
         <translation type="unfinished">Due passate</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+495"/>
         <source>Saving</source>
         <translation type="unfinished">Salvataggio in corso</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+181"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2451,7 +2456,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-86"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-92"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2476,7 +2481,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+83"/>
         <source>LIBVA (best)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2534,13 +2539,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-62"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-68"/>
+        <location line="+2"/>
         <source>Save current settings as default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-43"/>
+        <location line="+43"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished"></translation>
@@ -2574,7 +2580,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1449"/>
+        <location filename="../../common/gui_main.cpp" line="-1447"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2594,13 +2600,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+68"/>
+        <location line="+126"/>
+        <location line="+73"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-48"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2610,7 +2616,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2633,7 +2639,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+795"/>
+        <location line="+789"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -2664,7 +2670,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+297"/>
+        <location line="+298"/>
         <source>Oops</source>
         <translation type="unfinished">Ops</translation>
     </message>
@@ -2679,12 +2685,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-587"/>
+        <location filename="../../common/gui_save.cpp" line="-592"/>
         <source>Audio encoder index out of bounds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>No</source>
         <translation type="unfinished">No</translation>
     </message>
@@ -2694,7 +2700,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Job</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2704,7 +2710,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+227"/>
+        <location line="+229"/>
         <source>Function not implemented
 </source>
         <translation type="unfinished"></translation>
@@ -2730,22 +2736,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Maximum number of 9999 images reached, aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Saving images failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+25"/>
         <source>PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2775,29 +2776,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-207"/>
+        <location filename="../../common/gui_savenew.cpp" line="-210"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+182"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+24"/>
         <source>Cannot create encoder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-8"/>
-        <source>Cannot setup codec. Bitrate too low?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+57"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2809,20 +2804,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-253"/>
-        <location line="+286"/>
+        <location line="-257"/>
+        <location line="+290"/>
         <location line="+26"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-312"/>
-        <location line="+286"/>
+        <location line="-326"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+290"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="-102"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The choice of cut points may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Do you want to continue anyway?</source>
         <translation type="unfinished"></translation>
@@ -3145,7 +3150,7 @@
         <translation type="unfinished">MP4</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>AAC</source>
         <translation type="unfinished">AAC</translation>
     </message>
@@ -3201,7 +3206,7 @@
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
-        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+374"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+382"/>
         <source>Unknown</source>
         <translation type="unfinished">Sconosciuto</translation>
     </message>
@@ -3292,20 +3297,20 @@
         <translation type="unfinished">1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
-        <location line="+30"/>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
-        <location line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
         <source>Codec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
         <source>Internal error finding codec 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Internal error opening 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3321,31 +3326,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+812"/>
-        <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
-Dropping a keyframe will result in severely corrupted video.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
-Dropping a frame may result in some video corruption.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Do not warn again and drop frames silently while saving this video?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3583,7 +3564,7 @@
 <context>
     <name>avimuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+75"/>
         <source>Bad Idea</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3660,7 +3641,7 @@
 <context>
     <name>bitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+51"/>
         <source>Constant Bitrate</source>
         <translation type="unfinished">Bitrate costante</translation>
     </message>
@@ -3777,34 +3758,39 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+23"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+51"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>blackframes</name>
@@ -3825,9 +3811,37 @@
     </message>
 </context>
 <context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+219"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+45"/>
+        <source>59.94  (NTSC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+179"/>
         <source>Source Fps:</source>
         <translation>Fps sorgente:</translation>
     </message>
@@ -3852,7 +3866,7 @@
         <translation>Cambiamento fps</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-198"/>
         <source>Custom</source>
         <translation type="unfinished">Personalizzato</translation>
     </message>
@@ -3877,12 +3891,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>59.93  (NTSC)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
+        <location line="+33"/>
         <source>Change FPS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3892,7 +3901,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+165"/>
         <source>Error</source>
         <translation type="unfinished">Errore</translation>
     </message>
@@ -4196,7 +4205,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4457,25 +4466,25 @@
         <translation>Codifica in corso...</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+55"/>
         <source>Phase:</source>
         <translation>Fase:</translation>
     </message>
     <message>
-        <location line="+248"/>
+        <location line="+268"/>
         <source>Video Codec:</source>
         <translation>Codec video:</translation>
     </message>
     <message>
-        <location line="-255"/>
-        <location line="+220"/>
+        <location line="-282"/>
+        <location line="+247"/>
         <location line="+21"/>
         <source>None</source>
         <translation>Nessuno</translation>
     </message>
     <message>
-        <location line="-258"/>
-        <location line="+251"/>
+        <location line="-261"/>
+        <location line="+254"/>
         <source>Unknown</source>
         <translation>Sconosciuto</translation>
     </message>
@@ -4504,7 +4513,7 @@
         <translation>0 kB/s</translation>
     </message>
     <message>
-        <location line="-385"/>
+        <location line="-396"/>
         <source>Shut down computer when finished</source>
         <translation>Arresta il sistema al termine</translation>
     </message>
@@ -4539,7 +4548,12 @@
         <translation>Bassa</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+12"/>
+        <source>Keep dialog open when finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4549,7 +4563,7 @@
         <translation>Pausa / Annulla </translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Container:</source>
         <translation>Contenitore:</translation>
     </message>
@@ -4564,12 +4578,12 @@
         <translation>Tempo trascorso:</translation>
     </message>
     <message>
-        <location line="-446"/>
+        <location line="-504"/>
         <source>Time Remaining:</source>
         <translation>Tempo rimanente:</translation>
     </message>
     <message>
-        <location line="+467"/>
+        <location line="+525"/>
         <source>Frames/sec:</source>
         <translation>Fotogrammi/sec:</translation>
     </message>
@@ -4609,7 +4623,7 @@
         <translation type="unfinished">Avanzate</translation>
     </message>
     <message>
-        <location line="-175"/>
+        <location line="-199"/>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4702,7 +4716,7 @@
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished">Dissolvenza</translation>
@@ -4713,7 +4727,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+13"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Start time:</source>
         <translation type="unfinished">Tempo di _inizio:</translation>
     </message>
@@ -4726,13 +4765,13 @@
 <context>
     <name>fadeToBlack</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
-        <location line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+55"/>
+        <location line="+20"/>
         <source>Fade to black</source>
         <translation type="unfinished">Dissolvenza verso il nero</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-19"/>
         <source>Fade to black in/out.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4757,7 +4796,7 @@
         <translation type="unfinished">Dissolvenza in ingresso</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>_Fade type:</source>
         <translation type="unfinished">Tipo di _dissolvenza:</translation>
     </message>
@@ -4775,7 +4814,7 @@
 <context>
     <name>ffVAEncH264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4790,12 +4829,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Profile:</source>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4806,16 +4866,21 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Bitrate (kbps):</source>
+        <source>Quality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4825,7 +4890,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4833,27 +4898,53 @@
 <context>
     <name>ffVAEncHEVC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+343"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4863,7 +4954,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4871,7 +4962,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+223"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+256"/>
         <source>Default</source>
         <translation type="unfinished">Predefinito</translation>
     </message>
@@ -5340,8 +5431,32 @@
 <context>
     <name>ffnvenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+229"/>
+        <source>Controlled by Preset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
         <source>Low Quality</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5393,6 +5508,12 @@
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+        <source>RC Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Preset:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5402,6 +5523,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Bitrate (kbps):</source>
@@ -5415,32 +5542,48 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Frame Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>NVENC H.264 configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
-        <source>nvEnc HEVC  configuration</source>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+28"/>
+        <source>NVENC HEVC configuration</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5452,7 +5595,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+87"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished">Salvataggio mpeg PS (ff) in corso</translation>
     </message>
@@ -5548,7 +5691,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished">Salvataggio mpeg TS (ff) in corso</translation>
     </message>
@@ -5621,7 +5764,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5779,7 +5922,7 @@
 <context>
     <name>flvdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6350,7 +6493,7 @@
         <translation>Esci</translation>
     </message>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Oops</source>
         <translation type="unfinished">Ops</translation>
     </message>
@@ -6360,7 +6503,7 @@
         <translation type="unfinished">Errore grave durante la costruzione della lista attività.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>There are no jobs stored</source>
         <translation type="unfinished">Non ci sono attività immagazzinate</translation>
     </message>
@@ -6808,12 +6951,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+523"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6913,7 +7056,7 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+167"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
         <source>Saving Mkv</source>
         <translation type="unfinished">Salvataggio Mkv in corso</translation>
     </message>
@@ -7012,31 +7155,46 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Problema di lettura delle intestazioni SVQ3</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+67"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <location line="+17"/>
         <source>Unsupported</source>
         <translation type="unfinished">Non supportato</translation>
     </message>
     <message>
-        <location line="-9"/>
-        <source>Only MP4Video, H264, and H265 supported for video</source>
+        <location line="-17"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+182"/>
         <source>Saving mp4</source>
         <translation type="unfinished">Salvataggio mp4 in corso</translation>
     </message>
@@ -7046,7 +7204,7 @@
         <translation type="unfinished">Salvataggio PSP in corso</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7081,7 +7239,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Do not rotate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7107,6 +7265,51 @@
     </message>
     <message>
         <location line="+3"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>MP4 Muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7278,7 +7481,7 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+242"/>
+        <location filename="../../common/gui_navigate.cpp" line="+232"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7508,21 +7711,17 @@
 <context>
     <name>psdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Errore</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
         <translation type="unfinished">Indicizzazione</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -7592,7 +7791,7 @@
         <translation type="unfinished">Sono richesti i privilegi di amministratore per eseguire questa operazione.</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+126"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7607,7 +7806,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+185"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished">La codifica è in pausa. Vuoi ripristinarla o annullarla?</translation>
     </message>
@@ -7645,7 +7844,7 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+212"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+206"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7725,21 +7924,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+626"/>
+        <location line="+681"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+262"/>
+        <location line="+230"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+334"/>
-        <source> (%d track(s))</source>
+        <location line="+70"/>
+        <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>qgui2menu</name>
@@ -8430,18 +8638,27 @@
         <translation type="unfinished">Sì</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+33"/>
         <source>%2.3f fps</source>
         <translation type="unfinished">%2.3f fps</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+81"/>
+        <location line="+90"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation type="unfinished">%02d:%02d:%02d.%03d</translation>
     </message>
+    <message numerus="yes">
+        <location line="-55"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
     <message>
-        <location line="+30"/>
+        <location line="+83"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8467,12 +8684,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+27"/>
+        <location line="+33"/>
         <source>Total Duration:	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-31"/>
         <source>Extra Video Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8487,12 +8704,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Codec:		</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8517,12 +8734,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-172"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished">%s (%u:%u)</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+77"/>
         <source>Mono</source>
         <translation type="unfinished">Mono</translation>
     </message>
@@ -8535,7 +8752,7 @@
 <context>
     <name>qshell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+53"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
         <translation type="unfinished"></translation>
@@ -8547,6 +8764,19 @@
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>qtalert</name>
@@ -8608,6 +8838,16 @@
         <source>Video Only Muxer Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>removeplane</name>
@@ -8660,7 +8900,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
         <source>_Mode:</source>
         <translation>_Modalità:</translation>
     </message>
@@ -8675,7 +8915,7 @@
         <translation>Ricampionamento fps</translation>
     </message>
     <message>
-        <location line="-325"/>
+        <location line="-329"/>
         <source>Custom</source>
         <translation type="unfinished">Personalizzato</translation>
     </message>
@@ -8701,7 +8941,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
+        <source>59.94  (NTSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8718,7 +8958,7 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished">Larghezza e altezza non possono essere dispari</translation>
     </message>
@@ -8881,6 +9121,20 @@
         <translation type="unfinished">Destinazione:</translation>
     </message>
     <message>
+        <location line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+356"/>
+        <source>Lanzcos3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
         <source>Source PAR:</source>
         <translation type="unfinished"></translation>
@@ -8898,16 +9152,16 @@
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+44"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-312"/>
         <source>Resize Dimensions</source>
         <translation type="unfinished">Dimensioni</translation>
     </message>
@@ -9078,18 +9332,8 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+5"/>
-        <source>Lanzcos3</source>
-        <translation type="unfinished">Lanzcos3</translation>
+        <source>Lanczos-3</source>
+        <translation type="unfinished">Lanczos-3</translation>
     </message>
 </context>
 <context>
@@ -9447,26 +9691,32 @@
 <context>
     <name>tsdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Errore</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+183"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+325"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+84"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+207"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+19"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
         <translation type="unfinished">Indicizzazione</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -9558,19 +9808,137 @@
     </message>
 </context>
 <context>
+    <name>vaapiDeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Adaptive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Compensated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vaapiResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
-        <source>vaapi: Resize</source>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>vaapi: Resize image using vaapi.</source>
+        <source>Resize image using VA-API.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+129"/>
         <source>Width :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9581,7 +9949,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>mpeg-&gt;PC:</source>
+        <source>mpeg-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9603,7 +9971,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+197"/>
         <source>Keep Top Field</source>
         <translation type="unfinished">Mantieni semiquadro superiore</translation>
     </message>
@@ -9619,13 +9987,13 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>_Ivtc:</source>
+        <source>_IVTC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Resize:</source>
-        <translation type="unfinished">_Ridimensiona:</translation>
+        <source>_Resize</source>
+        <translation type="unfinished">_Ridimensiona</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9634,12 +10002,12 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Width :</source>
+        <source>Width:</source>
         <translation type="unfinished">Larghezza:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation type="unfinished">Altezza:</translation>
     </message>
     <message>
@@ -9661,13 +10029,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
-        <source>Width :</source>
+        <location line="+131"/>
+        <source>Width:</source>
         <translation type="unfinished">Larghezza:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation type="unfinished">Altezza:</translation>
     </message>
     <message>
@@ -9751,6 +10119,84 @@
     </message>
 </context>
 <context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vsWindow</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
@@ -9766,7 +10212,7 @@
 <context>
     <name>webmmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+68"/>
         <source>Unsupported Video.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
         <translation type="unfinished"></translation>
@@ -9778,7 +10224,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+89"/>
         <source>Saving Webm</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9801,7 +10247,7 @@
 <context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
         <source>Processing</source>
         <translation>Elaborazione in corso</translation>
     </message>
@@ -9811,12 +10257,12 @@
         <translation>Tempo trascorso:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+14"/>
         <source>Time Remaining:</source>
         <translation>Tempo rimanente:</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+13"/>
         <source>00:00:00</source>
         <translation>00:00:00</translation>
     </message>
@@ -9824,7 +10270,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9840,7 +10286,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished">Personalizzato</translation>
     </message>
@@ -9961,12 +10407,12 @@
         <translation type="unfinished">Salva con nome</translation>
     </message>
     <message>
-        <location line="+2982"/>
+        <location line="+2987"/>
         <source>kbit/s</source>
         <translation type="unfinished">kbit/s</translation>
     </message>
     <message>
-        <location line="-2655"/>
+        <location line="-2660"/>
         <source>Target Video Size:</source>
         <translation type="unfinished">Dimensione video finale:</translation>
     </message>
@@ -9987,12 +10433,12 @@
     </message>
     <message>
         <location line="+24"/>
-        <location line="+3152"/>
+        <location line="+3157"/>
         <source>Delete</source>
         <translation type="unfinished">Elimina</translation>
     </message>
     <message>
-        <location line="-3110"/>
+        <location line="-3115"/>
         <source>General</source>
         <translation type="unfinished">Generale</translation>
     </message>
@@ -10057,12 +10503,12 @@
     </message>
     <message>
         <location line="+14"/>
-        <location line="+2490"/>
+        <location line="+2495"/>
         <source>frames</source>
         <translation type="unfinished">fotogrammi</translation>
     </message>
     <message>
-        <location line="-528"/>
+        <location line="-533"/>
         <source>Variance AQ:</source>
         <translation type="unfinished">QA a varianza:</translation>
     </message>
@@ -10072,12 +10518,7 @@
         <translation type="unfinished">Normale</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Auto Variance AQ</source>
-        <translation type="unfinished">QA a varianza automatica</translation>
-    </message>
-    <message>
-        <location line="+91"/>
+        <location line="+101"/>
         <source>Advanced 1</source>
         <translation type="unfinished">Avanzate 1</translation>
     </message>
@@ -10112,7 +10553,7 @@
         <translation type="unfinished">Buffer suddiviso personalizzato sui successivi</translation>
     </message>
     <message>
-        <location line="-2369"/>
+        <location line="-2374"/>
         <source>Motion</source>
         <translation type="unfinished">Movimento</translation>
     </message>
@@ -10210,12 +10651,12 @@
     </message>
     <message>
         <location line="+13"/>
-        <location line="+2596"/>
+        <location line="+2601"/>
         <source>None</source>
         <translation type="unfinished">Nessuna</translation>
     </message>
     <message>
-        <location line="-2591"/>
+        <location line="-2596"/>
         <source>Spatial</source>
         <translation type="unfinished">Spaziale</translation>
     </message>
@@ -10297,12 +10738,12 @@
     </message>
     <message>
         <location line="+21"/>
-        <location line="+1328"/>
+        <location line="+1333"/>
         <source>Strength:</source>
         <translation type="unfinished">Intensità:</translation>
     </message>
     <message>
-        <location line="-1289"/>
+        <location line="-1294"/>
         <source>Threshold:</source>
         <translation type="unfinished">Soglia:</translation>
     </message>
@@ -10377,13 +10818,13 @@
         <translation type="unfinished">Controllo bitrate ramificato a macroblocchi</translation>
     </message>
     <message>
-        <location line="+2440"/>
+        <location line="+2445"/>
         <source>Custom:</source>
         <comment>multithreading</comment>
         <translation type="unfinished">Personalizzato:</translation>
     </message>
     <message>
-        <location line="-1259"/>
+        <location line="-1264"/>
         <source>Periodic Intra Refresh</source>
         <translation type="unfinished">Aggiornamento periodico fotogrammi chiave</translation>
     </message>
@@ -10545,12 +10986,12 @@
     </message>
     <message>
         <location line="+10"/>
-        <location line="+856"/>
+        <location line="+861"/>
         <source>Edit</source>
         <translation type="unfinished">Modifica</translation>
     </message>
     <message>
-        <location line="-809"/>
+        <location line="-814"/>
         <source>Quantiser Control</source>
         <translation type="unfinished">Controllo quantizzatore</translation>
     </message>
@@ -10567,12 +11008,12 @@
     <message>
         <location line="+85"/>
         <location line="+179"/>
-        <location line="+302"/>
+        <location line="+307"/>
         <source>%</source>
         <translation type="unfinished">%</translation>
     </message>
     <message>
-        <location line="-459"/>
+        <location line="-464"/>
         <source>Maximum Quantiser Step:</source>
         <translation type="unfinished">Massima variazione quantizzatore:</translation>
     </message>
@@ -10622,7 +11063,17 @@
         <translation type="unfinished">Quantizzazione adattiva</translation>
     </message>
     <message>
-        <location line="+129"/>
+        <location line="+26"/>
+        <source>Auto Variance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Video Buffer Verifier</source>
         <translation type="unfinished">Verifica buffer video</translation>
     </message>
@@ -10697,7 +11148,7 @@
         <translation type="unfinished">Output</translation>
     </message>
     <message>
-        <location line="-3165"/>
+        <location line="-3170"/>
         <location line="+669"/>
         <source>1</source>
         <translation type="unfinished">1</translation>
@@ -10804,7 +11255,7 @@
         <translation type="unfinished">31</translation>
     </message>
     <message>
-        <location line="+2482"/>
+        <location line="+2487"/>
         <source>Generate Access Unit Delimiters</source>
         <translation type="unfinished">Genera delimitatori di unità di accesso</translation>
     </message>
@@ -11037,7 +11488,7 @@
         <translation type="unfinished">Campioni a gamma completa</translation>
     </message>
     <message>
-        <location line="-3909"/>
+        <location line="-3914"/>
         <source>Basic</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11087,7 +11538,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2735"/>
+        <location line="+2740"/>
         <source>BluRay compatibility</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11173,7 +11624,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished">Personalizzato</translation>
     </message>
@@ -12377,7 +12828,7 @@
 <context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+33"/>
         <source>Low</source>
         <translation type="unfinished">Bassa</translation>
     </message>
@@ -12432,17 +12883,43 @@
         <translation type="unfinished">Threading</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+10"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Aspect Ratio:</source>
         <translation type="unfinished">Proporzioni:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-21"/>
         <source>Motion Estimation</source>
         <translation type="unfinished">Stima movimento</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+35"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Aspect Ratio</source>
         <translation type="unfinished">Proporzioni</translation>
     </message>
@@ -12452,7 +12929,7 @@
         <translation type="unfinished">Controllo bitrate</translation>
     </message>
     <message>
-        <location line="-113"/>
+        <location line="-123"/>
         <location line="+24"/>
         <source>None</source>
         <translation type="unfinished"></translation>
@@ -12503,12 +12980,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>MotionEstimation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+15"/>
         <source>Mi_n. quantizer:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12528,7 +13000,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+5"/>
         <source>_Quantization type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12553,12 +13025,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Advanced Simple Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+25"/>
         <source>Quantization</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12586,19 +13053,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Temporal &amp; spatial check</source>
-        <translation type="obsolete">Verifica temporale e spaziale</translation>
-    </message>
-    <message>
-        <source>Bob, temporal &amp; spatial check</source>
-        <translation type="obsolete">Sdoppia, verifica temporale e spaziale</translation>
-    </message>
-    <message>
-        <source>Bob, skip spatial temporal check</source>
-        <translation type="obsolete">Sdoppia, salta verifica temporale e spaziale</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+70"/>
         <source>Bottom field first</source>
         <translation type="unfinished">Prima il semiquadro inferiore</translation>
     </message>

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_ja.ts -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_ja.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">%s を開く試みは失敗しました!</translation>
     </message>
@@ -51,12 +51,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+47"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -370,27 +370,27 @@
 <context>
     <name>DialogProcessing</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+26"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+33"/>
         <source>00:00:00</source>
         <translation type="unfinished">00:00:00</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+51"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location line="-19"/>
+        <location line="-70"/>
         <source>Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+6"/>
         <source>TimeLeft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+41"/>
         <source>ProcessImages</source>
         <translation type="unfinished"></translation>
     </message>
@@ -400,7 +400,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-14"/>
         <source>0 fps</source>
         <translation type="unfinished"></translation>
     </message>
@@ -436,30 +436,28 @@
 <context>
     <name>FDK-AAC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
-        <source>_Profile::</source>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+9"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+2"/>
         <source>SBR enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+7"/>
-        <source>After burner</source>
+        <location line="+2"/>
+        <source>Afterburner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>FDK-AAC Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -609,12 +607,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>   (0 track(s))</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+145"/>
+        <location line="+155"/>
         <source>&amp;Shift:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -630,12 +623,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+946"/>
+        <location line="+931"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-871"/>
+        <location line="-856"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -753,17 +746,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+210"/>
         <source>Play filtered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-169"/>
         <source>Vol&amp;ume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-1006"/>
+        <source> (0 tracks)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+981"/>
         <source>Selection: 000000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -788,11 +786,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Alt+Return</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location line="+9"/>
         <source>Save &amp;Video...</source>
         <translation type="unfinished"></translation>
@@ -826,16 +819,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>&amp;Calculator...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>F7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location line="+15"/>
         <source>&amp;Input</source>
         <translation type="unfinished"></translation>
@@ -909,7 +892,7 @@
 <context>
     <name>Opus</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -931,11 +914,6 @@
         <source>Evaluate</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+3"/>
-        <source>Ctrl+Return</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>VapourSynthProxy</name>
@@ -989,7 +967,7 @@
     </message>
     <message>
         <location line="+10"/>
-        <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1050,7 +1028,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1205,21 +1183,27 @@
             </translation>
     </message>
     <message>
-        <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="obsolete">.mp4にmp3の代替タグを使う(_U)</translation>
-    </message>
-    <message>
         <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Auto-Append Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>XVideo (best)</source>
         <translation type="unfinished">
             </translation>
@@ -1262,7 +1246,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+213"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
         <translation type="unfinished">
             </translation>
@@ -1358,18 +1342,18 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+277"/>
+        <location line="+283"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+423"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
         <source>Audio</source>
         <translation type="unfinished">音声</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-73"/>
+        <location filename="../../common/gui_savenew.cpp" line="-239"/>
+        <location line="+170"/>
         <location line="+12"/>
         <location line="+16"/>
-        <location line="+8"/>
         <source>Video</source>
         <translation type="unfinished">映像</translation>
     </message>
@@ -1392,16 +1376,12 @@
         <translation type="unfinished">設定</translation>
     </message>
     <message>
-        <source>-</source>
-        <translation type="obsolete">-</translation>
-    </message>
-    <message>
         <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+72"/>
         <source>Copy</source>
         <translation type="unfinished">コピー</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation type="unfinished">フィルタ</translation>
@@ -1565,12 +1545,12 @@
         <translation type="unfinished">コーデックエラー</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+369"/>
+        <location filename="../../common/gui_main.cpp" line="+370"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">このバージョンではコード化されていません</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+214"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
@@ -1706,8 +1686,7 @@
         <translation type="unfinished">追加時に何かが失敗しました</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+321"/>
+        <location line="+320"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">何か悪いことが起きました (II)</translation>
     </message>
@@ -1765,7 +1744,7 @@
         <translation type="unfinished">主音声トラック</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+264"/>
         <source>AvsProxy</source>
         <translation type="unfinished">AvsProxy</translation>
     </message>
@@ -1843,30 +1822,35 @@
         <translation type="unfinished">音声保存中</translation>
     </message>
     <message>
-        <location line="+318"/>
-        <location line="+83"/>
+        <location line="+322"/>
+        <source>Maximum number of 99999 images reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+76"/>
         <source>Done</source>
         <translation type="unfinished">完了</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-76"/>
         <source>Saved %d images.</source>
         <translation type="unfinished">%d 画像を保存.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="-250"/>
+        <location filename="../../common/gui_main.cpp" line="-251"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
         <location line="+4"/>
         <location filename="../../common/gui_save.cpp" line="+2"/>
-        <location line="+99"/>
+        <location line="+92"/>
         <location line="+7"/>
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
@@ -2059,7 +2043,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-290"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-296"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2089,7 +2073,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2172,7 +2156,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-68"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-72"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2294,12 +2278,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <location line="+2"/>
         <source>Save current settings as default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Load saved settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2419,7 +2404,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2439,8 +2424,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
-        <location line="+44"/>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-43"/>
+        <location line="+43"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished"></translation>
@@ -2470,7 +2460,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="-144"/>
-        <location filename="../../common/gui_save.cpp" line="-597"/>
+        <location filename="../../common/gui_save.cpp" line="-602"/>
         <source>No audio track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2518,7 +2508,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1449"/>
+        <location filename="../../common/gui_main.cpp" line="-1447"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2543,13 +2533,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+68"/>
+        <location line="+126"/>
+        <location line="+73"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-48"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2559,7 +2549,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2582,7 +2572,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+795"/>
+        <location line="+789"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -2613,7 +2603,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+297"/>
+        <location line="+298"/>
         <source>Oops</source>
         <translation type="unfinished">しまった</translation>
     </message>
@@ -2633,7 +2623,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>No</source>
         <translation type="unfinished">いいえ</translation>
     </message>
@@ -2643,7 +2633,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Job</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2653,7 +2643,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Output file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2668,7 +2658,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Select PNG to Save</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2704,22 +2694,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Maximum number of 9999 images reached, aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Saving images failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+25"/>
         <source>PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2749,29 +2734,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-207"/>
+        <location filename="../../common/gui_savenew.cpp" line="-210"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+182"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+24"/>
         <source>Cannot create encoder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-8"/>
-        <source>Cannot setup codec. Bitrate too low?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+57"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2783,20 +2762,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-253"/>
-        <location line="+286"/>
+        <location line="-257"/>
+        <location line="+290"/>
         <location line="+26"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-312"/>
-        <location line="+286"/>
+        <location line="-326"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+290"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="-102"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The choice of cut points may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Do you want to continue anyway?</source>
         <translation type="unfinished"></translation>
@@ -3145,7 +3134,7 @@
         <translation type="unfinished">MP4</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>AAC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3195,12 +3184,12 @@
         <translation type="unfinished">メモリエラー</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+495"/>
         <source>Saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+181"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3211,7 +3200,7 @@
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
-        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+374"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+382"/>
         <source>Unknown</source>
         <translation type="unfinished">不明</translation>
     </message>
@@ -3302,20 +3291,20 @@
         <translation type="unfinished">1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
-        <location line="+30"/>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
-        <location line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
         <source>Codec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
         <source>Internal error finding codec 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Internal error opening 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3331,31 +3320,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+812"/>
-        <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
-Dropping a keyframe will result in severely corrupted video.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
-Dropping a frame may result in some video corruption.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Do not warn again and drop frames silently while saving this video?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3593,7 +3558,7 @@
 <context>
     <name>avimuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+75"/>
         <source>Bad Idea</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3670,7 +3635,7 @@
 <context>
     <name>bitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+51"/>
         <source>Constant Bitrate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3787,34 +3752,39 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+23"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+51"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>blackframes</name>
@@ -3835,6 +3805,29 @@
     </message>
 </context>
 <context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -3863,7 +3856,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
+        <source>59.94  (NTSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3877,7 +3870,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+141"/>
+        <location line="+146"/>
         <source>Source Fps:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4208,7 +4201,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4469,20 +4462,25 @@
         <translation type="unfinished">エンコード中...</translation>
     </message>
     <message>
-        <location line="+44"/>
-        <location line="+220"/>
+        <location line="+41"/>
+        <location line="+247"/>
         <location line="+21"/>
         <source>None</source>
         <translation type="unfinished">なし</translation>
     </message>
     <message>
-        <location line="-258"/>
-        <location line="+251"/>
+        <location line="-261"/>
+        <location line="+254"/>
         <source>Unknown</source>
         <translation type="unfinished">不明</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-157"/>
+        <source>Keep dialog open when finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>Audio Codec:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4556,17 +4554,17 @@
         <translation type="unfinished">0 kB/s</translation>
     </message>
     <message>
-        <location line="-385"/>
+        <location line="-396"/>
         <source>Shut down computer when finished</source>
         <translation type="unfinished">終了したらコンピュータをシャットダウンする</translation>
     </message>
     <message>
-        <location line="-11"/>
+        <location line="-58"/>
         <source>Time Remaining:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+78"/>
         <source>Priority:</source>
         <translation type="unfinished">優先度:</translation>
     </message>
@@ -4596,32 +4594,32 @@
         <translation type="unfinished">低い</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+69"/>
         <source>Pause / Abort</source>
         <translation type="unfinished">休止 / 中止</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+13"/>
         <source>Advanced</source>
         <translation type="unfinished">拡張</translation>
     </message>
     <message>
-        <location line="-175"/>
+        <location line="-199"/>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Phase:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+127"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+154"/>
+        <location line="+141"/>
         <source>Video Codec:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4715,7 +4713,7 @@
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished"></translation>
@@ -4726,7 +4724,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+13"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4739,13 +4762,13 @@
 <context>
     <name>fadeToBlack</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
-        <location line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+55"/>
+        <location line="+20"/>
         <source>Fade to black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-19"/>
         <source>Fade to black in/out.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4770,7 +4793,7 @@
         <translation type="unfinished">フェードイン</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>_Fade type:</source>
         <translation type="unfinished">フェードタイプ(_F):</translation>
     </message>
@@ -4788,7 +4811,7 @@
 <context>
     <name>ffVAEncH264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4803,12 +4826,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Profile:</source>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4819,16 +4863,21 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Bitrate (kbps):</source>
+        <source>Quality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4838,7 +4887,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4846,27 +4895,53 @@
 <context>
     <name>ffVAEncHEVC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+343"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4876,7 +4951,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4884,7 +4959,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+223"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+256"/>
         <source>Default</source>
         <translation type="unfinished">デフォルト</translation>
     </message>
@@ -5357,8 +5432,32 @@
 <context>
     <name>ffnvenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+229"/>
+        <source>Controlled by Preset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
         <source>Low Quality</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5410,6 +5509,12 @@
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+        <source>RC Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Preset:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5419,6 +5524,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Bitrate (kbps):</source>
@@ -5432,32 +5543,48 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Frame Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>NVENC H.264 configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
-        <source>nvEnc HEVC  configuration</source>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+28"/>
+        <source>NVENC HEVC configuration</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5469,7 +5596,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+87"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5565,7 +5692,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5638,7 +5765,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5794,7 +5921,7 @@
 <context>
     <name>flvdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6326,7 +6453,7 @@
 <context>
     <name>jobs</name>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Oops</source>
         <translation type="unfinished">しまった</translation>
     </message>
@@ -6336,7 +6463,7 @@
         <translation type="unfinished">ジョブリストを作成中に何か非常に悪いことが起きました</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>There are no jobs stored</source>
         <translation type="unfinished">ジョブがありません</translation>
     </message>
@@ -6824,12 +6951,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+523"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6929,7 +7056,7 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+167"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
         <source>Saving Mkv</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7028,31 +7155,46 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">SVQ3ヘッダ読取に問題</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+67"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <location line="+17"/>
         <source>Unsupported</source>
         <translation type="unfinished">未サポート</translation>
     </message>
     <message>
-        <location line="-9"/>
-        <source>Only MP4Video, H264, and H265 supported for video</source>
+        <location line="-17"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+182"/>
         <source>Saving mp4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7062,7 +7204,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7097,7 +7239,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Do not rotate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7123,6 +7265,51 @@
     </message>
     <message>
         <location line="+3"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>MP4 Muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7294,7 +7481,7 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+242"/>
+        <location filename="../../common/gui_navigate.cpp" line="+232"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7524,21 +7711,17 @@
 <context>
     <name>psdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">エラー</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
         <translation type="unfinished">インデックス作成中</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -7608,7 +7791,7 @@
         <translation type="unfinished">この操作を実行するにはRoot特権が要求される</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+126"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7623,7 +7806,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+185"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7661,7 +7844,7 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+212"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+206"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7741,21 +7924,29 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+626"/>
+        <location line="+681"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+262"/>
+        <location line="+230"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+334"/>
-        <source> (%d track(s))</source>
+        <location line="+70"/>
+        <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>qgui2menu</name>
@@ -7991,8 +8182,16 @@
         <source>Yes</source>
         <translation type="unfinished">はい</translation>
     </message>
+    <message numerus="yes">
+        <location line="+72"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
     <message>
-        <location line="+98"/>
+        <location line="+34"/>
         <source>Mono</source>
         <translation type="unfinished">モノ</translation>
     </message>
@@ -8028,12 +8227,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+27"/>
+        <location line="+33"/>
         <source>Total Duration:	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-31"/>
         <source>Extra Video Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8048,12 +8247,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Codec:		</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8078,18 +8277,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-155"/>
+        <location line="-170"/>
         <source>%2.3f fps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+81"/>
+        <location line="+90"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-87"/>
+        <location line="-96"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8097,7 +8296,7 @@
 <context>
     <name>qshell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+53"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
         <translation type="unfinished"></translation>
@@ -8109,6 +8308,19 @@
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>qtalert</name>
@@ -8170,6 +8382,16 @@
         <source>Video Only Muxer Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>removeplane</name>
@@ -8222,7 +8444,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
         <source>_Mode:</source>
         <translation type="unfinished">モード(_M):</translation>
     </message>
@@ -8232,7 +8454,7 @@
         <translation type="unfinished">新規フレームレート(_N):</translation>
     </message>
     <message>
-        <location line="-319"/>
+        <location line="-323"/>
         <source>Custom</source>
         <translation type="unfinished">カスタム</translation>
     </message>
@@ -8258,7 +8480,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
+        <source>59.94  (NTSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8272,7 +8494,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+284"/>
+        <location line="+288"/>
         <source>Resample fps</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8280,7 +8502,7 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished">幅や高さは 奇数にはできません</translation>
     </message>
@@ -8385,17 +8607,31 @@
         <translation type="unfinished">16:9</translation>
     </message>
     <message>
+        <location line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+338"/>
+        <source>Lanzcos3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+251"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+172"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-166"/>
         <source>1%</source>
         <translation type="unfinished">1%</translation>
     </message>
@@ -8642,17 +8878,7 @@
     </message>
     <message>
         <location line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+18"/>
-        <source>Lanzcos3</source>
+        <source>Lanczos-3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -9011,26 +9237,32 @@
 <context>
     <name>tsdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">エラー</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+183"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+325"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+84"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+207"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+19"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
         <translation type="unfinished">インデックス作成中</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -9122,19 +9354,137 @@
     </message>
 </context>
 <context>
+    <name>vaapiDeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Adaptive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Compensated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vaapiResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
-        <source>vaapi: Resize</source>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>vaapi: Resize image using vaapi.</source>
+        <source>Resize image using VA-API.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+129"/>
         <source>Width :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9145,7 +9495,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>mpeg-&gt;PC:</source>
+        <source>mpeg-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9167,7 +9517,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+197"/>
         <source>Keep Top Field</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9183,31 +9533,31 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>_Ivtc:</source>
+        <source>_IVTC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Resize:</source>
+        <source>_Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>_Deint Mode:</source>
+        <location line="+2"/>
+        <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Width :</source>
+        <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Height :</source>
+        <location line="-2"/>
+        <source>_Deint Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>vdpau</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9225,13 +9575,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
-        <source>Width :</source>
+        <location line="+131"/>
+        <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9315,6 +9665,84 @@
     </message>
 </context>
 <context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vsWindow</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
@@ -9330,7 +9758,7 @@
 <context>
     <name>webmmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+68"/>
         <source>Unsupported Video.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
         <translation type="unfinished"></translation>
@@ -9342,7 +9770,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+89"/>
         <source>Saving Webm</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9365,22 +9793,22 @@
 <context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
         <source>Processing</source>
         <translation type="unfinished">処理中</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+33"/>
         <source>00:00:00</source>
         <translation type="unfinished">00:00:00</translation>
     </message>
     <message>
-        <location line="-13"/>
+        <location line="-27"/>
         <source>Elapsed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+14"/>
         <source>Time Remaining:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9388,7 +9816,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9404,7 +9832,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished">カスタム</translation>
     </message>
@@ -9525,7 +9953,7 @@
         <translation type="unfinished">レート制御</translation>
     </message>
     <message>
-        <location line="+2882"/>
+        <location line="+2887"/>
         <source>Disable</source>
         <translation type="unfinished">
             </translation>
@@ -9537,18 +9965,18 @@
             </translation>
     </message>
     <message>
-        <location line="-2298"/>
+        <location line="-2303"/>
         <source>Motion Estimation</source>
         <translation type="unfinished">動き予測</translation>
     </message>
     <message>
         <location line="+392"/>
-        <location line="+2596"/>
+        <location line="+2601"/>
         <source>None</source>
         <translation type="unfinished">なし</translation>
     </message>
     <message>
-        <location line="-2591"/>
+        <location line="-2596"/>
         <source>Spatial</source>
         <translation type="unfinished">空間的</translation>
     </message>
@@ -9574,12 +10002,12 @@
         <translation type="unfinished">高速</translation>
     </message>
     <message>
-        <location line="+1598"/>
+        <location line="+1603"/>
         <source>Output</source>
         <translation type="unfinished">出力</translation>
     </message>
     <message>
-        <location line="-3165"/>
+        <location line="-3170"/>
         <location line="+669"/>
         <source>1</source>
         <translation type="unfinished">1</translation>
@@ -9686,7 +10114,17 @@
         <translation type="unfinished">普通</translation>
     </message>
     <message>
-        <location line="+590"/>
+        <location line="+5"/>
+        <source>Auto Variance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+585"/>
         <source>Pixel Aspect Ratio</source>
         <translation type="unfinished">ピクセルアスペクト比</translation>
     </message>
@@ -9706,7 +10144,7 @@
         <translation type="unfinished">CBR</translation>
     </message>
     <message>
-        <location line="-3949"/>
+        <location line="-3954"/>
         <source>x264 Configuraton</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9722,12 +10160,12 @@
     </message>
     <message>
         <location line="+7"/>
-        <location line="+3152"/>
+        <location line="+3157"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3110"/>
+        <location line="-3115"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9867,12 +10305,12 @@
     </message>
     <message>
         <location line="+14"/>
-        <location line="+2490"/>
+        <location line="+2495"/>
         <source>frames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2466"/>
+        <location line="-2471"/>
         <source>Sequence Parameter Set Identifer:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10040,12 +10478,12 @@
     </message>
     <message>
         <location line="+12"/>
-        <location line="+1328"/>
+        <location line="+1333"/>
         <source>Strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1289"/>
+        <location line="-1294"/>
         <source>Threshold:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10247,12 +10685,12 @@
     </message>
     <message>
         <location line="+10"/>
-        <location line="+856"/>
+        <location line="+861"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-809"/>
+        <location line="-814"/>
         <source>Quantiser Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10269,12 +10707,12 @@
     <message>
         <location line="+85"/>
         <location line="+179"/>
-        <location line="+302"/>
+        <location line="+307"/>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-459"/>
+        <location line="-464"/>
         <source>Maximum Quantiser Step:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10329,12 +10767,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Auto Variance AQ</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+91"/>
+        <location line="+114"/>
         <source>Advanced 1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10739,7 +11172,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished">カスタム</translation>
     </message>
@@ -11945,7 +12378,7 @@
 <context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+37"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+32"/>
         <location line="+24"/>
         <source>None</source>
         <translation type="unfinished">なし</translation>
@@ -12008,22 +12441,38 @@
             </translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="-2"/>
         <source>Motion Estimation</source>
         <translation type="unfinished">動き予測</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+35"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+25"/>
         <source>Rate Control</source>
         <translation type="unfinished">レート制御</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-52"/>
         <source>Aspect Ratio:</source>
         <translation type="unfinished">アスペクト比:</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-46"/>
         <source>DCT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12068,12 +12517,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>MotionEstimation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+15"/>
         <source>Mi_n. quantizer:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12094,6 +12538,16 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>_Quantization type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12118,12 +12572,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Advanced Simple Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+25"/>
         <source>Quantization</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12156,23 +12605,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Temporal &amp; spatial check</source>
-        <translation type="obsolete">時間と空間チェック</translation>
-    </message>
-    <message>
-        <source>Bob, temporal &amp; spatial check</source>
-        <translation type="obsolete">Bob, 時間と空間チェック</translation>
-    </message>
-    <message>
-        <source>Skip spatial temporal check</source>
-        <translation type="obsolete">空間-時間チェックをスキップ</translation>
-    </message>
-    <message>
-        <source>Bob, skip spatial temporal check</source>
-        <translation type="obsolete">Bob, 空間-時間チェックをスキップ</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+70"/>
         <source>Bottom field first</source>
         <translation type="unfinished">ボトムフィールドが先</translation>
     </message>

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_ko.ts -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_ko.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+194"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+425"/>
         <source>Cannot find a demuxer for %s</source>
         <translation>%s용 디먹서를 찾을 수 없습니다</translation>
     </message>
@@ -53,12 +53,12 @@
 2) 작업한 것들을 함께 연결시키면 됩니다 </translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
         <source>Checking if timestamps are valid..</source>
         <translation>타임스탬프가 유효한지 검사 중..</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+47"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -383,32 +383,32 @@
         <translation>대화</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+6"/>
         <source>TimeLeft</source>
         <translation>남은시간</translation>
     </message>
     <message>
-        <location line="-21"/>
+        <location line="+13"/>
         <source>00:00:00</source>
         <translation>00:00:00</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+28"/>
         <source>ProcessImages</source>
         <translation>이미지처리</translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+23"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="-30"/>
         <source>Speed</source>
         <translation>속도</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-14"/>
         <source>0 fps</source>
         <translation>0 fps</translation>
     </message>
@@ -444,30 +444,28 @@
 <context>
     <name>FDK-AAC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
-        <source>_Profile::</source>
-        <translation>_프로파일::</translation>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+9"/>
         <source>_Bitrate:</source>
         <translation>_비트레이트:</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+2"/>
         <source>SBR enabled</source>
         <translation>SBR 활성화됨</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+7"/>
-        <source>After burner</source>
-        <translation>애프터 버너</translation>
+        <location line="+2"/>
+        <source>Afterburner</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>FDK-AAC Configuration</source>
         <translation>FDK-AAC 설정</translation>
     </message>
@@ -586,12 +584,7 @@
         <translation>&lt;b&gt;오디오 출력&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>   (0 track(s))</source>
-        <translation>   (0 트랙)</translation>
-    </message>
-    <message>
-        <location line="+145"/>
+        <location line="+155"/>
         <source>&amp;Shift:</source>
         <translation>이동(&amp;S):</translation>
     </message>
@@ -607,12 +600,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+946"/>
+        <location line="+931"/>
         <source>&amp;Navigation</source>
         <translation>탐색(&amp;N)</translation>
     </message>
     <message>
-        <location line="-871"/>
+        <location line="-856"/>
         <source>Play [SPACE]</source>
         <translation>재생 [SPACE]</translation>
     </message>
@@ -761,17 +754,22 @@
         <translation>표시 B로 가기 [PAGE DOWN]</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+210"/>
         <source>Play filtered</source>
         <translation>처리 후 재생</translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-169"/>
         <source>Vol&amp;ume</source>
         <translation>볼륨(&amp;M)</translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-1006"/>
+        <source> (0 tracks)</source>
+        <translation> (0 트랙)</translation>
+    </message>
+    <message>
+        <location line="+981"/>
         <source>Selection: 000000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -796,9 +794,8 @@
         <translation>정보(&amp;I)...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Alt+Return</source>
-        <translation>Alt+Return</translation>
+        <translation type="vanished">Alt+Return</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -834,14 +831,12 @@
         <translation>프로젝트 저장하기</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>&amp;Calculator...</source>
-        <translation>계산기(&amp;C)...</translation>
+        <translation type="vanished">계산기(&amp;C)...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>F7</source>
-        <translation>F7</translation>
+        <translation type="vanished">F7</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -917,7 +912,7 @@
 <context>
     <name>Opus</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -940,9 +935,8 @@
         <translation>평가</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Ctrl+Return</source>
-        <translation>Ctrl+Return</translation>
+        <translation type="vanished">Ctrl+Return</translation>
     </message>
 </context>
 <context>
@@ -992,7 +986,7 @@
     </message>
     <message>
         <location line="+10"/>
-        <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1160,12 +1154,13 @@
         <translation>표시 초기화</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
+        <location line="+2"/>
         <source>Save current settings as default</source>
         <translation>현재 설정을 기본값으로 저장</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Load saved settings</source>
         <translation>저장된 설정 불러오기</translation>
     </message>
@@ -1241,7 +1236,7 @@
         <translation>시간으로 이동</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation>배율 1:4</translation>
     </message>
@@ -1261,6 +1256,11 @@
         <translation>배율 2:1</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+34"/>
         <source>R_esampling (Hz):</source>
         <translation>리샘플링 (Hz):</translation>
@@ -1304,7 +1304,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+381"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+389"/>
         <source>Stereo</source>
         <translation>스테레오</translation>
     </message>
@@ -1511,10 +1511,10 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+277"/>
+        <location line="+283"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+423"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
         <source>Audio</source>
         <translation>오디오</translation>
     </message>
@@ -1616,7 +1616,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-177"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>DXVA2로 비디오 디코드 (윈도우)</translation>
     </message>
@@ -1626,10 +1626,6 @@
         <translation>VDPAU로 비디오 디코드 (엔비디아)</translation>
     </message>
     <message>
-        <source>Decode video using XVBA (AMD)</source>
-        <translation type="vanished">XVBA로 비디오 디코드 (AMD)</translation>
-    </message>
-    <message>
         <location line="+1"/>
         <source>Decode video using LIBVA (INTEL)</source>
         <translation>LIBVA로 비디오 디코드 (인텔)</translation>
@@ -1792,21 +1788,27 @@
         <translation>우선 순위</translation>
     </message>
     <message>
-        <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="vanished">.mp4에서 MP3용 대체 태그 사용하기</translation>
-    </message>
-    <message>
         <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation>최근 읽은 파일의 폴더를 저장용 폴더로 사용하기</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Auto-Append Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1878,7 +1880,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+213"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
         <translation>PCM</translation>
     </message>
@@ -2001,7 +2003,7 @@
         <translation>환경 설정</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-107"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-114"/>
         <source>Save as BMP</source>
         <translation>BMP로 저장</translation>
     </message>
@@ -2011,10 +2013,6 @@
         <translation>JPEG로 저장</translation>
     </message>
     <message>
-        <source>-</source>
-        <translation type="vanished">-</translation>
-    </message>
-    <message>
         <location line="+6"/>
         <source>Connect to avsproxy</source>
         <translation>avsproxy에 연결</translation>
@@ -2030,7 +2028,7 @@
         <translation>환경 설정</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+34"/>
         <source>&amp;Advanced</source>
         <translation>고급(&amp;A)</translation>
     </message>
@@ -2080,8 +2078,8 @@
         <translation>다음 검정 프레임</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
@@ -2091,8 +2089,8 @@
         <location line="+24"/>
         <location line="+8"/>
         <location line="+4"/>
-        <location filename="../../common/gui_save.cpp" line="+199"/>
-        <location line="+99"/>
+        <location filename="../../common/gui_save.cpp" line="+205"/>
+        <location line="+92"/>
         <location line="+7"/>
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
@@ -2100,8 +2098,8 @@
         <translation>오류</translation>
     </message>
     <message>
-        <location line="-44"/>
-        <location line="+44"/>
+        <location line="-43"/>
+        <location line="+43"/>
         <source>You cannot remove *all* the video
 </source>
         <translation>*모든* 비디오를 삭제할 수는 없습니다</translation>
@@ -2134,7 +2132,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
-        <location filename="../../common/gui_save.cpp" line="-638"/>
+        <location filename="../../common/gui_save.cpp" line="-643"/>
         <source>No audio track</source>
         <translation>오디오 트랙 없음</translation>
     </message>
@@ -2193,7 +2191,7 @@
         <translation>FAAC 코덱이 없습니다! PSP 호환 비디오를 만들 때 필요합니다.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1449"/>
+        <location filename="../../common/gui_main.cpp" line="-1447"/>
         <source>Select script/project to run</source>
         <translation>실행할 스크립트/프로젝트 선택</translation>
     </message>
@@ -2218,18 +2216,18 @@
         <translation>최근 파일과 프로젝트의 목록을 지우려고 합니다. 이 작업은 복구할 수 없습니다. 진행할까요?</translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+115"/>
         <source>Not coded in this version</source>
         <translation>이 버전에 코딩되어 있지 않습니다</translation>
     </message>
     <message>
         <location line="+11"/>
-        <location line="+68"/>
+        <location line="+73"/>
         <source>Select Video File...</source>
         <translation>비디오 파일 선택...</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-48"/>
         <source>No engine</source>
         <translation>엔진 없음</translation>
     </message>
@@ -2239,7 +2237,7 @@
         <translation>이 빌드에서 TinyPy 스크립트는 사용할 수 없습니다</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Select Video File to Append...</source>
         <translation>덧붙일 비디오 파일 선택...</translation>
     </message>
@@ -2398,8 +2396,7 @@
         <translation>덧붙이는 중 뭔가 잘못됐습니다</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+321"/>
+        <location line="+320"/>
         <source>Something bad happened (II)</source>
         <translation>잘못된 일이 발생했습니다 (II)</translation>
     </message>
@@ -2488,7 +2485,7 @@
         <translation>주어진 트릭 인덱스의 언어를 설정할 수 없습니다: 무효한 트랙 인덱스!</translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+144"/>
         <source>AvsProxy</source>
         <translation>AvsProxy</translation>
     </message>
@@ -2539,7 +2536,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>No</source>
         <translation>아니오</translation>
     </message>
@@ -2549,7 +2546,7 @@
         <translation>불러온 파일이 없습니다</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Job</source>
         <translation>작업</translation>
     </message>
@@ -2559,7 +2556,7 @@
         <translation>데이터베이스에 접근할 수 없습니다. 실행 중인 작업이 있는지 확인하세요.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Output file</source>
         <translation>출력 파일</translation>
     </message>
@@ -2574,7 +2571,7 @@
         <translation>작업목록 대기열에 작업 넣기</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Select Workbench to Save</source>
         <translation>저장할 작업벤치 선택</translation>
     </message>
@@ -2646,22 +2643,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Maximum number of 9999 images reached, aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Saving images failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+25"/>
         <source>PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2686,18 +2678,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
-        <location line="+83"/>
+        <location line="-114"/>
+        <location line="+76"/>
         <source>Done</source>
         <translation>완료</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-78"/>
+        <source>Maximum number of 99999 images reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Saved %d images.</source>
         <translation>%d개의 이미지를 저장했습니다.</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+56"/>
         <source>BMP op failed</source>
         <translation></translation>
     </message>
@@ -2722,46 +2719,40 @@
         <translation>%s 파일을 제대로 저장하지 못했습니다.</translation>
     </message>
     <message>
-        <source>Cannot get tinyPÿ script engine</source>
-        <translation type="vanished">TinyPÿ 스크립트 엔진을 가져올 수 없습니다</translation>
-    </message>
-    <message>
         <location line="+41"/>
         <source>Cannot add job %s</source>
         <translation>%s 작업을 추가할 수 없습니다</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-244"/>
+        <location filename="../../common/gui_savenew.cpp" line="-251"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation>이전의 첫 패스 데이터를 재사용할까요? 경고, 설정을 닫어야 합니다.</translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+12"/>
+        <location line="+170"/>
         <location line="+12"/>
         <location line="+16"/>
-        <location line="+8"/>
         <source>Video</source>
         <translation>비디오</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-28"/>
         <source>Cannot instantiate video chain</source>
         <translation>비디오 체인을 인스턴스화할수 없습니다</translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+24"/>
         <source>Cannot create encoder</source>
         <translation>인코더를 만들 수 없습니다</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>Cannot setup codec. Bitrate too low?</source>
-        <translation>코덱을 설정할 수 없습니다. 비트레이트가 너무 낮은지 확인하세요.</translation>
+        <translation type="vanished">코덱을 설정할 수 없습니다. 비트레이트가 너무 낮은지 확인하세요.</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+57"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
         <translation>오디오 인코더를 설정할 수 없습니다, 스트림이 오디오 인코더와 호환되는지 확인하세요 (채널수, 비트레이트, 형식)</translation>
     </message>
@@ -2775,20 +2766,30 @@
 어쨌든 계속할까요?</translation>
     </message>
     <message>
-        <location line="-253"/>
-        <location line="+286"/>
+        <location line="-257"/>
+        <location line="+290"/>
         <location line="+26"/>
         <source>Muxer</source>
         <translation>먹서</translation>
     </message>
     <message>
-        <location line="-312"/>
-        <location line="+286"/>
+        <location line="-326"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+290"/>
         <source>Cannot instantiate muxer</source>
         <translation>먹서를 인스턴스화할 수 없습니다</translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="-102"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The choice of cut points may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Do you want to continue anyway?</source>
         <translation type="unfinished"></translation>
@@ -3146,7 +3147,7 @@
         <translation>MP4</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>AAC</source>
         <translation>AAC</translation>
     </message>
@@ -3196,12 +3197,12 @@
         <translation>메모리 오류</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+495"/>
         <source>Saving</source>
         <translation>저장 중</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+181"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3212,7 +3213,7 @@
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
-        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+374"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+382"/>
         <source>Unknown</source>
         <translation>알 수 없음</translation>
     </message>
@@ -3303,20 +3304,20 @@
         <translation>1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
-        <location line="+30"/>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
-        <location line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
         <source>Codec</source>
         <translation>코덱</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
         <source>Internal error finding codec 0x%x</source>
         <translation>코덱 0x%x 찾는 중 내부 오류 발생</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Internal error opening 0x%x</source>
         <translation>0x%x를 여는 중 내부 오류 발생</translation>
     </message>
@@ -3333,31 +3334,7 @@
         <translation>쉐이더를 컴파일할 수 없습니다</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+812"/>
-        <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
-Dropping a keyframe will result in severely corrupted video.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
-Dropping a frame may result in some video corruption.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Do not warn again and drop frames silently while saving this video?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3596,7 +3573,7 @@
 <context>
     <name>avimuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+75"/>
         <source>Bad Idea</source>
         <translation>잘못된 생각</translation>
     </message>
@@ -3674,7 +3651,7 @@
 <context>
     <name>bitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+51"/>
         <source>Constant Bitrate</source>
         <translation>고정 비트레이트</translation>
     </message>
@@ -3791,34 +3768,39 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
         <source>Right:</source>
         <translation>오른쪽:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+23"/>
         <source>Top:</source>
         <translation>위쪽:</translation>
     </message>
     <message>
         <location line="+43"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
         <source>Reset</source>
         <translation>초기화</translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
         <source>Bottom:</source>
         <translation>아래쪽:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+51"/>
         <source>Left:</source>
         <translation>왼쪽:</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>blackframes</name>
@@ -3839,6 +3821,29 @@
     </message>
 </context>
 <context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -3867,8 +3872,8 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
-        <translation>59.93  (NTSC)</translation>
+        <source>59.94  (NTSC)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+32"/>
@@ -3881,7 +3886,7 @@
         <translation>마치 FPS를 변경하듯이 비디오 속도를 빠르게/느리게 합니다. 이 필터는 재생시간을 변경합니다.</translation>
     </message>
     <message>
-        <location line="+141"/>
+        <location line="+146"/>
         <source>Source Fps:</source>
         <translation>원본 FPS:</translation>
     </message>
@@ -4210,7 +4215,7 @@
         <translation>경고: 높이를 너무 많이 잘라냈습니다! 높이 초기화!</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4476,30 +4481,30 @@
         <translation>메인</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+251"/>
+        <location line="+32"/>
+        <location line="+254"/>
         <source>Unknown</source>
         <translation>알 수 없음</translation>
     </message>
     <message>
-        <location line="-234"/>
-        <location line="+220"/>
+        <location line="-261"/>
+        <location line="+247"/>
         <location line="+21"/>
         <source>None</source>
         <translation>없음</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-254"/>
         <source>Phase:</source>
         <translation>페이즈:</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-31"/>
         <source>Time Remaining:</source>
         <translation>남은 시간:</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+58"/>
         <source>Shut down computer when finished</source>
         <translation>종료시 컴퓨터 끄기</translation>
     </message>
@@ -4534,7 +4539,12 @@
         <translation>낮음</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+12"/>
+        <source>Keep dialog open when finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
         <source>Minimize to Tray</source>
         <translation>트레이로 최소화하기</translation>
     </message>
@@ -4544,7 +4554,7 @@
         <translation>일시 정지 / 취소</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+13"/>
         <source>Advanced</source>
         <translation>고급</translation>
     </message>
@@ -4716,7 +4726,7 @@
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation>페이드</translation>
@@ -4727,7 +4737,32 @@
         <translation>점점 사라지게 합니다.</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+13"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Start time:</source>
         <translation>시작 시간:</translation>
     </message>
@@ -4740,13 +4775,13 @@
 <context>
     <name>fadeToBlack</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
-        <location line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+55"/>
+        <location line="+20"/>
         <source>Fade to black</source>
         <translation>검정색으로 페이드</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-19"/>
         <source>Fade to black in/out.</source>
         <translation>검정색으로 점점 사라지게/나타나게 합니다.</translation>
     </message>
@@ -4771,7 +4806,7 @@
         <translation>점점 나타남</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>_Fade type:</source>
         <translation>페이드 형식:</translation>
     </message>
@@ -4789,7 +4824,7 @@
 <context>
     <name>ffVAEncH264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4804,12 +4839,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Profile:</source>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4820,16 +4876,21 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Bitrate (kbps):</source>
+        <source>Quality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4839,7 +4900,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4847,27 +4908,53 @@
 <context>
     <name>ffVAEncHEVC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+343"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4877,7 +4964,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4885,7 +4972,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+217"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+250"/>
         <source>Normal (4:3)</source>
         <translation>보통 (4:3)</translation>
     </message>
@@ -5354,8 +5441,32 @@
 <context>
     <name>ffnvenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+229"/>
+        <source>Controlled by Preset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
         <source>Low Quality</source>
         <translation>낮은 품질</translation>
     </message>
@@ -5407,6 +5518,12 @@
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+        <source>RC Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Preset:</source>
         <translation>프리셋:</translation>
     </message>
@@ -5416,6 +5533,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Bitrate (kbps):</source>
@@ -5429,33 +5552,49 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Frame Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>NVENC H.264 configuration</source>
         <translation>NVENC H.264 설정</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
-        <source>nvEnc HEVC  configuration</source>
-        <translation>NVENC HEVC 설정</translation>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+28"/>
+        <source>NVENC HEVC configuration</source>
+        <translation type="unfinished">NVENC HEVC 설정</translation>
     </message>
 </context>
 <context>
@@ -5466,7 +5605,7 @@
         <translation>[불일치]</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+87"/>
         <source>Saving mpeg PS (ff)</source>
         <translation>Mpeg PS 저장 중 (ff)</translation>
     </message>
@@ -5562,7 +5701,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
         <source>Saving mpeg TS (ff)</source>
         <translation>Mpeg TS 저장 중 (ff)</translation>
     </message>
@@ -5635,7 +5774,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5793,7 +5932,7 @@
 <context>
     <name>flvdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>Warning</source>
         <translation>경고</translation>
     </message>
@@ -6365,7 +6504,7 @@
         <translation>끝내기</translation>
     </message>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Oops</source>
         <translation>웁스</translation>
     </message>
@@ -6375,7 +6514,7 @@
         <translation>작업 목록을 만드는 중 매우 잘못된 일이 발생했습니다.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>There are no jobs stored</source>
         <translation>저장된 작업이 없습니다</translation>
     </message>
@@ -6823,12 +6962,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
         <source>Matroska Images</source>
         <translation>Matroska 이미지</translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+523"/>
         <source>Matroska clusters</source>
         <translation>Matroska 클러스터</translation>
     </message>
@@ -6928,7 +7067,7 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+167"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
         <source>Saving Mkv</source>
         <translation>Mkv 저장 중</translation>
     </message>
@@ -7027,31 +7166,46 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
         <source>Problem reading SVQ3 headers</source>
         <translation>SVQ3 헤더를 읽는 중 문제 발생</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+67"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <location line="+17"/>
         <source>Unsupported</source>
         <translation>미지원</translation>
     </message>
     <message>
-        <location line="-9"/>
-        <source>Only MP4Video, H264, and H265 supported for video</source>
-        <translation>비디오용으로 MP4 비디오, H264와 H265만 지원합니다</translation>
+        <location line="-17"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
-        <translation>오디오용으로 AAC, AC3, E-AC3와 MPEG 오디오만 지원합니다</translation>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+182"/>
         <source>Saving mp4</source>
         <translation>MP4 저장 중</translation>
     </message>
@@ -7061,15 +7215,11 @@
         <translation>PSP 저장 중</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
         <source>Muxing Format</source>
         <translation>먹싱 형식</translation>
     </message>
     <message>
-        <source>Use alternate MP3 tag</source>
-        <translation type="vanished">대체 MP3 태그 사용</translation>
-    </message>
-    <message>
         <location line="+2"/>
         <source>No optimization</source>
         <translation type="unfinished"></translation>
@@ -7100,7 +7250,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Do not rotate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7126,6 +7276,51 @@
     </message>
     <message>
         <location line="+3"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>MP4 Muxer</source>
         <translation>MP4 먹서</translation>
     </message>
@@ -7297,7 +7492,7 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+242"/>
+        <location filename="../../common/gui_navigate.cpp" line="+232"/>
         <source>Cannot go to next keyframe</source>
         <translation>다음 키프레임으로 이동할 수 없습니다</translation>
     </message>
@@ -7527,27 +7722,17 @@
 <context>
     <name>psdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="vanished">오류</translation>
-    </message>
-    <message>
-        <source>This file&apos;s index has been created with an older version of avidemux.
-Please delete the idx2 file and reopen.</source>
-        <translation type="vanished">이 파일의 인덱스는 이전 버전의 avidemux로 만들었습니다.
-idx2 파일을 삭제하고 파일을 다시 여세요.</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
         <translation>인덱싱</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>연속적인 파일 이름을 가진 파일이 여럿 있습니다. 전부 불러올까요?</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -7617,7 +7802,7 @@
         <translation>이 동작을 수행하려면 루트 권한이 필요합니다.</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+126"/>
         <source>First Pass</source>
         <translation>첫 패스</translation>
     </message>
@@ -7632,7 +7817,7 @@
         <translation>인코딩...</translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+185"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>인코딩을 일시 중지했습니다. 재시작하거나 취소할까요?</translation>
     </message>
@@ -7670,7 +7855,7 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+212"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+206"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;새 버전이 나왔습니다!&lt;/b&gt;&lt;br&gt; 버전 %1&lt;br&gt;%2에 배포.&lt;br&gt;여기에서 다운로드할 수 있습니다&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; 자동 업데이트는 환경 설정에서 끌 수 있습니다.&lt;/small&gt;</translation>
     </message>
@@ -7750,21 +7935,29 @@
         <translation>1분 앞으로</translation>
     </message>
     <message>
-        <location line="+626"/>
+        <location line="+681"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>프로그램에서 치명적인 문제가 발생했습니다
 현재 편집 중인 것을 저장하고 다음 시작시에 다시 불러올 것입니다</translation>
     </message>
     <message>
-        <location line="+262"/>
+        <location line="+230"/>
         <source>%c-%s (%02d)</source>
         <translation>%c-%s (%02d)</translation>
     </message>
     <message>
-        <location line="+334"/>
-        <source> (%d track(s))</source>
-        <translation> (%d 트랙)</translation>
+        <location line="+70"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation>
+            <numerusform> (%n 트랙)</numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -8001,18 +8194,26 @@
         <translation>예</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+33"/>
         <source>%2.3f fps</source>
         <translation>%2.3f fps</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+81"/>
+        <location line="+90"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation>%02d:%02d:%02d.%03d</translation>
     </message>
+    <message numerus="yes">
+        <location line="-55"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
     <message>
-        <location line="+30"/>
+        <location line="+83"/>
         <source>Video</source>
         <translation>비디오</translation>
     </message>
@@ -8038,12 +8239,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+27"/>
+        <location line="+33"/>
         <source>Total Duration:	</source>
         <translation>전체 재생시간:	</translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-31"/>
         <source>Extra Video Properties</source>
         <translation>추가 비디오 속성</translation>
     </message>
@@ -8058,12 +8259,12 @@
         <translation>추가 날짜:	</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Audio</source>
         <translation>오디오</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Codec:		</source>
         <translation>코덱:		</translation>
     </message>
@@ -8088,12 +8289,12 @@
         <translation>오디오 없음</translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-172"/>
         <source>%s (%u:%u)</source>
         <translation>%s (%u:%u)</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+77"/>
         <source>Mono</source>
         <translation>모노</translation>
     </message>
@@ -8106,7 +8307,7 @@
 <context>
     <name>qshell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+53"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
         <translation>명령어를 입력하고 &quot;평가&quot; 버튼이나 Ctrl+Enter를 누르세요.</translation>
@@ -8118,6 +8319,19 @@
 </source>
         <translation>이전 명령어를 호출하려면 Ctrl+Page Up과 Ctrl+Page Down 키를 사용할 수 있습니다.</translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>qtalert</name>
@@ -8179,6 +8393,16 @@
         <source>Video Only Muxer Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>removeplane</name>
@@ -8257,8 +8481,8 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
-        <translation>59.93 (NTSC)</translation>
+        <source>59.94  (NTSC)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+35"/>
@@ -8271,7 +8495,7 @@
         <translation>FPS를 강제로 변경합니다. 재생시간과 싱크를 유지합니다.</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+281"/>
         <source>_Mode:</source>
         <translation>모드:</translation>
     </message>
@@ -8289,7 +8513,7 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
         <source>Width and height cannot be odd</source>
         <translation>너비와 높이는 홀수가 될 수 없습니다</translation>
     </message>
@@ -8452,6 +8676,20 @@
         <translation>대상:</translation>
     </message>
     <message>
+        <location line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+356"/>
+        <source>Lanzcos3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
         <source>Source PAR:</source>
         <translation type="unfinished"></translation>
@@ -8469,16 +8707,16 @@
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+44"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-312"/>
         <source>Resize Dimensions</source>
         <translation>해상도 크기조절</translation>
     </message>
@@ -8649,18 +8887,8 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+5"/>
-        <source>Lanzcos3</source>
-        <translation>Lanzcos3</translation>
+        <source>Lanczos-3</source>
+        <translation>Lanczos-3</translation>
     </message>
 </context>
 <context>
@@ -9018,32 +9246,32 @@
 <context>
     <name>tsdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="vanished">오류</translation>
-    </message>
-    <message>
-        <source>This file&apos;s index has been created with an older version of avidemux.
-Please delete the idx2 file and reopen.</source>
-        <translation type="vanished">이 파일의 인덱스는 이전 버전의 avidemux로 만들었습니다.
-idx2 파일을 삭제하고 파일을 다시 여세요.</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+183"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+325"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+84"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+207"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>연속적인 파일 이름을 가진 파일이 여럿 있습니다. 전부 불러올까요?</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+19"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
         <translation>인덱싱</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -9135,19 +9363,137 @@
     </message>
 </context>
 <context>
+    <name>vaapiDeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Adaptive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Compensated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vaapiResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
-        <source>vaapi: Resize</source>
-        <translation>vaapi: 크기조절</translation>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
+        <translation type="unfinished">VA-API 크기조절</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>vaapi: Resize image using vaapi.</source>
-        <translation>vaapi를 이용하여 이미지의 크기를 조절합니다.</translation>
+        <source>Resize image using VA-API.</source>
+        <translation type="unfinished">VA-API를 이용하여 이미지의 크기를 조절합니다.</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+129"/>
         <source>Width :</source>
         <translation>너비:</translation>
     </message>
@@ -9158,8 +9504,8 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>mpeg-&gt;PC:</source>
-        <translation>mpeg-&gt;PC:</translation>
+        <source>mpeg-&gt;PC</source>
+        <translation type="unfinished">mpeg-&gt;PC</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -9180,7 +9526,7 @@
         <translation>VDPAU 디인터레이서 (+크기조절).</translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+197"/>
         <source>Keep Top Field</source>
         <translation>상단 필드 유지</translation>
     </message>
@@ -9196,13 +9542,13 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>_Ivtc:</source>
-        <translation>Ivtc:</translation>
+        <source>_IVTC</source>
+        <translation>Ivtc</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Resize:</source>
-        <translation>크기조절:</translation>
+        <source>_Resize</source>
+        <translation>크기조절</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9211,12 +9557,12 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Width :</source>
+        <source>Width:</source>
         <translation>너비:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation>높이:</translation>
     </message>
     <message>
@@ -9238,13 +9584,13 @@
         <translation>vdpau를 이용해 이미지의 크기를 조절합니다.</translation>
     </message>
     <message>
-        <location line="+133"/>
-        <source>Width :</source>
+        <location line="+131"/>
+        <source>Width:</source>
         <translation>너비:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation>높이:</translation>
     </message>
     <message>
@@ -9328,6 +9674,84 @@
     </message>
 </context>
 <context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vsWindow</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
@@ -9343,7 +9767,7 @@
 <context>
     <name>webmmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+68"/>
         <source>Unsupported Video.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
         <translation>미지원 비디오.
@@ -9357,7 +9781,7 @@
 VP8/VP9 비디오와 Vorbis/Opus 오디오만 지원합니다</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+89"/>
         <source>Saving Webm</source>
         <translation>WebM 저장 중</translation>
     </message>
@@ -9380,7 +9804,7 @@
 <context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
         <source>Processing</source>
         <translation>처리 중</translation>
     </message>
@@ -9390,12 +9814,12 @@
         <translation>경과:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+14"/>
         <source>Time Remaining:</source>
         <translation>남은 시간:</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+13"/>
         <source>00:00:00</source>
         <translation>00:00:00</translation>
     </message>
@@ -9403,7 +9827,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
         <source>Not coded</source>
         <translation>코딩되지 않았습니다</translation>
     </message>
@@ -9419,7 +9843,7 @@
         <translation>없음</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation>사용자 정의</translation>
     </message>
@@ -9495,10 +9919,6 @@
         <translation>프로파일 저장</translation>
     </message>
     <message>
-        <source>my profile</source>
-        <translation type="vanished">내 프로파일</translation>
-    </message>
-    <message>
         <location line="+46"/>
         <source>Overwrite</source>
         <translation>덮어쓰기</translation>
@@ -9560,12 +9980,12 @@
     </message>
     <message>
         <location line="+7"/>
-        <location line="+3152"/>
+        <location line="+3157"/>
         <source>Delete</source>
         <translation>삭제</translation>
     </message>
     <message>
-        <location line="-3110"/>
+        <location line="-3115"/>
         <source>General</source>
         <translation>일반</translation>
     </message>
@@ -9793,12 +10213,12 @@
     </message>
     <message>
         <location line="+14"/>
-        <location line="+2490"/>
+        <location line="+2495"/>
         <source>frames</source>
         <translation>프레임</translation>
     </message>
     <message>
-        <location line="-2466"/>
+        <location line="-2471"/>
         <source>Sequence Parameter Set Identifer:</source>
         <translation>시퀀스 매개변수 세트 식별자: </translation>
     </message>
@@ -9931,12 +10351,12 @@
     </message>
     <message>
         <location line="+13"/>
-        <location line="+2596"/>
+        <location line="+2601"/>
         <source>None</source>
         <translation>없음</translation>
     </message>
     <message>
-        <location line="-2591"/>
+        <location line="-2596"/>
         <source>Spatial</source>
         <translation>공간의</translation>
     </message>
@@ -10017,12 +10437,12 @@
     </message>
     <message>
         <location line="+12"/>
-        <location line="+1328"/>
+        <location line="+1333"/>
         <source>Strength:</source>
         <translation>강도:</translation>
     </message>
     <message>
-        <location line="-1289"/>
+        <location line="-1294"/>
         <source>Threshold:</source>
         <translation>임계값:</translation>
     </message>
@@ -10229,12 +10649,12 @@
     </message>
     <message>
         <location line="+10"/>
-        <location line="+856"/>
+        <location line="+861"/>
         <source>Edit</source>
         <translation>편집</translation>
     </message>
     <message>
-        <location line="-809"/>
+        <location line="-814"/>
         <source>Quantiser Control</source>
         <translation>양자화기 제어</translation>
     </message>
@@ -10251,12 +10671,12 @@
     <message>
         <location line="+85"/>
         <location line="+179"/>
-        <location line="+302"/>
+        <location line="+307"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location line="-459"/>
+        <location line="-464"/>
         <source>Maximum Quantiser Step:</source>
         <translation>최대 양자화기 스텝:</translation>
     </message>
@@ -10317,8 +10737,13 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>Auto Variance AQ</source>
-        <translation>자동 변동 적응형 양자화</translation>
+        <source>Auto Variance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+91"/>
@@ -10761,7 +11186,7 @@
         <translation>없음</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation>사용자 정의</translation>
     </message>
@@ -11966,7 +12391,7 @@
 <context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+37"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+32"/>
         <location line="+24"/>
         <source>None</source>
         <translation>없음</translation>
@@ -12067,12 +12492,7 @@
         <translation>16:9 (NTSC)</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>MotionEstimation</source>
-        <translation>모션추정</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+9"/>
         <source>Threading</source>
         <translation>쓰레딩</translation>
     </message>
@@ -12098,6 +12518,16 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>_Quantization type:</source>
         <translation>양자화 형식:</translation>
     </message>
@@ -12127,17 +12557,28 @@
         <translation>XVID fcc 사용 (아니면 DIVX)</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Advanced Simple Profile</source>
-        <translation>고급 간편 프로파일</translation>
+        <location line="-32"/>
+        <source>Motion Estimation</source>
+        <translation>모션 추정</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Motion Estimation</source>
-        <translation>모션 추정</translation>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Quantization</source>
         <translation>양자화</translation>
     </message>
@@ -12175,23 +12616,7 @@
         <translation>Fizick 이 만든 avisynth 버전의 Yadif를 포팅한 필터입니다.</translation>
     </message>
     <message>
-        <source>Temporal &amp; spatial check</source>
-        <translation type="vanished">시간 &amp; 공간 검사</translation>
-    </message>
-    <message>
-        <source>Bob, temporal &amp; spatial check</source>
-        <translation type="vanished">Bob, 시간 &amp; 공간 검사</translation>
-    </message>
-    <message>
-        <source>Skip spatial temporal check</source>
-        <translation type="vanished">시간 공간 검사 건너뛰기</translation>
-    </message>
-    <message>
-        <source>Bob, skip spatial temporal check</source>
-        <translation type="vanished">Bob, 시간 공간 검사 건너뛰기</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+70"/>
         <source>Bottom field first</source>
         <translation>하단 필드 먼저</translation>
     </message>

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_pl.ts -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_pl.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
         <source>Attempt to open %s failed!</source>
         <translation>Nie udało się otworzyć %s!</translation>
     </message>
@@ -53,12 +53,12 @@
 2) połączenie ich razem</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
         <source>Checking if timestamps are valid..</source>
         <translation>Sprawdzanie, czy znaczniki czasu są prawidłowe...</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+47"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation>Ten film wideo zawiera klatki B, ale znaczniki czasu prezentacji (PTS) są albo nieobecne, albo rosną monotonicznie. Avidemux może spróbować zrekonstruować poprawne PTS przez dekodowanie całego wideo. To może zająć dużo czasu. Kontynuować?</translation>
     </message>
@@ -378,27 +378,27 @@
 <context>
     <name>DialogProcessing</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+26"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+33"/>
         <source>00:00:00</source>
         <translation>00:00:00</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+51"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="-19"/>
+        <location line="-70"/>
         <source>Dialog</source>
         <translation>Okno dialogowe</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+6"/>
         <source>TimeLeft</source>
         <translation>Pozostało</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+41"/>
         <source>ProcessImages</source>
         <translation>Przetwarzanie obrazów</translation>
     </message>
@@ -408,7 +408,7 @@
         <translation>Szybkość</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-14"/>
         <source>0 fps</source>
         <translation>0 fps</translation>
     </message>
@@ -444,30 +444,28 @@
 <context>
     <name>FDK-AAC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
-        <source>_Profile::</source>
-        <translation>_Profil:</translation>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+9"/>
         <source>_Bitrate:</source>
         <translation>_Przepływność:</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+2"/>
         <source>SBR enabled</source>
         <translation>SBR włączony</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+7"/>
-        <source>After burner</source>
-        <translation>Afterburner</translation>
+        <location line="+2"/>
+        <source>Afterburner</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>FDK-AAC Configuration</source>
         <translation>Konfiguracja FDK-AAC</translation>
     </message>
@@ -617,12 +615,7 @@
         <translation>&lt;b&gt;Wyjście audio&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>   (0 track(s))</source>
-        <translation>   (0 ścieżek)</translation>
-    </message>
-    <message>
-        <location line="+145"/>
+        <location line="+155"/>
         <source>&amp;Shift:</source>
         <translation>Przesunięcie:</translation>
     </message>
@@ -633,12 +626,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+946"/>
+        <location line="+931"/>
         <source>&amp;Navigation</source>
         <translation>Nawigacja</translation>
     </message>
     <message>
-        <location line="-871"/>
+        <location line="-856"/>
         <source>Play [SPACE]</source>
         <translation>Odtwórz [SPACJA]</translation>
     </message>
@@ -761,17 +754,22 @@
         <translation>Przejdź do znacznika B [PAGE DOWN]</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+210"/>
         <source>Play filtered</source>
         <translation>Odtwórz filtrowane</translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-169"/>
         <source>Vol&amp;ume</source>
         <translation>Głośność</translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-1006"/>
+        <source> (0 tracks)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+981"/>
         <source>Selection: 000000</source>
         <translation>Zaznaczenie: 000000</translation>
     </message>
@@ -796,9 +794,8 @@
         <translation>&amp;Informacje...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Alt+Return</source>
-        <translation>Alt+Return</translation>
+        <translation type="vanished">Alt+Return</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -834,14 +831,12 @@
         <translation>Zapisz projekt</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>&amp;Calculator...</source>
-        <translation>Kalkulator...</translation>
+        <translation type="vanished">Kalkulator...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>F7</source>
-        <translation>F7</translation>
+        <translation type="vanished">F7</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -917,7 +912,7 @@
 <context>
     <name>Opus</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
         <translation>_Przepływność:</translation>
     </message>
@@ -940,9 +935,8 @@
         <translation>Przelicz</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Ctrl+Return</source>
-        <translation>Ctrl+Enter</translation>
+        <translation type="vanished">Ctrl+Enter</translation>
     </message>
 </context>
 <context>
@@ -992,7 +986,7 @@
     </message>
     <message>
         <location line="+29"/>
-        <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1058,7 +1052,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>Dekoduj wideo używając DXVA2 (windows)</translation>
     </message>
@@ -1200,21 +1194,27 @@
         <translation>Priorytetyzacja</translation>
     </message>
     <message>
-        <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="vanished">_Użyj alternatywnej etykiety dla pliku MP3 w .mp4</translation>
-    </message>
-    <message>
         <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation>Domyślnie do zapisu użyj katalog, z którego wczytano ostatni plik</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Auto-Append Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
-        <translation>Oczyść dekodowane znaczniki czasowe (DTS) w trybie kopiowania</translation>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>XVideo (best)</source>
         <translation>XVideo (najlepszy)</translation>
     </message>
@@ -1255,7 +1255,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+213"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
         <translation>PCM</translation>
     </message>
@@ -1354,18 +1354,18 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+277"/>
+        <location line="+283"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+423"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
         <source>Audio</source>
         <translation>Dźwięk</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-73"/>
+        <location filename="../../common/gui_savenew.cpp" line="-239"/>
+        <location line="+170"/>
         <location line="+12"/>
         <location line="+16"/>
-        <location line="+8"/>
         <source>Video</source>
         <translation>Obraz</translation>
     </message>
@@ -1392,10 +1392,6 @@
         <translation>Preferencje</translation>
     </message>
     <message>
-        <source>-</source>
-        <translation type="vanished">-</translation>
-    </message>
-    <message>
         <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-12"/>
         <source>Copy</source>
         <translation>Kopiuj</translation>
@@ -1407,7 +1403,7 @@
         <translation>Usuń</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+22"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation>Filtry</translation>
@@ -1626,12 +1622,12 @@
         <translation>Błąd kodeka</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+369"/>
+        <location filename="../../common/gui_main.cpp" line="+370"/>
         <source>Not coded in this version</source>
         <translation>Nie zaimplementowane w tej wersji</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+214"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
@@ -1771,8 +1767,7 @@
         <translation>Dołączanie się nie powiodło</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+321"/>
+        <location line="+320"/>
         <source>Something bad happened (II)</source>
         <translation>Stało się coś złego (II)</translation>
     </message>
@@ -1831,7 +1826,7 @@
         <translation>Główna ścieżka dźwiękowa</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+264"/>
         <source>AvsProxy</source>
         <translation>AvsProxy</translation>
     </message>
@@ -1914,30 +1909,35 @@
         <translation>Zapisywanie dźwięku</translation>
     </message>
     <message>
-        <location line="+318"/>
-        <location line="+83"/>
+        <location line="+322"/>
+        <source>Maximum number of 99999 images reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+76"/>
         <source>Done</source>
         <translation>Zrobione</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-76"/>
         <source>Saved %d images.</source>
         <translation>Zapisano %d obrazów.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="-250"/>
+        <location filename="../../common/gui_main.cpp" line="-251"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
         <location line="+4"/>
         <location filename="../../common/gui_save.cpp" line="+2"/>
-        <location line="+99"/>
+        <location line="+92"/>
         <location line="+7"/>
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
@@ -1985,12 +1985,12 @@
         <translation>Wzmocnienie</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+495"/>
         <source>Saving</source>
         <translation>Zapisywanie</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+181"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
         <translation>Zapisany plik wideo jest niekompletny. Błąd wystąpił w %s (%d%). Przyczyną może być nieprawidłowy znacznik czasu w wideo.</translation>
     </message>
@@ -2080,15 +2080,11 @@
         <translation>Multipleksery</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-290"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-296"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation>Dekoduj wideo używając VDPAU (NVIDIA)</translation>
     </message>
     <message>
-        <source>Decode video using XVBA (AMD)</source>
-        <translation type="vanished">Dekoduj wideo używając XVBA (AMD)</translation>
-    </message>
-    <message>
         <location line="+1"/>
         <source>Decode video using LIBVA (INTEL)</source>
         <translation>Dekoduj wideo używając LIBVA (INTEL)</translation>
@@ -2114,7 +2110,7 @@
         <translation>Sprawdź czy jest nowe wydanie</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2192,7 +2188,7 @@
         <translation>Domyślny port do użycia</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-68"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-72"/>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
@@ -2303,12 +2299,13 @@
         <translation>Zresetuj znaczniki</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
+        <location line="+2"/>
         <source>Save current settings as default</source>
         <translation>Zapisz bieżące ustawienia jako domyślne</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Load saved settings</source>
         <translation>Wczytaj zapisane ustawienia</translation>
     </message>
@@ -2428,7 +2425,7 @@
         <translation>Przejdź do czasu</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation>Skala 1:4 (mały)</translation>
     </message>
@@ -2448,8 +2445,13 @@
         <translation>Skala 2:1 (duży)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
-        <location line="+44"/>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-43"/>
+        <location line="+43"/>
         <source>You cannot remove *all* the video
 </source>
         <translation>Nie możesz usunąć *całego* wideo
@@ -2483,7 +2485,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="-144"/>
-        <location filename="../../common/gui_save.cpp" line="-597"/>
+        <location filename="../../common/gui_save.cpp" line="-602"/>
         <source>No audio track</source>
         <translation>Brak ścieżki dźwiękowej</translation>
     </message>
@@ -2534,7 +2536,7 @@
 Jest on wymagany do tworzenia wideo kompatybilnego z PSP.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1449"/>
+        <location filename="../../common/gui_main.cpp" line="-1447"/>
         <source>Select script/project to run</source>
         <translation>Wybierz skrypt/projekt do uruchomienia</translation>
     </message>
@@ -2559,13 +2561,13 @@
         <translation>Zamierzasz wyczyścić listę ostatnich plików i projektów. Tego nie można cofnąć. Kontynuować?</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+68"/>
+        <location line="+126"/>
+        <location line="+73"/>
         <source>Select Video File...</source>
         <translation>Wybierz plik wideo...</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-48"/>
         <source>No engine</source>
         <translation>Brak silnika</translation>
     </message>
@@ -2575,7 +2577,7 @@
         <translation>Skrypt tinyPy nie jest włączony w tej kompilacji</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Select Video File to Append...</source>
         <translation>Wybierz plik wideo do dołączenia...</translation>
     </message>
@@ -2600,7 +2602,7 @@
         <translation>Błąd podczas wycinania.</translation>
     </message>
     <message>
-        <location line="+795"/>
+        <location line="+789"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation>Podano nieprawidłowy indeks audio</translation>
@@ -2631,7 +2633,7 @@
         <translation>Ustawienie języka dla podanego indeksu ścieżki nie jest możliwe: Nieprawidłowy indeks ścieżki!</translation>
     </message>
     <message>
-        <location line="+297"/>
+        <location line="+298"/>
         <source>Oops</source>
         <translation>Oops</translation>
     </message>
@@ -2651,7 +2653,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>No</source>
         <translation>Nie</translation>
     </message>
@@ -2661,7 +2663,7 @@
         <translation>Nie załadowano pliku</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Job</source>
         <translation>Zadanie</translation>
     </message>
@@ -2671,7 +2673,7 @@
         <translation>Nie można połączyć się z bazą danych. Czy  Kontrola zadań jest uruchomiona?</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Output file</source>
         <translation>Plik wyjściowy</translation>
     </message>
@@ -2686,7 +2688,7 @@
         <translation>Dodaj zadanie do kolejki</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Select PNG to Save</source>
         <translation>Wybierz plik PNG do zapisu</translation>
     </message>
@@ -2723,22 +2725,17 @@
         <translation>Zapisywanie zaznaczenia w postaci zestawu obrazów JPEG</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Warning</source>
         <translation>Ostrzeżenie</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Maximum number of 9999 images reached, aborting.</source>
-        <translation>Osiągnięto maksymalną liczbę 9999 obrazów, przerywam.</translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Saving images failed.</source>
         <translation>Zapisywanie obrazów nie powiodło się.</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+25"/>
         <source>PNG</source>
         <translation>PNG</translation>
     </message>
@@ -2763,39 +2760,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cannot get tinyPÿ script engine</source>
-        <translation type="vanished">Nie można uzyskać silnika skryptów tinyPÿ</translation>
-    </message>
-    <message>
         <location line="+7"/>
         <source>Cannot add job %s</source>
         <translation>Nie można dodać zadania %s</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-207"/>
+        <location filename="../../common/gui_savenew.cpp" line="-210"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation>Ponownie użyć poprzednich danych pierwszego przebiegu?
 Ostrzeżenie: ustawienia muszą być zbliżone.</translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+182"/>
         <source>Cannot instantiate video chain</source>
         <translation>Nie można utworzyć instancji łańcucha wideo</translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+24"/>
         <source>Cannot create encoder</source>
         <translation>Nie można utworzyć kodera</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>Cannot setup codec. Bitrate too low?</source>
-        <translation>Nie można skonfigurować kodeka. Zbyt mała szybkość transmisji?</translation>
+        <translation type="vanished">Nie można skonfigurować kodeka. Zbyt mała szybkość transmisji?</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+57"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
         <translation>Nie można ustawić kodera audio! Upewnij się, że Twój strumień jest zgodny z koderem audio (liczba kanałów, bitrate, format)</translation>
     </message>
@@ -2809,20 +2800,30 @@
 Czy kontynuować mimo to?</translation>
     </message>
     <message>
-        <location line="-253"/>
-        <location line="+286"/>
+        <location line="-257"/>
+        <location line="+290"/>
         <location line="+26"/>
         <source>Muxer</source>
         <translation>Mukser</translation>
     </message>
     <message>
-        <location line="-312"/>
-        <location line="+286"/>
+        <location line="-326"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+290"/>
         <source>Cannot instantiate muxer</source>
         <translation>Nie można utworzyć instancji muksera</translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="-102"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The choice of cut points may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Do you want to continue anyway?</source>
         <translation type="unfinished"></translation>
@@ -3170,7 +3171,7 @@
         <translation>MP4</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>AAC</source>
         <translation>AAC</translation>
     </message>
@@ -3226,7 +3227,7 @@
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
-        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+374"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+382"/>
         <source>Unknown</source>
         <translation>Nieznany</translation>
     </message>
@@ -3323,20 +3324,20 @@
         <translation>1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
-        <location line="+30"/>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
-        <location line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
         <source>Codec</source>
         <translation>Kodek</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
         <source>Internal error finding codec 0x%x</source>
         <translation>Błąd wewnętrzny przy wyszukiwaniu kodeka 0x%x</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Internal error opening 0x%x</source>
         <translation>Błąd wewnętrzny przy otwieraniu 0x%x</translation>
     </message>
@@ -3353,31 +3354,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+812"/>
-        <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
-Dropping a keyframe will result in severely corrupted video.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
-Dropping a frame may result in some video corruption.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Do not warn again and drop frames silently while saving this video?</source>
-        <translation>Nie ostrzegaj ponownie i porzuć klatki bez ostrzegania podczas zapisywania tego filmu wideo?</translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
         <translation>Błąd uprawnień</translation>
     </message>
@@ -3619,7 +3596,7 @@
 <context>
     <name>avimuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+75"/>
         <source>Bad Idea</source>
         <translation>Kiepski pomysł</translation>
     </message>
@@ -3697,7 +3674,7 @@
 <context>
     <name>bitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+51"/>
         <source>Constant Bitrate</source>
         <translation>Stała przepływność</translation>
     </message>
@@ -3814,34 +3791,39 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
         <source>Right:</source>
         <translation>Prawa:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+23"/>
         <source>Top:</source>
         <translation>Górna:</translation>
     </message>
     <message>
         <location line="+43"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
         <source>Reset</source>
         <translation>Resetuj</translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
         <source>Bottom:</source>
         <translation>Dolna:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+51"/>
         <source>Left:</source>
         <translation>Lewa:</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>blackframes</name>
@@ -3862,6 +3844,29 @@
     </message>
 </context>
 <context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -3890,8 +3895,8 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
-        <translation>59.93  (NTSC)</translation>
+        <source>59.94  (NTSC)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+32"/>
@@ -3904,7 +3909,7 @@
         <translation>Przyśpiesz/zwolnij wideo, zmieniając jego FPS. Ten filr zmieni także długość.</translation>
     </message>
     <message>
-        <location line="+141"/>
+        <location line="+146"/>
         <source>Source Fps:</source>
         <translation>Źródłowy FPS:</translation>
     </message>
@@ -4233,7 +4238,7 @@
         <translation>Ostrzeżenie! Kadrowanie zbyt dużej wysokości! Wysokość zresetowana!</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
         <source>Size: </source>
         <translation>Rozmiar: </translation>
     </message>
@@ -4494,20 +4499,25 @@
         <translation>Kodowanie...</translation>
     </message>
     <message>
-        <location line="+44"/>
-        <location line="+220"/>
+        <location line="+41"/>
+        <location line="+247"/>
         <location line="+21"/>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
-        <location line="-258"/>
-        <location line="+251"/>
+        <location line="-261"/>
+        <location line="+254"/>
         <source>Unknown</source>
         <translation>Nieznany</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-157"/>
+        <source>Keep dialog open when finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>Audio Codec:</source>
         <translation>Kodek dźwięku:</translation>
     </message>
@@ -4581,17 +4591,17 @@
         <translation>Kwantyzator:</translation>
     </message>
     <message>
-        <location line="-378"/>
+        <location line="-389"/>
         <source>Shut down computer when finished</source>
         <translation>Wyłącz komputer po zakończeniu</translation>
     </message>
     <message>
-        <location line="-11"/>
+        <location line="-58"/>
         <source>Time Remaining:</source>
         <translation>Pozostały czas:</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+78"/>
         <source>Priority:</source>
         <translation>Priorytet:</translation>
     </message>
@@ -4621,27 +4631,27 @@
         <translation>Niski</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+69"/>
         <source>Pause / Abort</source>
         <translation>Wstrzymaj / Przerwij</translation>
     </message>
     <message>
-        <location line="-149"/>
+        <location line="-186"/>
         <source>Main</source>
         <translation>Główne</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Phase:</source>
         <translation>Faza:</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+127"/>
         <source>Minimize to Tray</source>
         <translation>Minimalizuj do zasobnika</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+33"/>
         <source>Advanced</source>
         <translation>Zaawansowane</translation>
     </message>
@@ -4739,7 +4749,7 @@
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation>Zanikanie</translation>
@@ -4750,7 +4760,32 @@
         <translation>Zanikanie.</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+13"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Start time:</source>
         <translation>Czas początkowy:</translation>
     </message>
@@ -4763,13 +4798,13 @@
 <context>
     <name>fadeToBlack</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
-        <location line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+55"/>
+        <location line="+20"/>
         <source>Fade to black</source>
         <translation>Przejście do czarnego</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-19"/>
         <source>Fade to black in/out.</source>
         <translation>Przejście z/do czarnego</translation>
     </message>
@@ -4794,7 +4829,7 @@
         <translation>Wyłanianie się</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>_Fade type:</source>
         <translation>Typ przenikania:</translation>
     </message>
@@ -4812,7 +4847,7 @@
 <context>
     <name>ffVAEncH264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4827,12 +4862,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Profile:</source>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4843,16 +4899,21 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Bitrate (kbps):</source>
+        <source>Quality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4862,7 +4923,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4870,27 +4931,53 @@
 <context>
     <name>ffVAEncHEVC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+343"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4900,7 +4987,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4908,7 +4995,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+223"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+256"/>
         <source>Default</source>
         <translation>Domyślna</translation>
     </message>
@@ -5377,8 +5464,32 @@
 <context>
     <name>ffnvenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+229"/>
+        <source>Controlled by Preset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
         <source>Low Quality</source>
         <translation>Niska jakość</translation>
     </message>
@@ -5430,6 +5541,12 @@
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+        <source>RC Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Preset:</source>
         <translation>Ustawienie:</translation>
     </message>
@@ -5439,6 +5556,12 @@
         <translation>Profil:</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Bitrate (kbps):</source>
@@ -5452,32 +5575,48 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>GOP Size:</source>
         <translation>Rozmiar GOP:</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation>Maksymalna liczba kolejnych klatek B:</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
         <source>Rate Control</source>
         <translation>Kontrola jakości</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Frame Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>NVENC H.264 configuration</source>
         <translation>Konfiguracja NVENC H.264</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
-        <source>nvEnc HEVC  configuration</source>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+28"/>
+        <source>NVENC HEVC configuration</source>
         <translation>Konfiguracja NVENC HEVC</translation>
     </message>
 </context>
@@ -5489,7 +5628,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+87"/>
         <source>Saving mpeg PS (ff)</source>
         <translation>Zapisywanie mpeg PS (ff)</translation>
     </message>
@@ -5593,7 +5732,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
         <source>Saving mpeg TS (ff)</source>
         <translation>Zapisywanie mpeg TS (ff)</translation>
     </message>
@@ -5666,7 +5805,7 @@
         <translation>Kontrola klatek</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
         <translation>Konfiguracja kodera VideoToolbox H.264</translation>
     </message>
@@ -5824,7 +5963,7 @@
 <context>
     <name>flvdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>Warning</source>
         <translation>Ostrzeżenie</translation>
     </message>
@@ -6356,7 +6495,7 @@
 <context>
     <name>jobs</name>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Oops</source>
         <translation>Oops</translation>
     </message>
@@ -6366,7 +6505,7 @@
         <translation>Coś bardzo złego stało się podczas tworzenia listy zadań.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>There are no jobs stored</source>
         <translation>Nie ma więcej zadań</translation>
     </message>
@@ -6855,12 +6994,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
         <source>Matroska Images</source>
         <translation>Obrazy Matroska</translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+523"/>
         <source>Matroska clusters</source>
         <translation>Klastry Matroska</translation>
     </message>
@@ -6960,7 +7099,7 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+167"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
         <source>Saving Mkv</source>
         <translation>Zapisywanie MKV</translation>
     </message>
@@ -7059,31 +7198,46 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
         <source>Problem reading SVQ3 headers</source>
         <translation>Wystąpił problem podczas czytania nagłówków SVQ3</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+67"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <location line="+17"/>
         <source>Unsupported</source>
         <translation>Nie wspierane</translation>
     </message>
     <message>
-        <location line="-9"/>
-        <source>Only MP4Video, H264, and H265 supported for video</source>
-        <translation>Dla obrazu wspierane są tylko formaty MP4Video, H264 i H265</translation>
+        <location line="-17"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
-        <translation>Dla dźwięku wspierane są tylko formaty AAC, AC3, E-AC3 i mpegaudio dźwięku</translation>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+182"/>
         <source>Saving mp4</source>
         <translation>Zapisywanie MP4</translation>
     </message>
@@ -7093,15 +7247,11 @@
         <translation>Zapisywanie PSP</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
         <source>Muxing Format</source>
         <translation>Format muksowania</translation>
     </message>
     <message>
-        <source>Use alternate MP3 tag</source>
-        <translation type="vanished">Użyj alternatywnej etykiety pliku MP3</translation>
-    </message>
-    <message>
         <location line="+2"/>
         <source>No optimization</source>
         <translation type="unfinished"></translation>
@@ -7132,7 +7282,7 @@
         <translation>Proporcje obrazu (DAR)</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Do not rotate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7158,6 +7308,51 @@
     </message>
     <message>
         <location line="+3"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>MP4 Muxer</source>
         <translation>Mukser MP4</translation>
     </message>
@@ -7329,7 +7524,7 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+242"/>
+        <location filename="../../common/gui_navigate.cpp" line="+232"/>
         <source>Cannot go to next keyframe</source>
         <translation>Nie można przejść do następnej klatki kluczowej</translation>
     </message>
@@ -7559,27 +7754,17 @@
 <context>
     <name>psdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="vanished">Błąd</translation>
-    </message>
-    <message>
-        <source>This file&apos;s index has been created with an older version of avidemux.
-Please delete the idx2 file and reopen.</source>
-        <translation type="vanished">Indeks dla tego pliku został utworzony w starszej wersji avidemux.
-Proszę usunąć plik idx2 i otworzyć ponownie.</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
         <translation>Indeksowanie</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>Istnieje kilka plików z sekwencyjnymi nazwami plików. Czy wszystkie powinny być załadowane?</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -7649,7 +7834,7 @@
         <translation>Aby wykonać to działanie wymagane są uprawnienia administracyjne.</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+126"/>
         <source>First Pass</source>
         <translation>Pierwszy przebieg</translation>
     </message>
@@ -7664,7 +7849,7 @@
         <translation>Kodowanie...</translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+185"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>Kodowanie jest wstrzymane. Chcesz je wznowić, czy przerwać?</translation>
     </message>
@@ -7702,7 +7887,7 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+212"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+206"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;Dostępna jest nowa wersja&lt;/b&gt;&lt;br&gt;Wersja %1&lt;br&gt;Wydana %2&lt;br&gt;Możesz pobrać ją tutaj:&lt;br&gt;&lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt;Możesz wyłączyć automatyczne aktualizacje w preferencjach.&lt;/small&gt;</translation>
     </message>
@@ -7782,21 +7967,31 @@
         <translation>Do przodu jedna minuta</translation>
     </message>
     <message>
-        <location line="+626"/>
+        <location line="+681"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>Aplikacja napotkała fatalny problem!
 Bieżąca edycja została zapisana i zostanie ponownie załadowana przy następnym uruchomieniu</translation>
     </message>
     <message>
-        <location line="+262"/>
+        <location line="+230"/>
         <source>%c-%s (%02d)</source>
         <translation>%c-%s (%02d)</translation>
     </message>
     <message>
-        <location line="+334"/>
-        <source> (%d track(s))</source>
-        <translation> (ścieżki: %d)</translation>
+        <location line="+70"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -8032,8 +8227,18 @@
         <source>Yes</source>
         <translation>Tak</translation>
     </message>
+    <message numerus="yes">
+        <location line="+72"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
     <message>
-        <location line="+98"/>
+        <location line="+34"/>
         <source>Mono</source>
         <translation>Mono</translation>
     </message>
@@ -8069,12 +8274,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+27"/>
+        <location line="+33"/>
         <source>Total Duration:	</source>
         <translation>Całkowita długość:</translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-31"/>
         <source>Extra Video Properties</source>
         <translation>Dodatkowe właściwości wideo</translation>
     </message>
@@ -8089,12 +8294,12 @@
         <translation>Dodatkowe dane:	</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Audio</source>
         <translation>Dźwięk</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Codec:		</source>
         <translation>Kodek:		</translation>
     </message>
@@ -8119,18 +8324,18 @@
         <translation>Brak dźwięku</translation>
     </message>
     <message>
-        <location line="-155"/>
+        <location line="-170"/>
         <source>%2.3f fps</source>
         <translation>%2.3f fps</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+81"/>
+        <location line="+90"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation>%02d:%02d:%02d.%03d</translation>
     </message>
     <message>
-        <location line="-87"/>
+        <location line="-96"/>
         <source>%s (%u:%u)</source>
         <translation>%s (%u:%u)</translation>
     </message>
@@ -8138,7 +8343,7 @@
 <context>
     <name>qshell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+53"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
         <translation type="unfinished"></translation>
@@ -8150,6 +8355,19 @@
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>qtalert</name>
@@ -8211,6 +8429,16 @@
         <source>Video Only Muxer Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>removeplane</name>
@@ -8263,7 +8491,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
         <source>_Mode:</source>
         <translation>_Tryb:</translation>
     </message>
@@ -8278,7 +8506,7 @@
         <translation>Zmień liczbę klatek/s</translation>
     </message>
     <message>
-        <location line="-325"/>
+        <location line="-329"/>
         <source>Custom</source>
         <translation>Własna</translation>
     </message>
@@ -8304,8 +8532,8 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
-        <translation>59.93 (NTSC)</translation>
+        <source>59.94  (NTSC)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+35"/>
@@ -8321,7 +8549,7 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
         <source>Width and height cannot be odd</source>
         <translation>Szerokość i wysokość nie mogą być nieparzyste</translation>
     </message>
@@ -8426,17 +8654,31 @@
         <translation>16:9</translation>
     </message>
     <message>
+        <location line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+338"/>
+        <source>Lanzcos3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+251"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+172"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-166"/>
         <source>1%</source>
         <translation>1%</translation>
     </message>
@@ -8681,18 +8923,8 @@
     </message>
     <message>
         <location line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+18"/>
-        <source>Lanzcos3</source>
-        <translation>Lanzcos3</translation>
+        <source>Lanczos-3</source>
+        <translation>Lanczos-3</translation>
     </message>
 </context>
 <context>
@@ -9050,32 +9282,32 @@
 <context>
     <name>tsdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="vanished">Błąd</translation>
-    </message>
-    <message>
-        <source>This file&apos;s index has been created with an older version of avidemux.
-Please delete the idx2 file and reopen.</source>
-        <translation type="vanished">Indeks dla tego pliku został utworzony w starszej wersji avidemux.
-Proszę usunąć plik idx2 i otworzyć ponownie.</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+183"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+325"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+84"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+207"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>Istnieje kilka plików z sekwencyjnymi nazwami plików. Czy wszystkie powinny być załadowane?</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+19"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
         <translation>Indeksowanie</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -9167,19 +9399,137 @@
     </message>
 </context>
 <context>
+    <name>vaapiDeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Adaptive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Compensated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vaapiResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
-        <source>vaapi: Resize</source>
-        <translation>vaapi: Zmiana rozmiaru</translation>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
+        <translation type="unfinished">VA-API Zmiana rozmiaru</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>vaapi: Resize image using vaapi.</source>
-        <translation>vaapi: Zmień rozmiar obrazu używając vaapi.</translation>
+        <source>Resize image using VA-API.</source>
+        <translation>Zmień rozmiar obrazu używając VA-API.</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+129"/>
         <source>Width :</source>
         <translation>Szerokość:</translation>
     </message>
@@ -9190,8 +9540,8 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>mpeg-&gt;PC:</source>
-        <translation>mpeg-&gt;PC:</translation>
+        <source>mpeg-&gt;PC</source>
+        <translation type="unfinished">mpeg-&gt;PC</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -9212,7 +9562,7 @@
         <translation>VDPAU usuwanie przeplotu (+zmiana rozmiaru).</translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+197"/>
         <source>Keep Top Field</source>
         <translation>Zachowaj półobraz górny</translation>
     </message>
@@ -9228,13 +9578,13 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>_Ivtc:</source>
-        <translation>_Ivtc:</translation>
+        <source>_IVTC</source>
+        <translation>_IVTC</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Resize:</source>
-        <translation>Zmiana _rozmiaru:</translation>
+        <source>_Resize</source>
+        <translation>Zmiana _rozmiaru</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9243,12 +9593,12 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Width :</source>
+        <source>Width:</source>
         <translation>Szerokość:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation>Wysokość:</translation>
     </message>
     <message>
@@ -9270,13 +9620,13 @@
         <translation>vdpau: Zmień rozmiar obrazu używając vdpau.</translation>
     </message>
     <message>
-        <location line="+133"/>
-        <source>Width :</source>
+        <location line="+131"/>
+        <source>Width:</source>
         <translation>Szerokość:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation>Wysokość:</translation>
     </message>
     <message>
@@ -9360,6 +9710,84 @@
     </message>
 </context>
 <context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vsWindow</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
@@ -9375,7 +9803,7 @@
 <context>
     <name>webmmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+68"/>
         <source>Unsupported Video.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
         <translation type="unfinished"></translation>
@@ -9387,7 +9815,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+89"/>
         <source>Saving Webm</source>
         <translation>Zapisywanie Webm</translation>
     </message>
@@ -9410,22 +9838,22 @@
 <context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
         <source>Processing</source>
         <translation>Przetwarzanie</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+33"/>
         <source>00:00:00</source>
         <translation>00:00:00</translation>
     </message>
     <message>
-        <location line="-13"/>
+        <location line="-27"/>
         <source>Elapsed:</source>
         <translation>Upłynęło:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+14"/>
         <source>Time Remaining:</source>
         <translation>Pozostały czas:</translation>
     </message>
@@ -9433,7 +9861,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9450,7 +9878,7 @@
         <translation>brak</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation>Własne</translation>
     </message>
@@ -9522,10 +9950,6 @@
         <translation>Zapisz profil</translation>
     </message>
     <message>
-        <source>my profile</source>
-        <translation type="vanished">mój profil</translation>
-    </message>
-    <message>
         <location line="+46"/>
         <source>Overwrite</source>
         <translation>Zastąp</translation>
@@ -9576,12 +10000,12 @@
         <translation>Zapisz jako</translation>
     </message>
     <message>
-        <location line="+2982"/>
+        <location line="+2987"/>
         <source>kbit/s</source>
         <translation>kbit/s</translation>
     </message>
     <message>
-        <location line="-2655"/>
+        <location line="-2660"/>
         <source>Target Video Size:</source>
         <translation>Rozmiar docelowego wideo:</translation>
     </message>
@@ -9597,12 +10021,12 @@
     </message>
     <message>
         <location line="+24"/>
-        <location line="+3152"/>
+        <location line="+3157"/>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location line="-2840"/>
+        <location line="-2845"/>
         <source>Rate Control</source>
         <translation>Kontrola przepływności</translation>
     </message>
@@ -9614,7 +10038,7 @@
         <translation>Kwantyzator</translation>
     </message>
     <message>
-        <location line="+864"/>
+        <location line="+869"/>
         <source>Disable</source>
         <translation>Wyłącz</translation>
     </message>
@@ -9624,7 +10048,7 @@
         <translation>Automatyczne wykrycie</translation>
     </message>
     <message>
-        <location line="-2298"/>
+        <location line="-2303"/>
         <source>Motion Estimation</source>
         <translation>Szacowanie ruchu</translation>
     </message>
@@ -9642,22 +10066,22 @@
     </message>
     <message>
         <location line="-433"/>
-        <location line="+2596"/>
+        <location line="+2601"/>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
-        <location line="-2158"/>
+        <location line="-2163"/>
         <source>Fast</source>
         <translation>Szybko</translation>
     </message>
     <message>
-        <location line="+1598"/>
+        <location line="+1603"/>
         <source>Output</source>
         <translation>Wyjście</translation>
     </message>
     <message>
-        <location line="-3165"/>
+        <location line="-3170"/>
         <location line="+669"/>
         <source>1</source>
         <translation>1</translation>
@@ -9754,12 +10178,22 @@
         <translation>31</translation>
     </message>
     <message>
-        <location line="+2738"/>
+        <location line="+1921"/>
+        <source>Auto Variance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+817"/>
         <source>Crop</source>
         <translation>Kadruj</translation>
     </message>
     <message>
-        <location line="-2567"/>
+        <location line="-2572"/>
         <source>11 (Best)</source>
         <translation>11 (Najlepiej)</translation>
     </message>
@@ -9769,7 +10203,7 @@
         <translation>Zwykły</translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>VBR</source>
         <translation>VBR</translation>
     </message>
@@ -9779,7 +10213,7 @@
         <translation>CBR</translation>
     </message>
     <message>
-        <location line="-3949"/>
+        <location line="-3954"/>
         <source>x264 Configuraton</source>
         <translation>Konfiguracja x264</translation>
     </message>
@@ -9913,12 +10347,12 @@
     </message>
     <message>
         <location line="+14"/>
-        <location line="+2490"/>
+        <location line="+2495"/>
         <source>frames</source>
         <translation>klatek</translation>
     </message>
     <message>
-        <location line="-2466"/>
+        <location line="-2471"/>
         <source>Sequence Parameter Set Identifer:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10089,12 +10523,12 @@
     </message>
     <message>
         <location line="+12"/>
-        <location line="+1328"/>
+        <location line="+1333"/>
         <source>Strength:</source>
         <translation>Natężenie:</translation>
     </message>
     <message>
-        <location line="-1289"/>
+        <location line="-1294"/>
         <source>Threshold:</source>
         <translation>Próg:</translation>
     </message>
@@ -10296,12 +10730,12 @@
     </message>
     <message>
         <location line="+10"/>
-        <location line="+856"/>
+        <location line="+861"/>
         <source>Edit</source>
         <translation>Edycja</translation>
     </message>
     <message>
-        <location line="-809"/>
+        <location line="-814"/>
         <source>Quantiser Control</source>
         <translation>Kontrola kwantyzera</translation>
     </message>
@@ -10318,12 +10752,12 @@
     <message>
         <location line="+85"/>
         <location line="+179"/>
-        <location line="+302"/>
+        <location line="+307"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location line="-459"/>
+        <location line="-464"/>
         <source>Maximum Quantiser Step:</source>
         <translation>Maksymalny krok kwantyzera:</translation>
     </message>
@@ -10378,12 +10812,7 @@
         <translation>Zmienność AQ:</translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Auto Variance AQ</source>
-        <translation>Automatyczna zmienność AQ</translation>
-    </message>
-    <message>
-        <location line="+91"/>
+        <location line="+114"/>
         <source>Advanced 1</source>
         <translation>Zaawansowane 1</translation>
     </message>
@@ -10789,7 +11218,7 @@
         <translation>brak</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished">Własna</translation>
     </message>
@@ -11996,7 +12425,7 @@
 <context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+37"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+32"/>
         <location line="+24"/>
         <source>None</source>
         <translation>Brak</translation>
@@ -12057,22 +12486,38 @@
         <translation>Wątkowanie</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="-2"/>
         <source>Motion Estimation</source>
         <translation>Szacowanie ruchu:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+35"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+25"/>
         <source>Rate Control</source>
         <translation>Kontrola przepływności</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-52"/>
         <source>Aspect Ratio:</source>
         <translation>Proporcje obrazu:</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-46"/>
         <source>DCT</source>
         <translation>DCT</translation>
     </message>
@@ -12117,12 +12562,7 @@
         <translation>1:1 (PC)</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>MotionEstimation</source>
-        <translation>Szacowanie ruchu</translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+15"/>
         <source>Mi_n. quantizer:</source>
         <translation>Min. kwantyzer:</translation>
     </message>
@@ -12143,6 +12583,16 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>_Quantization type:</source>
         <translation type="unfinished">Typ kwantyzacji:</translation>
     </message>
@@ -12167,12 +12617,7 @@
         <translation>Użyj XVID fcc (przeciwnie DIVX)</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Advanced Simple Profile</source>
-        <translation>Advanced Simple Profile</translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+25"/>
         <source>Quantization</source>
         <translation>Kwantyzacja</translation>
     </message>
@@ -12205,23 +12650,7 @@
         <translation>Yadif, przeniesione z wersji avisynth (c) Fizick.</translation>
     </message>
     <message>
-        <source>Temporal &amp; spatial check</source>
-        <translation type="vanished">Sprawdzanie czasowe i przestrzenne</translation>
-    </message>
-    <message>
-        <source>Bob, temporal &amp; spatial check</source>
-        <translation type="vanished">Bob, sprawdzanie czasowe i przestrzenne</translation>
-    </message>
-    <message>
-        <source>Skip spatial temporal check</source>
-        <translation type="vanished">Pomiń sprawdzanie przestrzenno-czasowe</translation>
-    </message>
-    <message>
-        <source>Bob, skip spatial temporal check</source>
-        <translation type="vanished">Bob, pomiń sprawdzanie przestrzenno-czasowe</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+70"/>
         <source>Bottom field first</source>
         <translation>Najpierw półobraz dolny</translation>
     </message>

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_pt_BR.ts -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_pt_BR.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+194"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+425"/>
         <source>Cannot find a demuxer for %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51,12 +51,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+47"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -375,32 +375,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+6"/>
         <source>TimeLeft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
+        <location line="+13"/>
         <source>00:00:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+28"/>
         <source>ProcessImages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+23"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="-30"/>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-14"/>
         <source>0 fps</source>
         <translation type="unfinished"></translation>
     </message>
@@ -436,30 +436,28 @@
 <context>
     <name>FDK-AAC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
-        <source>_Profile::</source>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+9"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+2"/>
         <source>SBR enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+7"/>
-        <source>After burner</source>
+        <location line="+2"/>
+        <source>Afterburner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>FDK-AAC Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -578,12 +576,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>   (0 track(s))</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+145"/>
+        <location line="+155"/>
         <source>&amp;Shift:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,12 +592,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+946"/>
+        <location line="+931"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-871"/>
+        <location line="-856"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -753,17 +746,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+210"/>
         <source>Play filtered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-169"/>
         <source>Vol&amp;ume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-1006"/>
+        <source> (0 tracks)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+981"/>
         <source>Selection: 000000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -788,11 +786,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Alt+Return</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location line="+9"/>
         <source>Save &amp;Video...</source>
         <translation type="unfinished"></translation>
@@ -826,16 +819,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>&amp;Calculator...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>F7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location line="+15"/>
         <source>&amp;Input</source>
         <translation type="unfinished"></translation>
@@ -909,7 +892,7 @@
 <context>
     <name>Opus</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -931,11 +914,6 @@
         <source>Evaluate</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+3"/>
-        <source>Ctrl+Return</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>VapourSynthProxy</name>
@@ -984,7 +962,7 @@
     </message>
     <message>
         <location line="+10"/>
-        <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1050,7 +1028,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+458"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+466"/>
         <source>Output</source>
         <translation type="unfinished">Saida</translation>
     </message>
@@ -1305,10 +1283,10 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+277"/>
+        <location line="+283"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+423"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1410,7 +1388,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-177"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1587,12 +1565,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Auto-Append Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1664,7 +1652,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+213"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1909,12 +1897,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <location line="+2"/>
         <source>Save current settings as default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Load saved settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2040,7 +2029,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2060,8 +2049,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
-        <location line="+44"/>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
@@ -2071,8 +2065,8 @@
         <location line="+24"/>
         <location line="+8"/>
         <location line="+4"/>
-        <location filename="../../common/gui_save.cpp" line="+199"/>
-        <location line="+99"/>
+        <location filename="../../common/gui_save.cpp" line="+205"/>
+        <location line="+92"/>
         <location line="+7"/>
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
@@ -2080,8 +2074,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-44"/>
-        <location line="+44"/>
+        <location line="-43"/>
+        <location line="+43"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished"></translation>
@@ -2111,7 +2105,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
-        <location filename="../../common/gui_save.cpp" line="-638"/>
+        <location filename="../../common/gui_save.cpp" line="-643"/>
         <source>No audio track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2170,7 +2164,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1449"/>
+        <location filename="../../common/gui_main.cpp" line="-1447"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2195,18 +2189,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+115"/>
         <source>Not coded in this version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
-        <location line="+68"/>
+        <location line="+73"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-48"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2216,7 +2210,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2374,8 +2368,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+321"/>
+        <location line="+320"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2464,7 +2457,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+144"/>
         <source>AvsProxy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2510,7 +2503,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+51"/>
+        <location filename="../../common/gui_save.cpp" line="+54"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2520,7 +2513,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Job</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2530,7 +2523,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Output file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2545,7 +2538,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Select Workbench to Save</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2617,22 +2610,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Maximum number of 9999 images reached, aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Saving images failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+25"/>
         <source>PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2657,23 +2645,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
-        <location line="+83"/>
+        <location line="-114"/>
+        <location line="+76"/>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-583"/>
+        <location line="-588"/>
         <source>Audio encoder index out of bounds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+500"/>
+        <location line="+510"/>
+        <source>Maximum number of 99999 images reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Saved %d images.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+56"/>
         <source>BMP op failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2703,37 +2696,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-244"/>
+        <location filename="../../common/gui_savenew.cpp" line="-251"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+12"/>
+        <location line="+170"/>
         <location line="+12"/>
         <location line="+16"/>
-        <location line="+8"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-28"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+24"/>
         <source>Cannot create encoder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-8"/>
-        <source>Cannot setup codec. Bitrate too low?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+57"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2745,20 +2732,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-253"/>
-        <location line="+286"/>
+        <location line="-257"/>
+        <location line="+290"/>
         <location line="+26"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-312"/>
-        <location line="+286"/>
+        <location line="-326"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+290"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="-102"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The choice of cut points may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Do you want to continue anyway?</source>
         <translation type="unfinished"></translation>
@@ -3116,7 +3113,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>AAC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3166,12 +3163,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+495"/>
         <source>Saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+181"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3182,7 +3179,7 @@
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
-        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+374"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+382"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3273,20 +3270,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
-        <location line="+30"/>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
-        <location line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
         <source>Codec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
         <source>Internal error finding codec 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Internal error opening 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3302,31 +3299,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+812"/>
-        <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
-Dropping a keyframe will result in severely corrupted video.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
-Dropping a frame may result in some video corruption.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Do not warn again and drop frames silently while saving this video?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3564,7 +3537,7 @@
 <context>
     <name>avimuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+75"/>
         <source>Bad Idea</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3641,7 +3614,7 @@
 <context>
     <name>bitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+51"/>
         <source>Constant Bitrate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3758,34 +3731,39 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+23"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+51"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>blackframes</name>
@@ -3806,6 +3784,29 @@
     </message>
 </context>
 <context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -3834,7 +3835,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
+        <source>59.94  (NTSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3848,7 +3849,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+141"/>
+        <location line="+146"/>
         <source>Source Fps:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4175,7 +4176,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4431,14 +4432,14 @@
 <context>
     <name>encodingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+70"/>
-        <location line="+220"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+67"/>
+        <location line="+247"/>
         <location line="+21"/>
         <source>None</source>
         <translation type="unfinished">Nenhuma</translation>
     </message>
     <message>
-        <location line="-285"/>
+        <location line="-309"/>
         <source>Encoding...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4448,23 +4449,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+251"/>
+        <location line="+32"/>
+        <location line="+254"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-227"/>
+        <location line="-247"/>
         <source>Phase:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-31"/>
         <source>Time Remaining:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+58"/>
         <source>Shut down computer when finished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4499,7 +4500,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+12"/>
+        <source>Keep dialog open when finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4509,7 +4515,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+13"/>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4681,7 +4687,7 @@
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished"></translation>
@@ -4692,7 +4698,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+13"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4705,13 +4736,13 @@
 <context>
     <name>fadeToBlack</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
-        <location line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+55"/>
+        <location line="+20"/>
         <source>Fade to black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-19"/>
         <source>Fade to black in/out.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4736,7 +4767,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>_Fade type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4754,7 +4785,7 @@
 <context>
     <name>ffVAEncH264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4769,12 +4800,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Profile:</source>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4785,16 +4837,21 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Bitrate (kbps):</source>
+        <source>Quality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4804,7 +4861,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4812,27 +4869,53 @@
 <context>
     <name>ffVAEncHEVC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+343"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4842,7 +4925,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4850,7 +4933,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+217"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+250"/>
         <source>Normal (4:3)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5319,8 +5402,32 @@
 <context>
     <name>ffnvenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+229"/>
+        <source>Controlled by Preset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
         <source>Low Quality</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5372,6 +5479,12 @@
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+        <source>RC Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Preset:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5381,6 +5494,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Bitrate (kbps):</source>
@@ -5394,32 +5513,48 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Frame Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>NVENC H.264 configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
-        <source>nvEnc HEVC  configuration</source>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+28"/>
+        <source>NVENC HEVC configuration</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5431,7 +5566,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+87"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5527,7 +5662,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5600,7 +5735,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5756,7 +5891,7 @@
 <context>
     <name>flvdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6327,7 +6462,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Oops</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6337,7 +6472,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>There are no jobs stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6785,12 +6920,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+523"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6890,7 +7025,7 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+167"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
         <source>Saving Mkv</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6989,31 +7124,46 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+67"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <location line="+17"/>
         <source>Unsupported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
-        <source>Only MP4Video, H264, and H265 supported for video</source>
+        <location line="-17"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+182"/>
         <source>Saving mp4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7023,7 +7173,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7058,7 +7208,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Do not rotate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7084,6 +7234,51 @@
     </message>
     <message>
         <location line="+3"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>MP4 Muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7255,7 +7450,7 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+242"/>
+        <location filename="../../common/gui_navigate.cpp" line="+232"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7485,17 +7680,17 @@
 <context>
     <name>psdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -7565,7 +7760,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+126"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7580,7 +7775,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+185"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7618,7 +7813,7 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+212"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+206"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7698,21 +7893,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+626"/>
+        <location line="+681"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+262"/>
+        <location line="+230"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+334"/>
-        <source> (%d track(s))</source>
+        <location line="+70"/>
+        <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>qgui2menu</name>
@@ -7948,18 +8152,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+33"/>
         <source>%2.3f fps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+81"/>
+        <location line="+90"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation type="unfinished"></translation>
     </message>
+    <message numerus="yes">
+        <location line="-55"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
     <message>
-        <location line="+30"/>
+        <location line="+83"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7985,12 +8198,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+27"/>
+        <location line="+33"/>
         <source>Total Duration:	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-31"/>
         <source>Extra Video Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8005,12 +8218,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Codec:		</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8035,12 +8248,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-172"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+77"/>
         <source>Mono</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8053,7 +8266,7 @@
 <context>
     <name>qshell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+53"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
         <translation type="unfinished"></translation>
@@ -8065,6 +8278,19 @@
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>qtalert</name>
@@ -8126,6 +8352,16 @@
         <source>Video Only Muxer Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>removeplane</name>
@@ -8204,7 +8440,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
+        <source>59.94  (NTSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8218,7 +8454,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+281"/>
         <source>_Mode:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8236,7 +8472,7 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8399,6 +8635,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+356"/>
+        <source>Lanzcos3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
         <source>Source PAR:</source>
         <translation type="unfinished"></translation>
@@ -8416,16 +8666,16 @@
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+44"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-312"/>
         <source>Resize Dimensions</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8596,17 +8846,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+5"/>
-        <source>Lanzcos3</source>
+        <source>Lanczos-3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8965,22 +9205,32 @@
 <context>
     <name>tsdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+183"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+325"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+84"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+207"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+19"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -9072,19 +9322,137 @@
     </message>
 </context>
 <context>
+    <name>vaapiDeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Adaptive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Compensated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vaapiResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
-        <source>vaapi: Resize</source>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>vaapi: Resize image using vaapi.</source>
+        <source>Resize image using VA-API.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+129"/>
         <source>Width :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9095,7 +9463,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>mpeg-&gt;PC:</source>
+        <source>mpeg-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9117,7 +9485,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+197"/>
         <source>Keep Top Field</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9133,31 +9501,31 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>_Ivtc:</source>
+        <source>_IVTC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Resize:</source>
+        <source>_Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>_Deint Mode:</source>
+        <location line="+2"/>
+        <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Width :</source>
+        <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Height :</source>
+        <location line="-2"/>
+        <source>_Deint Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>vdpau</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9175,13 +9543,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
-        <source>Width :</source>
+        <location line="+131"/>
+        <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9265,6 +9633,84 @@
     </message>
 </context>
 <context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vsWindow</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
@@ -9280,7 +9726,7 @@
 <context>
     <name>webmmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+68"/>
         <source>Unsupported Video.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
         <translation type="unfinished"></translation>
@@ -9292,7 +9738,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+89"/>
         <source>Saving Webm</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9315,7 +9761,7 @@
 <context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
         <source>Processing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9325,12 +9771,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+14"/>
         <source>Time Remaining:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+13"/>
         <source>00:00:00</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9338,7 +9784,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9354,7 +9800,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9471,17 +9917,27 @@
     <name>x264ConfigDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui" line="+1358"/>
-        <location line="+2596"/>
+        <location line="+2601"/>
         <source>None</source>
         <translation type="unfinished">Nenhuma</translation>
     </message>
     <message>
-        <location line="-560"/>
+        <location line="-1120"/>
+        <source>Auto Variance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+555"/>
         <source>Output</source>
         <translation type="unfinished">Saida</translation>
     </message>
     <message>
-        <location line="-3379"/>
+        <location line="-3384"/>
         <source>x264 Configuraton</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9497,12 +9953,12 @@
     </message>
     <message>
         <location line="+7"/>
-        <location line="+3152"/>
+        <location line="+3157"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3110"/>
+        <location line="-3115"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9730,12 +10186,12 @@
     </message>
     <message>
         <location line="+14"/>
-        <location line="+2490"/>
+        <location line="+2495"/>
         <source>frames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2466"/>
+        <location line="-2471"/>
         <source>Sequence Parameter Set Identifer:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9948,12 +10404,12 @@
     </message>
     <message>
         <location line="+12"/>
-        <location line="+1328"/>
+        <location line="+1333"/>
         <source>Strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1289"/>
+        <location line="-1294"/>
         <source>Threshold:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10160,12 +10616,12 @@
     </message>
     <message>
         <location line="+10"/>
-        <location line="+856"/>
+        <location line="+861"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-809"/>
+        <location line="-814"/>
         <source>Quantiser Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10182,12 +10638,12 @@
     <message>
         <location line="+85"/>
         <location line="+179"/>
-        <location line="+302"/>
+        <location line="+307"/>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-459"/>
+        <location line="-464"/>
         <source>Maximum Quantiser Step:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10247,12 +10703,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Auto Variance AQ</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+91"/>
+        <location line="+101"/>
         <source>Advanced 1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10687,7 +11138,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11891,7 +12342,7 @@
 <context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+37"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+32"/>
         <location line="+24"/>
         <source>None</source>
         <translation type="unfinished">Nenhuma</translation>
@@ -11992,12 +12443,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>MotionEstimation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+9"/>
         <source>Threading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12023,6 +12469,16 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>_Quantization type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12052,17 +12508,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Advanced Simple Profile</source>
+        <location line="-32"/>
+        <source>Motion Estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Motion Estimation</source>
+        <source>Miscellaneous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Quantization</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12100,7 +12567,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+70"/>
         <source>Bottom field first</source>
         <translation type="unfinished"></translation>
     </message>

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_ru.ts -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_ru.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">Ошибка при открытии %s!</translation>
     </message>
@@ -53,19 +53,19 @@
 2) склеить их вместе</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished">Проверка правильности временных меток...</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+47"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
-        <translation type="unfinished"></translation>
+        <translation>Это видео содержит двунаправленные кадры (B-frames), в то время как метки времени показа (PTS) либо отсутствуют, либо монотонно возрастают. Авидемукс может попытаться восстановить правильные PTS путём декодирования всего видео. Это может занять много времени. Продолжить?</translation>
     </message>
     <message>
         <location line="+31"/>
         <source>Decoding video...</source>
-        <translation type="unfinished"></translation>
+        <translation>Декодирую видео...</translation>
     </message>
     <message>
         <location line="+115"/>
@@ -381,38 +381,37 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+14"/>
         <source>Dialog</source>
-        <translation type="unfinished">Диалог</translation>
+        <translation>Ход процесса</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+6"/>
         <source>TimeLeft</source>
-        <translation type="unfinished">Осталось времени</translation>
+        <translation>Осталось времени</translation>
     </message>
     <message>
-        <location line="-21"/>
+        <location line="+13"/>
         <source>00:00:00</source>
-        <translation type="unfinished"></translation>
+        <translation>00:00:00</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+28"/>
         <source>ProcessImages</source>
-        <translation type="unfinished">Обработка изображений</translation>
+        <translation>Количество изображений</translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+23"/>
         <source>0</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>0</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="-30"/>
         <source>Speed</source>
-        <translation type="unfinished">Скорость</translation>
+        <translation>Скорость</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-14"/>
         <source>0 fps</source>
-        <translation type="unfinished">0 к/с</translation>
+        <translation>0 к/с</translation>
     </message>
 </context>
 <context>
@@ -425,12 +424,12 @@
     <message>
         <location line="+13"/>
         <source>Current job</source>
-        <translation type="unfinished">Текущая операция</translation>
+        <translation>Текущая операция</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>1/1</source>
-        <translation type="unfinished"></translation>
+        <translation>1/1</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -446,30 +445,28 @@
 <context>
     <name>FDK-AAC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
-        <source>_Profile::</source>
-        <translation type="unfinished">_Профиль:</translation>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+9"/>
         <source>_Bitrate:</source>
         <translation type="unfinished">_Битрейт</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+2"/>
         <source>SBR enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+7"/>
-        <source>After burner</source>
-        <translation type="unfinished">После прожига</translation>
+        <location line="+2"/>
+        <source>Afterburner</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>FDK-AAC Configuration</source>
         <translation type="unfinished">Настройка FDK-AAC</translation>
     </message>
@@ -552,7 +549,12 @@
         <translation type="unfinished">Перех&amp;од</translation>
     </message>
     <message>
-        <location line="+1544"/>
+        <location line="+408"/>
+        <source> (0 tracks)</source>
+        <translation> (0 дорожек)</translation>
+    </message>
+    <message>
+        <location line="+1136"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">&amp;Открыть...</translation>
     </message>
@@ -562,7 +564,7 @@
         <translation type="unfinished">&amp;Информация...</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+9"/>
         <source>Save &amp;Video...</source>
         <translation type="unfinished">Сохранить &amp;Видео...</translation>
     </message>
@@ -595,12 +597,11 @@
         <translation type="unfinished">Сохранить проект</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>&amp;Calculator...</source>
-        <translation type="unfinished">&amp;Калькулятор...</translation>
+        <translation type="obsolete">&amp;Калькулятор...</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+15"/>
         <source>&amp;Input</source>
         <translation type="unfinished">&amp;Вход</translation>
     </message>
@@ -620,7 +621,7 @@
         <translation type="unfinished">&amp;Сверху</translation>
     </message>
     <message>
-        <location line="-1650"/>
+        <location line="-1635"/>
         <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
         <translation>&lt;b&gt;Декодер видео&lt;/b&gt;</translation>
     </message>
@@ -630,12 +631,12 @@
         <translation type="unfinished">Тип кадра:</translation>
     </message>
     <message>
-        <location line="+512"/>
+        <location line="+497"/>
         <source>&amp;Separate</source>
         <translation type="unfinished">&amp;Отделить</translation>
     </message>
     <message>
-        <location line="-1873"/>
+        <location line="-1858"/>
         <source>Avidemux</source>
         <translation type="unfinished"></translation>
     </message>
@@ -676,12 +677,7 @@
         <translation type="unfinished">&lt;b&gt;Аудио на выходе&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>   (0 track(s))</source>
-        <translation type="unfinished">   (0 дорожек)</translation>
-    </message>
-    <message>
-        <location line="+177"/>
+        <location line="+187"/>
         <source>ms</source>
         <translation type="unfinished">мс</translation>
     </message>
@@ -692,12 +688,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+946"/>
+        <location line="+931"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished">&amp;Навигация</translation>
     </message>
     <message>
-        <location line="-871"/>
+        <location line="-856"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished">Воспроизвести [SPACE]</translation>
     </message>
@@ -836,12 +832,12 @@
         <translation type="unfinished">Перейти к маркеру B [PAGE DOWN]</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+210"/>
         <source>Play filtered</source>
         <translation type="unfinished">Включить фильтр</translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-169"/>
         <source>Vol&amp;ume</source>
         <translation type="unfinished">&amp;Громкость</translation>
     </message>
@@ -861,17 +857,7 @@
         <translation type="unfinished">Открыть видео</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Alt+Return</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
-        <source>F7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+38"/>
+        <location line="+104"/>
         <source>&amp;Codec Options</source>
         <translation type="unfinished">&amp;Настройки кодека</translation>
     </message>
@@ -919,9 +905,9 @@
 <context>
     <name>Opus</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
-        <translation type="unfinished"></translation>
+        <translation>_Битрейт:</translation>
     </message>
 </context>
 <context>
@@ -941,11 +927,6 @@
         <source>Evaluate</source>
         <translation type="unfinished">Выполнить</translation>
     </message>
-    <message>
-        <location line="+3"/>
-        <source>Ctrl+Return</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>VapourSynthProxy</name>
@@ -994,7 +975,7 @@
     </message>
     <message>
         <location line="+29"/>
-        <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1060,7 +1041,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>Декодировать видео посредством DXVA2 (Windows)</translation>
     </message>
@@ -1197,21 +1178,27 @@
         <translation type="unfinished">Приоритет</translation>
     </message>
     <message>
-        <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="obsolete">_Использовать альтернативные тэги для MP3 в .MP4</translation>
-    </message>
-    <message>
         <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
-        <translation type="unfinished">_Сохранять видео в папке с последним прочитанным файлом по умолчанию</translation>
+        <translation>_Сохранять видео в папке с последним прочитанным файлом по умолчанию</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Auto-Append Settings</source>
+        <translation>Автоматическое объединение расчленённых потоков</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
-        <translation type="unfinished">В режиме _копирования повысить равномерность отметок времени декодирования (DTS)</translation>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
+        <translation>_Использовать нестандартный размер фрагментов при автоматическом объединении файлов MPEG-TS</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation>Размер _фрагментов:</translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>XVideo (best)</source>
         <translation type="unfinished">XVideo (лучшее)</translation>
     </message>
@@ -1263,18 +1250,18 @@
     <message>
         <location line="+5"/>
         <source>No downmixing</source>
-        <translation type="unfinished">Оригинальный</translation>
+        <translation>Никакой</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+49"/>
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
         <source>Stereo</source>
-        <translation type="unfinished">Стерео</translation>
+        <translation>Стерео</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+4"/>
         <source>_Local playback downmixing:</source>
-        <translation type="unfinished">_Даунмиксинг звука при локальном воспроизведении:</translation>
+        <translation>_Даунмиксинг звука при локальном воспроизведении:</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+26"/>
@@ -1306,12 +1293,12 @@
     <message>
         <location line="+45"/>
         <source>User Interface</source>
-        <translation type="unfinished">Интерфейс</translation>
+        <translation>Интерфейс</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Output</source>
-        <translation type="unfinished">Вывод</translation>
+        <translation>Вывод</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="+80"/>
@@ -1320,20 +1307,20 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+277"/>
+        <location line="+283"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+423"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
         <source>Audio</source>
-        <translation type="unfinished">Звук</translation>
+        <translation>Звук</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-73"/>
+        <location filename="../../common/gui_savenew.cpp" line="-239"/>
+        <location line="+170"/>
         <location line="+12"/>
         <location line="+16"/>
-        <location line="+8"/>
         <source>Video</source>
-        <translation type="unfinished">Видео</translation>
+        <translation>Видео</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+42"/>
@@ -1372,7 +1359,7 @@
         <translation type="unfinished">Установить маркер В</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+18"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation type="unfinished">Фильтры</translation>
@@ -1496,12 +1483,12 @@
         <translation type="unfinished">Ошибка аудиокодера</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+369"/>
+        <location filename="../../common/gui_main.cpp" line="+370"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">Нет в этой версии</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+214"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation>Это видео использует кадры прямого доступа без мгновенного обновления декодирования (non-IDR). Счётчик очерёдности показа изображений (POC) на таких ключевых кадрах не сбрасывается. Образовавшиеся точки разреза вставки при сохранении видео в режиме копирования могут привести к задержке воспроизведения из-за нарушенного порядка показа изображений.
@@ -1647,8 +1634,7 @@
         <translation type="unfinished">Ошибка при добавлении видео</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+321"/>
+        <location line="+320"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">Ошибка при обновлении видео</translation>
     </message>
@@ -1707,7 +1693,7 @@
         <translation type="unfinished">Главная звуковая дорожка</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+264"/>
         <source>Failed to connect to avsproxy.
 Is it running ?</source>
         <translation type="unfinished">Невозможно соединиться с AvsProxy.
@@ -1775,30 +1761,35 @@
         <translation type="unfinished">Сохранение аудио</translation>
     </message>
     <message>
-        <location line="+318"/>
-        <location line="+83"/>
+        <location line="+322"/>
+        <source>Maximum number of 99999 images reached.</source>
+        <translation>Предел в 99999 кадров достигнут.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+76"/>
         <source>Done</source>
-        <translation type="unfinished">Выполнено</translation>
+        <translation>Выполнено</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-76"/>
         <source>Saved %d images.</source>
-        <translation type="unfinished">Сохранено изображений: %d </translation>
+        <translation>Сохранено изображений: %d</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="-250"/>
+        <location filename="../../common/gui_main.cpp" line="-251"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
         <location line="+4"/>
         <location filename="../../common/gui_save.cpp" line="+2"/>
-        <location line="+99"/>
+        <location line="+92"/>
         <location line="+7"/>
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
@@ -1818,17 +1809,17 @@
     <message>
         <location line="+20"/>
         <source>File %s has been successfully saved.</source>
-        <translation type="unfinished">Файл &quot;%s&quot; успешно сохранен.</translation>
+        <translation>Файл &quot;%s&quot; успешно сохранен.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Failed</source>
-        <translation type="unfinished">Ошибка</translation>
+        <translation>Ошибка</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>File %s was NOT saved correctly.</source>
-        <translation type="unfinished">Файл &quot;%s&quot; сохранен некорректно.</translation>
+        <translation>Файл &quot;%s&quot; сохранен некорректно.</translation>
     </message>
     <message>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+47"/>
@@ -1938,12 +1929,12 @@
     <message>
         <location line="+5"/>
         <source>Shift audio:</source>
-        <translation type="unfinished">Сдвиг аудио:</translation>
+        <translation>Сдвиг аудио:</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Shift Value (ms):</source>
-        <translation type="unfinished">Значение сдвига (мс):</translation>
+        <translation>Значение сдвига (мс):</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-20"/>
@@ -2077,13 +2068,9 @@
         <translation type="unfinished">_Дерингинг</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-272"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-278"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
-        <translation type="unfinished">Декодировать видео с помощью VDPAU (NVIDIA)</translation>
-    </message>
-    <message>
-        <source>Decode video using XVBA (AMD)</source>
-        <translation type="obsolete">Декодировать видео с помощью XVBA (AMD)</translation>
+        <translation>Декодировать видео с помощью VDPAU (NVIDIA)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2093,17 +2080,17 @@
     <message>
         <location line="-3"/>
         <source>Decode video using VideoToolbox (macOS)</source>
-        <translation type="unfinished">Декодировать видео с помощью VideoToolbox (macOS)</translation>
+        <translation>Декодировать видео с помощью VideoToolbox (macOS)</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Enable openGl support</source>
-        <translation type="unfinished">Включить поддержку OpenGL</translation>
+        <translation>Включить поддержку OpenGL</translation>
     </message>
     <message>
         <location line="-3"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
-        <translation type="unfinished">При включении аппаратного ускорения лучше использовать подходящий видеодрайвер</translation>
+        <translation>При включении аппаратного ускорения лучше использовать соответствующий вывод видео</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -2116,7 +2103,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+61"/>
         <source>Caching of decoded pictures</source>
         <translation>Кэширование декодированных кадров</translation>
     </message>
@@ -2148,7 +2135,7 @@
     </message>
     <message>
         <location line="+15"/>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+213"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2185,17 +2172,17 @@
     <message>
         <location line="+25"/>
         <source>_Language</source>
-        <translation type="unfinished">_Язык</translation>
+        <translation>_Язык</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>_Limit Refresh Rate</source>
-        <translation type="unfinished">_Ограничение частоты обновлений</translation>
+        <translation>_Ограничение частоты обновления</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Refresh Rate Cap (ms)</source>
-        <translation type="unfinished">Интервал частоты обновлений (мс)</translation>
+        <translation>Интервал частоты обновления (мс)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2205,14 +2192,14 @@
     <message>
         <location line="+16"/>
         <source>Display</source>
-        <translation type="unfinished">Монитор</translation>
+        <translation>Видео</translation>
     </message>
     <message>
         <location line="+4"/>
         <location line="+3"/>
         <location line="+3"/>
         <source>HW Accel</source>
-        <translation type="unfinished">Аппаратное ускорение</translation>
+        <translation>Аппаратное ускорение</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -2225,7 +2212,7 @@
         <translation type="unfinished">Порт по умолчанию</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-96"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-100"/>
         <source>Open</source>
         <translation>&amp;Открыть...</translation>
     </message>
@@ -2252,22 +2239,22 @@
     <message>
         <location line="+1"/>
         <source>Save as BMP</source>
-        <translation type="unfinished">Сохранить битовой матрицей (BMP)</translation>
+        <translation>Сохранить битовой матрицей (BMP)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Save as PNG</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить как PNG</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Save as JPEG</source>
-        <translation type="unfinished">Сохранить как JPEG</translation>
+        <translation>Сохранить как JPEG</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Save Selection as JPEG</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить выборку как последовательность JPEG</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2277,12 +2264,12 @@
     <message>
         <location line="+2"/>
         <source>Information</source>
-        <translation type="unfinished">Сво&amp;йства</translation>
+        <translation>Сво&amp;йства</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Quit</source>
-        <translation type="unfinished">В&amp;ыйти из Avidemux</translation>
+        <translation>В&amp;ыйти из Avidemux</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -2293,7 +2280,7 @@
     <message>
         <location line="+7"/>
         <source>Undo</source>
-        <translation type="unfinished">Отменить</translation>
+        <translation>Отменить</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2303,23 +2290,23 @@
     <message>
         <location line="+1"/>
         <source>Reset Edit</source>
-        <translation type="unfinished">Сброс</translation>
+        <translation>Сброс</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cut</source>
-        <translation type="unfinished">Вырезать</translation>
+        <translation>Вырезать</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Paste</source>
-        <translation type="unfinished">Вставить</translation>
+        <translation>Вставить</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+2"/>
         <source>Delete</source>
-        <translation type="unfinished">Удалить</translation>
+        <translation>Удалить</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -2327,12 +2314,13 @@
         <translation>Сброс маркеров</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
+        <location line="+2"/>
         <source>Save current settings as default</source>
         <translation>Сохранить текущие настройки вывода по умолчанию</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Load saved settings</source>
         <translation>Загрузить настройки вывода по умолчанию</translation>
     </message>
@@ -2349,7 +2337,7 @@
     <message>
         <location line="+2"/>
         <source>Play filtered</source>
-        <translation type="unfinished"></translation>
+        <translation>Воспроизводить фильтрованным</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -2427,28 +2415,33 @@
         <translation type="unfinished">Перейти ко времени...</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
-        <translation type="unfinished">Масштаб 1:4</translation>
+        <translation>Масштаб 1:4</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Zoom 1:2</source>
-        <translation type="unfinished">Масштаб 1:2</translation>
+        <translation>Масштаб 1:2</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Zoom 1:1</source>
-        <translation type="unfinished">Масштаб 1:1</translation>
+        <translation>Масштаб 1:1</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Zoom 2:1</source>
-        <translation type="unfinished">Масштаб 2:1</translation>
+        <translation>Масштаб 2:1</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
-        <location line="+44"/>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation>Подогнать под размер окна</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-43"/>
+        <location line="+43"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished">Нельзя удалить все видео</translation>
@@ -2481,7 +2474,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="-144"/>
-        <location filename="../../common/gui_save.cpp" line="-597"/>
+        <location filename="../../common/gui_save.cpp" line="-602"/>
         <source>No audio track</source>
         <translation type="unfinished">Нет звуковой дорожки</translation>
     </message>
@@ -2532,7 +2525,7 @@
 Он требуется для создания видео, совместимого с PSP.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1449"/>
+        <location filename="../../common/gui_main.cpp" line="-1447"/>
         <source>Select script/project to run</source>
         <translation type="unfinished">Выбрать скрипт/проект для запуска</translation>
     </message>
@@ -2557,13 +2550,13 @@
         <translation>Вы собираетесь очистить список недавно открытых файлов и проектов. Этот шаг необратим. Продолжить?</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+68"/>
+        <location line="+126"/>
+        <location line="+73"/>
         <source>Select Video File...</source>
         <translation type="unfinished">Выбрать файл видео...</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-48"/>
         <source>No engine</source>
         <translation type="unfinished">Нет движка</translation>
     </message>
@@ -2573,7 +2566,7 @@
         <translation type="unfinished">Скрипт tinyPy не включен в эту сборку</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished">Выбрать файл видео для присоединения...</translation>
     </message>
@@ -2597,7 +2590,7 @@
         <translation type="unfinished">Ошибка обрезки</translation>
     </message>
     <message>
-        <location line="+795"/>
+        <location line="+789"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished">Неверный индекс аудио</translation>
@@ -2628,7 +2621,7 @@
         <translation type="unfinished">Установка языка дорожки невозможна: неверный индекс дорожки!</translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+144"/>
         <source>AvsProxy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2658,7 +2651,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>No</source>
         <translation type="unfinished">Нет</translation>
     </message>
@@ -2668,7 +2661,7 @@
         <translation type="unfinished">Файл не загружен</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Job</source>
         <translation type="unfinished">Операция</translation>
     </message>
@@ -2678,7 +2671,7 @@
         <translation type="unfinished">Невозможно подключиться к базе данных. У вас включено управление операциями?</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Output file</source>
         <translation type="unfinished">Выходной файл</translation>
     </message>
@@ -2693,7 +2686,7 @@
         <translation type="unfinished">Добавить операцию в очередь</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Select PNG to Save</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2729,22 +2722,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Maximum number of 9999 images reached, aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Saving images failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+25"/>
         <source>PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2769,39 +2757,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cannot get tinyPÿ script engine</source>
-        <translation type="obsolete">Невозможно запустить движок скрипта tinyPy</translation>
-    </message>
-    <message>
         <location line="+7"/>
         <source>Cannot add job %s</source>
         <translation type="unfinished">Невозможно добавить операцию %s</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-207"/>
+        <location filename="../../common/gui_savenew.cpp" line="-210"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished">Использовать предыдущие данные прохода еще раз?
 Предупреждение: настройки могут быть закрыты.</translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+182"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished">Невозможно подтвердить цепочку видео</translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+24"/>
         <source>Cannot create encoder</source>
         <translation type="unfinished">Невозможно создать декодер</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>Cannot setup codec. Bitrate too low?</source>
-        <translation type="unfinished">Невозможно установить кодек. Слишком низкий битрейт?</translation>
+        <translation type="obsolete">Невозможно установить кодек. Слишком низкий битрейт?</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+57"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
         <translation type="unfinished">Невозможно настроить аудиокодек, убедитесь в совместимости потока с ним (количество каналов, битрейт, формат)</translation>
     </message>
@@ -2814,20 +2796,30 @@
 Всё равно продолжить?</translation>
     </message>
     <message>
-        <location line="-253"/>
-        <location line="+286"/>
+        <location line="-257"/>
+        <location line="+290"/>
         <location line="+26"/>
         <source>Muxer</source>
         <translation type="unfinished">Мультиплексор</translation>
     </message>
     <message>
-        <location line="-312"/>
-        <location line="+286"/>
+        <location line="-326"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+290"/>
         <source>Cannot instantiate muxer</source>
-        <translation type="unfinished">Невозможно подтвердить мультиплексор</translation>
+        <translation>Не удаётся создать экземпляр мультиплексора</translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="-102"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation>Не удаётся настроить кодировщик. Возможно, что конфигурация, переданная кодировщику, несовместима, или кодировщик нуждается в функциях, не предоставляемых данной системой.</translation>
+    </message>
+    <message>
+        <location line="+74"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The choice of cut points may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Do you want to continue anyway?</source>
         <translation>Это видео использует кадры прямого доступа без мгновенного обновления декодирования (non-IDR). Счётчик очерёдности показа изображений (POC) на таких ключевых кадрах не сбрасывается. Выбранные точки разреза при сохранении видео в режиме копирования могут привести к задержке воспроизведения из-за нарушенного порядка показа изображений.
@@ -3163,7 +3155,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>AAC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3213,12 +3205,12 @@
         <translation type="unfinished">Ошибка выделения памяти</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+495"/>
         <source>Saving</source>
         <translation type="unfinished">Сохранение</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+181"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3229,7 +3221,7 @@
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
-        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+374"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+382"/>
         <source>Unknown</source>
         <translation type="unfinished">Неизвестно</translation>
     </message>
@@ -3325,20 +3317,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
-        <location line="+30"/>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
-        <location line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
         <source>Codec</source>
         <translation type="unfinished">Кодек</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
         <source>Internal error finding codec 0x%x</source>
         <translation type="unfinished">Внутренняя ошибка поиска кодека 0x%x</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Internal error opening 0x%x</source>
         <translation type="unfinished">Внутренняя ошибка открытия 0x%x</translation>
     </message>
@@ -3355,31 +3347,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+812"/>
-        <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
-Dropping a keyframe will result in severely corrupted video.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
-Dropping a frame may result in some video corruption.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Do not warn again and drop frames silently while saving this video?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3619,7 +3587,7 @@
 <context>
     <name>avimuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+75"/>
         <source>Bad Idea</source>
         <translation type="unfinished">Плохая идея</translation>
     </message>
@@ -3697,70 +3665,70 @@
 <context>
     <name>bitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+51"/>
         <source>Constant Bitrate</source>
-        <translation type="unfinished">Постоянный битрейт</translation>
+        <translation>Постоянный битрейт</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Constant Quantiser</source>
-        <translation type="unfinished">Постоянный квантизатор</translation>
+        <translation>Постоянный квантизатор</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Same Quantiser as Input</source>
-        <translation type="unfinished">Такой же квантизатор, как и на входе</translation>
+        <translation>Такой же квантизатор, как и на входе</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Constant Rate Factor</source>
-        <translation type="unfinished">Фактор постоянной частоты</translation>
+        <translation>Постоянное качество (CRF)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Two Pass - Video Size</source>
-        <translation type="unfinished">2 прохода - размер видео</translation>
+        <translation>2 прохода - размер видео</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Two Pass - Average Bitrate</source>
-        <translation type="unfinished">2 прохода - средний битрейт</translation>
+        <translation>2 прохода - средний битрейт</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Encoding mode</source>
-        <translation type="unfinished">Режим кодирования</translation>
+        <translation>Режим кодирования</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Bitrate</source>
-        <translation type="unfinished">Битрейт</translation>
+        <translation>Битрейт</translation>
     </message>
     <message>
         <location line="+86"/>
         <source>Target bitrate (kb/s)</source>
-        <translation type="unfinished">Целевой битрейт (кб/с)</translation>
+        <translation>Целевой битрейт (кб/с)</translation>
     </message>
     <message>
         <location line="+5"/>
         <location line="+19"/>
         <source>Quantizer</source>
-        <translation type="unfinished">Квантизатор</translation>
+        <translation>Квантизатор</translation>
     </message>
     <message>
         <location line="-14"/>
         <source>Target video size (MB)</source>
-        <translation type="unfinished">Конечный размер видео (МБ)</translation>
+        <translation>Конечный размер видео (МБ)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Average bitrate (kb/s)</source>
-        <translation type="unfinished">Средний битрейт (кб/с)</translation>
+        <translation>Средний битрейт (кб/с)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>-</source>
-        <translation type="unfinished"></translation>
+        <translation>-</translation>
     </message>
 </context>
 <context>
@@ -3768,27 +3736,27 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp" line="+48"/>
         <source>Black</source>
-        <translation type="unfinished">Черный</translation>
+        <translation>Зачернить</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Replace a section by black.</source>
-        <translation type="unfinished">Заменить отрезок черным.</translation>
+        <translation>Зачернить отрезок видео.</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>_Start time:</source>
-        <translation type="unfinished">_Начальное время:</translation>
+        <translation>_Начало:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_End time:</source>
-        <translation type="unfinished">_Конечное время:</translation>
+        <translation>_Конец:</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Replace by Black</source>
-        <translation type="unfinished">Заменить черным</translation>
+        <translation>Зачернить</translation>
     </message>
 </context>
 <context>
@@ -3796,12 +3764,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
         <source>Blacken Borders</source>
-        <translation type="unfinished">Зачернение краёв</translation>
+        <translation>Зачернение краёв</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Remove noisy edge by turning them to black.</source>
-        <translation type="unfinished">Удалить шум краёв, заполнив их черным цветом.</translation>
+        <translation>Удалить шум краёв, заполнив их черным цветом.</translation>
     </message>
 </context>
 <context>
@@ -3814,34 +3782,39 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
         <source>Right:</source>
         <translation type="unfinished">Справа:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+23"/>
         <source>Top:</source>
         <translation type="unfinished">Сверху:</translation>
     </message>
     <message>
         <location line="+43"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
         <source>Reset</source>
         <translation type="unfinished">Сброс</translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
         <source>Bottom:</source>
         <translation type="unfinished">Снизу:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+51"/>
         <source>Left:</source>
         <translation type="unfinished">Слева:</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>blackframes</name>
@@ -3862,6 +3835,29 @@
     </message>
 </context>
 <context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -3890,7 +3886,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
+        <source>59.94  (NTSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3904,7 +3900,7 @@
         <translation>Ускорить или замедлить видео за счёт изменения частоты кадров. Этот фильтр изменяет продолжительность видео.</translation>
     </message>
     <message>
-        <location line="+141"/>
+        <location line="+146"/>
         <source>Source Fps:</source>
         <translation>Режим исходной частоты кадров:</translation>
     </message>
@@ -4120,27 +4116,27 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/contrast.ui" line="+14"/>
         <location line="+19"/>
         <source>Contrast</source>
-        <translation type="unfinished">Контраст</translation>
+        <translation>Контраст</translation>
     </message>
     <message>
         <location line="+94"/>
         <source>Luma</source>
-        <translation type="unfinished">Яркость (luma)</translation>
+        <translation>Яркость (luma)</translation>
     </message>
     <message>
         <location line="-53"/>
         <source>Brightness</source>
-        <translation type="unfinished">Яркость</translation>
+        <translation>Яркость</translation>
     </message>
     <message>
         <location line="-48"/>
         <source>Contrast  </source>
-        <translation type="unfinished">Контраст  </translation>
+        <translation>Контраст  </translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Brightness  </source>
-        <translation type="unfinished">Яркость  </translation>
+        <translation>Яркость  </translation>
     </message>
     <message>
         <location line="+46"/>
@@ -4235,7 +4231,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4391,12 +4387,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp" line="+41"/>
         <source>MPlayer delogo2</source>
-        <translation type="unfinished"></translation>
+        <translation>MPlayer delogo2</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Blend a logo by interpolating its surrounding box.</source>
-        <translation type="unfinished">Стереть логотип с помощью интерполяции окружения.</translation>
+        <translation>Стереть логотип с помощью интерполяции окружения.</translation>
     </message>
 </context>
 <context>
@@ -4493,38 +4489,38 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+26"/>
         <source>Encoding...</source>
-        <translation type="unfinished">Кодирование...</translation>
+        <translation>Кодирование...</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+55"/>
         <source>Phase:</source>
-        <translation type="unfinished">Этап:</translation>
+        <translation>Этап:</translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+240"/>
         <source>Audio Codec:</source>
-        <translation type="unfinished"></translation>
+        <translation>Кодек аудио:</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Container:</source>
-        <translation type="unfinished"></translation>
+        <translation>Контейнер:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Video Codec:</source>
-        <translation type="unfinished">Кодек видео:</translation>
+        <translation>Кодек видео:</translation>
     </message>
     <message>
-        <location line="-255"/>
-        <location line="+220"/>
+        <location line="-282"/>
+        <location line="+247"/>
         <location line="+21"/>
         <source>None</source>
         <translation type="unfinished">Не нужно</translation>
     </message>
     <message>
-        <location line="-258"/>
-        <location line="+251"/>
+        <location line="-261"/>
+        <location line="+254"/>
         <source>Unknown</source>
         <translation type="unfinished">Неизвестно</translation>
     </message>
@@ -4547,12 +4543,12 @@
             </translation>
     </message>
     <message>
-        <location line="-460"/>
+        <location line="-518"/>
         <source>Time Remaining:</source>
         <translation type="unfinished">Осталось времени:</translation>
     </message>
     <message>
-        <location line="+291"/>
+        <location line="+349"/>
         <source>Total Size:</source>
         <translation type="unfinished">Общий размер:</translation>
     </message>
@@ -4562,7 +4558,7 @@
         <translation type="unfinished">Размер видео:</translation>
     </message>
     <message>
-        <location line="-301"/>
+        <location line="-312"/>
         <source>Shut down computer when finished</source>
         <translation type="unfinished">Выключить после завершения</translation>
     </message>
@@ -4597,19 +4593,24 @@
         <translation type="unfinished">Низкий</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+12"/>
+        <source>Keep dialog open when finished</source>
+        <translation>Оставить диалог открытым</translation>
+    </message>
+    <message>
+        <location line="+37"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished">Свернуть в трей</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Pause / Abort</source>
-        <translation type="unfinished">Пауза / Прервать</translation>
+        <translation>Пауза / Прервать</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+13"/>
         <source>Advanced</source>
-        <translation type="unfinished">Дополнительно</translation>
+        <translation>Дополнительно</translation>
     </message>
     <message>
         <location line="+249"/>
@@ -4632,12 +4633,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-509"/>
+        <location line="-533"/>
         <source>Main</source>
         <translation type="unfinished">Главный</translation>
     </message>
     <message>
-        <location line="+340"/>
+        <location line="+364"/>
         <location line="+7"/>
         <location line="+14"/>
         <source>0 MB</source>
@@ -4659,7 +4660,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+65"/>
         <source>Adjust contrast, brightness, saturation and gamma.</source>
-        <translation type="unfinished">Настройка контраста, яркости, насыщенности и гаммы.</translation>
+        <translation>Настройка контраста, яркости, насыщенности и гаммы.</translation>
     </message>
     <message>
         <location line="-1"/>
@@ -4669,7 +4670,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
         <source>Reset</source>
-        <translation type="unfinished"></translation>
+        <translation>Сброс</translation>
     </message>
 </context>
 <context>
@@ -4678,32 +4679,32 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+14"/>
         <location line="+88"/>
         <source>Contrast</source>
-        <translation type="unfinished">Контраст</translation>
+        <translation>Контраст</translation>
     </message>
     <message>
         <location line="-14"/>
         <source>Saturation</source>
-        <translation type="unfinished">Насыщенность</translation>
+        <translation>Насыщенность</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Brightness</source>
-        <translation type="unfinished">Яркость</translation>
+        <translation>Яркость</translation>
     </message>
     <message>
         <location line="-44"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
-        <translation type="unfinished">&lt;b&gt;Гамма&lt;/b&gt;</translation>
+        <translation>&lt;b&gt;Гамма&lt;/b&gt;</translation>
     </message>
     <message>
         <location line="+143"/>
         <source>Blue</source>
-        <translation type="unfinished">Синий</translation>
+        <translation>Синий</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Red</source>
-        <translation type="unfinished">Красный</translation>
+        <translation>Красный</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -4713,12 +4714,12 @@
     <message>
         <location line="+7"/>
         <source>Weight</source>
-        <translation type="unfinished">Вес</translation>
+        <translation>Вес</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Green</source>
-        <translation type="unfinished">Зеленый</translation>
+        <translation>Зеленый</translation>
     </message>
 </context>
 <context>
@@ -4742,10 +4743,10 @@
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
         <location line="+23"/>
         <source>Fade</source>
-        <translation type="unfinished">Затемнение   </translation>
+        <translation type="unfinished">Затемнение</translation>
     </message>
     <message>
         <location line="-22"/>
@@ -4753,26 +4754,51 @@
         <translation type="unfinished">Затемнить.</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+13"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Start time:</source>
-        <translation type="unfinished">_Начальное время:</translation>
+        <translation>_Начало:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_End time:</source>
-        <translation type="unfinished">_Конечное время:</translation>
+        <translation>_Конец:</translation>
     </message>
 </context>
 <context>
     <name>fadeToBlack</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
-        <location line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+55"/>
+        <location line="+20"/>
         <source>Fade to black</source>
         <translation type="unfinished">Затемнение до черного</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-19"/>
         <source>Fade to black in/out.</source>
         <translation type="unfinished">Затемнить до черного (появление/исчезание).</translation>
     </message>
@@ -4797,7 +4823,7 @@
         <translation type="unfinished">Появление</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>_Fade type:</source>
         <translation type="unfinished">_Тип затемнения:</translation>
     </message>
@@ -4815,7 +4841,7 @@
 <context>
     <name>ffVAEncH264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4830,12 +4856,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Profile:</source>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4846,16 +4893,21 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Bitrate (kbps):</source>
+        <source>Quality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4865,7 +4917,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4873,27 +4925,53 @@
 <context>
     <name>ffVAEncHEVC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+343"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4903,7 +4981,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4911,7 +4989,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+256"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+289"/>
         <source>Threading</source>
         <translation type="unfinished">Многопоточность</translation>
     </message>
@@ -5380,8 +5458,32 @@
 <context>
     <name>ffnvenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+229"/>
+        <source>Controlled by Preset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
         <source>Low Quality</source>
         <translation type="unfinished">Низкое качество</translation>
     </message>
@@ -5433,6 +5535,12 @@
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+        <source>RC Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Preset:</source>
         <translation type="unfinished">Предустановки:</translation>
     </message>
@@ -5442,6 +5550,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Bitrate (kbps):</source>
@@ -5455,33 +5569,53 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Frame Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>NVENC H.264 configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
         <source>nvEnc HEVC  configuration</source>
-        <translation type="unfinished">Настройка nvEnc HEVC</translation>
+        <translation type="obsolete">Настройка nvEnc HEVC</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+28"/>
+        <source>NVENC HEVC configuration</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5492,7 +5626,7 @@
         <translation type="unfinished">[Несовпадение]</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+87"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished">Сохранение mpeg PS (ff)</translation>
     </message>
@@ -5596,7 +5730,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished">Сохранение mpeg TS (ff)</translation>
     </message>
@@ -5669,7 +5803,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5827,7 +5961,7 @@
 <context>
     <name>flvdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>Warning</source>
         <translation type="unfinished">Предупреждение</translation>
     </message>
@@ -6359,7 +6493,7 @@
 <context>
     <name>jobs</name>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Oops</source>
         <translation type="unfinished">Предупреждение</translation>
     </message>
@@ -6369,7 +6503,7 @@
         <translation type="unfinished">Что-то очень необъяснимое случилось при построении списка заданий.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>There are no jobs stored</source>
         <translation type="unfinished">Нет сохраненных заданий</translation>
     </message>
@@ -6698,12 +6832,12 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/license.ui" line="+16"/>
         <source>License</source>
-        <translation type="unfinished">Лицензия</translation>
+        <translation>Лицензия</translation>
     </message>
     <message>
         <location line="+46"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>Закрыть</translation>
     </message>
 </context>
 <context>
@@ -6857,12 +6991,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
         <source>Matroska Images</source>
         <translation type="unfinished">Изображения Matroska</translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+523"/>
         <source>Matroska clusters</source>
         <translation type="unfinished">Кластеры Matroska</translation>
     </message>
@@ -6962,24 +7096,24 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+167"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
         <source>Saving Mkv</source>
         <translation type="unfinished">Сохранение в MKV</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
         <source>Force display width</source>
-        <translation type="unfinished">Принудительная ширина изображения</translation>
+        <translation>Принудительная ширина изображения</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Display width</source>
-        <translation type="unfinished">Ширина изображения</translation>
+        <translation>Ширина изображения</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Force Aspect Ratio (DAR)</source>
-        <translation type="unfinished">Поставить формат кадра (DAR)</translation>
+        <translation>Поставить формат кадра (DAR)</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -7061,72 +7195,83 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
         <source>Problem reading SVQ3 headers</source>
-        <translation type="unfinished">Ошибка чтения заголовков SVQ3</translation>
+        <translation>Ошибка чтения заголовков SVQ3</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation>Декодирование типа кадров</translation>
     </message>
 </context>
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+67"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <location line="+17"/>
         <source>Unsupported</source>
-        <translation type="unfinished">Не поддерживается</translation>
+        <translation>Не поддерживается</translation>
     </message>
     <message>
-        <location line="-9"/>
-        <source>Only MP4Video, H264, and H265 supported for video</source>
-        <translation type="unfinished">Для видео поддерживаются только MP4Video, H264 и H265</translation>
+        <location line="-17"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
+        <translation>Как видео поддерживаются только MPEG-4, H.264, HEVC и AV1</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
-        <translation type="unfinished">Для аудио поддерживаются только AAC, AC3, E-AC3 и mpegaudio</translation>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
+        <translation>Как аудио поддерживаются только AAC, AC3, E-AC3, LPCM, MP2, MP3 и Vorbis</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation>Несовместимый формат</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation>Формат PSP несовместим с аудиокодеком LPCM</translation>
+    </message>
+    <message>
+        <location line="+182"/>
         <source>Saving mp4</source>
-        <translation type="unfinished">Сохранение в MP4</translation>
+        <translation>Сохранение как MP4</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Saving PSP</source>
-        <translation type="unfinished">Сохранение в формате PSP</translation>
+        <translation>Сохранение в формате PSP</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
         <source>Muxing Format</source>
-        <translation type="unfinished">Формат мультиплексирования</translation>
-    </message>
-    <message>
-        <source>Use alternate MP3 tag</source>
-        <translation type="obsolete">Использовать альтернативные тэги для MP3</translation>
+        <translation>Формат мультиплексирования</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>No optimization</source>
-        <translation type="unfinished"></translation>
+        <translation>Без оптимизации</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Move index to the beginning of the file</source>
-        <translation type="unfinished"></translation>
+        <translation>Переместить индекс к началу файла</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Use fragmentation</source>
-        <translation type="unfinished"></translation>
+        <translation>Фрагментировать</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Optimize for Streaming</source>
-        <translation type="unfinished"></translation>
+        <translation>Оптимизировать для потоковой передачи</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Force aspect ratio</source>
-        <translation type="unfinished">Поставить соотношение сторон</translation>
+        <translation>Форсировать соотношение сторон</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -7134,7 +7279,7 @@
         <translation>Формат кадра (DAR)</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Do not rotate</source>
         <translation>не вращать</translation>
     </message>
@@ -7160,8 +7305,53 @@
     </message>
     <message>
         <location line="+3"/>
+        <source>Auto</source>
+        <translation>Автоматически</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation>24 кГц</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation>25 кГц</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation>30 кГц</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation>50 кГц</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation>60 кГц</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation>90 кГц</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation>180 кГц</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation>Шкала времени</translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>MP4 Muxer</source>
-        <translation type="unfinished"></translation>
+        <translation>Мультиплексор MP4</translation>
     </message>
 </context>
 <context>
@@ -7332,24 +7522,24 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+242"/>
+        <location filename="../../common/gui_navigate.cpp" line="+232"/>
         <source>Cannot go to next keyframe</source>
-        <translation type="unfinished">Невозможно перейти к следующему ключевому кадру</translation>
+        <translation>Невозможно перейти к следующему ключевому кадру</translation>
     </message>
     <message>
         <location line="+64"/>
         <source>Cannot go to previous keyframe</source>
-        <translation type="unfinished">Невозможно перейти к предыдущему ключевому кадру</translation>
+        <translation>Невозможно перейти к предыдущему ключевому кадру</translation>
     </message>
     <message>
         <location line="+188"/>
         <source>Seek</source>
-        <translation type="unfinished">Перейти</translation>
+        <translation>Поиск</translation>
     </message>
     <message>
         <location line="+78"/>
         <source>Error</source>
-        <translation type="unfinished">Ошибка</translation>
+        <translation>Ошибка</translation>
     </message>
 </context>
 <context>
@@ -7357,12 +7547,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/nvEnc/ADM_nvEnc.cpp" line="+136"/>
         <source>Low Quality</source>
-        <translation type="unfinished">Низкое качество</translation>
+        <translation>Низкое качество</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>High Quality</source>
-        <translation type="unfinished">Высокое качество</translation>
+        <translation>Высокое качество</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -7372,37 +7562,37 @@
     <message>
         <location line="+1"/>
         <source>Low Latency</source>
-        <translation type="unfinished">Низкий отклик</translation>
+        <translation>Минимальная задержка</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Low Latency (LQ)</source>
-        <translation type="unfinished">Низкий отклик (низкое качество)</translation>
+        <translation>Минимальная задержка (низкое качество)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Low Latency (HQ)</source>
-        <translation type="unfinished">Низкий отклик (высокое качество)</translation>
+        <translation>Минимальная задержка (высокое качество)</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Preset:</source>
-        <translation type="unfinished">Предустановка:</translation>
+        <translation>Предустановка:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bitrate (kbps):</source>
-        <translation type="unfinished">Битрейт (кб/с):</translation>
+        <translation>Битрейт (кб/с):</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max Bitrate (kbps):</source>
-        <translation type="unfinished">Максимальный битрейт (кб/с):</translation>
+        <translation>Максимальный битрейт (кб/с):</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Nvidia H264 Encoder configuration</source>
-        <translation type="unfinished">Настройка кодека Nvidia H264</translation>
+        <translation>Настройка кодировщика Nvidia H264</translation>
     </message>
 </context>
 <context>
@@ -7425,22 +7615,22 @@
     <message>
         <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
         <source>_Start time:</source>
-        <translation type="unfinished">_Начальное время:</translation>
+        <translation>_Начало:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_End time:</source>
-        <translation type="unfinished">_Конечное время:</translation>
+        <translation>_Конец:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Configure filter</source>
-        <translation type="unfinished">Настроить фильтр</translation>
+        <translation>Настроить фильтр</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Partial Filter</source>
-        <translation type="unfinished">Частичный фильтр</translation>
+        <translation>Частичный фильтр</translation>
     </message>
 </context>
 <context>
@@ -7562,27 +7752,17 @@
 <context>
     <name>psdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Ошибка</translation>
-    </message>
-    <message>
-        <source>This file&apos;s index has been created with an older version of avidemux.
-Please delete the idx2 file and reopen.</source>
-        <translation type="obsolete">Индекс &apos;этого файла был создан старой версией Avidemux.
-Пожалуйста, удалите файл idx2 и откройте заново.</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
         <translation type="unfinished">Индексирование</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished">Обнаружены несколько файлов с последовательными именами. Загрузить их все?</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -7652,9 +7832,9 @@
         <translation type="unfinished">Для выполнения этой операции требуются права root.</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+126"/>
         <source>First Pass</source>
-        <translation type="unfinished"></translation>
+        <translation>Первый проход</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -7667,19 +7847,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+185"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
-        <translation type="unfinished">Процесс кодирования приостановлен. Вы хотите продолжить или прервать его?</translation>
+        <translation>Процесс кодирования приостановлен. Вы хотите продолжить или прервать его?</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Resume</source>
-        <translation type="unfinished">Продолжить</translation>
+        <translation>Продолжить</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Abort</source>
-        <translation type="unfinished">Прервать</translation>
+        <translation>Прервать</translation>
     </message>
 </context>
 <context>
@@ -7705,24 +7885,24 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+212"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+206"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;Новая версия&lt;/b&gt;&lt;br&gt;Версия %1&lt;br&gt;Выпущена %2.&lt;br&gt;Доступна для загрузки с адреса&lt;br&gt;&lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt;Вы можете отключить автоматическую проверку обновлений в настройках.&lt;/small&gt;</translation>
     </message>
     <message>
         <location line="+245"/>
         <source>Recent Files</source>
-        <translation type="unfinished">Предыдущие файлы</translation>
+        <translation>Предыдущие файлы</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Recent Projects</source>
-        <translation type="unfinished">Предыдущие проекты</translation>
+        <translation>Предыдущие проекты</translation>
     </message>
     <message>
         <location line="+671"/>
         <source>Play/Stop</source>
-        <translation type="unfinished">Старт/стоп</translation>
+        <translation>Старт/стоп</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -7747,12 +7927,12 @@
     <message>
         <location line="+3"/>
         <source>Set start marker</source>
-        <translation type="unfinished">Поставить маркер A</translation>
+        <translation>Поставить маркер A</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Set end marker</source>
-        <translation type="unfinished">Поставить маркер B</translation>
+        <translation>Поставить маркер B</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -7767,12 +7947,12 @@
     <message>
         <location line="+3"/>
         <source>Go to marker A</source>
-        <translation type="unfinished">Перейти к маркеру A</translation>
+        <translation>Перейти к маркеру A</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Go to marker B</source>
-        <translation type="unfinished">Перейти к маркеру B</translation>
+        <translation>Перейти к маркеру B</translation>
     </message>
     <message>
         <location line="+16"/>
@@ -7785,21 +7965,31 @@
         <translation>Вперед на 1 минуту</translation>
     </message>
     <message>
-        <location line="+626"/>
+        <location line="+681"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
-        <translation type="unfinished">Приложение столкнулось с критической проблемой
+        <translation>Приложение столкнулось с критической проблемой
 Ход текущего редактирования сохранен и будет загружен при следующем запуске</translation>
     </message>
     <message>
-        <location line="+262"/>
+        <location line="+230"/>
         <source>%c-%s (%02d)</source>
-        <translation type="unfinished"></translation>
+        <translation>%c-%s (%02d)</translation>
     </message>
     <message>
-        <location line="+334"/>
-        <source> (%d track(s))</source>
-        <translation type="unfinished"> (%d дорожек)</translation>
+        <location line="+70"/>
+        <source>Selection: </source>
+        <translation>Выборка: </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation>
+            <numerusform> (%n дорожка)</numerusform>
+            <numerusform> (%n дорожки)</numerusform>
+            <numerusform> (%n дорожек)</numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -7807,7 +7997,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp" line="+51"/>
         <source>Project Script</source>
-        <translation type="unfinished">Скрипт проекта</translation>
+        <translation>Скрипт проекта</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -7817,7 +8007,7 @@
     <message>
         <location line="+6"/>
         <source>&amp;Run Project...</source>
-        <translation type="unfinished">&amp;Запустить проект...</translation>
+        <translation>&amp;Запустить проект...</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -7827,7 +8017,7 @@
     <message>
         <location line="+5"/>
         <source>Save &amp;As Project...</source>
-        <translation type="unfinished">Сохранить &amp;как проект...</translation>
+        <translation>Сохранить &amp;как проект...</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -7957,37 +8147,37 @@
     <message>
         <location line="+0"/>
         <source>This filter cannot be made partial</source>
-        <translation type="unfinished">Этот фильтр не может быть применен частично</translation>
+        <translation>Этот фильтр не может быть применен только к части видео</translation>
     </message>
     <message>
         <location line="+244"/>
         <source>Add</source>
-        <translation type="unfinished">Добавить</translation>
+        <translation>Добавить</translation>
     </message>
     <message>
         <location line="-96"/>
         <source>Remove</source>
-        <translation type="unfinished">Удалить</translation>
+        <translation>Удалить</translation>
     </message>
     <message>
         <location line="-1"/>
         <source>Configure</source>
-        <translation type="unfinished">Настройка</translation>
+        <translation>Настройка</translation>
     </message>
     <message>
         <location line="-2"/>
         <source>Move up</source>
-        <translation type="unfinished">Переместить вверх</translation>
+        <translation>Переместить вверх</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Move down</source>
-        <translation type="unfinished">Переместить вниз</translation>
+        <translation>Переместить вниз</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Make partial</source>
-        <translation type="unfinished">Сделать частичным</translation>
+        <translation>Сделать частичным</translation>
     </message>
     <message>
         <location line="+225"/>
@@ -8005,22 +8195,22 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
         <source>Unknown</source>
-        <translation type="unfinished">Неизвестно</translation>
+        <translation>Неизвестно</translation>
     </message>
     <message>
         <location line="+94"/>
         <source>_Resume</source>
-        <translation type="unfinished">_Продолжить</translation>
+        <translation>_Продолжить</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>The processing is paused.</source>
-        <translation type="unfinished">Обработка приостановлена.</translation>
+        <translation>Процесс приостановлен.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel it ?</source>
-        <translation type="unfinished">Отменить ее ?</translation>
+        <translation>Отменить дальнейшую обработку?</translation>
     </message>
 </context>
 <context>
@@ -8028,22 +8218,32 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
         <source>No</source>
-        <translation type="unfinished">Нет</translation>
+        <translation>Нет</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Yes</source>
-        <translation type="unfinished">Да</translation>
+        <translation>Да</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+72"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
+        <translation>
+            <numerusform>Аудио (%n включённая дорожка)</numerusform>
+            <numerusform>Аудио (%n включённой дорожки)</numerusform>
+            <numerusform>Аудио (%n включённых дорожек)</numerusform>
+        </translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+34"/>
         <source>Mono</source>
-        <translation type="unfinished">Моно</translation>
+        <translation>Моно</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Stereo</source>
-        <translation type="unfinished">Стерео</translation>
+        <translation>Стерео</translation>
     </message>
     <message>
         <location line="+46"/>
@@ -8072,39 +8272,39 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+27"/>
+        <location line="+33"/>
         <source>Total Duration:	</source>
-        <translation type="unfinished">Продолжительность:</translation>
+        <translation>Продолжительность:</translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-31"/>
         <source>Extra Video Properties</source>
         <translation>Дополнительные свойства видео</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>ExtraDataSize:	</source>
-        <translation type="unfinished">Размер дополнительных данных:</translation>
+        <translation>Размер дополнительных данных:</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Extra data:	</source>
-        <translation type="unfinished">Дополнительные данные:</translation>
+        <translation>Дополнительные данные:</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Audio</source>
         <translation>Звук</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Codec:		</source>
         <translation>Кодек:		</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Channels:	</source>
-        <translation>Каналы:		</translation>
+        <translation>Каналы:	</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -8122,29 +8322,29 @@
         <translation>Без звука</translation>
     </message>
     <message>
-        <location line="-155"/>
+        <location line="-170"/>
         <source>%2.3f fps</source>
-        <translation type="unfinished">%2.3f кадров/с</translation>
+        <translation>%2.3f кадров/с</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+81"/>
+        <location line="+90"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation>%02d:%02d:%02d,%03d</translation>
     </message>
     <message>
-        <location line="-87"/>
+        <location line="-96"/>
         <source>%s (%u:%u)</source>
-        <translation type="unfinished"></translation>
+        <translation>%s (%u:%u)</translation>
     </message>
 </context>
 <context>
     <name>qshell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+53"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
-        <translation type="unfinished">Введите команды и нажмите кнопку &quot;Выполнить&quot; или CTRL+ENTER.
+        <translation>Введите команды и нажмите кнопку &quot;Выполнить&quot; или CTRL+ENTER.
 </translation>
     </message>
     <message>
@@ -8152,8 +8352,25 @@
         <source>You can use CTRL+PageUP and CTRL+Page Down to recall previous commands
 Ready.
 </source>
-        <translation type="unfinished">Вы можете использовать CTRL+Page Up и CTRL+Page Down для вызова предыдущих команд
-Готово.</translation>
+        <translation>Вы можете использовать CTRL+Page Up и CTRL+Page Down для вызова предыдущих команд.
+Готовность.
+</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation>Введите команды и нажмите кнопку &quot;Выполнить&quot; или ⌘⏎.
+</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation>Вы можете использовать ⌥⌘▲ и ⌥⌘▼ для вызова предыдущих команд.
+Готовность.
+</translation>
     </message>
 </context>
 <context>
@@ -8216,6 +8433,16 @@
         <source>Video Only Muxer Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>removeplane</name>
@@ -8268,7 +8495,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
         <source>_Mode:</source>
         <translation type="unfinished">_Режим:</translation>
     </message>
@@ -8283,7 +8510,7 @@
         <translation>Ресамплировать видео</translation>
     </message>
     <message>
-        <location line="-325"/>
+        <location line="-329"/>
         <source>Custom</source>
         <translation type="unfinished">Вручную</translation>
     </message>
@@ -8309,7 +8536,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
+        <source>59.94  (NTSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8326,7 +8553,7 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
         <source>Width and height cannot be odd</source>
         <translation>Ширина и высота не могут быть нечетными</translation>
     </message>
@@ -8356,23 +8583,23 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+13"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+13"/>
         <source>Resize</source>
-        <translation type="unfinished">Изменить размер</translation>
+        <translation>Изменить размер</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>Source PAR:</source>
-        <translation type="unfinished"></translation>
+        <translation>PAR на входе:</translation>
     </message>
     <message>
         <location line="+8"/>
         <location line="+32"/>
         <source>1:1 (square pixels)</source>
-        <translation type="unfinished"></translation>
+        <translation>1:1 (квадратные пиксели)</translation>
     </message>
     <message>
         <location line="-8"/>
         <source>Destination PAR:</source>
-        <translation type="unfinished"></translation>
+        <translation>PAR на выходе:</translation>
     </message>
     <message>
         <location line="+341"/>
@@ -8402,7 +8629,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-423"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-423"/>
         <source>Aspect Ratio</source>
-        <translation type="unfinished">Соотношение сторон</translation>
+        <translation>Соотношение сторон</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -8417,7 +8644,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+12"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+12"/>
         <source>Lock Aspect Ratio</source>
-        <translation type="unfinished">Фиксировать соотношение сторон</translation>
+        <translation>Фиксировать соотношение сторон</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
@@ -8520,19 +8747,33 @@
         <translation type="unfinished">Приемник:</translation>
     </message>
     <message>
+        <location line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+356"/>
+        <source>Lanzcos3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+81"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+44"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+44"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-312"/>
         <source>Resize Dimensions</source>
-        <translation type="unfinished">Изменить размер приемника</translation>
+        <translation>Размеры на выходе</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -8547,7 +8788,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+20"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+20"/>
         <source>Width:</source>
-        <translation type="unfinished">Ширина:</translation>
+        <translation>Ширина:</translation>
     </message>
     <message>
         <location line="+36"/>
@@ -8562,7 +8803,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+36"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+36"/>
         <source>Height:</source>
-        <translation type="unfinished">Высота:</translation>
+        <translation>Высота:</translation>
     </message>
     <message>
         <location line="+35"/>
@@ -8577,7 +8818,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+35"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+35"/>
         <source>Round to the Nearest Multiple of 16</source>
-        <translation type="unfinished">Округлить до ближайшего множества 16</translation>
+        <translation>Округлить до ближайшего кратного 16</translation>
     </message>
     <message>
         <location line="+55"/>
@@ -8607,7 +8848,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+20"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+20"/>
         <source>Percent</source>
-        <translation type="unfinished">Процент</translation>
+        <translation>Процент</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -8637,7 +8878,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+50"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+50"/>
         <source>Error X / Y:</source>
-        <translation type="unfinished">Ошибка X / Y</translation>
+        <translation>Ошибка X / Y:</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -8652,7 +8893,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+7"/>
         <source>0.00 / 0.00</source>
-        <translation type="unfinished"></translation>
+        <translation>0,00 / 0,00</translation>
     </message>
     <message>
         <location line="+51"/>
@@ -8667,7 +8908,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+51"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+51"/>
         <source>Resize Method:</source>
-        <translation type="unfinished">Метод изменения размера:</translation>
+        <translation>Метод изменения размера:</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -8682,22 +8923,12 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+8"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+8"/>
         <source>Bilinear</source>
-        <translation type="unfinished">Билинейный</translation>
+        <translation>Билинейный</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+10"/>
-        <source>Lanzcos3</source>
-        <translation type="unfinished"></translation>
+        <source>Lanczos-3</source>
+        <translation>Ланчош-3</translation>
     </message>
 </context>
 <context>
@@ -8850,22 +9081,22 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
         <location line="+186"/>
         <source>Still Image</source>
-        <translation type="unfinished">Стоп-кадр</translation>
+        <translation>Стоп-кадр</translation>
     </message>
     <message>
         <location line="-185"/>
         <source>Duplicate frames for a given duration.</source>
-        <translation type="unfinished">Повторять кадр в течение заданного времени.</translation>
+        <translation>Повторять кадр в течение заданного времени.</translation>
     </message>
     <message>
         <location line="+181"/>
         <source>_Start time:</source>
-        <translation type="unfinished"></translation>
+        <translation>_Начало:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Duration:</source>
-        <translation type="unfinished"></translation>
+        <translation>_Длительность:</translation>
     </message>
 </context>
 <context>
@@ -9055,32 +9286,32 @@
 <context>
     <name>tsdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Ошибка</translation>
-    </message>
-    <message>
-        <source>This file&apos;s index has been created with an older version of avidemux.
-Please delete the idx2 file and reopen.</source>
-        <translation type="obsolete">Индекс &apos;этого файла был создан старой версией Avidemux.
-Пожалуйста, удалите файл idx2 и откройте заново.</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+183"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+325"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+84"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+207"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished">Обнаружены несколько файлов с последовательными именами. Загрузить их все?</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+19"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
         <translation type="unfinished">Индексирование</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -9172,19 +9403,145 @@
     </message>
 </context>
 <context>
+    <name>vaapiDeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
+        <translation>Деинтерлейсер на основе VA-API</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation>Устранить чересстрочность и по выбору изменить размер видео с помощью VA-API.</translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Adaptive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Compensated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation>Верхнее поле сначала</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation>Нижнее поле сначала</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation>Кадр за полный кадр</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation>Удвоить частоту кадров</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation>_Режим:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation>_Очерёдность полей:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation>_Вывод:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation>Чересстрочность</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation>_Изменить размер</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation>Ширина:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation>Высота:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation>Размеры</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation>Деинтерлейсер и трансформатор размеров для VA-API</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation>Неподдерживаемый режим</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation>Затребованный режим устранения чересстрочности %s не поддерживается, заменён на %s.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation>Ошибка в конфигурации VA-API</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation>Не удалось настроить VA-API, чисто транзитный режим.</translation>
+    </message>
+</context>
+<context>
     <name>vaapiResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
         <source>vaapi: Resize</source>
-        <translation type="unfinished">vaapi: Изменить размер</translation>
+        <translation type="obsolete">vaapi: Изменить размер</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>vaapi: Resize image using vaapi.</source>
-        <translation type="unfinished">vaapi: Изменить размер изображения с помощью vaapi.</translation>
+        <translation type="obsolete">vaapi: Изменить размер изображения с помощью vaapi.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
+        <translation>Изменить размер: VA-API</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize image using VA-API.</source>
+        <translation>Изменить размеры кадра с помощью интерфейса аппаратного ускорения VA-API.</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+129"/>
         <source>Width :</source>
         <translation>Ширина:</translation>
     </message>
@@ -9195,13 +9552,13 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>mpeg-&gt;PC:</source>
-        <translation type="unfinished"></translation>
+        <source>mpeg-&gt;PC</source>
+        <translation>Исходный материал по стандарту BT.601</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>vaapi</source>
-        <translation type="unfinished"></translation>
+        <translation>Изменить размер: VA-API</translation>
     </message>
 </context>
 <context>
@@ -9209,57 +9566,57 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+131"/>
         <source>vdpauDeint</source>
-        <translation type="unfinished"></translation>
+        <translation>Деинтерлейсер на основе VDPAU</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>VDPAU deinterlacer (+resize).</source>
-        <translation type="unfinished">Деинтерлейсер (+ изменение размеров) VDPAU</translation>
+        <translation>Устранить чересстрочность и по выбору изменить размер видео с помощью VDPAU.</translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+197"/>
         <source>Keep Top Field</source>
-        <translation type="unfinished">Сохранить верхнее поле</translation>
+        <translation>Сохранить верхнее поле</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Keep Bottom Field</source>
-        <translation type="unfinished">Сохранить нижнее поле</translation>
+        <translation>Сохранить нижнее поле</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Double framerate</source>
-        <translation type="unfinished">Удвоить частоту кадров</translation>
+        <translation>Удвоить частоту кадров</translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>_Ivtc:</source>
-        <translation type="unfinished"></translation>
+        <source>_IVTC</source>
+        <translation>_Обратный телесин</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Resize:</source>
-        <translation type="unfinished">_Изменить размер:</translation>
+        <source>_Resize</source>
+        <translation>_Изменить размер</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Deint Mode:</source>
-        <translation type="unfinished">_Режим деинтерлейсинга:</translation>
+        <translation>_Режим деинтерлейсинга:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Width :</source>
+        <source>Width:</source>
         <translation>Ширина:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation>Высота:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>vdpau</source>
-        <translation type="unfinished"></translation>
+        <translation>Деинтерлейсер на основе VDPAU</translation>
     </message>
 </context>
 <context>
@@ -9267,27 +9624,27 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="+69"/>
         <source>vdpau: Resize</source>
-        <translation type="unfinished">vdpau: Изменить размер</translation>
+        <translation>Изменить размер на основе VDPAU</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>vdpau: Resize image using vdpau.</source>
-        <translation type="unfinished">vdpau: Изменить размер с помощью vdpau.</translation>
+        <translation>Изменить размер с помощью VDPAU.</translation>
     </message>
     <message>
-        <location line="+133"/>
-        <source>Width :</source>
+        <location line="+131"/>
+        <source>Width:</source>
         <translation>Ширина:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation>Высота:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>vdpau</source>
-        <translation type="unfinished"></translation>
+        <translation>Изменить размер на основе VDPAU</translation>
     </message>
 </context>
 <context>
@@ -9365,6 +9722,84 @@
     </message>
 </context>
 <context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation>Режим реального времени</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation>Хорошее качество</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation>Наилучшее качество</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation>Наилучшее качество достигается в режиме среднего битрейта на два прохода при битрейте выставленном на ноль</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation>Предел времени</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation>Скорость</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation>Многопоточность</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation>Количество потоков равно количеству ядер процессора</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation>Длина группы кадров</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation>Использовать полный цветовой диапазон</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation>Режим</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation>Скорость и качество</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation>Ключевые кадры</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation>Разное</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation>Конфигурация кодировщика VP9 libvpx</translation>
+    </message>
+</context>
+<context>
     <name>vsWindow</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
@@ -9380,7 +9815,7 @@
 <context>
     <name>webmmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+68"/>
         <source>Unsupported Video.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
         <translation type="unfinished">Видео не поддерживается.
@@ -9394,19 +9829,19 @@
 Поддерживаются только видео VP8/VP9 и аудио Vorbis/Opus</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+89"/>
         <source>Saving Webm</source>
         <translation type="unfinished">Сохранение WEBM</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebmConfig.cpp" line="+27"/>
         <source>Force display width</source>
-        <translation type="unfinished">Принудительно устанавливать ширину монитора</translation>
+        <translation>Принудительная ширина изображения</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Display width</source>
-        <translation type="unfinished">Ширина монитора</translation>
+        <translation>Ширина изображения</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -9417,22 +9852,22 @@
 <context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
         <source>Processing</source>
         <translation type="unfinished">Обработка</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+20"/>
         <source>Time Remaining:</source>
-        <translation type="unfinished">Осталось времени:</translation>
+        <translation>Осталось времени:</translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-14"/>
         <source>Elapsed:</source>
-        <translation type="unfinished">Прошло времени</translation>
+        <translation>Прошло времени:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+27"/>
         <source>00:00:00</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9440,7 +9875,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
         <source>Not coded</source>
         <translation type="unfinished">Не разработано</translation>
     </message>
@@ -9456,7 +9891,7 @@
         <translation type="unfinished">нет</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished">Вручную</translation>
     </message>
@@ -9532,10 +9967,6 @@
         <translation type="unfinished">Сохранить профиль</translation>
     </message>
     <message>
-        <source>my profile</source>
-        <translation type="obsolete">мой профиль</translation>
-    </message>
-    <message>
         <location line="+46"/>
         <source>Overwrite</source>
         <translation type="unfinished">Перезаписать</translation>
@@ -9586,7 +10017,17 @@
         <translation type="unfinished">Управление битрейтом</translation>
     </message>
     <message>
-        <location line="+2882"/>
+        <location line="+2464"/>
+        <source>Auto Variance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+418"/>
         <source>Disable</source>
         <translation type="unfinished">Запретить</translation>
     </message>
@@ -9596,7 +10037,7 @@
         <translation type="unfinished">Автоопределение</translation>
     </message>
     <message>
-        <location line="-2298"/>
+        <location line="-2303"/>
         <source>Motion Estimation</source>
         <translation type="unfinished">Определение движения</translation>
     </message>
@@ -9624,12 +10065,12 @@
     </message>
     <message>
         <location line="-433"/>
-        <location line="+2596"/>
+        <location line="+2601"/>
         <source>None</source>
         <translation type="unfinished">Не нужно</translation>
     </message>
     <message>
-        <location line="-3730"/>
+        <location line="-3735"/>
         <location line="+1149"/>
         <source>Auto</source>
         <translation type="unfinished">Авто</translation>
@@ -9640,17 +10081,17 @@
         <translation type="unfinished">Быстро</translation>
     </message>
     <message>
-        <location line="+1598"/>
+        <location line="+1603"/>
         <source>Output</source>
         <translation type="unfinished">Вывод</translation>
     </message>
     <message>
-        <location line="-560"/>
+        <location line="-565"/>
         <source>Normal</source>
         <translation type="unfinished">Нормальный</translation>
     </message>
     <message>
-        <location line="+590"/>
+        <location line="+595"/>
         <source>Pixel Aspect Ratio</source>
         <translation type="unfinished">Cоотношение сторон:</translation>
     </message>
@@ -9660,7 +10101,7 @@
         <translation type="unfinished">Обрезка</translation>
     </message>
     <message>
-        <location line="-3641"/>
+        <location line="-3646"/>
         <source>x264 Configuraton</source>
         <translation type="unfinished">Настройка x264</translation>
     </message>
@@ -9676,12 +10117,12 @@
     </message>
     <message>
         <location line="+7"/>
-        <location line="+3152"/>
+        <location line="+3157"/>
         <source>Delete</source>
         <translation type="unfinished">Удалить</translation>
     </message>
     <message>
-        <location line="-3110"/>
+        <location line="-3115"/>
         <source>General</source>
         <translation type="unfinished">Общий</translation>
     </message>
@@ -9898,12 +10339,12 @@
     </message>
     <message>
         <location line="+14"/>
-        <location line="+2490"/>
+        <location line="+2495"/>
         <source>frames</source>
         <translation type="unfinished">кадры:</translation>
     </message>
     <message>
-        <location line="-2466"/>
+        <location line="-2471"/>
         <source>Sequence Parameter Set Identifer:</source>
         <translation type="unfinished">Идентификатор установки параметров последовательности:</translation>
     </message>
@@ -10090,12 +10531,12 @@
     </message>
     <message>
         <location line="+12"/>
-        <location line="+1328"/>
+        <location line="+1333"/>
         <source>Strength:</source>
         <translation type="unfinished">Сила:</translation>
     </message>
     <message>
-        <location line="-1289"/>
+        <location line="-1294"/>
         <source>Threshold:</source>
         <translation type="unfinished">Порог:</translation>
     </message>
@@ -10197,7 +10638,7 @@
     <message>
         <location line="+32"/>
         <source>I-frame Threshold:</source>
-        <translation type="unfinished">Попрог I-кадров:</translation>
+        <translation>Порог I-кадров:</translation>
     </message>
     <message>
         <location line="+36"/>
@@ -10297,12 +10738,12 @@
     </message>
     <message>
         <location line="+10"/>
-        <location line="+856"/>
+        <location line="+861"/>
         <source>Edit</source>
         <translation type="unfinished">Редактировать</translation>
     </message>
     <message>
-        <location line="-809"/>
+        <location line="-814"/>
         <source>Quantiser Control</source>
         <translation type="unfinished">Управление квантизатором</translation>
     </message>
@@ -10319,12 +10760,12 @@
     <message>
         <location line="+85"/>
         <location line="+179"/>
-        <location line="+302"/>
+        <location line="+307"/>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-459"/>
+        <location line="-464"/>
         <source>Maximum Quantiser Step:</source>
         <translation type="unfinished">Максимальный шаг квантизатора:</translation>
     </message>
@@ -10379,12 +10820,7 @@
         <translation type="unfinished">Отклонение адаптивной квантизации:</translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Auto Variance AQ</source>
-        <translation type="unfinished">Автоматическое отклонение адаптивной квантизации:</translation>
-    </message>
-    <message>
-        <location line="+91"/>
+        <location line="+114"/>
         <source>Advanced 1</source>
         <translation type="unfinished">Дополнительно 1</translation>
     </message>
@@ -10800,7 +11236,7 @@
         <translation type="unfinished">нет</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished">Вручную</translation>
     </message>
@@ -12010,7 +12446,7 @@
 <context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+37"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+32"/>
         <location line="+24"/>
         <source>None</source>
         <translation type="unfinished">Не нужно</translation>
@@ -12056,22 +12492,38 @@
         <translation type="unfinished">Многопоточность</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="-2"/>
         <source>Motion Estimation</source>
         <translation type="unfinished">Определение движения</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+35"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+25"/>
         <source>Rate Control</source>
         <translation type="unfinished">Управление битрейтом</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-52"/>
         <source>Aspect Ratio:</source>
         <translation type="unfinished">Соотношение сторон:</translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="-68"/>
         <source>Full</source>
         <translation type="unfinished">Полный</translation>
     </message>
@@ -12131,12 +12583,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>MotionEstimation</source>
-        <translation type="unfinished">Оценка движения</translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+15"/>
         <source>Mi_n. quantizer:</source>
         <translation type="unfinished">_Мин. квантизатор:</translation>
     </message>
@@ -12153,7 +12600,17 @@
     <message>
         <location line="+1"/>
         <source>_Number of B frames:</source>
-        <translation type="unfinished">_Количество B-кадров:</translation>
+        <translation>_Количество B-кадров:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation>_Сбрасывать одинаковые кадры (это отключает B-кадры)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -12181,12 +12638,7 @@
         <translation type="unfinished">Использовать XVID fcc (или DIVX)</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Advanced Simple Profile</source>
-        <translation type="unfinished">Дополнительный простой профиль</translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+25"/>
         <source>Quantization</source>
         <translation type="unfinished">Квантизация</translation>
     </message>
@@ -12219,30 +12671,14 @@
         <translation type="unfinished">Yadif, порт версии avisynth (c) Fizick.</translation>
     </message>
     <message>
-        <source>Temporal &amp; spatial check</source>
-        <translation type="obsolete">Временная &amp; пространственная проверка</translation>
-    </message>
-    <message>
-        <source>Bob, temporal &amp; spatial check</source>
-        <translation type="obsolete">Bob, временная &amp; пространственная проверка</translation>
-    </message>
-    <message>
-        <source>Skip spatial temporal check</source>
-        <translation type="obsolete">Пропустить временную &amp; пространственную проверку</translation>
-    </message>
-    <message>
-        <source>Bob, skip spatial temporal check</source>
-        <translation type="obsolete">Bob, пропустить временную &amp; пространственную проверку</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+70"/>
         <source>Bottom field first</source>
-        <translation type="unfinished">Нижнее поле первое</translation>
+        <translation>Нижнее поле сначала</translation>
     </message>
     <message>
         <location line="-1"/>
         <source>Top field first</source>
-        <translation type="unfinished">Верхнее поле первое</translation>
+        <translation>Верхнее поле сначала</translation>
     </message>
     <message>
         <location line="-7"/>

avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_sk.ts Added

@@ -0,0 +1,12746 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="sk_SK">
+<context>
+    <name>ADM_Composer</name>
+    <message>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+425"/>
+        <source>Cannot find a demuxer for %s</source>
+        <translation>Nemožno nájsť rozkladač videa pre %s</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Attempt to open %s failed!</source>
+        <translation>Zlyhalo otvorenie %s!</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>width</source>
+        <translation>šírka</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>%sheight</source>
+        <translation>%svýška</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source> and </source>
+        <translation> a </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>%sdifferent between first and this video stream</source>
+        <translation>%srozdiel medzi prvým a týmto video tokom</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source> are </source>
+        <translation> sú </translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source> is </source>
+        <translation> je </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
+1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
+2.) concatenate them together</source>
+        <translation>Nemôžete zmiešať rozdielne rozmery videa. Pomocou čiastkového filtra videa sa neskôr tento problém nevyrieši. Tu je riešenie:
+1.) &quot;zmeniť veľkosť&quot; / &quot;pridať okraje&quot; / &quot;orezať&quot; každý tok na rovnaké rozlíšenie
+2.) spojiť ich dohromady</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
+        <source>Checking if timestamps are valid..</source>
+        <translation>Kontrola platnosti časových údajov.</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
+        <translation>Toto video obsahuje snímky B, ale časové údaje prezentácie (PTS) chýbajú alebo sa monotónne zvyšujú. Avidemux sa môže pokúsiť rekonštruovať správne PTS dekódovaním celého videa. Môže to ale trvať veľmi dlho. Pokračovať?</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>Decoding video...</source>
+        <translation>Rozkladanie videa...</translation>
+    </message>
+    <message>
+        <location line="+115"/>
+        <source>Some timing information are incorrect.
+It happens with some capture software.
+If you re encode video we should drop these informations,
+ else it will cause dropped frame/jerky video.
+If you just copy the video without reencoding,
+ you should keep them.
+Drop timing informations ?</source>
+        <translation>Niektoré informácie o časovaní sú nesprávne.
+Stáva sa to pri niektorom softvéri na zachytávanie.
+Ak znova zakódujete video, mali by sme tieto informácie odstrániť,
+ inak to spôsobí pokles počtu snímiek a trhanie videa.
+Ak práve skopírujete video bez opätovného kódovania,
+ mali by ste ich udržať.
+Vypustiť časové údaje?</translation>
+    </message>
+</context>
+<context>
+    <name>CalculatorDialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="+16"/>
+        <source>Calculator</source>
+        <translation>Kalkulátor</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Target</source>
+        <translation>Cieľ</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>00:00:00</source>
+        <translation>00:00:00</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>AVI</source>
+        <translation>AVI</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>OGM</source>
+        <translation>OGM</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MPEG</source>
+        <translation>MPEG</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Medium:</source>
+        <translation>Stredný:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Format:</source>
+        <translation>Formát:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration:</source>
+        <translation>Trvanie:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>1 x 80 minute CD</source>
+        <translation>1 x 80 minútové CD</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>2 x 80 minute CD</source>
+        <translation>2 x 80 minútové CD</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1 x 74 minute CD</source>
+        <translation>1 x 74 minútové CD</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>2 x 74 minute CD</source>
+        <translation>2 x 74 minútové CD</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>DVD-5</source>
+        <translation>DVD-5</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Custom</source>
+        <translation>Vlastné</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>Custom Size:</source>
+        <translation>Vlastná veľkosť:</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <location line="+198"/>
+        <location line="+27"/>
+        <location line="+34"/>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <location line="-217"/>
+        <source>Audio Bitrate</source>
+        <translation>Dátový tok zvuku</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Track 1:</source>
+        <translation>1. stopa:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <location line="+37"/>
+        <location line="+232"/>
+        <source>kbps</source>
+        <translation>kB/s</translation>
+    </message>
+    <message>
+        <location line="-246"/>
+        <source>Track 2:</source>
+        <translation>2. stopa:</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Result</source>
+        <translation>Výsledok</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Audio Size:</source>
+        <translation>Veľkosť zvuku:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Video Size:</source>
+        <translation>Veľkosť videa:</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+27"/>
+        <location line="+34"/>
+        <location line="+68"/>
+        <location line="+18"/>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <location line="-101"/>
+        <source>Total Size:</source>
+        <translation>Celková veľkosť:</translation>
+    </message>
+    <message>
+        <location line="+120"/>
+        <source>Bits Per Pixel:</source>
+        <translation>Bitov na pixel:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Video Bitrate:</source>
+        <translation>Dátový tok videa:</translation>
+    </message>
+    <message>
+        <location line="+61"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation>Zrušiť</translation>
+    </message>
+</context>
+<context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+64"/>
+        <source>Indexing</source>
+        <translation>Indexovanie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Time Left : Infinity</source>
+        <translation>Zostávajúci čas: nekonečno</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source># Images :</source>
+        <translation># Obrázky:</translation>
+    </message>
+</context>
+<context>
+    <name>DialogAudioTracks</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="+14"/>
+        <source>Audio Tracks Configuration</source>
+        <translation>Konfigurácia audiou stôp</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Track 1</source>
+        <translation>1. stopa</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+41"/>
+        <location line="+41"/>
+        <location line="+41"/>
+        <source>Enabled</source>
+        <translation>Povolené</translation>
+    </message>
+    <message>
+        <location line="-107"/>
+        <location line="+41"/>
+        <location line="+41"/>
+        <location line="+41"/>
+        <source>Configure</source>
+        <translation>Konfigurovať...</translation>
+    </message>
+    <message>
+        <location line="-116"/>
+        <location line="+41"/>
+        <location line="+41"/>
+        <location line="+41"/>
+        <source>Filters</source>
+        <translation>Filtre</translation>
+    </message>
+    <message>
+        <location line="-112"/>
+        <source>Track 2</source>
+        <translation>2. stopa</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Track 3</source>
+        <translation>3. stopa</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Track 4</source>
+        <translation>4. stopa</translation>
+    </message>
+</context>
+<context>
+    <name>DialogOcr</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_ocr/ocr.ui" line="+13"/>
+        <source>Dialog</source>
+        <translation>Dialóg</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Calibrate</source>
+        <translation>Kalibrácia</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Skip All</source>
+        <translation>Preskočiť všetko</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Skip Glyph</source>
+        <translation>Preskočiť glyf</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Ignore</source>
+        <translation>Ignorovať</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Ok</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Close</source>
+        <translation>Zavrieť</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>00:00:00/000</source>
+        <translation>00:00:00/000</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Timecode:</source>
+        <translation>Časový kód:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>0/0</source>
+        <translation>0/0</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Nb Lines :</source>
+        <translation>Riadok titulkov:</translation>
+    </message>
+</context>
+<context>
+    <name>DialogProcessing</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+14"/>
+        <source>Dialog</source>
+        <translation>Dialóg</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>TimeLeft</source>
+        <translation>Odhad času</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>00:00:00</source>
+        <translation>00:00:00</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>ProcessImages</source>
+        <translation>Priebežne snímok</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <location line="-30"/>
+        <source>Speed</source>
+        <translation>Rýchlosť</translation>
+    </message>
+    <message>
+        <location line="-14"/>
+        <source>0 fps</source>
+        <translation>0 snímok/s</translation>
+    </message>
+</context>
+<context>
+    <name>DialogProgress</name>
+    <message>
+        <location filename="../ADM_jobs/src/uiProgress.ui" line="+17"/>
+        <source>Progress</source>
+        <translation>Priebeh</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Current job</source>
+        <translation>Súčasná úloha</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>1/1</source>
+        <translation>1/1</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>File being written </source>
+        <translation>Súbor sa zapisuje </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>FDK-AAC</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
+        <translation>_Profil:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Bitrate:</source>
+        <translation>_Dátový tok:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>SBR enabled</source>
+        <translation>SRB povolené</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Afterburner</source>
+        <translation>Dodatočné vypálenie</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+3"/>
+        <source>FDK-AAC Configuration</source>
+        <translation>Konfigurácia FDK-AAC</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+141"/>
+        <source>&amp;Auto</source>
+        <translation>Au&amp;tomaticky</translation>
+    </message>
+    <message>
+        <location line="-126"/>
+        <source>Avidemux</source>
+        <translation>Avidemux</translation>
+    </message>
+    <message>
+        <location line="+95"/>
+        <source>&amp;Help</source>
+        <translation>Náp&amp;oveda</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vi&amp;deo</source>
+        <translation>&amp;Video</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Edit</source>
+        <translation>&amp;Upraviť</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;View</source>
+        <translation>&amp;Zobraziť</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Toolbars</source>
+        <translation>&amp;Lišty nástrojov</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>&amp;Custom</source>
+        <translation>V&amp;lastné</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Go</source>
+        <translation>&amp;Prejsť na</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Tools</source>
+        <translation>&amp;Nástroje</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Audio</source>
+        <translation>&amp;Audio</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;File</source>
+        <translation>&amp;Súbor</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Recent</source>
+        <translation>Ne&amp;dávne</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Codec O&amp;ptions</source>
+        <translation>Nastavenie &amp;kodeku</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Video dekóder&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+75"/>
+        <location line="+7"/>
+        <source>XXXX</source>
+        <translation>XXXX</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+142"/>
+        <location line="+169"/>
+        <location line="+181"/>
+        <source>Configure</source>
+        <translation>Konfigurovať</translation>
+    </message>
+    <message>
+        <location line="-453"/>
+        <source>&lt;b&gt;Video Output&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Výstupné video&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <location line="+169"/>
+        <source>Copy</source>
+        <translation>Kopírovať</translation>
+    </message>
+    <message>
+        <location line="-136"/>
+        <location line="+169"/>
+        <source>Filters</source>
+        <translation>Filtre</translation>
+    </message>
+    <message>
+        <location line="-128"/>
+        <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Audio výstup&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+155"/>
+        <source>&amp;Shift:</source>
+        <translation>&amp;Posun:</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>ms</source>
+        <translation>ms</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Výstupný formát&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+114"/>
+        <location line="+931"/>
+        <source>&amp;Navigation</source>
+        <translation>&amp;Navigácia</translation>
+    </message>
+    <message>
+        <location line="-856"/>
+        <source>Play [SPACE]</source>
+        <translation>Prehrať [medzerník]</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Play</source>
+        <translation>Prehrať</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+26"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+26"/>
+        <location line="+341"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location line="-603"/>
+        <source>Go to previous frame [LEFT]</source>
+        <translation>Prejsť na predošlú snímku [šípka vľavo]</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next frame [RIGHT]</source>
+        <translation>Prejsť na ďalšiu snímku [šípka vpravo]</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to previous keyframe [DOWN]</source>
+        <translation>Prejsť na predošlú kľúčovú snímku [šípka dole]</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next keyframe [UP]</source>
+        <translation>Prejsť na ďalšiu kľúčovú snímku [šípka hore]</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Set start marker [CTRL+PAGEUP]</source>
+        <translation>Nastaviť značku začiatku [Ctrl+Page Up]</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Set end marker [CTRL+PAGEDOWN]</source>
+        <translation>Nastaviť značku konca [Ctrl+Page Down]</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Search previous black frame</source>
+        <translation>Nájsť predošlú čiernu snímku</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Search next black frame</source>
+        <translation>Nájsť ďalšiu čiernu snímku</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to first frame [HOME]</source>
+        <translation>Prejsť na prvú snímku [Home]</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to last frame [END]</source>
+        <translation>Prejsť na poslednú snímku [End]</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Backward one minute [CTRL+DOWN]</source>
+        <translation>Späť o 1 minútu [Ctrl+šípka dole]</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Forward one minute [CTRL+UP]</source>
+        <translation>Vpred o 1 minútu [Ctrl+šípka hore]</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Forward one minute</source>
+        <translation>Vpred o 1 minútu</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>Time:</source>
+        <translation>Čas:</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>00:00:00.000</source>
+        <translation>00:00:00.000</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>/ 00:00:00.000</source>
+        <translation>/ 00:00:00.000</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Frame type:</source>
+        <translation>Typ snímky:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>?</source>
+        <translation>?</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Se&amp;lection</source>
+        <translation>Vy&amp;brané</translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>A:</source>
+        <translation>A:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>B:</source>
+        <translation>B:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Go to marker A [PAGE UP]</source>
+        <translation>Choď na značku A [Page Up]</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+10"/>
+        <source>000000</source>
+        <translation>000000</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Go to Marker B [PAGE DOWN]</source>
+        <translation>Choď na značku B [Page Down]</translation>
+    </message>
+    <message>
+        <location line="+210"/>
+        <source>Play filtered</source>
+        <translation>Prehrať filtrované</translation>
+    </message>
+    <message>
+        <location line="-169"/>
+        <source>Vol&amp;ume</source>
+        <translation>Hlasi&amp;tosť</translation>
+    </message>
+    <message>
+        <location line="-1006"/>
+        <source> (0 tracks)</source>
+        <translation> (0 stôp)</translation>
+    </message>
+    <message>
+        <location line="+981"/>
+        <source>Selection: 000000</source>
+        <translation>Vybrané: 000000</translation>
+    </message>
+    <message>
+        <location line="+114"/>
+        <source>Audio &amp;Metre</source>
+        <translation>&amp;Audiometer</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>&amp;Open...</source>
+        <translation>&amp;Otvoriť...</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Open Video</source>
+        <translation>Otvorí video</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;Information...</source>
+        <translation>&amp;Informácia...</translation>
+    </message>
+    <message>
+        <source>Alt+Return</source>
+        <translation type="vanished">Alt+Enter</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save &amp;Video...</source>
+        <translation>&amp;Uložiť video...</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+3"/>
+        <source>Save Video</source>
+        <translation>Uloží video</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>&amp;Load/Run Project...</source>
+        <translation>N&amp;ačítať/spustiť projekt...</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+3"/>
+        <source>Load/Run Project</source>
+        <translation>Načíta/spustí projekt</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save &amp;Project</source>
+        <translation>Uložiť p&amp;rojekt</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+3"/>
+        <source>Save Project</source>
+        <translation>Uloží projekt</translation>
+    </message>
+    <message>
+        <source>&amp;Calculator...</source>
+        <translation type="vanished">&amp;Kalkulačka...</translation>
+    </message>
+    <message>
+        <source>F7</source>
+        <translation type="vanished">F7</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>&amp;Input</source>
+        <translation>&amp;Vstup</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;Output</source>
+        <translation>Vý&amp;stup</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>&amp;Codec Options</source>
+        <translation>Nastavenie &amp;kodeku</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+C</source>
+        <translation>Ctrl+Alt+C</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Ctrl+Alt+N</source>
+        <translation>Ctrl+Alt+N</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>&amp;Selection</source>
+        <translation>&amp;Vybrané</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+S</source>
+        <translation>Ctrl+Alt+S</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>&amp;Volume</source>
+        <translation>&amp;Hlasitosť</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+V</source>
+        <translation>Ctrl+Alt+V</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>&amp;Audio Metre</source>
+        <translation>&amp;Audiometer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+M</source>
+        <translation>Ctrl+Alt+M</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;Separate</source>
+        <translation>S&amp;amostatne</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;Top</source>
+        <translation>&amp;Na sebe</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Si&amp;de</source>
+        <translation>V&amp;edľa seba</translation>
+    </message>
+</context>
+<context>
+    <name>Opus</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
+        <source>_Bitrate:</source>
+        <translation>_Dátový tok:</translation>
+    </message>
+</context>
+<context>
+    <name>SpiderMonkeyShell</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_shell/shell.ui" line="+17"/>
+        <source>Shell</source>
+        <translation>Vzhľad prostredia</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Clear</source>
+        <translation>Vyčistiť</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>Evaluate</source>
+        <translation>Vyhodnotiť</translation>
+    </message>
+    <message>
+        <source>Ctrl+Return</source>
+        <translation type="vanished">Ctrl+Enter</translation>
+    </message>
+</context>
+<context>
+    <name>VapourSynthProxy</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vs.ui" line="+14"/>
+        <source>VapourSynth Proxy</source>
+        <translation>VapourSynth Proxy</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Select VS file</source>
+        <translation>Vybrať VS súbor</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Port to use: </source>
+        <translation>Port na použitie: </translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Run!</source>
+        <translation>Spustiť!</translation>
+    </message>
+</context>
+<context>
+    <name>aboutDialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+14"/>
+        <source>About Avidemux</source>
+        <translation>O Avidemuxe</translation>
+    </message>
+    <message>
+        <location line="+93"/>
+        <source>Avidemux </source>
+        <translation>Avidemux </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Multi-platform Video Editor</source>
+        <translation>Multiplatformný video editor</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
+        <translation type="vanished">© 2001 - 2019  Mean / Eumagga0x2a</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>http://www.avidemux.org</source>
+        <translation>http://www.avidemux.org&lt;p&gt;Slovenský preklad pripravil: Jozef Matta</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>&amp;License</source>
+        <translation>&amp;Licencia</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+</context>
+<context>
+    <name>addBorder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
+        <source>_Left border:</source>
+        <translation>_Ľavý okraj:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Right border:</source>
+        <translation>_Pravý okraj:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Top border:</source>
+        <translation>_Horný okraj:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Bottom border:</source>
+        <translation>_Dolný okraj:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h" line="+42"/>
+        <source>Add Borders</source>
+        <translation>Pridať okraje</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Incorrect parameters</source>
+        <translation>Nesprávne parametre</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All parameters must be even and within range.</source>
+        <translation>Všetky parametre musia byť párne a v platnom rozsahu.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h" line="+1"/>
+        <source>Add black borders around the image.</source>
+        <translation>Pridá čierne okraje okolo obrázka.</translation>
+    </message>
+</context>
+<context>
+    <name>adm</name>
+    <message>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+36"/>
+        <source>Open</source>
+        <translation>Otvoriť</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Append</source>
+        <translation>Pripojiť</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save</source>
+        <translation>Uložiť</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Queue</source>
+        <translation>Fronta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save as Image</source>
+        <translation>&amp;Uložiť ako obrázok</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Save as PNG</source>
+        <translation>Uložiť ako PNG</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Save Selection as JPEG</source>
+        <translation>Uložiť výber ako JPEG</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Close</source>
+        <translation>Zavrieť</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Information</source>
+        <translation>&amp;Informácia</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Quit</source>
+        <translation>Ukončiť</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation>Vyčistiť nedávne položky</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Redo</source>
+        <translation>Vpred</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Edit</source>
+        <translation>&amp;Vynulovať úpravy</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut</source>
+        <translation>Vystrihnúť</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy</source>
+        <translation>Kopírovať</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste</source>
+        <translation>Prilepiť</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+2"/>
+        <source>Delete</source>
+        <translation>Odstrániť</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Set Marker A</source>
+        <translation>Nastaviť značku A</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set Marker B</source>
+        <translation>Nastaviť značku B</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Markers</source>
+        <translation>Vynulovať značky</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+2"/>
+        <source>Save current settings as default</source>
+        <translation>Uložiť súčasné nastavenia ako predvolené</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Load saved settings</source>
+        <translation>Nahrať uložené nastavenia</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Decoder Option</source>
+        <translation>Možnosti dekódera</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>PostProcessing</source>
+        <translation>Následné spracovanie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>Filters</source>
+        <translation>&amp;Filtre</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <source>Play filtered</source>
+        <translation>Prehrať filtrované</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select Track</source>
+        <translation>Vybrať &amp;stopu</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save audio</source>
+        <translation>Uložiť &amp;audio</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Build Option</source>
+        <translation>&amp;Možnosti zostavy</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Plugins</source>
+        <translation>&amp;Rozšírenia</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>About</source>
+        <translation>&amp;O programe</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>First Frame</source>
+        <translation>Prvá snímka</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Last Frame</source>
+        <translation>Posledná snímka</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Go To Marker A</source>
+        <translation>Prejsť na značku A</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go To Marker B</source>
+        <translation>Prejsť na značku B</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Go To Time</source>
+        <translation>Prejsť na čas</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom 1:4</source>
+        <translation>Priblíženie 1:4</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Zoom 1:2</source>
+        <translation>Priblíženie 1:2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Zoom 1:1</source>
+        <translation>Priblíženie 1:1</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Zoom 2:1</source>
+        <translation>Priblíženie 2:1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation>Prispôsobiť oknu</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+34"/>
+        <source>R_esampling (Hz):</source>
+        <translation>P_revzorkovanie [Hz]:</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Resampling frequency (Hz)</source>
+        <translation>Frekvencia prevzorkovania [Hz]</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+25"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+43"/>
+        <source>None</source>
+        <translation>Nie je</translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <source>Film to PAL</source>
+        <translation>Film na PAL</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>PAL to Film</source>
+        <translation>PAL na film</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Frame rate change:</source>
+        <translation>_Zmena snímkovej frekvencie:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>No change</source>
+        <translation>Bez zmeny</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mono</source>
+        <translation>Mono</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+389"/>
+        <source>Stereo</source>
+        <translation>Stereo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Stereo+surround</source>
+        <translation>Stereo+okolie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Stereo+center</source>
+        <translation>Stereo+stred</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Stereo+center+surround</source>
+        <translation>Stereo+stred+okolie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Stereo front+stereo rear</source>
+        <translation>Stereo predné+stereo zadné</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>5 channels</source>
+        <translation>5 kanálov</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>5.1</source>
+        <translation>5.1</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Dolby Pro Logic</source>
+        <translation>Dolby Pro Logic</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Dolby Pro Logic II</source>
+        <translation>Dolby Pro Logic II</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>DRC</source>
+        <translation>DRC</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Automatic</source>
+        <translation>Automaticky</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Manual (dB)</source>
+        <translation>Ručne [dB]</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Gain</source>
+        <translation>Zisk</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Gain mode:</source>
+        <translation>Režim _zisku:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>G_ain value:</source>
+        <translation>Hodnota z_isku:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Maximum value:</source>
+        <translation>_Maximálna hodnota:</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>_Mixer:</source>
+        <translation>_Zmiešavač:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Remix:</source>
+        <translation>Premiešanie:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Mixer</source>
+        <translation>Zmiešavač</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Shift audio:</source>
+        <translation>Posun zvuku:</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Shift Value (ms):</source>
+        <translation>Posun hodnoty [ms]:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Audio Filters</source>
+        <translation>Audio filtre</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+81"/>
+        <source>Fontconfig</source>
+        <translation>Konfigurácia písma</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>FreeType 2</source>
+        <translation>Voľný typ 2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Gettext</source>
+        <translation>Gettext</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>SDL</source>
+        <translation>SDL</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>XVideo</source>
+        <translation>Xvideo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>VDPAU</source>
+        <translation>VDPAU</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>x86</source>
+        <translation>x86</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>x86-64</source>
+        <translation>x86-64</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Libraries</source>
+        <translation>Knižnice</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
+        <source>CPU</source>
+        <translation>CPU</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Built-in Support</source>
+        <translation>Zabudovaná podpora</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+33"/>
+        <source>TimeStamp:</source>
+        <translation>Časová pečiatka:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to Time</source>
+        <translation>Prejsť na čas</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="+8"/>
+        <source>_Job name:</source>
+        <translation>_Názov úlohy:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Output _File:</source>
+        <translation>Výstupný _súbor:</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Select Video To Write</source>
+        <translation>Vyberte video na zápis</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Save Job</source>
+        <translation>Uložiť úlohu</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="+57"/>
+        <source>Audio Plugins</source>
+        <translation>Rozšírenia audio</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-46"/>
+        <location line="+3"/>
+        <location line="+5"/>
+        <location filename="../../common/gui_save.cpp" line="+57"/>
+        <location line="+10"/>
+        <location line="+283"/>
+        <location line="+19"/>
+        <location line="+7"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <source>Audio</source>
+        <translation>Audio</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Video Encoder Plugins</source>
+        <translation>Rozšírenie video kodérov</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Video Encoder</source>
+        <translation>Video kodér</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Video Decoder Plugins</source>
+        <translation>Zásuvné moduly video dekodérov</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Video Decoder</source>
+        <translation>Video dekóder</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Audio Device Plugins</source>
+        <translation>Rozšírenie audio zariadenia</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Audio Device</source>
+        <translation>Audio zariadenie</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Audio Encoder Plugins</source>
+        <translation>Rozšírenia audio kodérov</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Audio Encoders</source>
+        <translation>Audio kodéry</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Demuxer Plugins</source>
+        <translation>Zásuvné moduly rozkladu videa</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Demuxers</source>
+        <translation>Rozklad videa</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Muxer Plugins</source>
+        <translation>Zásuvné moduly zmiešavačov</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Muxers</source>
+        <translation>Zmiešavače</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Plugins Info</source>
+        <translation>Informácia o rozšíreniach</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+27"/>
+        <source>_Filter strength:</source>
+        <translation>_Sila filtra:</translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <source>The options above are effective only for MPEG and DivX with software decoding</source>
+        <translation>Vyššie uvedené možnosti sú efektívne iba pre MPEG a DivX s dekódovaním softvéru</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-70"/>
+        <source>_Horizontal deblocking</source>
+        <translation>_Horizontálne odstránenie blokových artefaktov (deblocking)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>_Vertical deblocking</source>
+        <translation>_Vertikálne odstránenie blokových artefaktov (deblocking)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Deringing</source>
+        <translation>_Odstránenie zvlnenia okolo hrán (deringing)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>De_interlacing (ffmpegdeint)</source>
+        <translation>Ro_zkladač (ffmpedeint)</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-177"/>
+        <source>Decode video using DXVA2 (windows)</source>
+        <translation>Dekódovať video použitím DXVA2 (Windows)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Decode video using VDPAU (NVIDIA)</source>
+        <translation>Dekódovať video použitím VDPAU (NVIDIA)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Decode video using LIBVA (INTEL)</source>
+        <translation>Dekódovať video použitím LIBVA (Intel)</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Decode video using VideoToolbox (macOS)</source>
+        <translation>Dekódovať video použitím VideoToolbox (macOS)</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Enable openGl support</source>
+        <translation>Povoliť OpenGL podporu</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>If you use Hw decoding, it is better to use the matching display driver</source>
+        <translation>Ak použijete hardvérové dekódovanie, je lepšie použiť pripôsobený ovládač zobrazovania</translation>
+    </message>
+    <message>
+        <location line="-9"/>
+        <source>Ignore driver blacklist (Intel)</source>
+        <translation>Ignorovať čiernu listinu (Intel)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+        <translation>Ignorovať čiernu listinu (Intel, HEVC 10bit)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>_Accept non-standard audio frequency for DVD</source>
+        <translation>_Akceptovať neštandardnú frekvenciu zvuku pre DVD</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Revert to saved default output settings on video load</source>
+        <translation>_Vrátiť sa k uloženým pôvodným nastaveniam videa na čítanie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Enable alternative keyboard shortcuts</source>
+        <translation>_Povoliť alternatívne klávesové skratky</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Re_verse UP and DOWN arrow keys for navigation</source>
+        <translation>_Prehodiť klávesy šípka hore a šípka dole pre navigáciu</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Check for new release</source>
+        <translation>_Kontrolovať nové vydania</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>SIMD</source>
+        <translation>SIMD</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Enable all SIMD</source>
+        <translation>Povoliť všetky SIMD</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable MMX</source>
+        <translation>Povoliť MMX</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable MMXEXT</source>
+        <translation>Povoliť MMXEXT</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable 3DNOW</source>
+        <translation>Povoliť 3DNOW</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable 3DNOWEXT</source>
+        <translation>Povoliť 3DNOWEXT</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE</source>
+        <translation>Povoliť SSE</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE2</source>
+        <translation>Povoliť SSE2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE3</source>
+        <translation>Povoliť SSE3</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSSE3</source>
+        <translation>Povoliť SSSE3</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>_lavc threads:</source>
+        <translation>Vlákna _LAV kodeku:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Multi-threading</source>
+        <translation>Viacvláknové spracovanie</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+4"/>
+        <source>High</source>
+        <translation>Vysoká</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Above normal</source>
+        <translation>Nad normálom</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Normal</source>
+        <translation>Normálna</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Below normal</source>
+        <translation>Pod normálom</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-2"/>
+        <source>Low</source>
+        <translation>Nízka</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Encoding priority:</source>
+        <translation>Priorita _kódovania:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Indexing/unpacking priority:</source>
+        <translation>Priorita i_ndexácie/rozbaľovania:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Playback priority:</source>
+        <translation>Priorita pr_ehrávania:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Prioritisation</source>
+        <translation>Uprednostňovanie</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Default to the directory of the last read file for saving</source>
+        <translation>_Predvoliť priečinok naposledy načítaného súboru na uloženie</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Auto-Append Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Caching of decoded pictures</source>
+        <translation>Zásobník dekódovaných obrázkov</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Cache size:</source>
+        <translation>Veľkosť _zásobníka:</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>XVideo (best)</source>
+        <translation>Xvideo (najlepšie)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>VDPAU (best)</source>
+        <translation>VDPAU (najlepšie)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>DXVA2 (best)</source>
+        <translation>DXVA2 (najlepšie)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>OpenGL (best)</source>
+        <translation>OpenGL (najlepšie)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>LIBVA (best)</source>
+        <translation>LIBVA (najlepšie)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>SDL (good)</source>
+        <translation>SDL (dobré)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Video _display:</source>
+        <translation>Zobrazenie _videa:</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location line="+3"/>
+        <source>Sdl driver</source>
+        <translation>Sdl ovládač</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>No alerts</source>
+        <translation>Bez výstrah</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display only error alerts</source>
+        <translation>Zobrazovať len chybové výstrahy</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display all alerts</source>
+        <translation>Zobrazovať všetky výstrahy</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Message level:</source>
+        <translation>Úroveň _správy:</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
+        <source>PCM</source>
+        <translation>PCM</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Master</source>
+        <translation>Hlavné</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Volume control:</source>
+        <translation>Ovládač _hlasitosti:</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>No downmixing</source>
+        <translation>Bez premiešavania</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Pro Logic</source>
+        <translation>Pro Logic</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Pro Logic II</source>
+        <translation>Pro Logic II</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Local playback downmixing:</source>
+        <translation>_Lokálne premiešavanie prehrávania:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>_AudioDevice</source>
+        <translation>_Audio zariadenie</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>De_ringing</source>
+        <translation>Od_stránenie zvlnenia okolo hrán (deringing)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Strength:</source>
+        <translation>_Sila:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default Postprocessing</source>
+        <translation>Východzie dodatočné spracovanie</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>System language</source>
+        <translation>Jazyk systému</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>_Language</source>
+        <translation>_Jazyk</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>User Interface</source>
+        <translation>Užívateľské rozhranie</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Output</source>
+        <translation>Výstup</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>_Limit Refresh Rate</source>
+        <translation>_Obmedziť obnovovací kmitočet</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Refresh Rate Cap (ms)</source>
+        <translation>Strop obnovovacej frekvencie [ms]</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>GUI Rendering Options</source>
+        <translation>Grafické užívateľské prostredie volieb prevodu</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Display</source>
+        <translation>Zobrazenie</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+3"/>
+        <location line="+3"/>
+        <source>HW Accel</source>
+        <translation>HW akcelerácia</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Threading</source>
+        <translation>Vláknenie</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Always ask which port to use</source>
+        <translation>_Vždy sa opýtať, ktorý port sa má použiť</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default port to use</source>
+        <translation>Predvolený port na použitie</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Preferences</source>
+        <translation>Predvoľby</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-114"/>
+        <source>Save as BMP</source>
+        <translation>Uložiť ako BMP</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Save as JPEG</source>
+        <translation>Uložiť ako JPEG</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Connect to avsproxy</source>
+        <translation>Pripojiť sa k &amp;avsproxy</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Undo</source>
+        <translation>Späť</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Pr&amp;eferences</source>
+        <translation>Pre&amp;dvoľby</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>&amp;Advanced</source>
+        <translation>Po&amp;kročilé</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open Application &amp;Log</source>
+        <translation>Otvoriť &amp;záznam aplikácie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open Application Data &amp;Folder</source>
+        <translation>Otvoriť &amp;priečinok údajov aplikácie</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Play/Stop</source>
+        <translation>Prehrať/Zastaviť</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Previous Frame</source>
+        <translation>Predošlá snímka</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Frame</source>
+        <translation>Ďalšia snímka</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Previous Intra Frame</source>
+        <translation>Predošlá vnútorná snímka</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Intra Frame</source>
+        <translation>Ďalšia vnútorná snímka</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Previous Black Frame</source>
+        <translation>&amp;Predošlá čierna snímka</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Black Frame</source>
+        <translation>&amp;Nasledujúca čierna snímka</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
+        <location filename="../../common/gui_main.cpp" line="+1540"/>
+        <location line="+27"/>
+        <location line="+24"/>
+        <location line="+8"/>
+        <location line="+4"/>
+        <location filename="../../common/gui_save.cpp" line="+205"/>
+        <location line="+92"/>
+        <location line="+7"/>
+        <location line="+20"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
+        <source>Error</source>
+        <translation>Chyba</translation>
+    </message>
+    <message>
+        <location line="-43"/>
+        <location line="+43"/>
+        <source>You cannot remove *all* the video
+</source>
+        <translation>Nemôžete odstrániť *všetky* videá
+</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edFrameType.cpp" line="+72"/>
+        <source>Updating frametype</source>
+        <translation>Aktualizácia typu snímky</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+0"/>
+        <source>Core has been compiled without LIBVA support, but the application has been compiled with it.
+Installation mismatch</source>
+        <translation>Jadro bolo skompilované bez podpory LIBVA, ale aplikácia bola skompilovaná s ním.
+Zmätočná inštalácia</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+0"/>
+        <source>Core has been compiled without VDPAU support, but the application has been compiled with it.
+Installation mismatch</source>
+        <translation>Jadro bolo skompilované bez podpory VDPAU, ale aplikácia bola skompilovaná s ním.
+Zmätočná inštalácia</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+0"/>
+        <source>Core has been compiled without XVBA support, but the application has been compiled with it.
+Installation mismatch</source>
+        <translation>Jadro bolo skompilované bez podpory XVBA, ale aplikácia bola skompilovaná s ním.
+Zmätočná inštalácia</translation>
+    </message>
+    <message>
+        <location filename="../../common/gui_autodrive.cpp" line="+48"/>
+        <location filename="../../common/gui_save.cpp" line="-643"/>
+        <source>No audio track</source>
+        <translation>Žiadna audio stopa</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An audio track is necessary to create such file</source>
+        <translation>Pre vytvorenie takéhoto súboru je nutná audio stopa</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+6"/>
+        <location line="+15"/>
+        <location line="+27"/>
+        <location line="+35"/>
+        <source>Codec Error</source>
+        <translation>Chyba kodeku</translation>
+    </message>
+    <message>
+        <location line="-128"/>
+        <source>Cannot select the MPEG-4 SP codec.</source>
+        <translation>Nemožno vybrať MPEG-4 SP kodek.</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>No AAC audio encoder plugin found.</source>
+        <translation>Nenájdený zásuvný modul AAC enkódera.</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>The MP3 codec does not allow disabling reservoir.
+Install lame plugin</source>
+        <translation>Kodek MP3 neumožňuje vypnúť zásobník.
+Naištalujte rozšírenie lame</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>You don&apos;t have LAME!.
+It is needed to create FLV  video.</source>
+        <translation>Nemáte LAME!
+Je potrebné na vytvorenie FLV videa.</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Cannot select FLV1  codec.</source>
+        <translation>Nemožno vybrať FLV1 kodek.</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Cannot select MPEG-4 SP codec.</source>
+        <translation>Nemožno vybrať MPEG-4 SP kodek.</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>You don&apos;t have FAAC!.
+It is needed to create PSP compatible video.</source>
+        <translation>Nemáte FAAC!
+To je potrebný na vytvorenie PSP kompatibilného videa.</translation>
+    </message>
+    <message>
+        <location filename="../../common/gui_main.cpp" line="-1447"/>
+        <source>Select script/project to run</source>
+        <translation>Vyberte skript/projekt na spustenie</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Select script to run</source>
+        <translation>Vyberte skript na spustenie</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select script to debug</source>
+        <translation>Vyberte skript na ladenie</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select script to save</source>
+        <translation>Vyberte skript na uloženie</translation>
+    </message>
+    <message>
+        <location line="+67"/>
+        <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
+        <translation>Chystáte sa vymazať zoznam posledných súborov a projektov. Toto nie je možné vrátiť späť.
+Pokračovať?</translation>
+    </message>
+    <message>
+        <location line="+115"/>
+        <source>Not coded in this version</source>
+        <translation>Nepodporované v tejto verzii</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location line="+73"/>
+        <source>Select Video File...</source>
+        <translation>Vyberte video súbor...</translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <source>No engine</source>
+        <translation>Žiadny mechanizmus</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>tinyPy script is not enabled in this build</source>
+        <translation>Skript tinyPy nie je v tejto zostave povolený</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>Select Video File to Append...</source>
+        <translation>Vybrať video na pripojenie...</translation>
+    </message>
+    <message>
+        <location line="+122"/>
+        <source>The cut points of the pasted video are not on keyframes.
+Video saved in copy mode will be corrupted at these points.
+Proceed anyway?</source>
+        <translation>Body vystrihnutia vkladaného videa nie sú na kľúčových snímkach.
+Video uložené v režime kopírovania bude v týchto bodoch poškodené.
+Napriek tomu pokračovať?</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation>Toto video používa ako kľúčové snímky obnovovacie body bez IDR namiesto IDR. Informácie o zmene poradia obrázkov vo video toku sa nevynulujú v snímkach bez IDR. Body orezania vloženého výberu môžu mať za následok prerušenie prehrávania v dôsledku obráteného poradia zobrazovania snímok, ak sa uložia v režime kopírovania.
+Napriek tomu pokračovať?</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Codec or codec settings across a cut point of the pasted video do not match.
+Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation>Nastavenia kodeku alebo kodeku v bode prerušenia vloženého videa sa nezhodujú.
+Prehrávanie videa uloženého v režime kopírovania sa v tomto bode môže zastaviť.
+Napriek tomu pokračovať?</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cut points of the pasted video could not be checked. This indicates an issue with a source video, the state of editing or a bug in the program. Please check the application log file or console output for details.
+Try anyway?</source>
+        <translation>Body orezania vloženého videa sa nepodarilo skontrolovať. Naznačuje to problém so zdrojovým videom, stav úpravy alebo chybu v programe. Skontrolujte podrobnosti v protokolovom súbore aplikácie alebo na výstupe z konzoly.
+Napriek tomu to skúsiť?</translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <source>Are you sure?</source>
+        <translation>Ste si istý?</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <location line="+21"/>
+        <source>Cutting</source>
+        <translation>Vystrihnutie</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>It is impossible to cut out the entire video. Please recheck the position of markers A and B.</source>
+        <translation>Nemožno vystrihnúť celé video. Znovu skontrolujte polohu značiek A a B.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Deleting</source>
+        <translation>Odstraňovanie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>It is impossible to delete the entire video. Please recheck the position of markers A and B.</source>
+        <translation>Nie je možné zmazať celé video. Znovu skontrolujte polohu značiek A a B.</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Error while cutting out.</source>
+        <translation>Pri odstraňovaní sa vyskytla chyba.</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>The end point of the cut is not on a keyframe.
+Video saved in copy mode will be corrupted at this point.
+Proceed anyway?</source>
+        <translation>Koncový bod vystrihnutia nie je na kľúčovou snímkou.
+Video uložené v režime kopírovania bude v tomto bode poškodené.
+Napriek tomu pokračovať?</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>The end point of the deletion is not on a keyframe.
+Video saved in copy mode will be corrupted at this point.
+Proceed anyway?</source>
+        <translation>Koncový bod odstránenia nie je na kľúčovou snímkou.
+Video uložené v režime kopírovania bude v tomto bode poškodené.
+Napriek tomu pokračovať?</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the cut may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation>Toto video používa ako kľúčové snímky obnovovacie body bez IDR namiesto IDR. Informácie o zmene poradia obrázkov vo video toku sa nevynulujú v snímkach bez IDR. Zvolené začiatočné a koncové body rezu môžu mať za následok prerušenie prehrávania v dôsledku obráteného poradia zobrazovania snímok, ak sa uložia v režime kopírovania.
+Napriek tomu pokračovať?</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the deletion may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation>Toto video používa ako kľúčové snímky obnovovacie body bez IDR namiesto IDR. Informácie o zmene poradia obrázkov vo video prúde sa nevynulujú v snímkach bez IDR. Zvolené začiatočné a koncové body vymazania môžu mať za následok prerušenie prehrávania v dôsledku obráteného poradia zobrazovania snímok, ak sú uložené v režime kopírovania.
+Napriek tomu pokračovať?</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Codec or codec settings across the cut do not match. Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation>Nastavenia kodeku alebo kodeku naprieč rezom sa nezhodujú. Prehrávanie videa uloženého v režime kopírovania sa v tomto bode môže zastaviť.
+Napriek tomu pokračovať?</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Codec or codec settings across the deletion do not match. Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation>Nastavenia kodeku alebo kodeku v rámci vymazania sa nezhodujú. Prehrávanie videa uloženého v režime kopírovania sa v tomto bode môže zastaviť.
+Napriek tomu pokračovať?</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cut points could not be checked.
+This indicates an issue with a source video, the state of editing or a bug in the program. Please check the application log file or console output for details.
+Proceed anyway?</source>
+        <translation>Body rezu nebolo možné skontrolovať.
+Naznačuje to problém so zdrojovým videom, stav úpravy alebo chybu v programe. Skontrolujte podrobnosti v protokolovom súbore aplikácie alebo výstupe z konzoly.
+PNapriek tomu pokračovať?</translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Permission error</source>
+        <translation>Chyba oprávnenia</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cannot open &quot;%s&quot;.</source>
+        <translation>Nemožno otvoriť &quot;%s&quot;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>File error</source>
+        <translation>Chyba súboru</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>&quot;%s&quot; does not exist.</source>
+        <translation>&quot;%s&quot; neexistuje.</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Cannot open project using the video loader.</source>
+        <translation>Otvorením videa nemožno otvoriť projekt.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Try &apos;File&apos; -&gt; &apos;Load/Run Project...&apos;</source>
+        <translation>Skúste &apos;Súbor&apos; -&gt; &apos;Nahrať/Spustiť projekt...&apos;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Could not open the file</source>
+        <translation>Nemožno otvoriť súbor</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Multiple Audio Tracks</source>
+        <translation>Viacnásobné audio stopy</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>The file you just loaded contains several audio tracks.
+Go to Audio-&gt;MainTrack to select the active one.</source>
+        <translation>Načítaný súbor obsahuje viacero audio stôp.
+V ponuke Audio-&gt;Hlavná stopa vyberte tu aktívnu.</translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Something failed when appending</source>
+        <translation>Pri pripojovaní niečo zlyhalo</translation>
+    </message>
+    <message>
+        <location line="+320"/>
+        <source>Something bad happened (II)</source>
+        <translation>Stalo sa niečo zlé (II)</translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <location line="+43"/>
+        <source>The tinypy plugin is missing.
+Expect problems.</source>
+        <translation>Zásuvný modul tinypy chýba.
+Očakávajte problémy.</translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Checking video</source>
+        <translation>Kontrola videa</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>No error found</source>
+        <translation>Nenájdená žiadna chyba</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Errors found in %u frames</source>
+        <translation>Nájdená chyba v %u snímkach</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Marker A &gt; B</source>
+        <translation>Značka A &gt; B</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cannot delete the selection.</source>
+        <translation>Nemožno zmazať výber.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>You can&apos;t remove all frames</source>
+        <translation>Nemôžete odstrániť všetky snímky</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+120"/>
+        <source>Something bad happened</source>
+        <translation>Prihodilo sa niečo zlé</translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <source>_Track from video:</source>
+        <translation>_Stopa z videa:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Main Audio Track</source>
+        <translation>Hlavná audio stopa</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <location line="+7"/>
+        <source>Invalid audio index given</source>
+        <translation>Daný neplatný index audia</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Cannot use that file as audio track</source>
+        <translation>Tento súbor nemožno použiť ako zvukovú stopu</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Audio file not found in list, even though it should be there. Create a bug report!</source>
+        <translation>Zvukový súbor sa nenašiel v zozname, aj keď by tam mal byť. Vytvorte správu o chybe!</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Unable to set the audio language: No video loaded yet!</source>
+        <translation>Jazyk zvuku sa nedá nastaviť: Zatiaľ nie je načítané žiadne video!</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Setting the language for the given track index is not possible: Video has no audio file!</source>
+        <translation>Nemožno nastaviť jazyk pre daný index stopy: Video nemá žiadny zvukový súbor!</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Setting the language for the given track index is not possible: Invalid track index!</source>
+        <translation>Nastavený jazyk pre daný index stopy nie je vhodný: Neplatný index stopy!</translation>
+    </message>
+    <message>
+        <location line="+144"/>
+        <source>AvsProxy</source>
+        <translation>AvsProxy</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Failed to connect to avsproxy.
+Is it running ?</source>
+        <translation>Zlyhalo pripojenie k avsproxy.
+Je spustené?</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>avsproxy</source>
+        <translation>avsproxy</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Frame type:</source>
+        <translation>Typ snímky:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Frame size:</source>
+        <translation>Veľkosť snímky:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Frame Hex Dump</source>
+        <translation>Hex výpis snímiek</translation>
+    </message>
+    <message>
+        <location line="+111"/>
+        <source>Oops</source>
+        <translation>Hoplá</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>This function is disabled or no longer valid</source>
+        <translation>Táto funkcia je vypnutá alebo je už neplatná</translation>
+    </message>
+    <message>
+        <location filename="../../common/gui_play.cpp" line="+442"/>
+        <source>Trouble initializing audio device</source>
+        <translation>Chyba inicializácie audio zariadenia</translation>
+    </message>
+    <message>
+        <location filename="../../common/gui_save.cpp" line="+54"/>
+        <source>No</source>
+        <translation>Nie</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>No file loaded</source>
+        <translation>Nenahraný žiadny súbor</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Job</source>
+        <translation>Úloha</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cannot reach database. Do you have Job control running ?</source>
+        <translation>Nie je možné získať databázu. Máte spustené ovládače úlohy?</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Output file</source>
+        <translation>Výstupný súbor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Job name</source>
+        <translation>Názov úlohy</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Queue job to jobList</source>
+        <translation>Zaradené do zoznamu úloh</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Select Workbench to Save</source>
+        <translation>Vyberte projekt na uloženie</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location line="+2"/>
+        <source>Select File to Save Audio</source>
+        <translation>Vyberte súbor na uloženie audia</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select JPEG Sequence to Save</source>
+        <translation>Vyberte sekvenciu JPEG súborov na uloženie</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select BMP to Save</source>
+        <translation>Vyberte BMP na uloženie</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select JPEG to Save</source>
+        <translation>Vyberte JPEG na uloženie</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select PNG to Save</source>
+        <translation>Vyberte PNG na uloženie</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Select File to Save</source>
+        <translation>Vyberte súbor na uloženie</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Saving audio</source>
+        <translation>Ukladanie audia</translation>
+    </message>
+    <message>
+        <location line="+95"/>
+        <source>Function not implemented
+</source>
+        <translation>Funkcia nie je nezavedená
+</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Cannot create stream</source>
+        <translation>Nemožno vytvoriť tok</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Saving failed</source>
+        <translation>Uloženie zlyhalo</translation>
+    </message>
+    <message>
+        <location line="+84"/>
+        <source>Jpeg</source>
+        <translation>Jpeg</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Failed to save as JPEG</source>
+        <translation>Zlyhalo uloženie ako JPEG</translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Saving selection as set of JPEG images</source>
+        <translation>Ukladanie výberu ako sady JPEG obrázkov</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Warning</source>
+        <translation>Upozornenie</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Saving images failed.</source>
+        <translation>Ukladanie obrázku zlyhalo.</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>PNG</source>
+        <translation>PNG</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Failed to save as PNG</source>
+        <translation>Zlyhalo uloženie ako PNG</translation>
+    </message>
+    <message>
+        <location line="+67"/>
+        <source>Cannot get tinyPy script engine</source>
+        <translation>Nie je možné získať skriptový modul tinyPy</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Output file not specified</source>
+        <translation>Výstupný súbor nie je určený</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Job script %s already exists. Overwrite?</source>
+        <translation>Skript úlohy% s už existuje. Prepísať?</translation>
+    </message>
+    <message>
+        <location line="-114"/>
+        <location line="+76"/>
+        <source>Done</source>
+        <translation>Hotovo</translation>
+    </message>
+    <message>
+        <location line="-588"/>
+        <source>Audio encoder index out of bounds</source>
+        <translation>Index audio kódovača je mimo hraníc</translation>
+    </message>
+    <message>
+        <location line="+510"/>
+        <source>Maximum number of 99999 images reached.</source>
+        <translation>Dosiahol sa maximálny počet 99999 obrázkov.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Saved %d images.</source>
+        <translation>Uložených %d obrázkov.</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <source>BMP op failed</source>
+        <translation>BMP operácia zlyhala</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Saving %s as a BMP file failed.</source>
+        <translation>Uloženie %s ako BMP súboru zlyhalo.</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>File %s has been successfully saved.</source>
+        <translation>Súbor %s bol úspešne uložený.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Failed</source>
+        <translation>zlyhalo</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>File %s was NOT saved correctly.</source>
+        <translation>Súbor %s nebol riadne uložený.</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Cannot add job %s</source>
+        <translation>Nemožno pridať úlohu %s</translation>
+    </message>
+    <message>
+        <location filename="../../common/gui_savenew.cpp" line="-251"/>
+        <source>Reuse previous first pass data ?
+Warning, the settings must be close.</source>
+        <translation>Znova použiť predošlé prvé údaje prechodu?
+Upozornenie, nastavenia musia byť uzatvorené.</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location line="+170"/>
+        <location line="+12"/>
+        <location line="+16"/>
+        <source>Video</source>
+        <translation>Video</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <source>Cannot instantiate video chain</source>
+        <translation>Nemožno vytvoriť video reťazec</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Cannot create encoder</source>
+        <translation>Nemožno vytvoriť rozkladač videa</translation>
+    </message>
+    <message>
+        <source>Cannot setup codec. Bitrate too low?</source>
+        <translation type="vanished">Nemožno zriadiť kodek. Prenosová rýchlosť je nízka?</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
+        <translation>Nemožno zriadiť dekodér, uistite sa, že váš tok je kompatibilný s audio kódovaním (počet kanálov, prenosová rýchlosť, formát)</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>The video is in copy mode but the cut points are not on keyframes.
+The video will be saved but there will be corruption at cut point(s).
+Do you want to continue anyway ?</source>
+        <translation>Video je v režime kopírovania, ale body strihu nie sú na kľúčových snímkach.
+Video sa uloží, ale v týchto bodoch dôjde k poškodeniu.
+Chcete aj tak pokračovať?</translation>
+    </message>
+    <message>
+        <location line="-257"/>
+        <location line="+290"/>
+        <location line="+26"/>
+        <source>Muxer</source>
+        <translation>Zmiešavač</translation>
+    </message>
+    <message>
+        <location line="-326"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+290"/>
+        <source>Cannot instantiate muxer</source>
+        <translation>Nemožno priradiť zmiešavač</translation>
+    </message>
+    <message>
+        <location line="-102"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The choice of cut points may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Do you want to continue anyway?</source>
+        <translation>Toto video používa ako kľúčové snímky obnovovacie body bez IDR namiesto IDR. Informácie o zmene poradia obrázkov vo video toku sa nevynulujú v snímkach bez IDR. Výber bodov orezania môže mať za následok prerušenie prehrávania v dôsledku obráteného poradia zobrazovania snímok, ak sú uložené v režime kopírovania.
+Chcete napriek tomu pokračovať?</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Codec or codec settings across a cut point do not match. Playback of the video saved in copy mode may stop at this point.
+Do you want to continue anyway?</source>
+        <translation>Nastavenia kodeku alebo kodeku v bode prerušenia sa nezhodujú. Prehrávanie videa uloženého v režime kopírovania sa v tomto bode môže zastaviť.
+Chcete napriek tomu pokračovať?</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cut points could not be checked. This indicates an issue with a source video, the state of editing or a bug in the program. Please check the application log file or console output for details.
+Try anyway?</source>
+        <translation>Body rezu nebolo možné skontrolovať. Naznačuje to problém so zdrojovým videom, stav úpravy alebo chybu v programe. Skontrolujte podrobnosti v protokolovom súbore aplikácie alebo výstupe z konzoly.
+Skúsiť to znovu?</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Cannot open </source>
+        <translation>Nemožno otvoriť </translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+45"/>
+        <source>Disabled</source>
+        <translation>Vypnuté</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto-detect</source>
+        <translation>Automatické zisťovanie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Custom</source>
+        <translation>Vlastné</translation>
+    </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-11"/>
+        <source>_Interlaced</source>
+        <translation>_Prekladané</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ca_rtoon mode</source>
+        <translation>_Režim kreslených seriálov</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Greyscale</source>
+        <translation>_Odtiene sivej</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Turbo mode</source>
+        <translation>Turbo režim</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>C_hroma optimizer</source>
+        <translation>Opti_malizácia farebnej zložky</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Main</source>
+        <translation>Hlavné</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Very Low</source>
+        <translation>Veľmi nízka</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Medium</source>
+        <translation>Stredná</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Very High</source>
+        <translation>Veľmi vysoká</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ultra High</source>
+        <translation>Ultra vysoká</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion Search Precision</source>
+        <translation>Presnosť vyhľadávania pohybu</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Off</source>
+        <translation>Vypnuté</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mode Decision</source>
+        <translation>Rozhodovanie režimu</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Limited Search</source>
+        <translation>Obmedzené vyhľadávanie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Medium Search</source>
+        <translation>Stredné vyhľadávanie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Wide Search</source>
+        <translation>Široké vyhľadávanie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>VHQ Mode</source>
+        <translation>Režim VHQ</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Max B Frames</source>
+        <translation>Max počet B snímok</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quarter Pixel</source>
+        <translation>Štvrťpixel</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>GMC</source>
+        <translation>GMC</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>BVHQ</source>
+        <translation>BVHQ</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Advanced Simple Profile</source>
+        <translation>Prídavný jednoduchý profil</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>4MV</source>
+        <translation>4MV</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Chroma ME</source>
+        <translation>Farebná zložka pre predvídanie pohybu</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>HQ AC</source>
+        <translation>HQ AC</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>More Search</source>
+        <translation>Ďalšie možnosti</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Min Gop Size</source>
+        <translation>Min. veľkosť skupiny obrázkov (GOP)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max Gop Size</source>
+        <translation>Max. veľkosť skupiny obrázkov (GOP)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>GOP Size</source>
+        <translation>Veľkosť skupiny obrázkov</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Motion</source>
+        <translation>Pohyb</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>H263</source>
+        <translation>H263</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mpeg</source>
+        <translation>Mpeg</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantization Matrix</source>
+        <translation>Kvantifikačná matrica</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Trellis Quantization</source>
+        <translation>Kvantifikácia mriežkového kódovania</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Quantization</source>
+        <translation>Kvantifikácia</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Two Pass Tuning</source>
+        <translation>Vyladenie druhého priechodu</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Key Frame Boost(%)</source>
+        <translation>Zosilnenie kľúčových snímok [%]</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>I-frames closer than...</source>
+        <translation>I snímky bližšie než...</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>.. are reduced by(%)</source>
+        <translation>.. sú redukované o [%]</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max Overflow Improvement(%)</source>
+        <translation>Max. zlepšenie pretečenia [%]</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max Overglow Degradation(%)</source>
+        <translation>Max. zhoršenie pretečenia [%]</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Curve Compression</source>
+        <translation>Krivka kompresie</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>High Bitrate Scenes (%)</source>
+        <translation>Scény s vysokou prenosovou rýchlosťou [%]</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Low Bitrate Scenes (%)</source>
+        <translation>Scény s nízkou prenosovou rýchlosťou [%]</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Overflow Control Strength</source>
+        <translation>Intenzita kontroly pretečenia</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Two Pass</source>
+        <translation>Dva prechody</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Xvid4 Configuration</source>
+        <translation>Konfigurácia Xvid4</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_core/ADM_core/src/ADM_prettyPrint.cpp" line="+23"/>
+        <source>%d minute(s)</source>
+        <translation type="unfinished">%n minúta</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>%d hour(s)</source>
+        <translation type="unfinished">%n hodina</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Less than a minute</source>
+        <translation>Menej ako minútu</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>A few seconds</source>
+        <translation>Niekoľko sekúnd</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-1"/>
+        <source>DTS</source>
+        <translation>DTS</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>MP2</source>
+        <translation>MP2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MP3</source>
+        <translation>MP3</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>WMAPRO</source>
+        <translation>WMAPRO</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>WMA</source>
+        <translation>WMA</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>LPCM</source>
+        <translation>LPCM</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>AC3</source>
+        <translation>AC3</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OPUS</source>
+        <translation>OPUS</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>FLAC</source>
+        <translation>FLAC</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>E-AC3</source>
+        <translation>E-AC3</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Float PCM</source>
+        <translation>PCM na pohyblivej čiarke</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ogg Vorbis</source>
+        <translation>Ogg Vorbis</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MP4</source>
+        <translation>MP4</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>AAC</source>
+        <translation>AAC</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>QDM2</source>
+        <translation>QDM2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>AMR-NB</source>
+        <translation>AMR-NB</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MSADPCM</source>
+        <translation>MSADPCM</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>ULAW</source>
+        <translation>ULAW</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>IMA ADPCM</source>
+        <translation>IMA ADPCM</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>8-bit PCM</source>
+        <translation>8 bitové PCM</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Unknown codec</source>
+        <translation>Neznámy kodek</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
+        <source>Building time map</source>
+        <translation>Vybudovanie časovej mapy</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
+        <source>Memory error</source>
+        <translation>Chyba pamäte</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+495"/>
+        <source>Saving</source>
+        <translation>Ukladanie</translation>
+    </message>
+    <message>
+        <location line="+181"/>
+        <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
+        <translation>Ukladané video je nekompletné. Vyskytla sa chyba pri %s (%d%). Mohlo sa to stať z dôvodu neplatných časových údajov vo videu.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Too short</source>
+        <translation>Príliš krátke</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+382"/>
+        <source>Unknown</source>
+        <translation>Neznámy</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="-4"/>
+        <source>can&apos;t open &quot;%s&quot;: %s
+%s
+</source>
+        <translation>nemožno otvoriť &quot;%s&quot;: %s
+%s
+</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+85"/>
+        <source>filesystem full</source>
+        <translation>súborový systém je plný</translation>
+    </message>
+    <message>
+        <location line="-85"/>
+        <location line="+85"/>
+        <source>quota exceeded</source>
+        <translation>prekročená kvóta</translation>
+    </message>
+    <message>
+        <location line="-84"/>
+        <location line="+85"/>
+        <source>Please free up some space and press RETRY to try again.</source>
+        <translation>Uvoľnite miesto a stlačte tlačidlo Zopakovať a skúste to znova.</translation>
+    </message>
+    <message>
+        <location line="-78"/>
+        <source>can&apos;t open &quot;%s&quot;: %u (%s)
+</source>
+        <translation>nemožno otvoriť &quot;%s&quot;: %u (%s)
+</translation>
+    </message>
+    <message>
+        <location line="+75"/>
+        <source>can&apos;t write to file &quot;%s&quot;: %s
+%s
+</source>
+        <translation>nemožno zapisovať do súboru &quot;%s&quot;: %s
+%s
+</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+11"/>
+        <source>__unknown__</source>
+        <translation>__neznáme__</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <source>Ignore</source>
+        <translation>Ignorovať</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Retry</source>
+        <translation>Zopakovať</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>can&apos;t write to file &quot;%s&quot;: %u (%s)
+</source>
+        <translation>nemožno zapisovať do súboru &quot;%s&quot;: %u (%s)
+</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="-7"/>
+        <source>NTSC 4:3</source>
+        <translation>NTSC 4:3</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>NTSC 16:9</source>
+        <translation>NTSC 16:9</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>PAL 4:3</source>
+        <translation>PAL 4:3</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>PAL 16:9</source>
+        <translation>PAL 16:9</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>1:1</source>
+        <translation>1:1</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
+        <source>Codec</source>
+        <translation>Kodek</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
+        <source>Internal error finding codec 0x%x</source>
+        <translation>Interná chyba hľadania kodeku 0x%x</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Internal error opening 0x%x</source>
+        <translation>Interná chyba otvorenia 0x%x</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+0"/>
+        <source>Core has been compiled without DXVA2 support, but the application has been compiled with it.
+Installation mismatch</source>
+        <translation>Jadro bolo skompilované bez podpory DXVA2, ale aplikácia bola skompilovaná s ním. Zmätočná inštalácia</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="+246"/>
+        <source>Cannot compile shader</source>
+        <translation>Nemožno skompilovať shader</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
+        <source>Permission Error</source>
+        <translation>Chyba oprávnenia</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cannot open script &quot;%s&quot;.</source>
+        <translation>Nemožno otvoriť skript &quot;%s&quot;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>File Error</source>
+        <translation>Chyba súboru</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Script &quot;%s&quot; does not exist.</source>
+        <translation>Skript &quot;%s&quot; neexistuje.</translation>
+    </message>
+</context>
+<context>
+    <name>admIvtc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
+        <source>ADM ivtc.</source>
+        <translation>ADM ivtc.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All in one ivtc.</source>
+        <translation>Všetko v jednom ivtc.</translation>
+    </message>
+</context>
+<context>
+    <name>aften</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
+        <source>_Bitrate:</source>
+        <translation>_Prenosová rýchlosť:</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Aften Configuration</source>
+        <translation>Konfigurácia Aften</translation>
+    </message>
+</context>
+<context>
+    <name>asciiView</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
+        <source>Ascii View</source>
+        <translation>Zobraziť Ascii znaky</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ascii view</source>
+        <translation>Zobrazí Ascii znaky</translation>
+    </message>
+</context>
+<context>
+    <name>asfdemuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp" line="+158"/>
+        <source>File Error.</source>
+        <translation>Chyba súboru.</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cannot open file
+</source>
+        <translation>Nemožno otvoriť súbor
+</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfHeaders.cpp" line="+468"/>
+        <source>Indexing</source>
+        <translation>Indexovanie</translation>
+    </message>
+</context>
+<context>
+    <name>asharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp" line="+65"/>
+        <source>Asharp</source>
+        <translation>Asharp</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptative sharpener by MarcFD.</source>
+        <translation>Adaptívne doostrenie od MarcFD.</translation>
+    </message>
+</context>
+<context>
+    <name>asharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/asharp.ui" line="+14"/>
+        <source>ASharp</source>
+        <translation>ASharp</translation>
+    </message>
+    <message>
+        <location line="+123"/>
+        <source>Strength</source>
+        <translation>Sila</translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Threshold</source>
+        <translation>Prah</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>Block Adaptative</source>
+        <translation>Adaptívny blok</translation>
+    </message>
+    <message>
+        <location line="-27"/>
+        <source>Unknown flag</source>
+        <translation>Neznámy príznak</translation>
+    </message>
+</context>
+<context>
+    <name>ass</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="+76"/>
+        <source>SSA/ASS/SRT</source>
+        <translation>SSA/ASS/SRT</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hardcode ASS/SSA/SRT subtitles using libass.</source>
+        <translation>Pevné titulky ASS/SSA/SRT použitím knižnice libass.</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Format ?</source>
+        <translation>Formátovať?</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Are you sure this is an ASS/SSA file ?</source>
+        <translation>Ste si istý, že ide o súbor ASS/SSA?</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>_Subtitle file (ASS/SSA):</source>
+        <translation>_Súbor s titulkami (ASS/SSA):</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Select Subtitle File</source>
+        <translation>Vybrať súbor s titulkami</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Line spacing:</source>
+        <translation>_Medzera medzi riadkami:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Font scale:</source>
+        <translation>_Veľkosť písma:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Top margin:</source>
+        <translation>V_rchný okraj:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Botto_m margin:</source>
+        <translation>Sp_odný okraj:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do not adjust</source>
+        <translation>Neupravovať</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust for display aspect ratio:</source>
+        <translation>Upraviť pomer strán zobrazenia:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>ASS</source>
+        <translation>ASS</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>This is a SRT file. Convert to SSA ?</source>
+        <translation>Toto je súbor SRT. Konvertovať na SSA?</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+5"/>
+        <location line="+9"/>
+        <source>Error</source>
+        <translation>Chyba</translation>
+    </message>
+    <message>
+        <location line="-14"/>
+        <source>Cannot load this SRT file.</source>
+        <translation>Nemožno načítať tento SRT súbor.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cannot convert to SSA.</source>
+        <translation>Nemožno konvertovať na SSA.</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Cannot save converted file.</source>
+        <translation>Nemožno uložiť konvertovaný súbor.</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <source>Fonts</source>
+        <translation>Písma</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Preparing the fonts can take a few minutes the first time.
+This message will not be displayed again.</source>
+        <translation>Príprava písma po prvýkrát môže trvať niekoľko minút.
+Táto správa sa znova nezobrazí.</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>SSA Error</source>
+        <translation>Chyba SSA</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>ass_read_file() failed for %s</source>
+        <translation>ass_read_file() zlyhalo pre %s</translation>
+    </message>
+</context>
+<context>
+    <name>avimuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+75"/>
+        <source>Bad Idea</source>
+        <translation>Zlá myšlienka</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Using H264/H265 in AVI is a bad idea, MKV is better for that.
+ Do you want to continue anyway ?</source>
+        <translation>Použitie H264/H265 v AVI je zlá myšlienka, MKV je na to vhodnejšie.
+ Chcete napriek tomu pokračovať?</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Error</source>
+        <translation>Chyba</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cannot create AVI file</source>
+        <translation>Nemožno vytvoriť AVI súbor</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>Muxing Format</source>
+        <translation>Formát zmiešavania</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Avi Muxer</source>
+        <translation>Zmiešavač AVI</translation>
+    </message>
+</context>
+<context>
+    <name>avsfilter</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="+598"/>
+        <source>_wine app file:</source>
+        <translation>Súbor aplikácie _wine:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select wine filename[wine/cedega/etc.]</source>
+        <translation>Vyberte názov súboru wine [wine/cedega/a pod.]</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_loader file:</source>
+        <translation>Súbor _zavádzača:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select loader filename[avsload.exe]</source>
+        <translation>Vyberte názov zavádzača [avsload.exe]</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_avs file:</source>
+        <translation>Súbor _avs:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select avs filename[*.avs]</source>
+        <translation>Vyberte názov avs súboru[*.avs]</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_pipe timeout:</source>
+        <translation>Časový _limit rúry:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>AvsFilter config</source>
+        <translation>Konfigurácia Avs filtra</translation>
+    </message>
+</context>
+<context>
+    <name>bitrate</name>
+    <message>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+51"/>
+        <source>Constant Bitrate</source>
+        <translation>Konštantná prenosová rýchlosť</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Constant Quantiser</source>
+        <translation>Konštantný kvantifikátor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Same Quantiser as Input</source>
+        <translation>Rovnaký kvantifikátor ako vstup</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Constant Rate Factor</source>
+        <translation>Faktor konštantného rýchlosti</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Two Pass - Video Size</source>
+        <translation>Dva prechody - veľkosť videa</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Two Pass - Average Bitrate</source>
+        <translation>Dva prechody - priemerná prenosová rýchlosť</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding mode</source>
+        <translation>Režim kódovania</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bitrate</source>
+        <translation>Prenosová rýchlosť</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Target bitrate (kb/s)</source>
+        <translation>Cieľová prenosová rýchlosť [kB/s]</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+19"/>
+        <source>Quantizer</source>
+        <translation>Kvantifikátor</translation>
+    </message>
+    <message>
+        <location line="-14"/>
+        <source>Target video size (MB)</source>
+        <translation>Cieľová veľkosť videa [MB]</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Average bitrate (kb/s)</source>
+        <translation>Priemerná prenosová rýchlosť [kB/s]</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+</context>
+<context>
+    <name>black</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp" line="+48"/>
+        <source>Black</source>
+        <translation>Čierna</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace a section by black.</source>
+        <translation>Nahradí sekciu čiernou.</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>_Start time:</source>
+        <translation>Čas _štartu:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation>Čas _konca:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Replace by Black</source>
+        <translation>Nahradiť čiernou</translation>
+    </message>
+</context>
+<context>
+    <name>blacken</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <source>Blacken Borders</source>
+        <translation>Začiernené okraje</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remove noisy edge by turning them to black.</source>
+        <translation>Odstráni zašumené okraje ich premenou na čiernu.</translation>
+    </message>
+</context>
+<context>
+    <name>blackenDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/blackenBorders.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+14"/>
+        <source>Blacken Borders</source>
+        <translation>Začiernené okraje</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
+        <source>Right:</source>
+        <translation>Vpravo:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+23"/>
+        <source>Top:</source>
+        <translation>Hore:</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <source>Reset</source>
+        <translation>Vynulovať</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
+        <source>Bottom:</source>
+        <translation>Dole:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+51"/>
+        <source>Left:</source>
+        <translation>Vľavo:</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation>&amp;Skryť gumičku</translation>
+    </message>
+</context>
+<context>
+    <name>blackframes</name>
+    <message>
+        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
+        <source>BlackFrame</source>
+        <translation>Čierne snímky</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>This function is unsupported at the moment</source>
+        <translation>Táto funkcia momentálne nie je podporovaná</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Searching black frame..</source>
+        <translation>Vyhľadávanie čiernej snímky.</translation>
+    </message>
+</context>
+<context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation>Snímky zmiešavania</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation>Zmieša skupiny N snímok do jednej snímky. Užitočné pre zrýchlenie záznamu spomaleného pohybu alebo vytvorenie časových oneskorení.</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation>snímok</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation>Zmiešavanie</translation>
+    </message>
+</context>
+<context>
+    <name>changeFps</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
+        <source>Custom</source>
+        <translation>Vlastné</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25  (PAL)</source>
+        <translation>25 (PAL)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>23.976 (Film)</source>
+        <translation>23.976 (Film)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>29.97 (NTSC)</source>
+        <translation>29.97 (NTSC)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 (Pal)</source>
+        <translation>50 (Pal)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>59.94  (NTSC)</source>
+        <translation>59.94  (NTSC)</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Change FPS</source>
+        <translation>Zmeniť snímkovú frekvenciu</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed up/slow down the video as if altering fps. This filter changes duration.</source>
+        <translation>Zmenou rýchlosti videa, ako keby ste menili snímkovú frekvenciu. Tento filter vytvára trvalé zmeny.</translation>
+    </message>
+    <message>
+        <location line="+146"/>
+        <source>Source Fps:</source>
+        <translation>Snímok/s zdroja:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Source frame rate:</source>
+        <translation>Zdrojová snímková frekvencia:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Destination Fps:</source>
+        <translation>Snímok/s cieľa:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Destination frame rate:</source>
+        <translation>Cieľová snímková frekvencia:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Change fps</source>
+        <translation>Zmeniť snímkovú frekvenciu</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error</source>
+        <translation>Chyba</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Invalid fps</source>
+        <translation>Neplatná snímková frekvencia</translation>
+    </message>
+</context>
+<context>
+    <name>chromashift</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp" line="+35"/>
+        <source>ChromaShift</source>
+        <translation>Posun farebnej zložky</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Shift chroma U/V to fix badly synced luma/chroma.</source>
+        <translation>Posun U/V farebnej zložky pre opravu zle synchronizovanej jasovej zložky/farebnej zložky.</translation>
+    </message>
+</context>
+<context>
+    <name>chromashiftDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/chromashift.ui" line="+14"/>
+        <source>ChromaShift</source>
+        <translation>Posun farebnej zložky</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>V Shift</source>
+        <translation>Posun V</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>U Shift</source>
+        <translation>Posun U</translation>
+    </message>
+</context>
+<context>
+    <name>coloryuv</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="+62"/>
+        <source>Avisynth color filter.</source>
+        <translation>Farebný filter Avisynth.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Color management filter.</source>
+        <translation>Filter riadenia farby.</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>AutoWhite</source>
+        <translation>Automatická biela</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>AutoGain</source>
+        <translation>Automatický zisk</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clip to Tv Range (16-235)</source>
+        <translation>Strih pre Tv rozsah (16-235)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation>Nie je</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>PC-&gt;TV</source>
+        <translation>PC-&gt;TV</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>TV-&gt;PC</source>
+        <translation>TV-&gt;PC</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Levels:</source>
+        <translation>Úrovne:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Y gain</source>
+        <translation>Y zisk</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Y Brightness</source>
+        <translation>Y jas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Y Gamma</source>
+        <translation>Y gama</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Y Contrast</source>
+        <translation>Y kontrast</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>U gain</source>
+        <translation>U zisk</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>U Brightness</source>
+        <translation>U jas</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>U Contrast</source>
+        <translation>U kontrast</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>V gain</source>
+        <translation>V zisk</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>V Brightness</source>
+        <translation>V jas</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>V Contrast</source>
+        <translation>V kontrast</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Flags</source>
+        <translation>Príznaky</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Y</source>
+        <translation>Y</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>U</source>
+        <translation>U</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>V</source>
+        <translation>V</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>colorYuv</source>
+        <translation>farby YUV</translation>
+    </message>
+</context>
+<context>
+    <name>contrast</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+34"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
+        <location line="+87"/>
+        <source>Contrast</source>
+        <translation>Kontrast</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust contrast, brightness and colors.</source>
+        <translation>Upraví kontrast, jas a farby.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
+        <location line="+87"/>
+        <source>Brightness</source>
+        <translation>Jas</translation>
+    </message>
+</context>
+<context>
+    <name>contrastDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/contrast.ui" line="+14"/>
+        <location line="+19"/>
+        <source>Contrast</source>
+        <translation>Kontrast</translation>
+    </message>
+    <message>
+        <location line="-7"/>
+        <source>Contrast  </source>
+        <translation>Kontrast  </translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Brightness  </source>
+        <translation>Jas  </translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <source>Luma</source>
+        <translation>Jasová zložka</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Process</source>
+        <translation>Priebeh</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>MPEG2-&gt;PC</source>
+        <translation>MPEG2-&gt;PC</translation>
+    </message>
+    <message>
+        <location line="-43"/>
+        <source>ChromaU</source>
+        <translation>Farebná zložka U</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>ChromaV</source>
+        <translation>Farebná zložka V</translation>
+    </message>
+    <message>
+        <location line="-46"/>
+        <source>Brightness</source>
+        <translation>Jas</translation>
+    </message>
+</context>
+<context>
+    <name>convolution</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp" line="+136"/>
+        <source>_Process luma</source>
+        <translation>Priebeh _jasovej zložky</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Process luma plane</source>
+        <translation>Spracovanie roviny jasu</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>P_rocess chroma</source>
+        <translation>Priebeh _farebnej zložky</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fast Convolution</source>
+        <translation>Rýchle previnutie</translation>
+    </message>
+</context>
+<context>
+    <name>crash</name>
+    <message>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
+        <source>Load it</source>
+        <translation>Načítať to</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Crash file</source>
+        <translation>Uložený súbor po havárii</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>I have detected a crash file. 
+Do you want to load it  ?
+(It will be deleted in all cases, you should save it if you want to keep it)</source>
+        <translation>Objavil som havarovaný súbor.
+Chcete ho načítať?
+(V každom prípade bude zmazaný, mali by ste ho uložiť, ak ho chcete zachovať)</translation>
+    </message>
+</context>
+<context>
+    <name>crop</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <source>Crop</source>
+        <translation>Orezanie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Crop filter</source>
+        <translation>Filter orezávania</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Warning Cropping too much width ! Width reseted !
+</source>
+        <translation>Upozornenie na prílišnú šírku orezania! Šírka vynulovaná!
+</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Warning Cropping too much height ! Height reseted !
+</source>
+        <translation>Upozornenie na prílišnú výšku orezania! Výška vynulovaná!
+</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
+        <source>Size: </source>
+        <translation>Veľkosť: </translation>
+    </message>
+</context>
+<context>
+    <name>cropDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
+        <source>Crop</source>
+        <translation>Orezanie</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+75"/>
+        <source>Right:</source>
+        <translation>Vpravo:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
+        <source>Top:</source>
+        <translation>Hore:</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-30"/>
+        <source>Reset</source>
+        <translation>Vynulovať</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
+        <source>Bottom:</source>
+        <translation>Dole:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
+        <source>Left:</source>
+        <translation>Vľavo:</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
+        <source>Auto Crop</source>
+        <translation>Automatické orezanie</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+        <source>Size: </source>
+        <translation>Veľkosť: </translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation>&amp;Skryť gumičku</translation>
+    </message>
+</context>
+<context>
+    <name>dcaenc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.cpp" line="+272"/>
+        <source>_Bitrate:</source>
+        <translation>_Prenosová rýchlosť:</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>DcaEnc Configuration</source>
+        <translation>Konfigurácia DcaEnc</translation>
+    </message>
+</context>
+<context>
+    <name>decimate</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+56"/>
+        <source>Decomb decimate</source>
+        <translation>Dekombinácia decimácie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Donald Graft decimate. Remove duplicate after telecide.</source>
+        <translation>Donald Graft decimácia. Odstráni duplikáty po telecide.</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Discard closer</source>
+        <translation>Zahodiť bližší</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace (interpolate)</source>
+        <translation>Nahradiť (interpolovať)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Discard longer dupe (animés)</source>
+        <translation>Zahodiť dlhšie duplikáty (animé)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Pulldown dupe removal</source>
+        <translation>Odstránenie roletových duplikátov</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Fastest (no chroma, partial luma)</source>
+        <translation>Najrýchlejšia (bez farebnej zložky, čiastočná jasová zložka)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Medium (full luma, no chroma)</source>
+        <translation>Stredná (plná jasová zložka, bez farebnej zložky)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Mode:</source>
+        <translation>_Režim:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Quality:</source>
+        <translation>_Kvalita:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Threshold 1:</source>
+        <translation>_Prah 1:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>T_hreshold 2:</source>
+        <translation>Pra_h 2:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>C_ycle:</source>
+        <translation>_Cyklus:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Sho_w</source>
+        <translation>_Ukázať</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Decomb Decimate</source>
+        <translation>Dekombinácia decimácie</translation>
+    </message>
+</context>
+<context>
+    <name>delogo2</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp" line="+41"/>
+        <source>MPlayer delogo2</source>
+        <translation>Odstránenie loga MPlayer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend a logo by interpolating its surrounding box.</source>
+        <translation>Vymaže logo interpoláciou jeho okolia.</translation>
+    </message>
+</context>
+<context>
+    <name>dgbob</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+56"/>
+        <source>dgbob</source>
+        <translation>dgbob</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Donald Graft Bob.</source>
+        <translation>Bob filter Donalda Grafta.</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Top</source>
+        <translation>Vrchný</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom</source>
+        <translation>Spodný</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Keep nb of frames and fps</source>
+        <translation>Zachovať počet a frekvenciu snímok</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double nb of frames and fps</source>
+        <translation>Zdvojnásobiť počet a frekvenciu snímok</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double nb of frames (slow motion)</source>
+        <translation>Zdvojnásobiť počet snímok (spomalenie)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Top Field First:</source>
+        <translation>_Horné pole prvé:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Mode:</source>
+        <translation>_Režim:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Threshold:</source>
+        <translation>_Prah:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Extra</source>
+        <translation>_Extra</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Extra check, avoid using it</source>
+        <translation>Extra kontrola, nepoužívajte</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>DGBob</source>
+        <translation>DGBob</translation>
+    </message>
+</context>
+<context>
+    <name>dummy</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dummy/dummyVideoFilter.cpp" line="+44"/>
+        <source>Dummy</source>
+        <translation>Zdanlivý</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter, it does nothing at all.</source>
+        <translation>Nulový filter, nič to nerobí.</translation>
+    </message>
+</context>
+<context>
+    <name>dv</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
+        <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
+        <translation>DV podporuje len 720*576*25snímok/s a 720*480*29.97snímok/s</translation>
+    </message>
+</context>
+<context>
+    <name>encodingDialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+26"/>
+        <source>Encoding...</source>
+        <translation>Prebieha kódovanie...</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Main</source>
+        <translation>Hlavné</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <location line="+254"/>
+        <source>Unknown</source>
+        <translation>Neznámy</translation>
+    </message>
+    <message>
+        <location line="-261"/>
+        <location line="+247"/>
+        <location line="+21"/>
+        <source>None</source>
+        <translation>Nie je</translation>
+    </message>
+    <message>
+        <location line="-254"/>
+        <source>Phase:</source>
+        <translation>Fáza:</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <source>Time Remaining:</source>
+        <translation>Zostávajúci čas:</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>Shut down computer when finished</source>
+        <translation>Po ukončení vypnúť počítač</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Priority:</source>
+        <translation>Priorita:</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>High</source>
+        <translation>Vysoká</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Above Normal</source>
+        <translation>Nad normálom</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Normal</source>
+        <translation>Normálna</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Below Normal</source>
+        <translation>Pod normálom</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Low</source>
+        <translation>Nízka</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Keep dialog open when finished</source>
+        <translation>Po dokončení ponechajte dialógové okno otvorené</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Minimize to Tray</source>
+        <translation>Minimalizovať na lištu</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Pause / Abort</source>
+        <translation>Pozastaviť / Zrušiť</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Advanced</source>
+        <translation>Pokročilé</translation>
+    </message>
+    <message>
+        <location line="+80"/>
+        <source>Audio Codec:</source>
+        <translation>Audio kodek:</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Container:</source>
+        <translation>Kontajner:</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Audio Size:</source>
+        <translation>Veľkosť audia:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Total Size:</source>
+        <translation>Celková veľkosť:</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Video Size:</source>
+        <translation>Veľkosť videa:</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Average Bitrate:</source>
+        <translation>Priemerná prenosová rýchlosť:</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Processed Frames:</source>
+        <translation>Spracované snímky:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Quantiser:</source>
+        <translation>Kvantifikátor:</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Elapsed:</source>
+        <translation>Uplynulý čas:</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Frames/sec:</source>
+        <translation>snímok/sek:</translation>
+    </message>
+    <message>
+        <location line="-226"/>
+        <source>Video Codec:</source>
+        <translation>Video kodek:</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <source>0 MB</source>
+        <translation>0 MB</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <location line="+31"/>
+        <location line="+57"/>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <location line="-64"/>
+        <source>0 kB/s</source>
+        <translation>0 kB/s</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>00:00:00</source>
+        <translation>00:00:00</translation>
+    </message>
+</context>
+<context>
+    <name>eq2</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
+        <source>MPlayer eq2</source>
+        <translation>MPlayer eq2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust contrast, brightness, saturation and gamma.</source>
+        <translation>Upraví kontrast, jas, nasýtenie a gama.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
+        <source>Reset</source>
+        <translation>Vynulovať</translation>
+    </message>
+</context>
+<context>
+    <name>eq2Dialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+14"/>
+        <location line="+88"/>
+        <source>Contrast</source>
+        <translation>Kontrast</translation>
+    </message>
+    <message>
+        <location line="-51"/>
+        <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Gama&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Saturation</source>
+        <translation>Nasýtenie</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Brightness</source>
+        <translation>Jas</translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <source>Blue</source>
+        <translation>Modrá</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Red</source>
+        <translation>Červená</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Initial</source>
+        <translation>Východzia</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Weight</source>
+        <translation>Váha</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Green</source>
+        <translation>Zelená</translation>
+    </message>
+</context>
+<context>
+    <name>faac</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/faac/audioencoder_faac.cpp" line="+292"/>
+        <source>_Bitrate:</source>
+        <translation>_Prenosová rýchlosť:</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Faac Configuration</source>
+        <translation>Konfigurácia Faac</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+        <source>Opus Configuration</source>
+        <translation>Konfigurácia Opus</translation>
+    </message>
+</context>
+<context>
+    <name>fadeTo</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location line="+23"/>
+        <source>Fade</source>
+        <translation>Vytrácanie</translation>
+    </message>
+    <message>
+        <location line="-22"/>
+        <source>Fade.</source>
+        <translation>Vytrácanie obrazu.</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>From</source>
+        <translation>Od</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation>Vytrácanie prvého obrázka vo filme</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation>Do</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation>Vytrácanie filmu po prvý obrázok</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation>Smer _vytrácania:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Start time:</source>
+        <translation>Čas _štartu:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation>Čas _konca:</translation>
+    </message>
+</context>
+<context>
+    <name>fadeToBlack</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+55"/>
+        <location line="+20"/>
+        <source>Fade to black</source>
+        <translation>Zčernenie</translation>
+    </message>
+    <message>
+        <location line="-19"/>
+        <source>Fade to black in/out.</source>
+        <translation>Zčernenie od/do.</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Out</source>
+        <translation>Do</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade out</source>
+        <translation>Vytrácanie</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>In</source>
+        <translation>Dnu</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade in</source>
+        <translation>Zjavovanie</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Fade type:</source>
+        <translation>_Typ vytrácania:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Start time:</source>
+        <translation>Čas _štartu:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation>Čas _konca:</translation>
+    </message>
+</context>
+<context>
+    <name>ffVAEncH264</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
+        <source>Baseline</source>
+        <translation>Základné</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Main</source>
+        <translation>Hlavné</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>High</source>
+        <translation>Vysoké</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Profile:</source>
+        <translation>Profil:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>GOP Size:</source>
+        <translation>Veľkosť skupiny obrázkov:</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Maximum Consecutive B-Frames:</source>
+        <translation>Maximum následných B snímok:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation>Prenosová rýchlosť [kB/s]:</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <source>Max Bitrate (kbps):</source>
+        <translation>Maximálna prenosová rýchlosť [kB/s]:</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Rate Control</source>
+        <translation>Riadenie prenosovej rýchlosti</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Frame Control</source>
+        <translation>Riadenie rýchlosti</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>FFmpeg VA-API H.264 Encoder Configuration</source>
+        <translation>Konfigurácia kódovača FFmpeg VA-API H.264</translation>
+    </message>
+</context>
+<context>
+    <name>ffVAEncHEVC</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
+        <source>GOP Size:</source>
+        <translation>Veľkosť skupiny obrázkov:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Maximum Consecutive B-Frames:</source>
+        <translation>Maximum následných B snímok:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Bitrate (kbps):</source>
+        <translation>Prenosová rýchlosť [kB/s]:</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <source>Max Bitrate (kbps):</source>
+        <translation>Maximálna prenosová rýchlosť [kB/s]:</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Rate Control</source>
+        <translation>Riadenie prenosovej rýchlosti</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Frame Control</source>
+        <translation>Riadenie snímkov</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>FFmpeg VA-API HEVC Encoder Configuration</source>
+        <translation>Konfigurácia kódovača FFmpeg VA-API HEVC</translation>
+    </message>
+</context>
+<context>
+    <name>ffmpeg2</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+250"/>
+        <source>Normal (4:3)</source>
+        <translation>Normálne (4:3)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Wide (16:9)</source>
+        <translation>Širokouhlé (16:9)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Default</source>
+        <translation>Východzie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tmpgenc</source>
+        <translation>Tmpgenc</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Animes</source>
+        <translation>Kreslené</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>KVCD</source>
+        <translation>KVCD</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>MB comparison</source>
+        <translation>Porovnanie MB</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fewest bits (vhq)</source>
+        <translation>Najmnšie bity (vhq)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Rate distortion</source>
+        <translation>Miera skreslenia</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>One thread</source>
+        <translation>Jedno vlákno</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Two threads)</source>
+        <translation>Dve vlákna</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Three threads</source>
+        <translation>Tri vlákna</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto (#cpu)</source>
+        <translation>Automaticky (počet CPU)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Progressive</source>
+        <translation>Progresívny</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Interlaced</source>
+        <translation>Prekladaný</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation>Najskôr horná polsnímka</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation>Najskôr dolná polsnímka</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Threading</source>
+        <translation>Vláknenie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mi_n. quantizer:</source>
+        <translation>Mi_n. kvantifikátor:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ma_x. quantizer:</source>
+        <translation>Ma_x. kvantifikátor:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max. quantizer _difference:</source>
+        <translation>Max. r_ozdiel kvantfikátorov:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>VBV Buffer Size:</source>
+        <translation>Veľkosť VBV zásobníka:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max bitrate (kb/s):</source>
+        <translation>Maximálna prenosová rýchlosť [kB/s]:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Trellis quantization</source>
+        <translation>_Kvantifikácia mriežkového kódovania</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Number of B frames:</source>
+        <translation>_Počet B snímok:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Macroblock decision:</source>
+        <translation>_Rozhodovanie makroblokov:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Aspect ratio:</source>
+        <translation>Pomer strán:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Matrices:</source>
+        <translation>Matrice:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Filesize tolerance (kb):</source>
+        <translation>_Tolerancia veľkosti súboru [kB]:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Quantizer compression:</source>
+        <translation>_Kompresia kvantifikátorov:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantizer _blur:</source>
+        <translation>_Rozostrenie kvantifikátorov:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Gop Size:</source>
+        <translation>Veľkosť _skupiny obrázkov:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Interlaced:</source>
+        <translation>_Prekladané:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Field Order:</source>
+        <translation>Poradie polsnímok:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Basic Settings</source>
+        <translation>Základné nastavenia</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Adv. Settings</source>
+        <translation>Rozšírené nastavenia</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Interlacing</source>
+        <translation>Prekladanie</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quantization</source>
+        <translation>Kvantifikácia</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Rate Control</source>
+        <translation>Riadenie prenosovej rýchlosti</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>libavcodec MPEG-2 configuration</source>
+        <translation>Konfigurácia libavcodec MPEG-2</translation>
+    </message>
+</context>
+<context>
+    <name>ffmpeg4</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
+        <source>H.263</source>
+        <translation>H.263</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MPEG</source>
+        <translation>MPEG</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>MB comparison</source>
+        <translation>Porovnanie MB</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fewest bits (vhq)</source>
+        <translation>Najmenšie bity (vhq)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Rate distortion</source>
+        <translation>Miera skreslenia</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>One thread</source>
+        <translation>Jedno vlákno</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Two threads)</source>
+        <translation>Dve vlákna</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Three threads</source>
+        <translation>Tri vlákna</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto (#cpu)</source>
+        <translation>Automaticky (počet CPU)</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Threading</source>
+        <translation>Vláknenie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mi_n. quantizer:</source>
+        <translation>Mi_n. kvantifikátor:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ma_x. quantizer:</source>
+        <translation>Ma_x. kvantifikátor:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max. quantizer _difference:</source>
+        <translation>Max. r_ozdiel kvantfikátorov:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>4_MV</source>
+        <translation>4_MV</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Trellis quantization</source>
+        <translation>_Kvantifikácia mriežkového kódovania</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Quarter pixel</source>
+        <translation>Štvrť _pixel</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Number of B frames:</source>
+        <translation>_Počet B snímok:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Quantization type:</source>
+        <translation>_Typ kvantifikácie:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Macroblock decision:</source>
+        <translation>_Rozhodovanie makroblokov:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Filesize tolerance (kb):</source>
+        <translation>_Tolerancia veľkosti súboru [kB]:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Quantizer compression:</source>
+        <translation>_Kompresia kvantifikátorov:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantizer _blur:</source>
+        <translation>_Rozostrenie kvantifikátorov:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Gop Size:</source>
+        <translation>Veľkosť _skupiny obrázkov:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>User Interface</source>
+        <translation>Užívateľské rozhranie</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Advanced Simple Profile</source>
+        <translation>Prídavný jednoduchý profil</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Motion Estimation</source>
+        <translation>Odhad pohybu</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Quantization</source>
+        <translation>Kvantifikácia</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Rate Control</source>
+        <translation>Riadenie prenosovej rýchlosti</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation>Konfigurácia libavcodec MPEG-4</translation>
+    </message>
+</context>
+<context>
+    <name>ffmsmpeg4</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="+224"/>
+        <source>None</source>
+        <translation>Nie je</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Full</source>
+        <translation>Plná</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Log</source>
+        <translation>Záznam hlásenia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Phods</source>
+        <translation>Phods</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>EPZS</source>
+        <translation>EPZS</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>X1</source>
+        <translation>X1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>H.263</source>
+        <translation>H.263</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MPEG</source>
+        <translation>MPEG</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>MB comparison</source>
+        <translation>Porovnanie MB</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fewest bits (vhq)</source>
+        <translation>Najmenšie bity (vhq)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Rate distortion</source>
+        <translation>Miera skreslenia</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Mi_n. quantizer:</source>
+        <translation>Mi_n. kvantifikátor:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ma_x. quantizer:</source>
+        <translation>Ma_x. kvantifikátor:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max. quantizer _difference:</source>
+        <translation>Max. r_ozdiel kvantfikátorov:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Trellis quantization</source>
+        <translation>_Kvantifikácia mriežkového kódovania</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Filesize tolerance (kb):</source>
+        <translation>_Tolerancia veľkosti súboru [kB]:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Quantizer compression:</source>
+        <translation>_Kompresia kvantifikátorov:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantizer _blur:</source>
+        <translation>_Rozostrenie kvantifikátorov:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Gop Size:</source>
+        <translation>Veľkosť _skupiny obrázkov:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>User Interface</source>
+        <translation>Užívateľské rozhranie</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quantization</source>
+        <translation>Kvantifikácia</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Rate Control</source>
+        <translation>Riadenie prenosovej rýchlosti</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation>Konfigurácia libavcodec MPEG-4</translation>
+    </message>
+</context>
+<context>
+    <name>ffnvenc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+229"/>
+        <source>Controlled by Preset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
+        <source>Low Quality</source>
+        <translation>Nízka kvalita</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>High Quality</source>
+        <translation>Vysoká kvalita</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>BluRay</source>
+        <translation>Blu-ray</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency</source>
+        <translation>Nízka odozva</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency (LQ)</source>
+        <translation>Nízka odozva (LQ)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency (HQ)</source>
+        <translation>Nízka odozva (HQ)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Baseline</source>
+        <translation>Základná</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Main</source>
+        <translation>Hlavné</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>High</source>
+        <translation>Vysoká</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+        <source>RC Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Preset:</source>
+        <translation>Predvoľba:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Profile:</source>
+        <translation>Profil:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation>Prenosová rýchlosť [kB/s]:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Max Bitrate (kbps):</source>
+        <translation>Maximálna prenosová rýchlosť [kB/s]:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>GOP Size:</source>
+        <translation>Veľkosť skupiny obrázkov:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Maximum Consecutive B-Frames:</source>
+        <translation>Maximum následných B snímok:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>Rate Control</source>
+        <translation>Riadenie prenosovej rýchlosti</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Frame Control</source>
+        <translation>Riadenie snímkov</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>NVENC H.264 configuration</source>
+        <translation>Konfigurácia NVENC H.264</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+28"/>
+        <source>NVENC HEVC configuration</source>
+        <translation>Konfigurácia NVENC HEVC</translation>
+    </message>
+</context>
+<context>
+    <name>ffpsmuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+64"/>
+        <source>[Mismatch]</source>
+        <translation>[Zmätočné]</translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Saving mpeg PS (ff)</source>
+        <translation>Uloženie mpeg PS (ff)</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source> video not compatible
+</source>
+        <translation> nekompatibilné video
+</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source> Bad width/height for VCD
+</source>
+        <translation> Neplatná šírka/výška pre VCD
+</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source> Bad width/height for SVCD
+</source>
+        <translation> Neplatná šírka/výška pre SVCD
+</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source> Bad width/height for DVD
+</source>
+        <translation> Neplatná šírka/výška pre DVD
+</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source> VCD : only MP2 audio accepted
+</source>
+        <translation> VCD: akcetpované len MP2 audio
+</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source> VCD : only 44.1 khz audio accepted
+</source>
+        <translation> VCD: akceptované len 44.1 kHz audio
+</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source> DVD : only 48 khz audio accepted
+</source>
+        <translation> DVD: akceptované len 48 kHz audio
+</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>[ffPS] DVD : only MP2/AC3/DTS audio accepted
+</source>
+        <translation>[ffPS] DVD: akceptované len MP2/AC3/DTS audio
+</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <source>Free</source>
+        <translation>Voľné</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Muxing Format</source>
+        <translation>Formát zmiešavania</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Allow non compliant stream</source>
+        <translation>Povoliť nezhodný tok</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Total Muxrate (kbits)</source>
+        <translation>Celková miera zmiešavania (kB)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video Muxrate (kbits)</source>
+        <translation>Podiel videa zmiešavania (kB)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>VBV size (kBytes)</source>
+        <translation>Veľkosť VBV (kB)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Advanced</source>
+        <translation>Pokročilé</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Mpeg PS Muxer</source>
+        <translation>Zmiešavač Mpeg PS zmiešavač</translation>
+    </message>
+</context>
+<context>
+    <name>fftsmuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
+        <source>Saving mpeg TS (ff)</source>
+        <translation>Uloženie mpeg TS (ff)</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTSConfig.cpp" line="+28"/>
+        <source>VBR muxing</source>
+        <translation>VBR zmiešavanie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mux rate (MBits/s)</source>
+        <translation>Frekvencia zmiešavania [mB/s]</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>TS Muxer</source>
+        <translation>Zmiešavač TS</translation>
+    </message>
+</context>
+<context>
+    <name>ffvtenc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <source>Baseline</source>
+        <translation>Základný</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Main</source>
+        <translation>Hlavné</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>High</source>
+        <translation>Vysoká</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Profile:</source>
+        <translation>Profil:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>GOP Size:</source>
+        <translation>Veľkosť skupiny obrázkov:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Maximum Consecutive B-Frames:</source>
+        <translation>Maximum následných B snímok:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation>Prenosová rýchlosť [kB/s]:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max Bitrate (kbps):</source>
+        <translation>Maximálna prenosová rýchlosť [kB/s]:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Rate Control</source>
+        <translation>Riadenie prenosovej rýchlosti</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Frame Control</source>
+        <translation>Riadenie snímkov</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>VideoToolbox H.264 Encoder Configuration</source>
+        <translation>Video nástroje konfigurácie kódovača H.264</translation>
+    </message>
+</context>
+<context>
+    <name>filesel</name>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
+        <source>File error</source>
+        <translation>Chyba súboru</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cannot open &quot;%s&quot;.</source>
+        <translation>Nemožno otvoriť &quot;%s&quot;.</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>%s already exists.
+
+Do you want to replace it?</source>
+        <translation>%s už existuje.
+
+Chcete ho nahradiť?</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location line="+14"/>
+        <source>It is possible that you are trying to overwrite an input file!</source>
+        <translation>Je možné, že sa snažíte prepísať vstupný súbor!</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Cannot write the file</source>
+        <translation>Nemožno zapísať súbor</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>No write access to &quot;%s&quot;.</source>
+        <translation>Bez prístupu zápisu do &quot;% s&quot;.</translation>
+    </message>
+</context>
+<context>
+    <name>flux</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+37"/>
+        <location line="+56"/>
+        <source>FluxSmooth</source>
+        <translation>FluxSmooth</translation>
+    </message>
+    <message>
+        <location line="-55"/>
+        <source>Spatio-temporal cleaner by Ross Thomas.</source>
+        <translation>Priestorovo-časové vyhladenie obrazu od Rossa Thomasa.</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>_Temporal threshold:</source>
+        <translation>Doč_asný prah:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Spatial threshold:</source>
+        <translation>_Priestorový prah:</translation>
+    </message>
+</context>
+<context>
+    <name>flv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="+162"/>
+        <source>H.263</source>
+        <translation>H.263</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MPEG</source>
+        <translation>MPEG</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>MB comparison</source>
+        <translation>Porovnanie MB</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fewest bits (vhq)</source>
+        <translation>Najmenšie bity (vhq)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Rate distortion</source>
+        <translation>Miera skreslenia</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Mi_n. quantizer:</source>
+        <translation>Mi_n. kvantifikátor:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ma_x. quantizer:</source>
+        <translation>Ma_x. kvantifikátor:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max. quantizer _difference:</source>
+        <translation>Max. r_ozdiel kvantfikátorov:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Trellis quantization</source>
+        <translation>_Kvantifikácia mriežkového kódovania</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Filesize tolerance (kb):</source>
+        <translation>_Tolerancia veľkosti súboru [kB]:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Quantizer compression:</source>
+        <translation>_Kompresia kvantifikátorov:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantizer _blur:</source>
+        <translation>_Rozostrenie kvantifikátorov:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Gop Size:</source>
+        <translation>Veľkosť _skupiny obrázkov:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>User Interface</source>
+        <translation>Užívateľské rozhranie</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quantization</source>
+        <translation>Kvantifikácia</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Rate Control</source>
+        <translation>Riadenie prenosovej rýchlosti</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>libavcodec FLV1 configuration</source>
+        <translation>Konfigurácia libavcodec FLV1</translation>
+    </message>
+</context>
+<context>
+    <name>flvdemuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
+        <source>Warning</source>
+        <translation>Upozornenie</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>This FLV file says it has no video.
+I will assume it has and try to continue</source>
+        <translation>Tento súbor FLV tvrdí, že nemá žiadne video.
+Je predpoklad, že má a pokúsiť sa pokračovať</translation>
+    </message>
+</context>
+<context>
+    <name>flvmuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerFlv/muxerFlv.cpp" line="+68"/>
+        <location line="+10"/>
+        <location line="+6"/>
+        <source>Unsupported</source>
+        <translation>Nepodporované</translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <source>Only FLV1 &amp; VP6 supported for video</source>
+        <translation>Podporované len pre video FLV1 &amp; VP6</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Only AAC &amp; mpegaudio supported for audio</source>
+        <translation>Podporované len pre audio AAC &amp; mpegaudio</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Only 44.1, 22.050 and 11.025 kHz supported</source>
+        <translation>Pordporované len 44.1, 22.050 a 11.025 kHz</translation>
+    </message>
+</context>
+<context>
+    <name>gaussian</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Gauss.cpp" line="+26"/>
+        <source>Gaussian convolution.</source>
+        <translation>Gaussova konvolúcia.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>3x3 convolution filter :gaussian.</source>
+        <translation>3x3 konvolučný gausov filter.</translation>
+    </message>
+</context>
+<context>
+    <name>glBenchmark</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glBenchmark/benchGl.cpp" line="+61"/>
+        <source>OpenGl ReadBack benchmark</source>
+        <translation>Vykoná skúšobný test spätného čítania OpenGl</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Check how fast readback is.</source>
+        <translation>Kontroluje aké rýchle je spätné čítanie.</translation>
+    </message>
+</context>
+<context>
+    <name>glFragment</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.cpp" line="+68"/>
+        <source>OpenGl Fragment Shader Sample</source>
+        <translation>Príklad fragmentácie shaderov OpenGL</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Run a fragment shader.</source>
+        <translation>Spustí fragmentáciu shaderov.</translation>
+    </message>
+</context>
+<context>
+    <name>glFragment2</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.cpp" line="+66"/>
+        <source>OpenGl Fragment Shader Sample2</source>
+        <translation>2. príklad fragmentácie shaderov OpenGL</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Run a fragment shader.</source>
+        <translation>Spustí fragmentáciu shaderov.</translation>
+    </message>
+</context>
+<context>
+    <name>glResize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="+66"/>
+        <source>OpenGl Resize</source>
+        <translation>Zmena veľkosti OpenGL</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize using openGl.</source>
+        <translation>Zmení použitie OpenGL.</translation>
+    </message>
+    <message>
+        <location line="+146"/>
+        <source>Width :</source>
+        <translation>Šírka:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height :</source>
+        <translation>Výška:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>glResize</source>
+        <translation>glResize</translation>
+    </message>
+</context>
+<context>
+    <name>glRotate</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.cpp" line="+57"/>
+        <source>OpenGl Rotate</source>
+        <translation>Rotácia OpenGL</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Rotate image by a small amount.</source>
+        <translation>Krátko pootočí obrázok.</translation>
+    </message>
+    <message>
+        <location line="+118"/>
+        <source>Angle (°):</source>
+        <translation>Uhol pootočenia [°]:</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>glRotate</source>
+        <translation>glRotate</translation>
+    </message>
+</context>
+<context>
+    <name>glSample</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.cpp" line="+68"/>
+        <source>OpenGl Fragment Shader Sample</source>
+        <translation>Príklad fragmentácie shaderov OpenGL</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Run a fragment shader.</source>
+        <translation>Spustí fragmentáciu shaderov.</translation>
+    </message>
+</context>
+<context>
+    <name>glShader</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="-182"/>
+        <source>Shader Loader</source>
+        <translation>Zavádzač shaderov</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Run an external shader program.</source>
+        <translation>Spustí externý program pre shadery.</translation>
+    </message>
+    <message>
+        <location line="+192"/>
+        <source>ShaderFile to load</source>
+        <translation>Súbor shadrov na načítanie</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>ShaderLoader</source>
+        <translation>ShaderLoader</translation>
+    </message>
+</context>
+<context>
+    <name>glSmooth</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.cpp" line="+61"/>
+        <source>OpenGl Smooth</source>
+        <translation>Vyhladenie OpenGL</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Smooth image while preserving edge.</source>
+        <translation>Vyhladí hrany obrázka.</translation>
+    </message>
+</context>
+<context>
+    <name>glVdpaufilter</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="+84"/>
+        <source>vdpauDeintGl</source>
+        <translation>vdpauDeintGl</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>VDPAU deinterlacer+resize, openGl version (faster).</source>
+        <translation>Rozkladač VDPAU + zmena veľkosti, verzia OpenGL (rýchle).</translation>
+    </message>
+    <message>
+        <location line="+178"/>
+        <source>Keep Top Field</source>
+        <translation>Zachovať hornú polsnímku</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Keep Bottom Field</source>
+        <translation>Dodržať dolnú polsnímku</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double framerate</source>
+        <translation>Dvojitá snímková frakvencia</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Resize:</source>
+        <translation>_Zmena veľkosti:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Deint Mode:</source>
+        <translation>Režim _rozkladu:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width :</source>
+        <translation>Šírka:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height :</source>
+        <translation>Výška:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>vdpau</source>
+        <translation>vdpau</translation>
+    </message>
+</context>
+<context>
+    <name>glVertex</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.cpp" line="+59"/>
+        <source>OpenGl Vertex Shader</source>
+        <translation>Vrcholové shadery OpenGL</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Run a simple vertex shader.</source>
+        <translation>Spustí jednotlivé vrcholy shaderov.</translation>
+    </message>
+</context>
+<context>
+    <name>glWave</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.cpp" line="+59"/>
+        <source>OpenGl wave </source>
+        <translation>Kmitočet OpenGL </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Simple wave filter.</source>
+        <translation>Jednoduchý filter kmitočtu.</translation>
+    </message>
+</context>
+<context>
+    <name>glYadif</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.cpp" line="+77"/>
+        <source>Yadif (openGl)</source>
+        <translation>Yadif (OpenGl)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Yet another deinterlacer, using shaders.</source>
+        <translation>Ešte ďalší rozkladač, používanie shaderu.</translation>
+    </message>
+    <message>
+        <location line="+182"/>
+        <source>Temporal &amp; spatial check</source>
+        <translation>Časová a priestorová kontrola</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bob, temporal &amp; spatial check</source>
+        <translation>Bob, časová a priestorová kontrola</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Skip spatial temporal check</source>
+        <translation>Vynechať priestorovú časovú kontrolu</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bob, skip spatial temporal check</source>
+        <translation>Bob, vynechať priestorovú časovú kontrolu</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Bottom field first</source>
+        <translation>Najskôr dolná polsnímka</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Top field first</source>
+        <translation>Najskôr horná polsnímka</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation>_Režim:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Order:</source>
+        <translation>_Poradie:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>yadif</source>
+        <translation>yadif</translation>
+    </message>
+</context>
+<context>
+    <name>hflip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/horizontalFlip/horizontalFlip.cpp" line="+44"/>
+        <source>Horizontal Flip</source>
+        <translation>Preklopiť horizontálne</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Horizontally flip the image.</source>
+        <translation>Preklopí obrázok horizontálne.</translation>
+    </message>
+</context>
+<context>
+    <name>histogram</name>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_bitrateHisto.cpp" line="+56"/>
+        <location line="+75"/>
+        <source>No data</source>
+        <translation>Žiadne údaje</translation>
+    </message>
+    <message>
+        <location line="+71"/>
+        <source>Max. bitrate:</source>
+        <translation>Maximálna prenosová rýchlosť:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Average bitrate:</source>
+        <translation>Priemerná prenosová rýchlosť:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Number of I frames:</source>
+        <translation>Počet I snímok:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Number of P frames:</source>
+        <translation>Počet P snímok:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Number of B frames:</source>
+        <translation>Počet B snímok:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max. B frames:</source>
+        <translation>Max. B snímok:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Bitrate Histogram</source>
+        <translation>Histogram prenosovej rýchlosti</translation>
+    </message>
+</context>
+<context>
+    <name>hue</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+60"/>
+        <source>Mplayer Hue</source>
+        <translation>Mplayer odtieň</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust hue and saturation.</source>
+        <translation>Upraví odtieň a sýtosť.</translation>
+    </message>
+</context>
+<context>
+    <name>hueDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/hue.ui" line="+14"/>
+        <location line="+45"/>
+        <source>Hue</source>
+        <translation>Odtieň</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Saturation</source>
+        <translation>Nasýtenie</translation>
+    </message>
+</context>
+<context>
+    <name>huff</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <source>HUFFYUV</source>
+        <translation>HuffYUV</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>FF HUFFYUV</source>
+        <translation>FF HuffYUV</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Type:</source>
+        <translation>Typ:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>HuffYUV Configuration</source>
+        <translation>Konfigurácia HuffYUV</translation>
+    </message>
+</context>
+<context>
+    <name>hzstackfield</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/hzStackField.cpp" line="+52"/>
+        <source>Horizontal Stack Fields</source>
+        <translation>Horizontálne pole zásobníkov</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Put fields side by side.</source>
+        <translation>Pokladať polia vedľa seba.</translation>
+    </message>
+</context>
+<context>
+    <name>indexing</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
+        <source>Continue indexing</source>
+        <translation>Priebežné indexovanie</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Abort Requested</source>
+        <translation>Zrušiť požadované</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Do you want to abort indexing ?</source>
+        <translation>Chcete zrušiť indexovanie?</translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <source>Time Left :%02d:%02d:%02d</source>
+        <translation>Zostávajúci čas: %02d:%02d:%02d</translation>
+    </message>
+</context>
+<context>
+    <name>ivtcRemover</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
+        <source>Remove IVTC dupe.</source>
+        <translation>Odstrániť IVTC duplikáty.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remove the duplicate frames present after ivtc.</source>
+        <translation>Odstráni duplicitné snímky vyskytujúce sa po ivtc.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
+        <source>_Noise:</source>
+        <translation>Š_um:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
+        <source>_Show:</source>
+        <translation>Zobraziť:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Remove duplicate:</source>
+        <translation>_Odstrániť duplikáty:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <source>Full</source>
+        <translation>Plná</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
+        <source>Fast</source>
+        <translation>Rýchla</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
+        <source>VeryFast</source>
+        <translation>Veľmi rýchla</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <source>_Frame rate change:</source>
+        <translation>Zmena _snímkovej frekvencie:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
+        <source>DupeRemover</source>
+        <translation>Odstraňovač duplicít</translation>
+    </message>
+</context>
+<context>
+    <name>jobs</name>
+    <message>
+        <location filename="../ADM_jobs/src/uiJobs.ui" line="+17"/>
+        <source>Avidemux Jobs</source>
+        <translation>Úlohy programu Avidemux</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Run all pending jobs</source>
+        <translation>Spustiť všetky čakajúce úlohy</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Run jobs</source>
+        <translation>Spustiť úlohu</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Delete already executed jobs</source>
+        <translation>Odstrániť už vykonané úlohy</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Cleanup</source>
+        <translation>Vymazať</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>If you use VDPAU you cannot use CLI version</source>
+        <translation>Ak používate VDPAU, nemôžete používať verziu CLI</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>use Qt version</source>
+        <translation>použiť Qt verziu</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Quit</source>
+        <translation>Ukončiť</translation>
+    </message>
+    <message>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
+        <source>Oops</source>
+        <translation>Hoplá</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Something very wrong happened when building joblist.</source>
+        <translation>Pri zostavovaní zoznamu úloh sa stalo niečo veľmi zlé.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>There are no jobs stored</source>
+        <translation>Nie sú uložené žiadne úlohy</translation>
+    </message>
+</context>
+<context>
+    <name>jobsDialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="+13"/>
+        <source>Jobs</source>
+        <translation>Úlohy</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Delete Sel. Job</source>
+        <translation>Odstrániť vybranú úlohu</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Delete All Jobs</source>
+        <translation>Odstrániť všetky úlohy</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Run All Jobs</source>
+        <translation>Spustiť všetky úlohy</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Run Selected Job</source>
+        <translation>Spustiť vybranú úlohu</translation>
+    </message>
+</context>
+<context>
+    <name>jpeg</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+90"/>
+        <source>YUV422</source>
+        <translation>YUV422</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>YUV420</source>
+        <translation>YUV420</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>_Quantizer:</source>
+        <translation>_Kvantifikátor:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_ColorSpace:</source>
+        <translation>_Farebný priestor:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Mjpeg Configuration</source>
+        <translation>Konfigurácia Mjpeg</translation>
+    </message>
+</context>
+<context>
+    <name>kerneldeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp" line="+50"/>
+        <source>Kernel Deint.</source>
+        <translation>Rozkladač jadra.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Port of Donald Graft Kernel Deinterlacer.</source>
+        <translation>Rozkladač matrice jadra portovaný od Donalda Grafta.</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top</source>
+        <translation>Vrchný</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom</source>
+        <translation>Spodný</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Field order:</source>
+        <translation>Por_adie polsnímok:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Threshold:</source>
+        <translation>_Prah:</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Smaller means more deinterlacing</source>
+        <translation>Menšie číslo znamená väčšiu mieru rozkladu</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Sharp</source>
+        <translation>_Ostré</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>_Sharper engine:</source>
+        <translation>_Ostrejšie spracovanie:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>T_woway</source>
+        <translation>_Dvojcestný</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Extrapolate better (better not to use it)</source>
+        <translation>Lepšia extrapolácia (radšej nepoužívať)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Map</source>
+        <translation>_Mapovať</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Show interlaced areas (for test!)</source>
+        <translation>Zobrazovať prekladané miesta (len pre testovanie)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>KernelDeint</source>
+        <translation>Rozklad matrice Kernel</translation>
+    </message>
+</context>
+<context>
+    <name>lame</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="+310"/>
+        <source>CBR</source>
+        <translation>CBR</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>ABR</source>
+        <translation>ABR</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Bit_rate mode:</source>
+        <translation>Režim _prenosovej rýchlosti:</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>_Bitrate:</source>
+        <translation>_Prenosová rýchlosť:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Quality:</source>
+        <translation>_Kvalita:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Disable reservoir</source>
+        <translation>_Zakázať rezervoár</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>LAME Configuration</source>
+        <translation>Konfigurácia LAME</translation>
+    </message>
+</context>
+<context>
+    <name>largemedian</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.cpp" line="+36"/>
+        <source>Large Median (5x5).</source>
+        <translation>Veľký Median (5x5).</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Median filter on 5x5 matrix.</source>
+        <translation>Filter Median s matricou 5x5.</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>_Process luma</source>
+        <translation>Priebeh _jasovej zložky</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Process luma plane</source>
+        <translation>Spracovanie roviny jasu</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>P_rocess chroma</source>
+        <translation>Priebeh _farebnej zložky</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fast Convolution</source>
+        <translation>Rýchle previnutie</translation>
+    </message>
+</context>
+<context>
+    <name>lavcodec</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
+        <source>_Bitrate:</source>
+        <translation>_Prenosová rýchlosť:</translation>
+    </message>
+</context>
+<context>
+    <name>lavdecoder</name>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/DIA_lavDecoder.cpp" line="+23"/>
+        <source>_Swap U and V</source>
+        <translation>_Prehodiť U a V</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Decoder Options</source>
+        <translation>Možnosti dekódera</translation>
+    </message>
+</context>
+<context>
+    <name>lavdeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp" line="+71"/>
+        <source>Libavdec Deinterlacers</source>
+        <translation>Rozkladač Libavcodec</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lavcodec deinterlacer family.</source>
+        <translation>Rodina rozkladačov Lavcodec.</translation>
+    </message>
+    <message>
+        <location line="+116"/>
+        <source>None</source>
+        <translation>Nie je</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Linear blend</source>
+        <translation>Lineárne zmiešavanie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Linear interpolate</source>
+        <translation>Lineárna interpolácia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cubic interpolate</source>
+        <translation>Kubická interpolácia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Median interpolate</source>
+        <translation>Interpolácia Median</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>FFmpeg deint</source>
+        <translation>Rozkladač FFmpeg</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Deinterlacing:</source>
+        <translation>_Rozklad:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Autolevel</source>
+        <translation>_Automatické úrovne</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libavcodec deinterlacer</source>
+        <translation>Rozkladač libavcodec</translation>
+    </message>
+</context>
+<context>
+    <name>licenseDialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/license.ui" line="+16"/>
+        <source>License</source>
+        <translation>Licencia</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+</context>
+<context>
+    <name>logo</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp" line="+22"/>
+        <source>Add logo</source>
+        <translation>Pridať logo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Put a logo on top of video, with alpha blending.</source>
+        <translation>Vloží logo na vrchol videa metódou alfa zmiešavania.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
+        <source>Select Logo Image</source>
+        <translation>Vybrať obrázok loga</translation>
+    </message>
+    <message>
+        <location line="+72"/>
+        <source> s</source>
+        <translation> s</translation>
+    </message>
+</context>
+<context>
+    <name>logoDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/logo.ui" line="+14"/>
+        <source>Logo</source>
+        <translation>Logo</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+7"/>
+        <source>Image</source>
+        <translation>Obrázok</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Select</source>
+        <translation>Vybrať</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>X</source>
+        <translation>X</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Y</source>
+        <translation>Y</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>Fade-in/out</source>
+        <translation>Zjavovanie/Vytrácanie</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>You can click in the image to approximately position the logo</source>
+        <translation>Kliknutím na obrázok môžete umiestniť logo</translation>
+    </message>
+    <message>
+        <location line="-85"/>
+        <source>Alpha</source>
+        <translation>Alfa</translation>
+    </message>
+</context>
+<context>
+    <name>lumaonly</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
+        <source>GreyScale</source>
+        <translation>Stupne sivej</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remove color, only key grey image.</source>
+        <translation>Odstráni farbu, zobrazí sa len kľúčová sivá.</translation>
+    </message>
+</context>
+<context>
+    <name>mainFilterDialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="+20"/>
+        <source>Video Filter Manager</source>
+        <translation>Správca video filtrov</translation>
+    </message>
+    <message>
+        <location line="+61"/>
+        <source>&lt;big&gt;&lt;b&gt;Active Filters&lt;/b&gt;&lt;/big&gt;</source>
+        <translation>&lt;big&gt;&lt;b&gt;Aktívne filtre&lt;/b&gt;&lt;/big&gt;</translation>
+    </message>
+    <message>
+        <location line="+78"/>
+        <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
+        <translation>&lt;big&gt;&lt;b&gt;Dostupné filtre&lt;/b&gt;&lt;/big&gt;</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Transform</source>
+        <translation>Transformovanie</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Interlacing</source>
+        <translation>Prekladanie</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Colors</source>
+        <translation>Farby</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Noise</source>
+        <translation>Šum</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Sharpness</source>
+        <translation>Ostrosť</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Subtitles</source>
+        <translation>Titulky</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>OpenGl</source>
+        <translation>OpenGL</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Miscellaneous</source>
+        <translation>Rôzne</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>&amp;Preview</source>
+        <translation>&amp;Náhľad</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Zavrieť</translation>
+    </message>
+</context>
+<context>
+    <name>matroskademuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
+        <source>Matroska Images</source>
+        <translation>Matroska obrázky</translation>
+    </message>
+    <message>
+        <location line="+523"/>
+        <source>Matroska clusters</source>
+        <translation>Matroska klustery</translation>
+    </message>
+</context>
+<context>
+    <name>mcdeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="+81"/>
+        <source>MCDeint</source>
+        <translation>Rozkladač MC</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation deinterlacer. Ported from MPlayer.</source>
+        <translation>Rokladač kompenzáciou pohybu. Portovaný z MPlayeru.</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Fast</source>
+        <translation>Rýchla</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Medium</source>
+        <translation>Stredný</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Slow iterative motion search</source>
+        <translation>Pomalé interaktívne hľadanie pohybu</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Extra slow (same as 3+multiple reference frames)</source>
+        <translation>Extra pomalé (rovnako ako 3 + viacnásobné referenčné snímky)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation>_Režim:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom :</source>
+        <translation>Dole:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Qp:</source>
+        <translation>_Qp:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>mcDeinterlace</source>
+        <translation>Rozkladač mc</translation>
+    </message>
+</context>
+<context>
+    <name>mean</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Mean.cpp" line="+27"/>
+        <source>Mean convolution.</source>
+        <translation>Konvolúcia Mean.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>3x3 convolution filter :mean.</source>
+        <translation>Konvolučný filter 3x3 :mean.</translation>
+    </message>
+</context>
+<context>
+    <name>median</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Median.cpp" line="+28"/>
+        <source>Median convolution.</source>
+        <translation>Konvolúcia Median.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>3x3 convolution filter :median.</source>
+        <translation>Konvolučný filter 3x3 :median.</translation>
+    </message>
+</context>
+<context>
+    <name>mergeFields</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidMergeField.cpp" line="+52"/>
+        <source>Merge Fields</source>
+        <translation>Spájanie polsnímok</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Merge two pictures as if they were two fields.</source>
+        <translation>Spojí dva obrazy tak, ako keby to boli dve polsnímky.</translation>
+    </message>
+</context>
+<context>
+    <name>mkvmuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
+        <source>Saving Mkv</source>
+        <translation>Uloženie MKV</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
+        <source>Force display width</source>
+        <translation>Vynútená šírka zobrazenia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display width</source>
+        <translation>Šírka zobrazenia</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Force Aspect Ratio (DAR)</source>
+        <translation>Vynútený pomer strán (DAR)</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>MKV Muxer</source>
+        <translation>Zmiešavač MKV</translation>
+    </message>
+</context>
+<context>
+    <name>mp3d</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+201"/>
+        <source>Mplayer Denoise 3D HQ</source>
+        <translation>Odstraňovač šumu 3D HQ MediaPlayer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
+        <translation>Zníži šum, vyhladí obraz, zvýši kompresiu. Verzia HQ.</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>_Spatial luma strength:</source>
+        <translation>_Priestorový prah jasovej zložky:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>S_patial chroma strength:</source>
+        <translation>P_riestorový prah farebnej zložky:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Temporal luma strength:</source>
+        <translation>Dočasná intenzita _jasu:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>T_emporal chroma strength:</source>
+        <translation>Dočasná intenzita _farebnej zložky:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>MPlayer Denoise 3D HQ</source>
+        <translation>Odstraňovač šumu 3D HQ MediaPlayer</translation>
+    </message>
+</context>
+<context>
+    <name>mp3dlow</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="+36"/>
+        <source>Mplayer Denoise 3D</source>
+        <translation>Odstraňovač šumu 3D MediaPlayer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce noise, smooth image, increase compressibility.</source>
+        <translation>Zníži šum, vyhladí obraz, zväčší kompresiu.</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>_Spatial luma strength:</source>
+        <translation>_Priestorová intenzita jasu:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>S_patial chroma strength:</source>
+        <translation>P_riestorová intenzita farebnej zložky:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Temporal strength:</source>
+        <translation>Doč_asná intenzita:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>MPlayer Denoise 3D</source>
+        <translation>Odstraňovač šumu 3D MediaPlayer</translation>
+    </message>
+</context>
+<context>
+    <name>mp4demuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <source>Problem reading SVQ3 headers</source>
+        <translation>Chyba čítania hlavičky SVQ3</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>mp4muxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <location line="+17"/>
+        <source>Unsupported</source>
+        <translation>Nepodporované</translation>
+    </message>
+    <message>
+        <location line="-17"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
+        <translation>Podporované len video MP4Video, H264, H265 a AV1</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
+        <translation>Podporované len audio AAC, AC3, E-AC3, LPCM, MP2, MP3 a Vorbis</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+182"/>
+        <source>Saving mp4</source>
+        <translation>Uloženie mp4</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Saving PSP</source>
+        <translation>Uloženie PSP</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
+        <source>Muxing Format</source>
+        <translation>Formát zmiešavania</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>No optimization</source>
+        <translation>Bez optimalizácie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Move index to the beginning of the file</source>
+        <translation>Presunúť index na začiatok súboru</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use fragmentation</source>
+        <translation>Použiť fragmentáciu</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Optimize for Streaming</source>
+        <translation>Optimalizácia audiovizuálneho prenosu</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Force aspect ratio</source>
+        <translation>Vynútený pomer strán</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Aspect Ratio (DAR)</source>
+        <translation>Pomer strán (DAR)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Do not rotate</source>
+        <translation>Bez otáčania</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90°</source>
+        <translation>90°</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180°</source>
+        <translation>180°</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>270°</source>
+        <translation>270°</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Rotate video</source>
+        <translation>Otáčať video</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto</source>
+        <translation>Automaticky</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation>24 kHz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation>25 kHz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation>30 kHz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation>50 kHz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation>60 kHz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation>90 kHz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation>180 kHz</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation>Časová mierka</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>MP4 Muxer</source>
+        <translation>Zmiešavač MP4</translation>
+    </message>
+</context>
+<context>
+    <name>mp4v2muxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <source>Audio</source>
+        <translation>Audio</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Audio format not supported, only AAC/MP3/AC3</source>
+        <translation>Audio formát nie je podporovaný, len AAC/MP3/AC3</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Saving</source>
+        <translation>Ukladanie</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Video</source>
+        <translation>Video</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Video does not have enough timing information. Are you copying from AVI?</source>
+        <translation>Video nemá dostatok informácií o časovaní. Kopírujete z AVI?</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Cannot rename file (optimize)</source>
+        <translation>Nemožno premenovať súbor (optimalizovať)</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp" line="+53"/>
+        <source>Invalid frequency for AC3. Only 32, 44.1 &amp; 48 kHz</source>
+        <translation>Neplatná frekvencia pre AC3. Len 32, 44,1 &amp; 48 kHz</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Invalid bitrate for AC3</source>
+        <translation>Neplatná prenosová rýchlosť pre AC3</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Invalid number of channels for AC3</source>
+        <translation>Neplatné číslo kanálu pre AC3</translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>Cannot get AAC Extra data
+</source>
+        <translation>Nemožno získať údaje AAC Extra
+</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Config.cpp" line="+31"/>
+        <source>Optimize for streaming (SLOW)</source>
+        <translation>Optimalizácia pre audiovizuálny prenos (pomalé)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add ipod metadata</source>
+        <translation>Pridať iPod metaúdaje</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>MP4V2 Settings</source>
+        <translation>Natavenia MP4V2</translation>
+    </message>
+</context>
+<context>
+    <name>mpdelogoDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/mpdelogo.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+14"/>
+        <source>Mplayer Delogo</source>
+        <translation>Logo odstraňovača prekladania MediaPlayer</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+32"/>
+        <source>X</source>
+        <translation>X</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+37"/>
+        <source>Y</source>
+        <translation>Y</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="-17"/>
+        <source>Width</source>
+        <translation>Šírka</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+7"/>
+        <source>Height</source>
+        <translation>Výška</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="-14"/>
+        <source>Border Width</source>
+        <translation>Šírka okraja</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Preview. Click in the image above to coarsly set the box coordinates</source>
+        <translation>Náhľad. Kliknite na obrázok vyššie a nahrubo nastavte súradnice</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+59"/>
+        <source>You can resize the red rectangle using the grips </source>
+        <translation>Veľkosť červeného obdĺžnika môžete meniť pomocou úchytiek </translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>Preview</source>
+        <translation>Náhľad</translation>
+    </message>
+</context>
+<context>
+    <name>msharpen</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+48"/>
+        <source>Msharpen</source>
+        <translation>Filter Msharpen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Sharpen edges without amplifying noise. By Donald Graft.</source>
+        <translation>Zaostrí obrysy bez toho, aby sa zväčšil šum. Od Donalda Grafta.</translation>
+    </message>
+</context>
+<context>
+    <name>msharpenDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/msharpen.ui" line="+14"/>
+        <source>MSharpen</source>
+        <translation>Filter MSharpen</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Mask</source>
+        <translation>Maska</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Strength</source>
+        <translation>Sila</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Threshold</source>
+        <translation>Prah</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>HighQuality</source>
+        <translation>Vysoká kvalita</translation>
+    </message>
+</context>
+<context>
+    <name>navigate</name>
+    <message>
+        <location filename="../../common/gui_navigate.cpp" line="+232"/>
+        <source>Cannot go to next keyframe</source>
+        <translation>Nemožno prejsť ďalšiu snímku</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Cannot go to previous keyframe</source>
+        <translation>Nemožno prejsť na predošlú snímku</translation>
+    </message>
+    <message>
+        <location line="+188"/>
+        <source>Seek</source>
+        <translation>Hľadať</translation>
+    </message>
+    <message>
+        <location line="+78"/>
+        <source>Error</source>
+        <translation>Chyba</translation>
+    </message>
+</context>
+<context>
+    <name>nvenc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/nvEnc/ADM_nvEnc.cpp" line="+136"/>
+        <source>Low Quality</source>
+        <translation>Nízka kvalita</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>High Quality</source>
+        <translation>Vysoká kvalita</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>BluRay</source>
+        <translation>Blu-ray</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Low Latency</source>
+        <translation>Nízka odozva</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Low Latency (LQ)</source>
+        <translation>Nízka odozva (LQ)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Low Latency (HQ)</source>
+        <translation>Nízka odozva (HQ)</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Preset:</source>
+        <translation>Predvoľba:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation>Prenosová rýchlosť [kB/s]:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max Bitrate (kbps):</source>
+        <translation>Maximálna prenosová rýchlosť [kB/s]:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Nvidia H264 Encoder configuration</source>
+        <translation>Konfigurácia kódovača Nvidia H264</translation>
+    </message>
+</context>
+<context>
+    <name>opendmldemuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location line="+76"/>
+        <location line="+268"/>
+        <source>Malformed header</source>
+        <translation>Chybná hlavička</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
+        <source>Unpacking bitstream</source>
+        <translation>Rozbaľujem bitstream</translation>
+    </message>
+</context>
+<context>
+    <name>partial</name>
+    <message>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
+        <source>_Start time:</source>
+        <translation>Čas _štartu:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation>Čas _konca:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Configure filter</source>
+        <translation>Konfigurácia filtra</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Partial Filter</source>
+        <translation>Čiastkový filter</translation>
+    </message>
+</context>
+<context>
+    <name>printinfo</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/printInfo/printInfo.cpp" line="+44"/>
+        <source>PrintInfo</source>
+        <translation>Tlačové informácie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display some informations on Screen.</source>
+        <translation>Zobrazí niektoré informácie na obrazovke.</translation>
+    </message>
+</context>
+<context>
+    <name>propsDialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="+14"/>
+        <source>Properties</source>
+        <translation>Vlastnosti</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Video</source>
+        <translation>Video</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation>Textová návesť</translation>
+    </message>
+    <message>
+        <location line="-49"/>
+        <source>Frame Rate:</source>
+        <translation>Snímková frekvencia:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <location line="+135"/>
+        <source>Total Duration:</source>
+        <translation>Celkové trvanie:</translation>
+    </message>
+    <message>
+        <location line="-121"/>
+        <source>Aspect Ratio:</source>
+        <translation>Pomer strán:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Image Size:</source>
+        <translation>Veľkosť obrázka:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Codec 4CC:</source>
+        <translation>Kodek 4CC:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Extra Video Properties</source>
+        <translation>Zvláštne vlastnosti videa</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>ExtraDataSize:</source>
+        <translation>Veľkosť zvláštnych údajov:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Extra data :</source>
+        <translation>Zvláštne údaje:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Audio</source>
+        <translation>Audio</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Frequency:</source>
+        <translation>Frekvencia:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Variable Bitrate:</source>
+        <translation>Variabilná prenosová rýchlosť:</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Bitrate:</source>
+        <translation>Prenosová rýchlosť:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Channels:</source>
+        <translation>Kanály:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Codec:</source>
+        <translation>Kodek:</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Copy to Clipboard</source>
+        <translation>Kopírovať do schránky</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+</context>
+<context>
+    <name>psdemuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
+        <source>Indexing</source>
+        <translation>Indexovanie</translation>
+    </message>
+    <message>
+        <location line="-32"/>
+        <source>There are several files with sequential file names. Should they be all loaded ?</source>
+        <translation>Existuje niekoľko súborov s postupnými názvami súborov. Majú byť všetky načítané?</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
+        <source>This file&apos;s index has been created with an older version of avidemux.
+The file must be re-indexed. Proceed?</source>
+        <translation>Index tohto súboru bol vytvorený pomocou staršej verzie avidemuxu.
+Súbor musí byť preindexovaný. Pokračovať?</translation>
+    </message>
+</context>
+<context>
+    <name>qaudiotracks</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
+        <source>Select audio file</source>
+        <translation>Vybrať audio súbor</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <location line="+161"/>
+        <source>Error</source>
+        <translation>Chyba</translation>
+    </message>
+    <message>
+        <location line="-161"/>
+        <source>Cannot use that file as audio track</source>
+        <translation>Tento súbor nemožno použiť ako audio stopu</translation>
+    </message>
+    <message>
+        <location line="+161"/>
+        <source>Some tracks are used multiple times</source>
+        <translation>Niektoré stopy sú použité viackrát</translation>
+    </message>
+    <message>
+        <location line="+126"/>
+        <source>Track </source>
+        <translation>Stopa </translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source> from video</source>
+        <translation> z videa</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>File </source>
+        <translation>Súbor </translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>.... Add audio track</source>
+        <translation>.... Pridať audio stopu</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>copy</source>
+        <translation>kopírovať</translation>
+    </message>
+</context>
+<context>
+    <name>qencoding</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="+65"/>
+        <location line="+20"/>
+        <source>Privileges Required</source>
+        <translation>Požadované výhradné práva</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+20"/>
+        <source>Root privileges are required to perform this operation.</source>
+        <translation>Na túto operáciu sú vyžadované základné výhradné práva.</translation>
+    </message>
+    <message>
+        <location line="+126"/>
+        <source>First Pass</source>
+        <translation>Prvý prechod</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Pass 1</source>
+        <translation>Prechod 1</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Encoding...</source>
+        <translation>Prebieha kódovanie...</translation>
+    </message>
+    <message>
+        <location line="+185"/>
+        <source>The encoding is paused. Do you want to resume or abort?</source>
+        <translation>Kódovanie je pozastavené. Chcete v ňom pokračovať, alebo ho ukončiť?</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resume</source>
+        <translation>Zhrnúť</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Abort</source>
+        <translation>Prerušiť</translation>
+    </message>
+</context>
+<context>
+    <name>qfile</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+45"/>
+        <location line="+142"/>
+        <source>All files (*.*)</source>
+        <translation>Všetky súbory (*.*)</translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <location line="+106"/>
+        <source> files (*.</source>
+        <translation> súbory (*.</translation>
+    </message>
+    <message>
+        <location line="-82"/>
+        <source>Overwrite file </source>
+        <translation>Prepísať súbor </translation>
+    </message>
+</context>
+<context>
+    <name>qgui2</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+206"/>
+        <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
+        <translation>&lt;b&gt;Dostupná nová verzia&lt;/b&gt;&lt;br&gt; verzia %1&lt;br&gt;uvoľnená od %2.&lt;br&gt;Môžete si ju stiahnuť tu&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; Automatickú aktualizáciu môžete zakázať v predvoľbách.&lt;/small&gt;</translation>
+    </message>
+    <message>
+        <location line="+245"/>
+        <source>Recent Files</source>
+        <translation>Nedávne &amp;súbory</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Recent Projects</source>
+        <translation>Nedávne &amp;projekty</translation>
+    </message>
+    <message>
+        <location line="+671"/>
+        <source>Play/Stop</source>
+        <translation>Pre&amp;hrať/Zastaviť</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to previous frame</source>
+        <translation>Prejsť na predošlú snímku</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to next frame</source>
+        <translation>Prejsť na ďalšiu snímku</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to previous keyframe</source>
+        <translation>Prejsť na predošlú kľúčovú snímku</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to next keyframe</source>
+        <translation>Prejsť na ďalšiu kľúčovú snímku</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Set start marker</source>
+        <translation>Nastaviť značku začiatku</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Set end marker</source>
+        <translation>Nastaviť značku konca</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Go to first frame</source>
+        <translation>Presjť na prvú snímku</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to last frame</source>
+        <translation>Prejsť na poslednú snímku</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to marker A</source>
+        <translation>Prejsť na značku A</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to marker B</source>
+        <translation>Prejsť na značku B</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Backward one minute</source>
+        <translation>Späť o 1 minútu</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Forward one minute</source>
+        <translation>Vpred o 1 minútu</translation>
+    </message>
+    <message>
+        <location line="+681"/>
+        <source>The application has encountered a fatal problem
+The current editing has been saved and will be reloaded at next start</source>
+        <translation>Aplikácia sa stretla s fatálnym problémom
+Súčasná úprava bola uložená a pri ďalšom štarte bude znovu načítaná</translation>
+    </message>
+    <message>
+        <location line="+230"/>
+        <source>%c-%s (%02d)</source>
+        <translation>%c-%s (%02d)</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation>
+            <numerusform> (%n stopa)</numerusform>
+            <numerusform> (%n stopy)</numerusform>
+            <numerusform> (%n stôp)</numerusform>
+        </translation>
+    </message>
+</context>
+<context>
+    <name>qgui2menu</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp" line="+51"/>
+        <source>Project Script</source>
+        <translation>&amp;Skript projektu</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source> Project</source>
+        <translation> projekt</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Run Project...</source>
+        <translation>&amp;Spustiť projekt...</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Debug Project...</source>
+        <translation>&amp;Ladiť projekt...</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save &amp;As Project...</source>
+        <translation>&amp;Uložiť projekt ako...</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Scripting Shell</source>
+        <translation>&amp;Prostredie skriptovania</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source> Shell</source>
+        <translation> Prostredie</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Scripting Reference</source>
+        <translation>Odporúčania skriptovania</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source> Reference</source>
+        <translation> Odporúčania</translation>
+    </message>
+    <message>
+        <location line="+172"/>
+        <source>Restore previous session</source>
+        <translation>&amp;Obnoviť predošlú reláciu</translation>
+    </message>
+</context>
+<context>
+    <name>qjobs</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="+13"/>
+        <source>Ready</source>
+        <translation>Pripravený</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Succeeded</source>
+        <translation>Dokončené</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Failed</source>
+        <translation>Zlyhalo</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Deleted</source>
+        <translation>Odstránené</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Running</source>
+        <translation>Spustené</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Job Name</source>
+        <translation>Názov úlohy</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Status</source>
+        <translation>Stav</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Start Time</source>
+        <translation>Čas štartu</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>End Time</source>
+        <translation>Čas konca</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <location line="+15"/>
+        <source>Sure!</source>
+        <translation>Naisto!</translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Delete job</source>
+        <translation>Odstrániť úlohu</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Are you sure you want to delete %s job?</source>
+        <translation>Naozaj chcete odstrániť úlohu %s?</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Delete *all* job</source>
+        <translation>Zmazať všetky úlohy</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Are you sure you want to delete ALL jobs?</source>
+        <translation>Naozaj chcete zmazať všetky úlohy?</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Already done</source>
+        <translation>Už je to hotové</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>This script has already been successfully executed.</source>
+        <translation>Tento skript už bol úspešne vykonaný.</translation>
+    </message>
+</context>
+<context>
+    <name>qlicense</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_license.cpp" line="+25"/>
+        <source>&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot;&gt;&lt;html&gt;&lt;head&gt;  &lt;title&gt;Avidemux is free software; you can redistribute it and/or  modify it under the terms of the GNU General Public License  version 2 as published by the Free Software Foundation&lt;/title&gt;&lt;style type=&quot;text/css&quot;&gt;&lt;!-- /* Style Definitions */ p.licenseStyle, li.licenseStyle, div.licenseStyle        {margin:0cm;        margin-bottom:.0001pt;        font-size:12.0pt;        font-family:&quot;Times New Roman&quot;;} /* Page Definitions */ @page Section1        {size:612.0pt 792.0pt;        margin:72.0pt 90.0pt 72.0pt 90.0pt;}div.Section1        {page:Section1;}--&gt;&lt;/style&gt;&lt;/head&gt;&lt;body lang=&quot;EN-GB&quot; style=&apos;text-justify-trim:punctuation&apos;&gt;  &lt;div class=&quot;Section1&quot;&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt;Avidemux is    free software; you can redistribute it and/or modify it under    the terms of the GNU General Public License version 2 as    published by the Free Software Foundation.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;b&gt;&lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt;    &lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC    LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Version 2, June    1991&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Copyright (C) 1989, 1991    Free Software Foundation, Inc.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;59 Temple Place, Suite    330, Boston, MA  02111-1307  USA&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Everyone is permitted to    copy and distribute verbatim copies of this license document,    but changing it is not allowed.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Preamble&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The licenses for most    software are designed to take away your freedom to share and    change it.  By contrast, the GNU General Public License is    intended to guarantee your freedom to share and change free    software--to make sure the software is free for all its users.     This General Public License applies to most of the Free    Software Foundation&apos;s software and to any other program whose    authors commit to using it.  (Some other Free Software    Foundation software is covered by the GNU Library General    Public License instead.)  You can apply it to your programs,    too.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;When we speak of free    software, we are referring to freedom, not price.  Our General    Public Licenses are designed to make sure that you have the    freedom to distribute copies of free software (and charge for    this service if you wish), that you receive source code or can    get it if you want it, that you can change the software or use    pieces of it in new free programs; and that you know you can do    these things.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;To protect your rights, we    need to make restrictions that forbid anyone to deny you these    rights or to ask you to surrender the rights. These    restrictions translate to certain responsibilities for you if    you distribute copies of the software, or if you modify    it.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;For example, if you    distribute copies of such a program, whether gratis or for a    fee, you must give the recipients all the rights that you have.     You must make sure that they, too, receive or can get the    source code.  And you must show them these terms so they know    their rights.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;We protect your rights    with two steps: (1) copyright the software, and (2) offer you    this license which gives you legal permission to copy,    distribute and/or modify the software.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Also, for each author&apos;s    protection and ours, we want to make certain that everyone    understands that there is no warranty for this free software.     If the software is modified by someone else and passed on, we    want its recipients to know that what they have is not the    original, so that any problems introduced by others will not    reflect on the original authors&apos; reputations.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Finally, any free program    is threatened constantly by software patents.  We wish to avoid    the danger that redistributors of a free program will    individually obtain patent licenses, in effect making the    program proprietary.  To prevent this, we have made it clear    that any patent must be licensed for everyone&apos;s free use or not    licensed at all.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The precise terms and    conditions for copying, distribution and modification    follow.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC    LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;TERMS AND CONDITIONS FOR    COPYING, DISTRIBUTION AND MODIFICATION&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;0. This License applies to    any program or other work which contains a notice placed by the    copyright holder saying it may be distributed under the terms    of this General Public License.  The &quot;Program&quot;, below, refers    to any such program or work, and a &quot;work based on the Program&quot;    means either the Program or any derivative work under copyright    law: that is to say, a work containing the Program or a portion    of it, either verbatim or with modifications and/or translated    into another language.  (Hereinafter, translation is included    without limitation in the term &quot;modification&quot;.)  Each licensee    is addressed as &quot;you&quot;.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Activities other than    copying, distribution and modification are not covered by this    License; they are outside its scope.  The act of running the    Program is not restricted, and the output from the Program is    covered only if its contents constitute a work based on the    Program (independent of having been made by running the    Program). Whether that is true depends on what the Program    does.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;1. You may copy and    distribute verbatim copies of the Program&apos;s source code as you    receive it, in any medium, provided that you conspicuously and    appropriately publish on each copy an appropriate copyright    notice and disclaimer of warranty; keep intact all the notices    that refer to this License and to the absence of any warranty;    and give any other recipients of the Program a copy of this    License along with the Program.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;You may charge a fee for    the physical act of transferring a copy, and you may at your    option offer warranty protection in exchange for a    fee.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;2. You may modify your    copy or copies of the Program or any portion of it, thus    forming a work based on the Program, and copy and distribute    such modifications or work under the terms of Section 1 above,    provided that you also meet all of these conditions:&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) You must cause the    modified files to carry prominent notices stating that you    changed the files and the date of any change.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) You must cause any work    that you distribute or publish, that in whole or in part    contains or is derived from the Program or any part thereof, to    be licensed as a whole at no charge to all third parties under    the terms of this License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) If the modified program    normally reads commands interactively when run, you must cause    it, when started running for such interactive use in the most    ordinary way, to print or display an announcement including an    appropriate copyright notice and a notice that there is no    warranty (or else, saying that you provide a warranty) and that    users may redistribute the program under these conditions, and    telling the user how to view a copy of this License.     (Exception: if the Program itself is interactive but does not    normally print such an announcement, your work based on the    Program is not required to print an announcement.)&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;These requirements apply    to the modified work as a whole.  If identifiable sections of    that work are not derived from the Program, and can be    reasonably considered independent and separate works in    themselves, then this License, and its terms, do not apply to    those sections when you distribute them as separate works.  But    when you distribute the same sections as part of a whole which    is a work based on the Program, the distribution of the whole    must be on the terms of this License, whose permissions for    other licensees extend to the entire whole, and thus to each    and every part regardless of who wrote it.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Thus, it is not the intent    of this section to claim rights or contest your rights to work    written entirely by you; rather, the intent is to exercise the    right to control the distribution of derivative or collective    works based on the Program.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;In addition, mere    aggregation of another work not based on the Program with the    Program (or with a work based on the Program) on a volume of a    storage or distribution medium does not bring the other work    under the scope of this License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;3. You may copy and    distribute the Program (or a work based on it, under Section 2)    in object code or executable form under the terms of Sections 1    and 2 above provided that you also do one of the    following:&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) Accompany it with the    complete corresponding machine-readable source code, which must    be distributed under the terms of Sections 1 and 2 above on a    medium customarily used for software interchange;    or,&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) Accompany it with a    written offer, valid for at least three years, to give any    third party, for a charge no more than your cost of physically    performing source distribution, a complete machine-readable    copy of the corresponding source code, to be distributed under    the terms of Sections 1 and 2 above on a medium customarily    used for software interchange; or,&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) Accompany it with the    information you received as to the offer to distribute    corresponding source code.  (This alternative is allowed only    for noncommercial distribution and only if you received the    program in object code or executable form with such an offer,    in accord with Subsection b above.)&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The source code for a work    means the preferred form of the work for making modifications    to it.  For an executable work, complete source code means all    the source code for all modules it contains, plus any    associated interface definition files, plus the scripts used to    control compilation and installation of the executable.     However, as a special exception, the source code distributed    need not include anything that is normally distributed (in    either source or binary form) with the major components    (compiler, kernel, and so on) of the operating system on which    the executable runs, unless that component itself accompanies    the executable.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If distribution of    executable or object code is made by offering access to copy    from a designated place, then offering equivalent access to    copy the source code from the same place counts as distribution    of the source code, even though third parties are not compelled    to copy the source along with the object code.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;4. You may not copy,    modify, sublicense, or distribute the Program except as    expressly provided under this License.  Any attempt otherwise    to copy, modify, sublicense or distribute the Program is void,    and will automatically terminate your rights under this    License. However, parties who have received copies, or rights,    from you under this License will not have their licenses    terminated so long as such parties remain in full    compliance.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;5. You are not required to    accept this License, since you have not signed it.  However,    nothing else grants you permission to modify or distribute the    Program or its derivative works.  These actions are prohibited    by law if you do not accept this License.  Therefore, by    modifying or distributing the Program (or any work based on the    Program), you indicate your acceptance of this License to do    so, and all its terms and conditions for copying, distributing    or modifying the Program or works based on it.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;6. Each time you    redistribute the Program (or any work based on the Program),    the recipient automatically receives a license from the    original licensor to copy, distribute or modify the Program    subject to these terms and conditions.  You may not impose any    further restrictions on the recipients&apos; exercise of the rights    granted herein. You are not responsible for enforcing    compliance by third parties to this License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;7. If, as a consequence of    a court judgment or allegation of patent infringement or for    any other reason (not limited to patent issues), conditions are    imposed on you (whether by court order, agreement or otherwise)    that contradict the conditions of this License, they do not    excuse you from the conditions of this License.  If you cannot    distribute so as to satisfy simultaneously your obligations    under this License and any other pertinent obligations, then as    a consequence you may not distribute the Program at all.  For    example, if a patent license would not permit royalty-free    redistribution of the Program by all those who receive copies    directly or indirectly through you, then the only way you could    satisfy both it and this License would be to refrain entirely    from distribution of the Program.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If any portion of this    section is held invalid or unenforceable under any particular    circumstance, the balance of the section is intended to apply    and the section as a whole is intended to apply in other    circumstances.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;It is not the purpose of    this section to induce you to infringe any patents or other    property right claims or to contest validity of any such    claims; this section has the sole purpose of protecting the    integrity of the free software distribution system, which is    implemented by public license practices.  Many people have made    generous contributions to the wide range of software    distributed through that system in reliance on consistent    application of that system; it is up to the author/donor to    decide if he or she is willing to distribute software through    any other system and a licensee cannot impose that    choice.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;This section is intended    to make thoroughly clear what is believed to be a consequence    of the rest of this License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;8. If the distribution    and/or use of the Program is restricted in certain countries    either by patents or by copyrighted interfaces, the original    copyright holder who places the Program under this License may    add an explicit geographical distribution limitation excluding    those countries, so that distribution is permitted only in or    among countries not thus excluded.  In such case, this License    incorporates the limitation as if written in the body of this    License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;9. The Free Software    Foundation may publish revised and/or new versions of the    General Public License from time to time.  Such new versions    will be similar in spirit to the present version, but may    differ in detail to address new problems or    concerns.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Each version is given a    distinguishing version number.  If the Program specifies a    version number of this License which applies to it and &quot;any    later version&quot;, you have the option of following the terms and    conditions either of that version or of any later version    published by the Free Software Foundation.  If the Program does    not specify a version number of this License, you may choose    any version ever published by the Free Software    Foundation.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;10. If you wish to    incorporate parts of the Program into other free programs whose    distribution conditions are different, write to the author to    ask for permission.  For software which is copyrighted by the    Free Software Foundation, write to the Free Software    Foundation; we sometimes make exceptions for this.  Our    decision will be guided by the two goals of preserving the free    status of all derivatives of our free software and of promoting    the sharing and reuse of software generally.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;NO WARRANTY&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;11. BECAUSE THE PROGRAM IS    LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM,    TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN    OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER    PARTIES PROVIDE THE PROGRAM &quot;AS IS&quot; WITHOUT WARRANTY OF ANY    KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A    PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND    PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM    PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY    SERVICING, REPAIR OR CORRECTION.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;12. IN NO EVENT UNLESS    REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY    COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR    REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU    FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR    CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO    USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR    DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR    THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY    OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN    ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;END OF TERMS AND    CONDITIONS&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;  &lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot;&gt;&lt;html&gt;&lt;head&gt;  &lt;title&gt;Avidemux je svobodný software; můžete jej šířit a modifikovat podle ustanovení GNU General Public License verze 2, vydané Free Software Foundation.&lt;/title&gt;&lt;style type=&quot;text/css&quot;&gt;&lt;!-- /* Style Definitions */ p.licenseStyle, li.licenseStyle, div.licenseStyle        {margin:0cm;        margin-bottom:.0001pt;        font-size:12.0pt;        font-family:&quot;Times New Roman&quot;;} /* Page Definitions */ @page Section1        {size:612.0pt 792.0pt;        margin:72.0pt 90.0pt 72.0pt 90.0pt;}div.Section1        {page:Section1;}--&gt;&lt;/style&gt;&lt;/head&gt;&lt;body lang=&quot;EN-GB&quot; style=&apos;text-justify-trim:punctuation&apos;&gt;  &lt;div class=&quot;Section1&quot;&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt;Avidemux je svobodný software; můžete jej šířit a modifikovat podle ustanovení GNU General Public License verze 2, vydané Free Software Foundation.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;b&gt;&lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt;    &lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC    LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Version 2, June    1991&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Copyright (C) 1989, 1991    Free Software Foundation, Inc.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;59 Temple Place, Suite    330, Boston, MA  02111-1307  USA&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Everyone is permitted to    copy and distribute verbatim copies of this license document,    but changing it is not allowed.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Preamble&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The licenses for most    software are designed to take away your freedom to share and    change it.  By contrast, the GNU General Public License is    intended to guarantee your freedom to share and change free    software--to make sure the software is free for all its users.     This General Public License applies to most of the Free    Software Foundation&apos;s software and to any other program whose    authors commit to using it.  (Some other Free Software    Foundation software is covered by the GNU Library General    Public License instead.)  You can apply it to your programs,    too.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;When we speak of free    software, we are referring to freedom, not price.  Our General    Public Licenses are designed to make sure that you have the    freedom to distribute copies of free software (and charge for    this service if you wish), that you receive source code or can    get it if you want it, that you can change the software or use    pieces of it in new free programs; and that you know you can do    these things.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;To protect your rights, we    need to make restrictions that forbid anyone to deny you these    rights or to ask you to surrender the rights. These    restrictions translate to certain responsibilities for you if    you distribute copies of the software, or if you modify    it.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;For example, if you    distribute copies of such a program, whether gratis or for a    fee, you must give the recipients all the rights that you have.     You must make sure that they, too, receive or can get the    source code.  And you must show them these terms so they know    their rights.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;We protect your rights    with two steps: (1) copyright the software, and (2) offer you    this license which gives you legal permission to copy,    distribute and/or modify the software.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Also, for each author&apos;s    protection and ours, we want to make certain that everyone    understands that there is no warranty for this free software.     If the software is modified by someone else and passed on, we    want its recipients to know that what they have is not the    original, so that any problems introduced by others will not    reflect on the original authors&apos; reputations.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Finally, any free program    is threatened constantly by software patents.  We wish to avoid    the danger that redistributors of a free program will    individually obtain patent licenses, in effect making the    program proprietary.  To prevent this, we have made it clear    that any patent must be licensed for everyone&apos;s free use or not    licensed at all.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The precise terms and    conditions for copying, distribution and modification    follow.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC    LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;TERMS AND CONDITIONS FOR    COPYING, DISTRIBUTION AND MODIFICATION&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;0. This License applies to    any program or other work which contains a notice placed by the    copyright holder saying it may be distributed under the terms    of this General Public License.  The &quot;Program&quot;, below, refers    to any such program or work, and a &quot;work based on the Program&quot;    means either the Program or any derivative work under copyright    law: that is to say, a work containing the Program or a portion    of it, either verbatim or with modifications and/or translated    into another language.  (Hereinafter, translation is included    without limitation in the term &quot;modification&quot;.)  Each licensee    is addressed as &quot;you&quot;.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Activities other than    copying, distribution and modification are not covered by this    License; they are outside its scope.  The act of running the    Program is not restricted, and the output from the Program is    covered only if its contents constitute a work based on the    Program (independent of having been made by running the    Program). Whether that is true depends on what the Program    does.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;1. You may copy and    distribute verbatim copies of the Program&apos;s source code as you    receive it, in any medium, provided that you conspicuously and    appropriately publish on each copy an appropriate copyright    notice and disclaimer of warranty; keep intact all the notices    that refer to this License and to the absence of any warranty;    and give any other recipients of the Program a copy of this    License along with the Program.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;You may charge a fee for    the physical act of transferring a copy, and you may at your    option offer warranty protection in exchange for a    fee.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;2. You may modify your    copy or copies of the Program or any portion of it, thus    forming a work based on the Program, and copy and distribute    such modifications or work under the terms of Section 1 above,    provided that you also meet all of these conditions:&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) You must cause the    modified files to carry prominent notices stating that you    changed the files and the date of any change.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) You must cause any work    that you distribute or publish, that in whole or in part    contains or is derived from the Program or any part thereof, to    be licensed as a whole at no charge to all third parties under    the terms of this License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) If the modified program    normally reads commands interactively when run, you must cause    it, when started running for such interactive use in the most    ordinary way, to print or display an announcement including an    appropriate copyright notice and a notice that there is no    warranty (or else, saying that you provide a warranty) and that    users may redistribute the program under these conditions, and    telling the user how to view a copy of this License.     (Exception: if the Program itself is interactive but does not    normally print such an announcement, your work based on the    Program is not required to print an announcement.)&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;These requirements apply    to the modified work as a whole.  If identifiable sections of    that work are not derived from the Program, and can be    reasonably considered independent and separate works in    themselves, then this License, and its terms, do not apply to    those sections when you distribute them as separate works.  But    when you distribute the same sections as part of a whole which    is a work based on the Program, the distribution of the whole    must be on the terms of this License, whose permissions for    other licensees extend to the entire whole, and thus to each    and every part regardless of who wrote it.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Thus, it is not the intent    of this section to claim rights or contest your rights to work    written entirely by you; rather, the intent is to exercise the    right to control the distribution of derivative or collective    works based on the Program.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;In addition, mere    aggregation of another work not based on the Program with the    Program (or with a work based on the Program) on a volume of a    storage or distribution medium does not bring the other work    under the scope of this License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;3. You may copy and    distribute the Program (or a work based on it, under Section 2)    in object code or executable form under the terms of Sections 1    and 2 above provided that you also do one of the    following:&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) Accompany it with the    complete corresponding machine-readable source code, which must    be distributed under the terms of Sections 1 and 2 above on a    medium customarily used for software interchange;    or,&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) Accompany it with a    written offer, valid for at least three years, to give any    third party, for a charge no more than your cost of physically    performing source distribution, a complete machine-readable    copy of the corresponding source code, to be distributed under    the terms of Sections 1 and 2 above on a medium customarily    used for software interchange; or,&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) Accompany it with the    information you received as to the offer to distribute    corresponding source code.  (This alternative is allowed only    for noncommercial distribution and only if you received the    program in object code or executable form with such an offer,    in accord with Subsection b above.)&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The source code for a work    means the preferred form of the work for making modifications    to it.  For an executable work, complete source code means all    the source code for all modules it contains, plus any    associated interface definition files, plus the scripts used to    control compilation and installation of the executable.     However, as a special exception, the source code distributed    need not include anything that is normally distributed (in    either source or binary form) with the major components    (compiler, kernel, and so on) of the operating system on which    the executable runs, unless that component itself accompanies    the executable.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If distribution of    executable or object code is made by offering access to copy    from a designated place, then offering equivalent access to    copy the source code from the same place counts as distribution    of the source code, even though third parties are not compelled    to copy the source along with the object code.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;4. You may not copy,    modify, sublicense, or distribute the Program except as    expressly provided under this License.  Any attempt otherwise    to copy, modify, sublicense or distribute the Program is void,    and will automatically terminate your rights under this    License. However, parties who have received copies, or rights,    from you under this License will not have their licenses    terminated so long as such parties remain in full    compliance.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;5. You are not required to    accept this License, since you have not signed it.  However,    nothing else grants you permission to modify or distribute the    Program or its derivative works.  These actions are prohibited    by law if you do not accept this License.  Therefore, by    modifying or distributing the Program (or any work based on the    Program), you indicate your acceptance of this License to do    so, and all its terms and conditions for copying, distributing    or modifying the Program or works based on it.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;6. Each time you    redistribute the Program (or any work based on the Program),    the recipient automatically receives a license from the    original licensor to copy, distribute or modify the Program    subject to these terms and conditions.  You may not impose any    further restrictions on the recipients&apos; exercise of the rights    granted herein. You are not responsible for enforcing    compliance by third parties to this License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;7. If, as a consequence of    a court judgment or allegation of patent infringement or for    any other reason (not limited to patent issues), conditions are    imposed on you (whether by court order, agreement or otherwise)    that contradict the conditions of this License, they do not    excuse you from the conditions of this License.  If you cannot    distribute so as to satisfy simultaneously your obligations    under this License and any other pertinent obligations, then as    a consequence you may not distribute the Program at all.  For    example, if a patent license would not permit royalty-free    redistribution of the Program by all those who receive copies    directly or indirectly through you, then the only way you could    satisfy both it and this License would be to refrain entirely    from distribution of the Program.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If any portion of this    section is held invalid or unenforceable under any particular    circumstance, the balance of the section is intended to apply    and the section as a whole is intended to apply in other    circumstances.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;It is not the purpose of    this section to induce you to infringe any patents or other    property right claims or to contest validity of any such    claims; this section has the sole purpose of protecting the    integrity of the free software distribution system, which is    implemented by public license practices.  Many people have made    generous contributions to the wide range of software    distributed through that system in reliance on consistent    application of that system; it is up to the author/donor to    decide if he or she is willing to distribute software through    any other system and a licensee cannot impose that    choice.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;This section is intended    to make thoroughly clear what is believed to be a consequence    of the rest of this License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;8. If the distribution    and/or use of the Program is restricted in certain countries    either by patents or by copyrighted interfaces, the original    copyright holder who places the Program under this License may    add an explicit geographical distribution limitation excluding    those countries, so that distribution is permitted only in or    among countries not thus excluded.  In such case, this License    incorporates the limitation as if written in the body of this    License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;9. The Free Software    Foundation may publish revised and/or new versions of the    General Public License from time to time.  Such new versions    will be similar in spirit to the present version, but may    differ in detail to address new problems or    concerns.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Each version is given a    distinguishing version number.  If the Program specifies a    version number of this License which applies to it and &quot;any    later version&quot;, you have the option of following the terms and    conditions either of that version or of any later version    published by the Free Software Foundation.  If the Program does    not specify a version number of this License, you may choose    any version ever published by the Free Software    Foundation.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;10. If you wish to    incorporate parts of the Program into other free programs whose    distribution conditions are different, write to the author to    ask for permission.  For software which is copyrighted by the    Free Software Foundation, write to the Free Software    Foundation; we sometimes make exceptions for this.  Our    decision will be guided by the two goals of preserving the free    status of all derivatives of our free software and of promoting    the sharing and reuse of software generally.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;NO WARRANTY&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;11. BECAUSE THE PROGRAM IS    LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM,    TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN    OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER    PARTIES PROVIDE THE PROGRAM &quot;AS IS&quot; WITHOUT WARRANTY OF ANY    KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A    PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND    PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM    PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY    SERVICING, REPAIR OR CORRECTION.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;12. IN NO EVENT UNLESS    REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY    COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR    REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU    FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR    CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO    USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR    DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR    THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY    OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN    ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;END OF TERMS AND    CONDITIONS&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;  &lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>qmainfilter</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+432"/>
+        <source>Partial</source>
+        <translation>Čiastočný</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>This filter cannot be made partial</source>
+        <translation>Tento filter nemôže urobený ako čiastočný</translation>
+    </message>
+    <message>
+        <location line="+244"/>
+        <source>Add</source>
+        <translation>Pridať</translation>
+    </message>
+    <message>
+        <location line="-96"/>
+        <source>Remove</source>
+        <translation>Odstrániť</translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <source>Configure</source>
+        <translation>Konfigurovať</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <source>Move up</source>
+        <translation>Posunúť hore</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Move down</source>
+        <translation>Posunúť dole</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make partial</source>
+        <translation>Vytvoriť čiastočný</translation>
+    </message>
+    <message>
+        <location line="+225"/>
+        <source>Load video filters..</source>
+        <translation>Nahrať video filtre..</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Save video filters..</source>
+        <translation>Uložiť video filtre..</translation>
+    </message>
+</context>
+<context>
+    <name>qprocessing</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
+        <source>Unknown</source>
+        <translation>Neznámy</translation>
+    </message>
+    <message>
+        <location line="+94"/>
+        <source>_Resume</source>
+        <translation>_Zhrnutie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The processing is paused.</source>
+        <translation>Spracovanie je pozastavené.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel it ?</source>
+        <translation>Zrušiť to?</translation>
+    </message>
+</context>
+<context>
+    <name>qprops</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
+        <source>No</source>
+        <translation>Nie</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Yes</source>
+        <translation>Áno</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>%2.3f fps</source>
+        <translation>%2.3f snímok/s</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+90"/>
+        <source>%02d:%02d:%02d.%03d</source>
+        <translation>%02d:%02d:%02d.%03d</translation>
+    </message>
+    <message numerus="yes">
+        <location line="-55"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
+        <translation>
+            <numerusform>Audio (%n aktívna stopa)</numerusform>
+            <numerusform>Audio (%n aktívne stopy)</numerusform>
+            <numerusform>Audio (%n aktívnych stôp)</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Video</source>
+        <translation>Video</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Codec 4CC:	</source>
+        <translation>Kodek 4CC:	</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Image Size:	</source>
+        <translation>Veľkosť obrázka:	</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Aspect Ratio:	</source>
+        <translation>Pomer strán:	</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Frame Rate:	</source>
+        <translation>Snímková frekvencia::	</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+33"/>
+        <source>Total Duration:	</source>
+        <translation>Celkové trvanie:	</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <source>Extra Video Properties</source>
+        <translation>Zvláštne vlastnosti videa</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>ExtraDataSize:	</source>
+        <translation>Veľkosť zvláštnych údajov:	</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Extra data:	</source>
+        <translation>Zvláštne údaje:	</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Audio</source>
+        <translation>Audio</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Codec:		</source>
+        <translation>Kodek:		</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Channels:	</source>
+        <translation>Kanály:	</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Bitrate:	</source>
+        <translation>Prenosová rýchlosť:	</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Frequency:	</source>
+        <translation>Frekvencia:	</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>No Audio</source>
+        <translation>Žiadne audio</translation>
+    </message>
+    <message>
+        <location line="-172"/>
+        <source>%s (%u:%u)</source>
+        <translation>%s (%u:%u)</translation>
+    </message>
+    <message>
+        <location line="+77"/>
+        <source>Mono</source>
+        <translation>Mono</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Stereo</source>
+        <translation>Stereo</translation>
+    </message>
+</context>
+<context>
+    <name>qshell</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+53"/>
+        <source>Enter your commands then press the evaluate button or CTRL+ENTER.
+</source>
+        <translation>Zadajte príkazy a potom stlačte tlačidlo vyhodnotenia alebo Ctrl+Enter.
+</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use CTRL+PageUP and CTRL+Page Down to recall previous commands
+Ready.
+</source>
+        <translation>Môžete použiť Ctrl+PageUp a CTRL+PageDown pre vyvolanie predchádzajúcich príkazov
+Pripravený.
+</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation>Zadajte príkazy a stlačte tlačidlo Vyhodnotiť alebo ⌘⏎.
+</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation>Na vyvolanie predchádzajúcich príkazov môžete použiť ⌥⌘ ▲ a ⌥⌘ ▼.
+Pripravený.
+</translation>
+    </message>
+</context>
+<context>
+    <name>qtalert</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
+        <source>Alert</source>
+        <translation>Upozornenie</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+25"/>
+        <location line="+25"/>
+        <source>Info</source>
+        <translation>Informácia</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <location line="+31"/>
+        <source>Confirmation</source>
+        <translation>Potvrdenie</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+33"/>
+        <source>Question</source>
+        <translation>Otázka</translation>
+    </message>
+    <message>
+        <location line="-7"/>
+        <source>Question?</source>
+        <translation>Otázka?</translation>
+    </message>
+</context>
+<context>
+    <name>qtray</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_gui/ADM_qtray.cpp" line="+82"/>
+        <source>Open Avidemux</source>
+        <translation>Otvoriť Avidemux</translation>
+    </message>
+</context>
+<context>
+    <name>qvobsub</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
+        <source>Select Idx File</source>
+        <translation>Vybrať idx súbor</translation>
+    </message>
+</context>
+<context>
+    <name>rawmuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRawConfig.cpp" line="+29"/>
+        <source>Prefer Annex B type stream</source>
+        <translation>Preferujte tok typu B uvedený v prílohe B</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Video Only Muxer Settings</source>
+        <translation>Nastavenia len video zmiešavača</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation>Ukladanie surového videa</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation>Nie je</translation>
+    </message>
+</context>
+<context>
+    <name>removeplane</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp" line="+45"/>
+        <source>Remove  Plane</source>
+        <translation>Odstrániť úroveň</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remove Y,U or V plane (used mainly to debug other filters).</source>
+        <translation>Odstráni úrovne Y, U, V (používa sa hlavne na ladenie iných filtrov).</translation>
+    </message>
+    <message>
+        <location line="+105"/>
+        <source>Keep Y Plane</source>
+        <translation>Zachovať úroveň Y</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Process luma plane</source>
+        <translation>Spracovanie úrovne jasu</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Keep U Plane</source>
+        <translation>Zachovať úroveň U</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Process chromaU plane</source>
+        <translation>Spracovanie úrovne farebnej zložky U</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Keep V Plane</source>
+        <translation>Zachovať úroveň V</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Process chromaV plane</source>
+        <translation>Spracovanie úrovne farebnej zložky V</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Remove plane</source>
+        <translation>Odstrániť úroveň</translation>
+    </message>
+</context>
+<context>
+    <name>resampleFps</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+43"/>
+        <source>Custom</source>
+        <translation>Vlastné</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25  (PAL)</source>
+        <translation>25 (PAL)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>23.976 (Film)</source>
+        <translation>23.976 (Film)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>29.97 (NTSC)</source>
+        <translation>29.97 (NTSC)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 (Pal)</source>
+        <translation>50 (Pal)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>59.94  (NTSC)</source>
+        <translation>59.94  (NTSC)</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Resample FPS</source>
+        <translation>Prevzorkovať snímkovanie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change and enforce FPS. Keep duration and sync.</source>
+        <translation>Mení a vynucuje snímkovanie. Udržuje dobu trvanie a synchronizáciu.</translation>
+    </message>
+    <message>
+        <location line="+281"/>
+        <source>_Mode:</source>
+        <translation>_Režim:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_New frame rate:</source>
+        <translation>_Nová snímková frekvencia:</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Resample fps</source>
+        <translation>Prevzorkovať snímkovanie</translation>
+    </message>
+</context>
+<context>
+    <name>resize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
+        <source>Width and height cannot be odd</source>
+        <translation>Šírka a výška nemôžu byť nepárne</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+80"/>
+        <source>swsResize</source>
+        <translation>Softvérová zmena veľkosti</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>swScale Resizer.</source>
+        <translation>Softvérový menič mierky.</translation>
+    </message>
+</context>
+<context>
+    <name>resizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+13"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+13"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+13"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+13"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+13"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+13"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+13"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+13"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+13"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+13"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+13"/>
+        <source>Resize</source>
+        <translation>Zmena veľkosti</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+12"/>
+        <source>Aspect Ratio</source>
+        <translation>Pomer strán</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+12"/>
+        <source>Lock Aspect Ratio</source>
+        <translation>Zamknúť pomer strán</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+18"/>
+        <source>Source:</source>
+        <translation>Zdroj:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+8"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+8"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+8"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+8"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+8"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+8"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+8"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+8"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+8"/>
+        <location line="+42"/>
+        <source>1:1</source>
+        <translation>1:1</translation>
+    </message>
+    <message>
+        <location line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-37"/>
+        <location line="+42"/>
+        <source>4:3</source>
+        <translation>4:3</translation>
+    </message>
+    <message>
+        <location line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-37"/>
+        <location line="+42"/>
+        <source>16:9</source>
+        <translation>16:9</translation>
+    </message>
+    <message>
+        <location line="-18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-18"/>
+        <source>Destination:</source>
+        <translation>Cieľ:</translation>
+    </message>
+    <message>
+        <location line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+356"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+356"/>
+        <source>Lanzcos3</source>
+        <translation>Lanzcos3</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
+        <source>Source PAR:</source>
+        <translation>Zdroj PAR:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+32"/>
+        <source>1:1 (square pixels)</source>
+        <translation>1:1 (štvorcové pixely)</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <source>Destination PAR:</source>
+        <translation>Cieľ PAR:</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-312"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-312"/>
+        <source>Resize Dimensions</source>
+        <translation>Zmena rozmenrov</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+20"/>
+        <source>Width:</source>
+        <translation>Šírka:</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+36"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+36"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+36"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+36"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+36"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+36"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+36"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+36"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+36"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+36"/>
+        <source>Height:</source>
+        <translation>Výška:</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+35"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation>Zaokrúhliť na najbližší násobok 16</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+55"/>
+        <source>1%</source>
+        <translation>1 %</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+20"/>
+        <source>Percent</source>
+        <translation>Percent</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+20"/>
+        <source>200%</source>
+        <translation>200 %</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+50"/>
+        <source>Error X / Y:</source>
+        <translation>Chyba X/Y:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+7"/>
+        <source>0.00 / 0.00</source>
+        <translation>0,00/0,00</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+51"/>
+        <source>Resize Method:</source>
+        <translation>Metóda zmeny veľkosti:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+8"/>
+        <source>Bilinear</source>
+        <translation>Bilineárna</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+5"/>
+        <source>Bicubic</source>
+        <translation>Bikubická</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation>Lanczos-3</translation>
+    </message>
+</context>
+<context>
+    <name>rotate</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
+        <location line="+163"/>
+        <source>Rotate</source>
+        <translation>Rotácia</translation>
+    </message>
+    <message>
+        <location line="-162"/>
+        <source>Rotate the image by 90/180/270 degrees.</source>
+        <translation>Otočí obrázok o 90/180/270/ stupňov.</translation>
+    </message>
+    <message>
+        <location line="+155"/>
+        <source>None</source>
+        <translation>Nie je</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 degrees</source>
+        <translation>90 stupňov</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>90°</source>
+        <translation>90°</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 degrees</source>
+        <translation>180 stupňov</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>180°</source>
+        <translation>180°</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>270 degrees</source>
+        <translation>270 stupňov</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>270°</source>
+        <translation>270°</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Angle:</source>
+        <translation>U_hol:</translation>
+    </message>
+</context>
+<context>
+    <name>seekablePreviewDialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_filters/seekablePreview.ui" line="+20"/>
+        <source>Preview</source>
+        <translation>Náhľad</translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
+        <source>Back one minute</source>
+        <translation>Späť o jednu minútu</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&lt;&lt;</source>
+        <translation>&lt;&lt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Play</source>
+        <translation>Prehrať</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next image</source>
+        <translation>Ďalší obrázok</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&gt;</source>
+        <translation>&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&gt;&gt;</source>
+        <translation>&gt;&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation>Vpred o 1 minútu</translation>
+    </message>
+</context>
+<context>
+    <name>separateFields</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidSeparateField.cpp" line="+53"/>
+        <source>Separate Fields</source>
+        <translation>Oddelené polia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Split each image into 2 fields.</source>
+        <translation>Rozdelí každý obrázok na 2 polia.</translation>
+    </message>
+</context>
+<context>
+    <name>shaderLoader</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="-3"/>
+        <source>Reload shader</source>
+        <translation>Znovunačítať shader</translation>
+    </message>
+</context>
+<context>
+    <name>sharpen</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Sharpen.cpp" line="+27"/>
+        <source>Sharpen convolution.</source>
+        <translation>Zaostriť konvolúciou.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>3x3 convolution filter :sharpen.</source>
+        <translation>Filter konvolúcie 3x3 :zaostrenie.</translation>
+    </message>
+</context>
+<context>
+    <name>stackfield</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/stackField.cpp" line="+47"/>
+        <source>Stack Fields</source>
+        <translation>Pole zásobníkov</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Put even lines on top, odd lines at bottom.</source>
+        <translation>Položí párne čiary hore, nepárne dole.</translation>
+    </message>
+</context>
+<context>
+    <name>stillimage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+        <location line="+186"/>
+        <source>Still Image</source>
+        <translation>Statický obrázok</translation>
+    </message>
+    <message>
+        <location line="-185"/>
+        <source>Duplicate frames for a given duration.</source>
+        <translation>Duplikuje snímky pre danú dobu trvania.</translation>
+    </message>
+    <message>
+        <location line="+181"/>
+        <source>_Start time:</source>
+        <translation>Čas _štartu:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Duration:</source>
+        <translation>_Doba trvania:</translation>
+    </message>
+</context>
+<context>
+    <name>swapuv</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp" line="+41"/>
+        <source>Swap UV</source>
+        <translation>Prehodiť UV</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Swap the U and V planes.</source>
+        <translation>Prehodí úrovne U a V.</translation>
+    </message>
+</context>
+<context>
+    <name>telecide</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide.cpp" line="+45"/>
+        <source>Decomb telecide</source>
+        <translation>Dekombinácia Telecide</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Donald Graft Telecide. Replace ivtc pattern by progressive frames. Video stays at 30 fps.</source>
+        <translation>Telecide od Donalda Grafta. Nahradí šablónu ivtc postupnými snímkami. Video pozostáva z 30 snímok/s.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="+186"/>
+        <source>No strategy</source>
+        <translation>Žiadna stratégia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>3:2 pulldown</source>
+        <translation>stiahnuť na 3:2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>PAL/SECAM</source>
+        <translation>PAL/SECAM</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>NTSC converted from PAL</source>
+        <translation>NTSC konvertované z PAL</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Top</source>
+        <translation>Vrchný</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom</source>
+        <translation>Spodný</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Never</source>
+        <translation>Nikdy</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>If still combed</source>
+        <translation>Pokiaľ je stále prekladaný</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Always</source>
+        <translation>Vždy</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>None</source>
+        <translation>Nie je</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None but compute</source>
+        <translation>Žiadne, ale spočítať</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Postproc on best match</source>
+        <translation>Dodatočné spracovanie na najlepšej zhode</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Postproc and show zones (debug)</source>
+        <translation>Dodatočné spracovanie a zobrazenie zón (ladenie)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Process image (not fields)</source>
+        <translation>Spracovanie obrazu (nie polsnímky)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Process image (not fields), debug</source>
+        <translation>Spracovanie obrazu (nie polsnímky), ladenie</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Strategy:</source>
+        <translation>_Stratégia:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field order:</source>
+        <translation>Por_adie polsnímok:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Postprocessing:</source>
+        <translation>_Dodatočné spracovanie:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Try backward:</source>
+        <translation>S_kúsiť spätne:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Direct threshold:</source>
+        <translation>_Priamy prah:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Backward threshold:</source>
+        <translation>Spä_tný prah:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Noise threshold:</source>
+        <translation>P_rah šumu:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Postp_rocessing threshold:</source>
+        <translation>Pra_h dodatočného spracovania:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Use chroma to decide</source>
+        <translation>Po_užiť farebnú zložku pre rozhodnutie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Sho_w info</source>
+        <translation>Zobrazovať _informácie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Debu_g</source>
+        <translation>_Ladenie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bl_end</source>
+        <translation>Z_miešavanie</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Decomb Telecide</source>
+        <translation>Dekombinácia Telecide</translation>
+    </message>
+</context>
+<context>
+    <name>timestamp</name>
+    <message>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <source> h</source>
+        <translation> h</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source> m</source>
+        <translation> m</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source> s</source>
+        <translation> s</translation>
+    </message>
+</context>
+<context>
+    <name>tsdemuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+207"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
+        <source>There are several files with sequential file names. Should they be all loaded ?</source>
+        <translation>Existuje niekoľko súborov so sekvenčnými názvami súborov. Majú byť všetky načítané?</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+19"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
+        <source>Indexing</source>
+        <translation>Indexovanie</translation>
+    </message>
+    <message>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
+        <source>This file&apos;s index has been created with an older version of avidemux.
+The file must be re-indexed. Proceed?</source>
+        <translation>Index tohto súboru bol vytvorený pomocou staršej verzie avidemuxu.
+Súbor musí byť preindexovaný. Pokračovať?</translation>
+    </message>
+</context>
+<context>
+    <name>twolame</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/twolame/audioencoder_twolame.cpp" line="+205"/>
+        <source>_Bitrate:</source>
+        <translation>_Prenosová rýchlosť:</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>TwoLame Configuration</source>
+        <translation>Konfigurácia TwoLame</translation>
+    </message>
+</context>
+<context>
+    <name>uisupport</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
+        <source>X11</source>
+        <translation>X11</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>MS Windows GDI</source>
+        <translation>MS Windows GDI</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Mac OS X Quartz 2D</source>
+        <translation>Mac OS X Quartz 2D</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Mac OS X QuickDraw</source>
+        <translation>Mac OS X QuickDraw</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>OpenGL</source>
+        <translation>OpenGL</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>MS Windows Direct3D</source>
+        <translation>MS Windows Direct3D</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Default Raster</source>
+        <translation>Pôvodný raster</translation>
+    </message>
+</context>
+<context>
+    <name>unstackfield</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/unstackField.cpp" line="+47"/>
+        <source>Unstack Fields</source>
+        <translation>Polsnímky bez zásobníka</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave top and bottom halves.</source>
+        <translation>Spletie horné a spodné polovice.</translation>
+    </message>
+</context>
+<context>
+    <name>vaEncH264</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+        <source>vaH264 Configuration</source>
+        <translation>Konfigurácia vaH264</translation>
+    </message>
+</context>
+<context>
+    <name>vaH264</name>
+    <message>
+        <location line="-4"/>
+        <source>_IDR Period:</source>
+        <translation>_IDR perióda:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Bitrate(kbps)</source>
+        <translation>_Prenosová rýchlosť [kB/s]</translation>
+    </message>
+</context>
+<context>
+    <name>vaapiDeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Adaptive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Compensated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>vaapiResize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
+        <translation>VA-API Zmena veľkosti</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize image using VA-API.</source>
+        <translation>Zmena veľkosti obrázka použitím VA-API.</translation>
+    </message>
+    <message>
+        <location line="+129"/>
+        <source>Width :</source>
+        <translation>Šírka:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height :</source>
+        <translation>Výška:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>mpeg-&gt;PC</source>
+        <translation type="unfinished">mpeg-&gt;PC</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>vaapi</source>
+        <translation>vaapi</translation>
+    </message>
+</context>
+<context>
+    <name>vdpaudeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+131"/>
+        <source>vdpauDeint</source>
+        <translation>Rozkladač vdpau</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>VDPAU deinterlacer (+resize).</source>
+        <translation>Rozkladač VDPAU (+ zmena veľkosti).</translation>
+    </message>
+    <message>
+        <location line="+197"/>
+        <source>Keep Top Field</source>
+        <translation>Zachovať hornú polsnímku</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Keep Bottom Field</source>
+        <translation>Dodržať dolnú polsnímku</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double framerate</source>
+        <translation>Dvojitá snímková frekvencia</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_IVTC</source>
+        <translation>_IVTC</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Resize</source>
+        <translation>_Zmena veľkosti</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Deint Mode:</source>
+        <translation>Režim _rozkladu:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation>Šírka:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation>Výška:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>vdpau</source>
+        <translation>vdpau</translation>
+    </message>
+</context>
+<context>
+    <name>vdpresize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="+69"/>
+        <source>vdpau: Resize</source>
+        <translation>vdpau: Zmena veľkosti</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>vdpau: Resize image using vdpau.</source>
+        <translation>Zmena veľkosti obrázka použitím vdpau.</translation>
+    </message>
+    <message>
+        <location line="+131"/>
+        <source>Width:</source>
+        <translation>Šírka:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation>Výška:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>vdpau</source>
+        <translation>vdpau</translation>
+    </message>
+</context>
+<context>
+    <name>vflip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/verticalFlip/verticalFlip.cpp" line="+47"/>
+        <source>Vertical Flip</source>
+        <translation>Preklopiť vertikálne</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically flip the image.</source>
+        <translation>Preklopí obrázok vertikálne.</translation>
+    </message>
+</context>
+<context>
+    <name>vobSubDialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/vobsub.ui" line="+13"/>
+        <source>Subtitle Font Size and Position</source>
+        <translation>Veľkosť písma a pozícia titulkov</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Delay :</source>
+        <translation>Odozva: </translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Select File</source>
+        <translation>Vybrať súbor</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Language :</source>
+        <translation>Jazyk: </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Idx File :</source>
+        <translation>IDy súboru: </translation>
+    </message>
+</context>
+<context>
+    <name>vorbis</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp" line="+331"/>
+        <source>VBR</source>
+        <translation>VBR</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quality based</source>
+        <translation>Režim kvality</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Mode:</source>
+        <translation>_Režim:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>_Bitrate:</source>
+        <translation>_Prenosová rýchlosť:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Quality:</source>
+        <translation>_Kvalita:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Vorbis Configuration</source>
+        <translation>Konfigurácia Vorbis</translation>
+    </message>
+</context>
+<context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation>Reálny čas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation>Dobrá kvalita</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation>Najlepšia kvalita</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation>Ak chcete dosiahnuť optimálnu kvalitu, vyberte režim priemernej bitovej rýchlosti s 2 prechodmi a cieľovú prenosovú rýchlosť nastavte na nulu</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation>Hraničný termín</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation>Rýchlosť</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation>Vlákna</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation>Použiť toľko vlákien ako jadier CPU</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation>Veľkosť skupiny obrázkov</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation>Používať celý farebný rozsah</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation>Režim kódovania</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation>Rýchlosť proti kvalite</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation>Kľúčové snímky</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation>Rôzne</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation>Konfigurácia kódovača libvpx VP9</translation>
+    </message>
+</context>
+<context>
+    <name>vsWindow</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
+        <source>Open VapourSynth File</source>
+        <translation>Otvoriť súbor VapourSynth</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>VS Script Files (*.vpy)</source>
+        <translation>Súbory skriptov VS (*.vpy)</translation>
+    </message>
+</context>
+<context>
+    <name>webmmuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+68"/>
+        <source>Unsupported Video.
+Only VP8/VP9 video and Vorbis/Opus audio supported</source>
+        <translation>Nepodporované video.
+Podporované audio len VP8/VP9 video a Vorbis/Opus</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Unsupported Audio.
+Only VP8/VP9 video and Vorbis/Opus audio supported</source>
+        <translation>Nepodporované audio.
+Podporované audio len VP8/VP9 video a Vorbis/Opus</translation>
+    </message>
+    <message>
+        <location line="+89"/>
+        <source>Saving Webm</source>
+        <translation>Uloženie Webm</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebmConfig.cpp" line="+27"/>
+        <source>Force display width</source>
+        <translation>Vynútená šírka zobrazenia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display width</source>
+        <translation>Šírka zobrazenia</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Webm Muxer</source>
+        <translation>Zmiešavač Webm</translation>
+    </message>
+</context>
+<context>
+    <name>workingDialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
+        <source>Processing</source>
+        <translation>Spracovávanie</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Elapsed:</source>
+        <translation>Uplynulý čas:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Time Remaining:</source>
+        <translation>Zostávajúci čas:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>00:00:00</source>
+        <translation>00:00:00</translation>
+    </message>
+</context>
+<context>
+    <name>x264</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <source>Not coded</source>
+        <translation>Nekódované</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>this mode has not been implemented
+</source>
+        <translation>tento režim nie je implementovaný
+</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
+        <source>none</source>
+        <translation>nie je</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>Custom</source>
+        <translation>Vlastné</translation>
+    </message>
+    <message>
+        <location line="+412"/>
+        <source>Target Bitrate:</source>
+        <translation>Cieľová prenosová rýchlosť [kB/s]:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+19"/>
+        <source>kbit/s</source>
+        <translation>kB/s</translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Quantiser:</source>
+        <translation>Kvantifikátor:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Quality:</source>
+        <translation>Kvalita:</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Target Video Size:</source>
+        <translation>Cieľová veľkosť videa:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Average Bitrate:</source>
+        <translation>Priemerná prenosová rýchlosť:</translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
+
+Do you wish to continue?</source>
+        <translation>Optimalizácia stromu makroblokov vyžaduje povolenú adaptívnu kvantifikáciu. Varianta adaptívnej kvantizácie bude automaticky zakázaná.
+
+Chcete pokračovat?</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Macroblock-Tree optimisation will automatically be disabled.
+
+Do you wish to continue?</source>
+        <translation>Optimalizácia stromu makroblokov vyžaduje povolenú adaptívnu kvantfikáciu. Optimalizácia stromu makroblokov bude automaticky zakázaná.
+
+Chcete pokračovat?</translation>
+    </message>
+    <message>
+        <location line="+61"/>
+        <location line="+70"/>
+        <location line="+14"/>
+        <source>Error</source>
+        <translation>Chyba</translation>
+    </message>
+    <message>
+        <location line="-84"/>
+        <source>Cannot load preset</source>
+        <translation>Nemožno načítať predvoľbu</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Save Profile</source>
+        <translation>Uložiť profil</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Overwrite</source>
+        <translation>Prepísať</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Replace the following preset ?:</source>
+        <translation>Nahradiť nasledujúcu predvoľbu?:</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Cannot save preset</source>
+        <translation>Nemožno uložiť predvoľbu</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Cannot delete custom profile</source>
+        <translation>Nemožno odstrániť vlastný profil</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Do you really want to delete the </source>
+        <translation>Naozaj chcete odstrániť </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source> profile ?.
+If it is a system profile it will be recreated next time.</source>
+        <translation> profil?
+Ak je to systémový profil, bude nabudúce obnovený.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Delete preset</source>
+        <translation>Odstrániť predvoľbu</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Delete</source>
+        <translation>&amp;Odstrániť</translation>
+    </message>
+</context>
+<context>
+    <name>x264ConfigDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui" line="+15"/>
+        <source>x264 Configuraton</source>
+        <translation>Konfigurácia x264</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Configuration:</source>
+        <translation>Konfigurácia:</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save As</source>
+        <translation>Uložiť ako</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3157"/>
+        <source>Delete</source>
+        <translation>&amp;Odstrániť</translation>
+    </message>
+    <message>
+        <location line="-3115"/>
+        <source>General</source>
+        <translation>Obecné</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Basic</source>
+        <translation>Základné</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Use advanced configuration</source>
+        <translation>Použiť rozšírenú konfiguráciu</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Profile:</source>
+        <translation>Profil:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Preset:</source>
+        <translation>Predvoľba:</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>Tuning:</source>
+        <translation>Ladenie:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>IDC Level:</source>
+        <translation>Úroveň IDC:</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <location line="+1149"/>
+        <source>Auto</source>
+        <translation>Automatický</translation>
+    </message>
+    <message>
+        <location line="-1144"/>
+        <location line="+669"/>
+        <source>1</source>
+        <translation>1</translation>
+    </message>
+    <message>
+        <location line="-664"/>
+        <source>1.1</source>
+        <translation>1.1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1.2</source>
+        <translation>1.2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1.3</source>
+        <translation>1.3</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>2</source>
+        <translation>2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>2.1</source>
+        <translation>2.1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>2.2</source>
+        <translation>2.2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+639"/>
+        <source>3</source>
+        <translation>3</translation>
+    </message>
+    <message>
+        <location line="-634"/>
+        <source>3.1</source>
+        <translation>3.1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>3.2</source>
+        <translation>3.2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4</source>
+        <translation>4</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4.1</source>
+        <translation>4.1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4.2</source>
+        <translation>4.2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>5</source>
+        <translation>5</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>5.1</source>
+        <translation>5.1</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Fast Decode</source>
+        <translation>Rýchle dekódovanie</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zero Latency</source>
+        <translation>Nulová odozva</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Fast First Pass</source>
+        <translation>Rýchly prvý prechod</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Threads </source>
+        <translation>Vlákna </translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Rate Control</source>
+        <translation>Riadenie prenosovej rýchlosti</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Target Video Size:</source>
+        <translation>Cieľová veľkosť videa:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Constant Bitrate (Single Pass)</source>
+        <translation>Konštantná prenosová rýchlosť (jeden prechod)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Constant Quantiser (Single Pass)</source>
+        <translation>Konštantný kvantifikátor (jeden prechod)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Constant Rate Factor (Single Pass)</source>
+        <translation>Faktor konštantnej rýchlosti (jeden prechod)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Video Size (Two Pass)</source>
+        <translation>Veľkosť videa (dva prechody)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Average Bitrate (Two Pass)</source>
+        <translation>Priemerná prenosová rýchlosť (dva prechody)</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Encoding Mode:</source>
+        <translation>Režim kódovania:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+200"/>
+        <source>0 (High Quality)</source>
+        <translation>0 (vysoká kvalita)</translation>
+    </message>
+    <message>
+        <location line="-177"/>
+        <location line="+200"/>
+        <location line="+1649"/>
+        <source>Quantiser</source>
+        <translation>Kvantifikátor</translation>
+    </message>
+    <message>
+        <location line="-1826"/>
+        <location line="+200"/>
+        <source>51 (Low Quality)</source>
+        <translation>51 (nízka kvalita)</translation>
+    </message>
+    <message>
+        <location line="-101"/>
+        <source>Advanced RC</source>
+        <translation>Rozšírené riadenie rýchlosti</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Advanced Rate Control</source>
+        <translation>Rozšírené riadenie rýchlosti</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Maximum Constant Rate Factor</source>
+        <translation>Faktor maximálnej konštantnej rýchlosti</translation>
+    </message>
+    <message>
+        <location line="+158"/>
+        <source>Macroblock-tree Rate Control</source>
+        <translation>Riadenie rýchlosti stromu makroblokov</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Frametype Lookahead:</source>
+        <translation>Typ následných snímok:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <location line="+2495"/>
+        <source>frames</source>
+        <translation>snímok</translation>
+    </message>
+    <message>
+        <location line="-2471"/>
+        <source>Sequence Parameter Set Identifer:</source>
+        <translation>Nastavenie identifikátora parametrov sekvencie:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>7</source>
+        <translation>7</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>15</source>
+        <translation>15</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>31</source>
+        <translation>31</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Motion</source>
+        <translation>Pohyb</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Motion Estimation</source>
+        <translation>Odhad pohybu</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion Estimation Method:</source>
+        <translation>Metóda odhadu pohybu:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Diamond Search</source>
+        <translation>Štvoruholníkové vyhľadávanie</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hexagonal Search</source>
+        <translation>Šesťuholníkové vyhľadávanie</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Uneven Multi-hexagonal Search</source>
+        <translation>Nerovnomerné viacnásobné šesťuholníkové vyhľadávanie</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Exhaustive Search</source>
+        <translation>Dôkladné vyhľadávanie</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hadamard Exhaustive Search</source>
+        <translation>Hadamardovo dôkladné vyhľadávanie</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>1 (Fast)</source>
+        <translation>1 (rýchle)</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subpixel Refinement</source>
+        <translation>Subpixelové spresnenie</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>11 (Best)</source>
+        <translation>11 (najlepšie)</translation>
+    </message>
+    <message>
+        <location line="+78"/>
+        <source>Motion Vector</source>
+        <translation>Vektor pohybu</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Maximum Motion Vector Length:</source>
+        <translation>Maximálna dĺžka vektora pohybu:</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>Minimum Buffer Between Threads:</source>
+        <translation>Minimálny zásobník medzi vláknami:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Maximum Motion Vector Search Range:</source>
+        <translation>Maximálny rozsah hľadania vektoru pohybu:</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Prediction</source>
+        <translation>Predvídanie</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location line="+450"/>
+        <location line="+36"/>
+        <source>Disabled</source>
+        <translation>Zakázané</translation>
+    </message>
+    <message>
+        <location line="-481"/>
+        <source>Weighted References</source>
+        <translation>Odporúčaná záťaž</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted References + Duplicates</source>
+        <translation>Odporúčaná záťaž + duplikáty</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Direct Prediction Mode:</source>
+        <translation>Režim priameho predvídania:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Weighted Prediction for P-frames:</source>
+        <translation>Predvídanie záťaže pre P snímky:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location line="+2601"/>
+        <source>None</source>
+        <translation>Nie je</translation>
+    </message>
+    <message>
+        <location line="-2596"/>
+        <source>Spatial</source>
+        <translation>Priestorový</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Temporal</source>
+        <translation>Dočasný</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Weighted Prediction for B-frames</source>
+        <translation>Predvídanie záťaže pre B snímky</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Constrained Intra Prediction</source>
+        <translation>Obmedzené predvídanie záťaže</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Partition</source>
+        <translation>Rozdelenie</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Partition Search</source>
+        <translation>Vyhľadávanie častí</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>8x8 DCT Spatial Transform</source>
+        <translation>8x8 DCT priestorová transformácia</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>8x8, 8x16 and 16x8 P-frame Intra-predicted Blocks</source>
+        <translation>8x8, 8x16 a 16x8 predvídanie vnútorných blokov P snímok</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>8x8, 8x16 and 16x8 B-frame Intra-predicted Blocks</source>
+        <translation>8x8, 8x16 a 16x8 predvídanie vnútorných blokov B snímok</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>4x4, 4x8 and 8x4 P-frame Intra-predicted Blocks</source>
+        <translation>4x4, 4x8 a 8x4 predvídanie vnútorných blokov P snímok</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>8x8 Intra-predicted Blocks</source>
+        <translation>8x8 predvídanie vnútorných blokov</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>4x4 Intra-predicted Blocks</source>
+        <translation>4x4 predvídanie vnútorných blokov</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Frame</source>
+        <translation>Snímka</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Frame Encoding</source>
+        <translation>Zakódovanie snímok</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>CABAC</source>
+        <translation>CABAC</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Loop Filter:</source>
+        <translation>Filter slučky:</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location line="+1333"/>
+        <source>Strength:</source>
+        <translation>Sila:</translation>
+    </message>
+    <message>
+        <location line="-1294"/>
+        <source>Threshold:</source>
+        <translation>Prah:</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Open GOP:</source>
+        <translation>Otvoriť skupinu obrázkov:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Normal Mode</source>
+        <translation>Normálny režim</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Blu-ray Mode</source>
+        <translation>Režim Blu-ray</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Interlaced:</source>
+        <translation>Prekladaný:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Bottom Field First</source>
+        <translation>Najskôr dolná polsnímka</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Top Field First</source>
+        <translation>Najskôr horná polsnímka</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Maximum Reference Frames:</source>
+        <translation>Maximum referenčných snímok:</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>B-frames</source>
+        <translation>B snímky</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>B-frames as References:</source>
+        <translation>B snímky ako referencie:</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Strictly Hierarchical Pyramid</source>
+        <translation>Prísne hierarchická pyramída</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Non-strict (Not Blu-ray Compatible)</source>
+        <translation>Nie prísne (nie je kompatibilné s Blu-ray)</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>Fast</source>
+        <translation>Rýchla</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Optimal</source>
+        <translation>Optimálne</translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>B-frame Bias:</source>
+        <translation>Miera použitia B snímok:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Maximum Consecutive B-frames:</source>
+        <translation>Maximum následných B snímok:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Adaptive B-frame Decision:</source>
+        <translation>Adaptívne rozhodovanie B snímok:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>I-frames</source>
+        <translation>I snímky</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>GOP Size:</source>
+        <translation>Veľkosť skupiny obrázkov:</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Minimum:</source>
+        <translation>Minimálne:</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Maximum:</source>
+        <translation>Maximálne:</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I-frame Threshold:</source>
+        <translation>Prah I snímok:</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Periodic Intra Refresh</source>
+        <translation>Periodická vnútorná obnova</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <location line="+6"/>
+        <source>Analysis</source>
+        <translation>Analýza</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Mixed References</source>
+        <translation>Zmiešané referencie</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Chroma Motion Estimation</source>
+        <translation>Odhad pohybu farebnej zložky</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Trellis Quantization:</source>
+        <translation>Kvantifikácia mriežkového kódovania:</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Final Macroblock Only</source>
+        <translation>Len finálny makroblok</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Always On</source>
+        <translation>Vždy zapnuté</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Fast Skip Detection on P-frames</source>
+        <translation>Detekcia s rýchlym preskokom na P snímkach</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>DCT Decimation on P-frames</source>
+        <translation>DCT decimácia na P snímkach</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Psychovisual Rate Distortion Optimisation:</source>
+        <translation>Psychovizuálna optimalizácia miery skreslenia:</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Psychovisual Trellis:</source>
+        <translation>Psychovizuálne mriežkové kódovanie:</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Noise Reduction:</source>
+        <translation>Redukcia šumu:</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Luma Quantisation Deadzone</source>
+        <translation>Jasová kvantifikácia hluchej zóny</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Intra Luma Quantisation Deadzone:</source>
+        <translation>Vnútorná jasová kvantifikácia hluchej zóny:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Inter Luma Quantisation Deadzone:</source>
+        <translation>Vonkajšia jasová kvantifikácia hluchej zóny:</translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Quantisation Matrix</source>
+        <translation>Kvantifikačná matrica</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Flat Matrix</source>
+        <translation>Plochá matrica</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>JVT Matrix</source>
+        <translation>JVT matrica</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Custom Matrix</source>
+        <translation>Vlastná matrica</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+861"/>
+        <source>Edit</source>
+        <translation>Upraviť</translation>
+    </message>
+    <message>
+        <location line="-814"/>
+        <source>Quantiser Control</source>
+        <translation>Riadenie kvantifikátorov</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Maximum Quantiser:</source>
+        <translation>Maximálny kvantifikátor:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>I and P-frame Quantiser Ratio:</source>
+        <translation>Pomer kvantifikátorov I a P snímok:</translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <location line="+179"/>
+        <location line="+307"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location line="-464"/>
+        <source>Maximum Quantiser Step:</source>
+        <translation>Maximálny krok kvantifikátorov:</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>P and B-frame Quantiser Ratio:</source>
+        <translation>Pomer kvantifikátorov P a B snímok:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Average Bitrate Tolerance:</source>
+        <translation>Tolerancia priemernej prenosovej rýchlosti:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Chroma to Luma Quantiser Offset:</source>
+        <translation>Posuv kvantifikátorov farebnej zložky proti jasovej zložke:</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Minimum Quantiser:</source>
+        <translation>Minimálny kvantifikátor:</translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>Quantiser Curve Compression</source>
+        <translation>Kompresia krivky kvantifikátorov</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Quantiser Curve Compression:</source>
+        <translation>Kompresia krivky kvantifikátorov:</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Reduce Fluctuation Before Curve Compression:</source>
+        <translation>Redukcia výkyvov pred kompresiou krivky:</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>Reduce Fluctuation After Curve Compression:</source>
+        <translation>Redukcia výkyvov po kompresii krivky:</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Adaptive Quantisation</source>
+        <translation>Adaptívna kvantifikácia</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Variance AQ:</source>
+        <translation>Rozptyl AQ:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Normal</source>
+        <translation>Normálna</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance</source>
+        <translation>Automatická odchýlka</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
+        <translation>Ovplyvnená automatická odchýlka</translation>
+    </message>
+    <message>
+        <location line="+91"/>
+        <source>Advanced 1</source>
+        <translation>Pokročilé 1</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Video Buffer Verifier</source>
+        <translation>Kontrola video zásobníka</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Maximum VBV Bitrate:</source>
+        <translation>Maximálna prenosová rýchlodť VBV:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Initial VBV Buffer Occupancy:</source>
+        <translation>Počiatočné obsadenie VBV zásobníka:</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>kbit</source>
+        <translation>kB</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>kbit/s</source>
+        <translation>kB/s</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>VBV Buffer Size:</source>
+        <translation>Veľkosť VBV zásobníka:</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Slicing</source>
+        <translation>Krájanie bitov (slicing)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Slices per Frame:</source>
+        <translation>Plátkov (slices) na snímku:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Maximum Size per Slice:</source>
+        <translation>Maximálna veľkosť na plátok:</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>bytes</source>
+        <translation>bajtov</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Maximum Macroblocks per Slice:</source>
+        <translation>Maximálne makrobloky pre plátky (slice):</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>Zones</source>
+        <translation>Zóny</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Add</source>
+        <translation>Pridať</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Advanced 2</source>
+        <translation>Pokročilé 2</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Multithreading</source>
+        <translation>Viacvláknové spracovanie</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Disable</source>
+        <translation>Zakázať</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Auto-detect</source>
+        <translation>Automatická detekcia</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Custom:</source>
+        <comment>multithreading</comment>
+        <translation>Vlastné:</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Enforce Repeatability</source>
+        <translation>Vynútiť opakovateľnosť</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Slice-based Threading</source>
+        <translation>Základné krájanie vlákien</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Custom Threaded Lookahead Buffer:</source>
+        <translation>Vlastný zásobník následných vlákien:</translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>Output 1</source>
+        <translation>Výstup 1</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Output</source>
+        <translation>Výstup</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Generate Access Unit Delimiters</source>
+        <translation>Generovať prístup obmedzovačov jednotiek</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>BluRay compatibility</source>
+        <translation>Kompatibilné s Blu-ray</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Generate fake interlaced</source>
+        <translation>Vytvárať falošné prekladanie</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pixel Aspect Ratio</source>
+        <translation>Pomer strán v pixeloch</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Custom:</source>
+        <comment>PAR</comment>
+        <translation>Vlastné:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>As Input</source>
+        <translation>Ako vstup</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>:</source>
+        <translation>:</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Predefined Aspect Ratio:</source>
+        <translation>Prednastavený pomer strán:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>16:15 (PAL 4:3)</source>
+        <translation>16:15 (PAL 4:3)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>64:45 (PAL 16:9)</source>
+        <translation>64:45 (PAL 16:9)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>8:9 (NTSC 4:3)</source>
+        <translation>8:9 (NTSC 4:3)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>32:27 (NTSC 16:9)</source>
+        <translation>32:27 (NTSC 16:9)</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Output 2</source>
+        <translation>Výstup 2</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Video Usability Information</source>
+        <translation>Informácia o použití videa</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>These settings are only suggestions for the playback equipment.  Use at your own risk.</source>
+        <translation>Tieto nastavenia sú len inštrukcie pre prehrávacie zariadenie. Použitie je na vlastné riziko.</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Overscan:</source>
+        <translation>Zosnímanie:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+46"/>
+        <location line="+58"/>
+        <location line="+63"/>
+        <location line="+73"/>
+        <source>Undefined</source>
+        <translation>Nedefinované</translation>
+    </message>
+    <message>
+        <location line="-235"/>
+        <source>Show</source>
+        <translation>Zobraziť</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Crop</source>
+        <translation>Orezanie</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Video Format:</source>
+        <translation>Video formát:</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Component</source>
+        <translation>Komponentný</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>PAL</source>
+        <translation>PAL</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>NTSC</source>
+        <translation>NTSC</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>SECAM</source>
+        <translation>SECAM</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MAC</source>
+        <translation>MAC</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Colour Primaries:</source>
+        <translation>Primárne farby:</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+63"/>
+        <location line="+73"/>
+        <source>BT709</source>
+        <translation>BT709</translation>
+    </message>
+    <message>
+        <location line="-131"/>
+        <location line="+63"/>
+        <source>BT470M</source>
+        <translation>BT470M</translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <location line="+63"/>
+        <location line="+73"/>
+        <source>BT470BG</source>
+        <translation>BT470BG</translation>
+    </message>
+    <message>
+        <location line="-131"/>
+        <location line="+136"/>
+        <source>SMPTE170M</source>
+        <translation>SMPTE170M</translation>
+    </message>
+    <message>
+        <location line="-131"/>
+        <location line="+78"/>
+        <location line="+58"/>
+        <source>SMPTE240M</source>
+        <translation>SMPTE240M</translation>
+    </message>
+    <message>
+        <location line="-131"/>
+        <source>Film</source>
+        <translation>Film</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Transfer Characteristics:</source>
+        <translation>Charakteristika prevodu:</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Linear</source>
+        <translation>Lineárna</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>LOG100</source>
+        <translation>LOG100</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>LOG316</source>
+        <translation>LOG316</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>SMPTEL170M</source>
+        <translation>SMPTEL170M</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Colour Matrix:</source>
+        <translation>Matrica farieb:</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>FCC</source>
+        <translation>FCC</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>GBR</source>
+        <translation>GBR</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>YCgCo</source>
+        <translation>YCgCo</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>HRD Parameters:</source>
+        <translation>Parametre HRD:</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>VBR</source>
+        <translation>VBR</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>CBR</source>
+        <translation>CBR</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Chroma Sample Location:</source>
+        <translation>Umiestnenie farebnej zložky vzorky:</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Full Range Samples</source>
+        <translation>Úplné vzorky</translation>
+    </message>
+</context>
+<context>
+    <name>x264CustomMatrixDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264CustomMatrixDialog.ui" line="+16"/>
+        <source>x264 Custom Matrix</source>
+        <translation>Vlastná matrica x264</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Intra 4x4</source>
+        <translation>Vnútorná 4x4</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+446"/>
+        <location line="+446"/>
+        <location line="+703"/>
+        <source>Luma:</source>
+        <translation>Jasová zložka:</translation>
+    </message>
+    <message>
+        <location line="-1385"/>
+        <location line="+446"/>
+        <source>Chroma U/V:</source>
+        <translation>Farebná zložka U/V:</translation>
+    </message>
+    <message>
+        <location line="-238"/>
+        <source>Inter 4x4</source>
+        <translation>Mimo 4x4</translation>
+    </message>
+    <message>
+        <location line="+446"/>
+        <source>Intra 8x8</source>
+        <translation>Vnútri 8x8</translation>
+    </message>
+    <message>
+        <location line="+703"/>
+        <source>Inter 8x8</source>
+        <translation>Vonkajšia 8x8</translation>
+    </message>
+    <message>
+        <location line="+727"/>
+        <source>Load File</source>
+        <translation>Načítať súbor</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cancel</source>
+        <translation>Zrušiť</translation>
+    </message>
+</context>
+<context>
+    <name>x265</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
+        <source>Not coded</source>
+        <translation>Nekódované</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>this mode has not been implemented
+</source>
+        <translation>tento režim nie je implementovaný
+</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
+        <source>none</source>
+        <translation>nie je</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>Custom</source>
+        <translation>Vlastné</translation>
+    </message>
+    <message>
+        <location line="+362"/>
+        <source>Target Bitrate:</source>
+        <translation>Cieľová prenosová rýchlosť:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+20"/>
+        <source>kbit/s</source>
+        <translation>kB/s</translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Quantiser:</source>
+        <translation>Kvantifikátor:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Quality:</source>
+        <translation>Kvalita:</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Target Video Size:</source>
+        <translation>Cieľová veľkosť videa:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Average Bitrate:</source>
+        <translation>Priemerná prenosová rýchlosť:</translation>
+    </message>
+    <message>
+        <location line="+101"/>
+        <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
+
+Do you wish to continue?</source>
+        <translation>Optimalizácia stromu makroblokov vyžaduje povolenú adaptívnu kvantifikáciu. Varianta adaptívnej kvantifikácie bude automaticky zakázaná.
+
+Chcete pokračovat?</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Macroblock-Tree optimisation will automatically be disabled.
+
+Do you wish to continue?</source>
+        <translation>Optimalizácia stromu makroblokov vyžaduje povolenú adaptívnu kvantfikáciu. Optimalizácia stromu makroblokov bude automaticky zakázaná.
+
+Chcete pokračovat?</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <location line="+70"/>
+        <location line="+14"/>
+        <source>Error</source>
+        <translation>Chyba</translation>
+    </message>
+    <message>
+        <location line="-84"/>
+        <source>Cannot load preset</source>
+        <translation>Nemožno načítať predvoľbu</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Save Profile</source>
+        <translation>Uložiť profil</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Overwrite</source>
+        <translation>Prepísať</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Replace the following preset ?:</source>
+        <translation>Nahradiť nasledujúcu predvoľbu?:</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Cannot save preset</source>
+        <translation>Nemožno uložiť predvoľbu</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Cannot delete custom profile</source>
+        <translation>Nemožno odstrániť vlastný profil</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Do you really want to delete the </source>
+        <translation>Naozaj chcete odstrániť </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source> profile ?.
+If it is a system profile it will be recreated next time.</source>
+        <translation> profil?
+Ak je to systémový profil, bude nabudúce obnovený.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Delete preset</source>
+        <translation>Odstrániť predvoľbu</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Delete</source>
+        <translation>&amp;Odstrániť</translation>
+    </message>
+</context>
+<context>
+    <name>x265ConfigDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
+        <source>x265 Configuraton</source>
+        <translation>Konfigurácia x265</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Configuration:</source>
+        <translation>Konfigurácia:</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save As</source>
+        <translation>Uložiť ako</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+2738"/>
+        <source>Delete</source>
+        <translation>&amp;Odstrániť</translation>
+    </message>
+    <message>
+        <location line="-2696"/>
+        <source>General</source>
+        <translation>Obecné</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Basic</source>
+        <translation>Základné</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Use advanced configuration</source>
+        <translation>Použiť rozšírenú konfiguráciu</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Profile:</source>
+        <translation>Profil:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Preset:</source>
+        <translation>Predvoľba:</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>Tuning:</source>
+        <translation>Ladenie:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>IDC Level:</source>
+        <translation>Úroveň IDC:</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Auto</source>
+        <translation>Automatická</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+668"/>
+        <source>1</source>
+        <translation>1</translation>
+    </message>
+    <message>
+        <location line="-663"/>
+        <source>1.1</source>
+        <translation>1.1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1.2</source>
+        <translation>1.2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1.3</source>
+        <translation>1.3</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>2</source>
+        <translation>2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>2.1</source>
+        <translation>2.1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>2.2</source>
+        <translation>2.2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+638"/>
+        <source>3</source>
+        <translation>3</translation>
+    </message>
+    <message>
+        <location line="-633"/>
+        <source>3.1</source>
+        <translation>3.1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>3.2</source>
+        <translation>3.2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4</source>
+        <translation>4</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4.1</source>
+        <translation>4.1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4.2</source>
+        <translation>4.2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>5</source>
+        <translation>5</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>5.1</source>
+        <translation>5.1</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Pool Threads </source>
+        <translation>Súbor vlákien </translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Frame Threads </source>
+        <translation>Vlákna snímky </translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Rate Control</source>
+        <translation>Riadenie prenosovej rýchlosti</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Target Video Size:</source>
+        <translation>Cieľová veľkosť videa:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Constant Bitrate (Single Pass)</source>
+        <translation>Konštantná prenosová rýchlosť (jeden prechod)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Constant Quantiser (Single Pass)</source>
+        <translation>Konštantný kvantifikátor (jeden prechod)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Constant Rate Factor (Single Pass)</source>
+        <translation>Faktor konštantnej rýchlosti (jeden prechod)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Video Size (Two Pass)</source>
+        <translation>Veľkosť videa (dva prechody)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Average Bitrate (Two Pass)</source>
+        <translation>Priemerná prenosová rýchlosť (dva prechody)</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Encoding Mode:</source>
+        <translation>Režim kódovania:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <location line="+213"/>
+        <source>0 (High Quality)</source>
+        <translation>0 (vysoká kvalita)</translation>
+    </message>
+    <message>
+        <location line="-190"/>
+        <location line="+213"/>
+        <location line="+1274"/>
+        <source>Quantiser</source>
+        <translation>Kvantifikátor</translation>
+    </message>
+    <message>
+        <location line="-1464"/>
+        <location line="+213"/>
+        <source>51 (Low Quality)</source>
+        <translation>51 (nízka kvalita)</translation>
+    </message>
+    <message>
+        <location line="-143"/>
+        <source>Use Strict Constant Bitrate Mode</source>
+        <translation>Použiť prísny režim konštanty prenosovej rýchlosti</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Advanced RC</source>
+        <translation>Rozšírené riadenie rýchlosti</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Advanced Rate Control</source>
+        <translation>Rozšírené riadenie rýchlosti</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Maximum Constant Rate Factor</source>
+        <translation>Faktor maximálnej konštantnej rýchlosti</translation>
+    </message>
+    <message>
+        <location line="+158"/>
+        <source>Coding Unit-tree Rate Control</source>
+        <translation>Riadenie kódovania frekvencie stromu jednotiek</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Frametype Lookahead:</source>
+        <translation>Zistenie typu nasledujúcich snímok:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <location line="+2077"/>
+        <source>frames</source>
+        <translation>snímok</translation>
+    </message>
+    <message>
+        <location line="-2053"/>
+        <source>Sequence Parameter Set Identifer:</source>
+        <translation>Identifikátor nastavenia parametrov sekvencie:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>7</source>
+        <translation>7</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>15</source>
+        <translation>15</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>31</source>
+        <translation>31</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Motion</source>
+        <translation>Pohyb</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Motion Estimation</source>
+        <translation>Odhad pohybu</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion Estimation Method:</source>
+        <translation>Metóda odhadu pohybu:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Diamond Search</source>
+        <translation>Štvoruholníkové vyhľadávanie</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hexagonal Search</source>
+        <translation>Šesťuholníkové vyhľadávanie</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Uneven Multi-hexagonal Search</source>
+        <translation>Nerovnomerné viacnásobné šesťuholníkové vyhľadávanie</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Star Search</source>
+        <translation>Hviezdicové vyhľadávanie</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Exhaustive Search</source>
+        <translation>Dôkladné vyhľadávanie</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>1 (Fast)</source>
+        <translation>1 (rýchle)</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subpixel Refinement</source>
+        <translation>Subpixelové spresnenie</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>7 (Best)</source>
+        <translation>7 (najlepšie)</translation>
+    </message>
+    <message>
+        <location line="+78"/>
+        <source>Motion Vector</source>
+        <translation>Vektor pohybu</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Maximum Motion Vector Search Range:</source>
+        <translation>Maximálny rozsah hľadania vektoru pohybu:</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Prediction</source>
+        <translation>Predvídanie</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Weighted Prediction for B-frames</source>
+        <translation>Predvídanie záťaže pre B snímky</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Constrained Intra Prediction</source>
+        <translation>Obmedzené predvídanie záťaže</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Weighted Prediction for P-frames:</source>
+        <translation>Predvídanie záťaže pre P snímky:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+217"/>
+        <location line="+36"/>
+        <source>Disabled</source>
+        <translation>Vypnuté</translation>
+    </message>
+    <message>
+        <location line="-248"/>
+        <source>Weighted References</source>
+        <translation>Odporúčaná záťaž</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted References + Duplicates</source>
+        <translation>Odporúčaná záťaž + duplikáty</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Frame</source>
+        <translation>Snímka</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Frame Encoding</source>
+        <translation>Zakódovanie snímok</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Loop Filter:</source>
+        <translation>Filter slučky:</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Open GOP:</source>
+        <translation>Otvoriť skupinu obrázkov:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Normal Mode</source>
+        <translation>Normálny režim</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Blu-ray Mode</source>
+        <translation>Režim Blu-ray</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Interlaced:</source>
+        <translation>Prekladaný:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Top Field First</source>
+        <translation>Najskôr horná polsnímka</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bottom Field First</source>
+        <translation>Najskôr dolná polsnímka</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Maximum Reference Frames:</source>
+        <translation>Maximum referenčných snímok:</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>B-frames</source>
+        <translation>B snímky</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>B-frames as References:</source>
+        <translation>B snímky ako referencie:</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Strictly Hierarchical Pyramid</source>
+        <translation>Príne hierarchická pyramída</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Non-strict (Not Blu-ray Compatible)</source>
+        <translation>Nie prísne (nie je kompatibilné s Blu-ray)</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>Fast</source>
+        <translation>Rýchla</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Optimal</source>
+        <translation>Optimálne</translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>B-frame Bias:</source>
+        <translation>Miera použitia B snímok:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Maximum Consecutive B-frames:</source>
+        <translation>Maximum následných B snímok:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Adaptive B-frame Decision:</source>
+        <translation>Adaptívne rozhodovanie B snímok:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>I-frames</source>
+        <translation>I snímky</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>GOP Size:</source>
+        <translation>Veľkosť skupiny obrázkov:</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Minimum:</source>
+        <translation>Minimálne:</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Maximum:</source>
+        <translation>Maximálne:</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I-frame Threshold:</source>
+        <translation>Prah I snímok:</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <location line="+6"/>
+        <source>Analysis</source>
+        <translation>Analýza</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Trellis Quantization:</source>
+        <translation>Kvantifikácia mriežkového kódovania:</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Final Macroblock Only</source>
+        <translation>Len finálny makroblok</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Always On</source>
+        <translation>Vždy zapnuté</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Fast Skip Detection on P-frames</source>
+        <translation>Detekcia s rýchlym preskokom na P snímkach</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>DCT Decimation on P-frames</source>
+        <translation>DCT decimácia na P snímkach</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Psychovisual Rate Distortion Optimisation:</source>
+        <translation>Psychovizuálna optimalizácia miery skreslenia:</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise Reduction:</source>
+        <translation>Redukcia šumu:</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Noise Reduction Intra:</source>
+        <translation>Redukcia vnútorného šumu:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Noise Reduction Inter:</source>
+        <translation>Redukcia vonkajšieho šumu:</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Strong Intra Smoothing</source>
+        <translation>Silné vnútorné vyhladzovanie</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Quantisation Matrix</source>
+        <translation>Kvantifikačná matrica</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Flat Matrix</source>
+        <translation>Plochá matrica</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>JVT Matrix</source>
+        <translation>JVT matrica</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Custom Matrix</source>
+        <translation>Vlastná matrica</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+818"/>
+        <source>Edit</source>
+        <translation>Upraviť</translation>
+    </message>
+    <message>
+        <location line="-771"/>
+        <source>Quantiser Control</source>
+        <translation>Riadenie kvantifikátorov</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Chroma to Luma Quantiser Offset:</source>
+        <translation>Posuv kvantifikátorov farebnej zložky proti jasovej zložke:</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>I and P-frame Quantiser Ratio:</source>
+        <translation>Pomer kvantifikátorov I a P snímok:</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <location line="+168"/>
+        <location line="+302"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location line="-448"/>
+        <source>Maximum Quantiser Step:</source>
+        <translation>Maximálny krok kvantifikátorov:</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Cb</source>
+        <translation>Cb</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Cr</source>
+        <translation>Cr</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>P and B-frame Quantiser Ratio:</source>
+        <translation>Pomer kvantifikátorov P a B snímok:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Average Bitrate Tolerance:</source>
+        <translation>Tolerancia priemernej prenosovej rýchlosti:</translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>Quantiser Curve Compression</source>
+        <translation>Kompresia krivky kvantifikátorov</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Quantiser Curve Compression:</source>
+        <translation>Kompresia krivky kvantifikátorov:</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Reduce Fluctuation Before Curve Compression:</source>
+        <translation>Redukcia výkyvov pred kompresiou krivky:</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>Reduce Fluctuation After Curve Compression:</source>
+        <translation>Redukcia výkyvov po kompresii krivky:</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Adaptive Quantisation</source>
+        <translation>Adaptívna kvantifikácia</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Variance AQ:</source>
+        <translation>Rozptyl AQ:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Normal</source>
+        <translation>Normálna</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance AQ</source>
+        <translation>Automatický rozptyl AQ</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Strength:</source>
+        <translation>Sila:</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Advanced 1</source>
+        <translation>Pokročilé 1</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Video Buffer Verifier</source>
+        <translation>Kontrola video zásobníka</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Maximum VBV Bitrate:</source>
+        <translation>Maximálny dátový tok VBV:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Initial VBV Buffer Occupancy:</source>
+        <translation>Počiatočné obsadenie VBV zásobníka:</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>kbit</source>
+        <translation>kB</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>kbit/s</source>
+        <translation>kB/s</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>VBV Buffer Size:</source>
+        <translation>Veľkosť VBV zásobníka:</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Slicing</source>
+        <translation>Krájanie bitov (slicing)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Slices per Frame:</source>
+        <translation>Plátkov (slices) na snímku:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Maximum Size per Slice:</source>
+        <translation>Maximálna veľkosť na plátok:</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>bytes</source>
+        <translation>bajtov</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Maximum Macroblocks per Slice:</source>
+        <translation>Maximálne makrobloky pre plátky (slice):</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>Zones</source>
+        <translation>Zóny</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Add</source>
+        <translation>Pridať</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Advanced 2</source>
+        <translation>Pokročilé 2</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Multithreading</source>
+        <translation>Viacvláknové spracovanie</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Disable</source>
+        <translation>Vypnúť</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Auto-detect</source>
+        <translation>Automatická detekcia</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Custom:</source>
+        <comment>multithreading</comment>
+        <translation>Vlastné:</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Enforce Repeatability</source>
+        <translation>Vynútiť opakovateľnosť</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Slice-based Threading</source>
+        <translation>Základné orezanie vlákien</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Custom Threaded Lookahead Buffer:</source>
+        <translation>Vlastný zásobník vzhľadu vlákien:</translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>Output 1</source>
+        <translation>Výstup 1</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Output</source>
+        <translation>Výstup</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Generate Access Unit Delimiters</source>
+        <translation>Generovať prístup obmedzovačov jednotiek</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pixel Aspect Ratio</source>
+        <translation>Pomer strán v pixeloch</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Custom:</source>
+        <comment>PAR</comment>
+        <translation>Vlastné:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>As Input</source>
+        <translation>Ako vstup</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>:</source>
+        <translation>:</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Predefined Aspect Ratio:</source>
+        <translation>Prednastavený pomer strán:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>16:15 (PAL 4:3)</source>
+        <translation>16:15 (PAL 4:3)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>64:45 (PAL 16:9)</source>
+        <translation>64:45 (PAL 16:9)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>8:9 (NTSC 4:3)</source>
+        <translation>8:9 (NTSC 4:3)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>32:27 (NTSC 16:9)</source>
+        <translation>32:27 (NTSC 16:9)</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Output 2</source>
+        <translation>Výstup 2</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Video Usability Information</source>
+        <translation>Informácia o použití videa</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>These settings are only suggestions for the playback equipment.  Use at your own risk.</source>
+        <translation>Tieto nastavenia sú len inštrukcie pre prehrávacie zariadenie. Použitie je na vlastné riziko.</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Overscan:</source>
+        <translation>Zosnímanie:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+46"/>
+        <location line="+58"/>
+        <location line="+63"/>
+        <location line="+73"/>
+        <source>Undefined</source>
+        <translation>Nedefinované</translation>
+    </message>
+    <message>
+        <location line="-235"/>
+        <source>Show</source>
+        <translation>Zobraziť</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Crop</source>
+        <translation>Orezanie</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Video Format:</source>
+        <translation>Video formát:</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Component</source>
+        <translation>Komponentný</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>PAL</source>
+        <translation>PAL</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>NTSC</source>
+        <translation>NTSC</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>SECAM</source>
+        <translation>SECAM</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MAC</source>
+        <translation>MAC</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Colour Primaries:</source>
+        <translation>Primárne farby:</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+63"/>
+        <location line="+73"/>
+        <source>BT709</source>
+        <translation>BT709</translation>
+    </message>
+    <message>
+        <location line="-131"/>
+        <location line="+63"/>
+        <source>BT470M</source>
+        <translation>BT470M</translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <location line="+63"/>
+        <location line="+73"/>
+        <source>BT470BG</source>
+        <translation>BT470BG</translation>
+    </message>
+    <message>
+        <location line="-131"/>
+        <location line="+136"/>
+        <source>SMPTE170M</source>
+        <translation>SMPTE170M</translation>
+    </message>
+    <message>
+        <location line="-131"/>
+        <location line="+78"/>
+        <location line="+58"/>
+        <source>SMPTE240M</source>
+        <translation>SMPTE240M</translation>
+    </message>
+    <message>
+        <location line="-131"/>
+        <source>Film</source>
+        <translation>Film</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Transfer Characteristics:</source>
+        <translation>Charakteristika prevodu:</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Linear</source>
+        <translation>Lineárna</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>LOG100</source>
+        <translation>LOG100</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>LOG316</source>
+        <translation>LOG316</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>SMPTEL170M</source>
+        <translation>SMPTEL170M</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Colour Matrix:</source>
+        <translation>Matrica farieb:</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>FCC</source>
+        <translation>FCC</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>GBR</source>
+        <translation>GBR</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>YCgCo</source>
+        <translation>YCgCo</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>HRD Parameters:</source>
+        <translation>Parametre HRD:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>None</source>
+        <translation>Nie je</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>VBR</source>
+        <translation>VBR</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>CBR</source>
+        <translation>CBR</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Chroma Sample Location:</source>
+        <translation>Umiestnenie farebnej zložky vzorky:</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Full Range Samples</source>
+        <translation>Plný rozsah snímok</translation>
+    </message>
+</context>
+<context>
+    <name>x265CustomMatrixDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265CustomMatrixDialog.ui" line="+14"/>
+        <source>x265 Custom Matrix</source>
+        <translation>Vlastná matrica x265</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Intra 4x4</source>
+        <translation>Vnútri 4x4</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+446"/>
+        <location line="+446"/>
+        <location line="+703"/>
+        <source>Luma:</source>
+        <translation>Jasová zložka:</translation>
+    </message>
+    <message>
+        <location line="-1385"/>
+        <location line="+446"/>
+        <source>Chroma U/V:</source>
+        <translation>Farebná zložka U/V:</translation>
+    </message>
+    <message>
+        <location line="-238"/>
+        <source>Inter 4x4</source>
+        <translation>Mimo 4x4</translation>
+    </message>
+    <message>
+        <location line="+446"/>
+        <source>Intra 8x8</source>
+        <translation>Vnútri 8x8</translation>
+    </message>
+    <message>
+        <location line="+703"/>
+        <source>Inter 8x8</source>
+        <translation>Mimo 8x8</translation>
+    </message>
+    <message>
+        <location line="+727"/>
+        <source>Load File</source>
+        <translation>Načítať súbor</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cancel</source>
+        <translation>Zrušiť</translation>
+    </message>
+</context>
+<context>
+    <name>xvid4</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+32"/>
+        <location line="+24"/>
+        <source>None</source>
+        <translation>Nie je</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Low</source>
+        <translation>Nízka</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Medium</source>
+        <translation>Stredný</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Full</source>
+        <translation>Plná</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>H.263</source>
+        <translation>H.263</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MPEG</source>
+        <translation>MPEG</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Custom</source>
+        <translation>Vlastné</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>DCT</source>
+        <translation>DTC</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Qpel16</source>
+        <translation>Qpel16</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Qpel8</source>
+        <translation>Qpel8</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Square</source>
+        <translation>Štvorec</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>One thread</source>
+        <translation>Jedno vlákno</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Two threads)</source>
+        <translation>Dve vlákna</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Three threads</source>
+        <translation>Tri vlákna</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto (#cpu)</source>
+        <translation>Automaticky (CPU)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>1:1 (PC)</source>
+        <translation>1:1 (PC)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4:3 (PAL)</source>
+        <translation>4:3 (PAL)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4:3 (NTSC)</source>
+        <translation>4:3 (NTSC)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>16:9 (PAL)</source>
+        <translation>16:9 (PAL)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>16:9 (NTSC)</source>
+        <translation>16:9 (NTSC)</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Threading</source>
+        <translation>Vláknenie</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Mi_n. quantizer:</source>
+        <translation>Mi_n. kvantifikátor:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ma_x. quantizer:</source>
+        <translation>Ma_x. kvantifikátor:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Trellis quantization</source>
+        <translation>_Kvantifikácia mriežkového kódovania</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Number of B frames:</source>
+        <translation>_Počet B snímok:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation>Vypustiť identické snímky (zakáže B-snímky)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation>Pomer úbytku snímok:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Quantization type:</source>
+        <translation>_Typ kvantifikácie:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Macroblock decision:</source>
+        <translation>_Rozhodovanie makroblokov:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Profile:</source>
+        <translation>Profil:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Aspect Ratio:</source>
+        <translation>Pomer strán pixelu:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>_Gop Size:</source>
+        <translation>Veľkosť _skupiny obrázkov:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Use XVID fcc (else DIVX)</source>
+        <translation>Použiť Xvid fcc (inak DivX)</translation>
+    </message>
+    <message>
+        <location line="-32"/>
+        <source>Motion Estimation</source>
+        <translation>Odhad pohybu</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation>Režim kódovania</translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
+        <translation>Nastavenie snímky</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Miscellaneous</source>
+        <translation>Rôzne</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Quantization</source>
+        <translation>Kvantifikácia</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Threads</source>
+        <translation>Vlákna</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Aspect Ratio</source>
+        <translation>Pomer strán</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Rate Control</source>
+        <translation>Riadenie prenosovej rýchlosti</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Xvid4 MPEG-4 ASP configuration</source>
+        <translation>Konfigurácia Xvid4 MPEG-4 ASP</translation>
+    </message>
+</context>
+<context>
+    <name>yadif</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
+        <source>Yadif</source>
+        <translation>Yadif</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Yadif, port of avisynth version (c) Fizick.</source>
+        <translation>Yadif, portované pre avisynth verziu © Fizick.</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>Bottom field first</source>
+        <translation>Najskôr dolná polsnímka</translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <source>Top field first</source>
+        <translation>Najskôr horná polsnímka</translation>
+    </message>
+    <message>
+        <location line="-7"/>
+        <source>Frame : Temporal &amp; spatial check</source>
+        <translation>Snímka: Časová a priestorová kontrola</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Field :  Temporal &amp; spatial check</source>
+        <translation>Polsnímka: Časová a priestorová kontrola</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Frame : Skip spatial temporal check</source>
+        <translation>Snímka: Preskočiť priestorovú časovú kontrolu</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Field : Skip spatial temporal check</source>
+        <translation>Posnímka: Preskočiť priestorovú časovú kontrolu</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Deint all</source>
+        <translation>Rozklad všetkého</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deint interlaced</source>
+        <translation>Rozklad prekladaného</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Mode:</source>
+        <translation>_Režim:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Deint:</source>
+        <translation>_Rozklad:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Order:</source>
+        <translation>_Poradie:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>yadif</source>
+        <translation>yadif</translation>
+    </message>
+</context>
+</TS>

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_sr.ts -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_sr.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">Покушај да отворим %s није успео!</translation>
     </message>
@@ -51,12 +51,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+47"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -370,27 +370,27 @@
 <context>
     <name>DialogProcessing</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+26"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+33"/>
         <source>00:00:00</source>
         <translation type="unfinished">00:00:00</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+51"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location line="-19"/>
+        <location line="-70"/>
         <source>Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+6"/>
         <source>TimeLeft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+41"/>
         <source>ProcessImages</source>
         <translation type="unfinished"></translation>
     </message>
@@ -400,7 +400,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-14"/>
         <source>0 fps</source>
         <translation type="unfinished"></translation>
     </message>
@@ -436,30 +436,28 @@
 <context>
     <name>FDK-AAC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
-        <source>_Profile::</source>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+9"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+2"/>
         <source>SBR enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+7"/>
-        <source>After burner</source>
+        <location line="+2"/>
+        <source>Afterburner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>FDK-AAC Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -609,12 +607,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>   (0 track(s))</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+145"/>
+        <location line="+155"/>
         <source>&amp;Shift:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -630,12 +623,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+946"/>
+        <location line="+931"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-871"/>
+        <location line="-856"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -753,17 +746,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+210"/>
         <source>Play filtered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-169"/>
         <source>Vol&amp;ume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-1006"/>
+        <source> (0 tracks)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+981"/>
         <source>Selection: 000000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -788,11 +786,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Alt+Return</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location line="+9"/>
         <source>Save &amp;Video...</source>
         <translation type="unfinished"></translation>
@@ -826,16 +819,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>&amp;Calculator...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>F7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location line="+15"/>
         <source>&amp;Input</source>
         <translation type="unfinished"></translation>
@@ -909,7 +892,7 @@
 <context>
     <name>Opus</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -931,11 +914,6 @@
         <source>Evaluate</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+3"/>
-        <source>Ctrl+Return</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>VapourSynthProxy</name>
@@ -989,7 +967,7 @@
     </message>
     <message>
         <location line="+10"/>
-        <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1050,7 +1028,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1192,21 +1170,27 @@
         <translation type="unfinished">Постављање приоритета</translation>
     </message>
     <message>
-        <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="obsolete">Користи _алтернативни таг за MP3 у .mp4</translation>
-    </message>
-    <message>
         <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Auto-Append Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>XVideo (best)</source>
         <translation type="unfinished">XVideo (најбоље)</translation>
     </message>
@@ -1247,7 +1231,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+213"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
         <translation type="unfinished">ПЦМ</translation>
     </message>
@@ -1341,18 +1325,18 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+277"/>
+        <location line="+283"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+423"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
         <source>Audio</source>
         <translation type="unfinished">Звук</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-73"/>
+        <location filename="../../common/gui_savenew.cpp" line="-239"/>
+        <location line="+170"/>
         <location line="+12"/>
         <location line="+16"/>
-        <location line="+8"/>
         <source>Video</source>
         <translation type="unfinished">Видео</translation>
     </message>
@@ -1374,16 +1358,12 @@
         <translation type="unfinished">Поставке</translation>
     </message>
     <message>
-        <source>-</source>
-        <translation type="obsolete">-</translation>
-    </message>
-    <message>
         <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+72"/>
         <source>Copy</source>
         <translation type="unfinished">Без измене</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation type="unfinished">Филтери</translation>
@@ -1547,12 +1527,12 @@
         <translation type="unfinished">Грешка у кодецима</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+369"/>
+        <location filename="../../common/gui_main.cpp" line="+370"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">Није кодирано у овој верзији</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+214"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
@@ -1688,8 +1668,7 @@
         <translation type="unfinished">Нешто није успело приликом додавања</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+321"/>
+        <location line="+320"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">Нешто лоше се десило (II)</translation>
     </message>
@@ -1747,7 +1726,7 @@
         <translation type="unfinished">Главна звучна стаза</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+264"/>
         <source>AvsProxy</source>
         <translation type="unfinished">AvsProxy</translation>
     </message>
@@ -1825,30 +1804,35 @@
         <translation type="unfinished">Снимам звук</translation>
     </message>
     <message>
-        <location line="+318"/>
-        <location line="+83"/>
+        <location line="+322"/>
+        <source>Maximum number of 99999 images reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+76"/>
         <source>Done</source>
         <translation type="unfinished">Завршено</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-76"/>
         <source>Saved %d images.</source>
         <translation type="unfinished">Сачувано %d слика.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="-250"/>
+        <location filename="../../common/gui_main.cpp" line="-251"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
         <location line="+4"/>
         <location filename="../../common/gui_save.cpp" line="+2"/>
-        <location line="+99"/>
+        <location line="+92"/>
         <location line="+7"/>
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
@@ -2041,7 +2025,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-290"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-296"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2071,7 +2055,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2154,7 +2138,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-68"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-72"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2276,12 +2260,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <location line="+2"/>
         <source>Save current settings as default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Load saved settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2401,7 +2386,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2421,8 +2406,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
-        <location line="+44"/>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-43"/>
+        <location line="+43"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished"></translation>
@@ -2452,7 +2442,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="-144"/>
-        <location filename="../../common/gui_save.cpp" line="-597"/>
+        <location filename="../../common/gui_save.cpp" line="-602"/>
         <source>No audio track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2500,7 +2490,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1449"/>
+        <location filename="../../common/gui_main.cpp" line="-1447"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2525,13 +2515,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+68"/>
+        <location line="+126"/>
+        <location line="+73"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-48"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2541,7 +2531,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2564,7 +2554,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+795"/>
+        <location line="+789"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -2595,7 +2585,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+297"/>
+        <location line="+298"/>
         <source>Oops</source>
         <translation type="unfinished">Упс...</translation>
     </message>
@@ -2615,7 +2605,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>No</source>
         <translation type="unfinished">Не</translation>
     </message>
@@ -2625,7 +2615,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Job</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2635,7 +2625,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Output file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2650,7 +2640,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Select PNG to Save</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2686,22 +2676,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Maximum number of 9999 images reached, aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Saving images failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+25"/>
         <source>PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2731,29 +2716,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-207"/>
+        <location filename="../../common/gui_savenew.cpp" line="-210"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+182"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+24"/>
         <source>Cannot create encoder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-8"/>
-        <source>Cannot setup codec. Bitrate too low?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+57"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2765,20 +2744,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-253"/>
-        <location line="+286"/>
+        <location line="-257"/>
+        <location line="+290"/>
         <location line="+26"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-312"/>
-        <location line="+286"/>
+        <location line="-326"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+290"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="-102"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The choice of cut points may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Do you want to continue anyway?</source>
         <translation type="unfinished"></translation>
@@ -3126,7 +3115,7 @@
         <translation type="unfinished">MP4</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>AAC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3176,12 +3165,12 @@
         <translation type="unfinished">Грешка у меморији</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+495"/>
         <source>Saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+181"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3192,7 +3181,7 @@
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
-        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+374"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+382"/>
         <source>Unknown</source>
         <translation type="unfinished">Непознато</translation>
     </message>
@@ -3283,20 +3272,20 @@
         <translation type="unfinished">1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
-        <location line="+30"/>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
-        <location line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
         <source>Codec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
         <source>Internal error finding codec 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Internal error opening 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3312,31 +3301,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+812"/>
-        <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
-Dropping a keyframe will result in severely corrupted video.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
-Dropping a frame may result in some video corruption.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Do not warn again and drop frames silently while saving this video?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3574,7 +3539,7 @@
 <context>
     <name>avimuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+75"/>
         <source>Bad Idea</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3651,7 +3616,7 @@
 <context>
     <name>bitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+51"/>
         <source>Constant Bitrate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3768,34 +3733,39 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+23"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+51"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>blackframes</name>
@@ -3816,6 +3786,29 @@
     </message>
 </context>
 <context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -3844,7 +3837,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
+        <source>59.94  (NTSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3858,7 +3851,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+141"/>
+        <location line="+146"/>
         <source>Source Fps:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4188,7 +4181,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4449,20 +4442,25 @@
         <translation type="unfinished">Kодирање...</translation>
     </message>
     <message>
-        <location line="+44"/>
-        <location line="+220"/>
+        <location line="+41"/>
+        <location line="+247"/>
         <location line="+21"/>
         <source>None</source>
         <translation type="unfinished">Ништа</translation>
     </message>
     <message>
-        <location line="-258"/>
-        <location line="+251"/>
+        <location line="-261"/>
+        <location line="+254"/>
         <source>Unknown</source>
         <translation type="unfinished">Непознато</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-157"/>
+        <source>Keep dialog open when finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>Audio Codec:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4536,17 +4534,17 @@
         <translation type="unfinished">0 kB/s</translation>
     </message>
     <message>
-        <location line="-385"/>
+        <location line="-396"/>
         <source>Shut down computer when finished</source>
         <translation type="unfinished">Угаси рачунар након завршеног посла</translation>
     </message>
     <message>
-        <location line="-11"/>
+        <location line="-58"/>
         <source>Time Remaining:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+78"/>
         <source>Priority:</source>
         <translation type="unfinished">Приоритет:</translation>
     </message>
@@ -4576,32 +4574,32 @@
         <translation type="unfinished">Ниско</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+69"/>
         <source>Pause / Abort</source>
         <translation type="unfinished">Пауза / Прекид</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+13"/>
         <source>Advanced</source>
         <translation type="unfinished">Напредније</translation>
     </message>
     <message>
-        <location line="-175"/>
+        <location line="-199"/>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Phase:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+127"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+154"/>
+        <location line="+141"/>
         <source>Video Codec:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4694,7 +4692,7 @@
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished"></translation>
@@ -4705,7 +4703,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+13"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4718,13 +4741,13 @@
 <context>
     <name>fadeToBlack</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
-        <location line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+55"/>
+        <location line="+20"/>
         <source>Fade to black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-19"/>
         <source>Fade to black in/out.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4749,7 +4772,7 @@
         <translation type="unfinished">Бледи улаз</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>_Fade type:</source>
         <translation type="unfinished">Тип _изблеђивања:</translation>
     </message>
@@ -4767,7 +4790,7 @@
 <context>
     <name>ffVAEncH264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4782,12 +4805,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Profile:</source>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4798,16 +4842,21 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Bitrate (kbps):</source>
+        <source>Quality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4817,7 +4866,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4825,27 +4874,53 @@
 <context>
     <name>ffVAEncHEVC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+343"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4855,7 +4930,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4863,7 +4938,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+223"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+256"/>
         <source>Default</source>
         <translation type="unfinished">Подразумевано</translation>
     </message>
@@ -5332,8 +5407,32 @@
 <context>
     <name>ffnvenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+229"/>
+        <source>Controlled by Preset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
         <source>Low Quality</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5385,6 +5484,12 @@
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+        <source>RC Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Preset:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5394,6 +5499,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Bitrate (kbps):</source>
@@ -5407,32 +5518,48 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Frame Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>NVENC H.264 configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
-        <source>nvEnc HEVC  configuration</source>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+28"/>
+        <source>NVENC HEVC configuration</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5444,7 +5571,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+87"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5540,7 +5667,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5613,7 +5740,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5769,7 +5896,7 @@
 <context>
     <name>flvdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6300,7 +6427,7 @@
 <context>
     <name>jobs</name>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Oops</source>
         <translation type="unfinished">Упс...</translation>
     </message>
@@ -6310,7 +6437,7 @@
         <translation type="unfinished">Нешто веома лоше се десило приликом прављења листе задатака</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>There are no jobs stored</source>
         <translation type="unfinished">Нема сачуваних задатака.</translation>
     </message>
@@ -6798,12 +6925,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+523"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6903,7 +7030,7 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+167"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
         <source>Saving Mkv</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7002,31 +7129,46 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Проблем при читању SVQ3 заглавља</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+67"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <location line="+17"/>
         <source>Unsupported</source>
         <translation type="unfinished">Није подржано</translation>
     </message>
     <message>
-        <location line="-9"/>
-        <source>Only MP4Video, H264, and H265 supported for video</source>
+        <location line="-17"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+182"/>
         <source>Saving mp4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7036,7 +7178,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7071,7 +7213,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Do not rotate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7097,6 +7239,51 @@
     </message>
     <message>
         <location line="+3"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>MP4 Muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7268,7 +7455,7 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+242"/>
+        <location filename="../../common/gui_navigate.cpp" line="+232"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7498,21 +7685,17 @@
 <context>
     <name>psdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Грешка</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
         <translation type="unfinished">Правим индекс</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -7582,7 +7765,7 @@
         <translation type="unfinished">Администраторска овлашћења су потребна за извршавање ове операције.</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+126"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7597,7 +7780,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+185"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7635,7 +7818,7 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+212"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+206"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7715,21 +7898,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+626"/>
+        <location line="+681"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+262"/>
+        <location line="+230"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+334"/>
-        <source> (%d track(s))</source>
+        <location line="+70"/>
+        <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>qgui2menu</name>
@@ -7964,8 +8157,18 @@
         <source>Yes</source>
         <translation type="unfinished">Да</translation>
     </message>
+    <message numerus="yes">
+        <location line="+72"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
     <message>
-        <location line="+98"/>
+        <location line="+34"/>
         <source>Mono</source>
         <translation type="unfinished">Моно</translation>
     </message>
@@ -8001,12 +8204,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+27"/>
+        <location line="+33"/>
         <source>Total Duration:	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-31"/>
         <source>Extra Video Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8021,12 +8224,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Codec:		</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8051,18 +8254,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-155"/>
+        <location line="-170"/>
         <source>%2.3f fps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+81"/>
+        <location line="+90"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-87"/>
+        <location line="-96"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8070,7 +8273,7 @@
 <context>
     <name>qshell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+53"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
         <translation type="unfinished"></translation>
@@ -8082,6 +8285,19 @@
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>qtalert</name>
@@ -8143,6 +8359,16 @@
         <source>Video Only Muxer Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>removeplane</name>
@@ -8195,7 +8421,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
         <source>_Mode:</source>
         <translation type="unfinished">_Режим:</translation>
     </message>
@@ -8205,7 +8431,7 @@
         <translation type="unfinished">_Нова учестаност кадрова:</translation>
     </message>
     <message>
-        <location line="-319"/>
+        <location line="-323"/>
         <source>Custom</source>
         <translation type="unfinished">Произвољно</translation>
     </message>
@@ -8231,7 +8457,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
+        <source>59.94  (NTSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8245,7 +8471,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+284"/>
+        <location line="+288"/>
         <source>Resample fps</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8253,7 +8479,7 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished">Висина и ширина не могу бити непарни бројеви</translation>
     </message>
@@ -8358,17 +8584,31 @@
         <translation type="unfinished">16:9</translation>
     </message>
     <message>
+        <location line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+338"/>
+        <source>Lanzcos3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+251"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+172"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-166"/>
         <source>1%</source>
         <translation type="unfinished">1%</translation>
     </message>
@@ -8613,17 +8853,7 @@
     </message>
     <message>
         <location line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+18"/>
-        <source>Lanzcos3</source>
+        <source>Lanczos-3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8982,26 +9212,32 @@
 <context>
     <name>tsdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Грешка</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+183"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+325"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+84"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+207"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+19"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
         <translation type="unfinished">Правим индекс</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -9093,19 +9329,137 @@
     </message>
 </context>
 <context>
+    <name>vaapiDeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Adaptive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Compensated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vaapiResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
-        <source>vaapi: Resize</source>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>vaapi: Resize image using vaapi.</source>
+        <source>Resize image using VA-API.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+129"/>
         <source>Width :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9116,7 +9470,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>mpeg-&gt;PC:</source>
+        <source>mpeg-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9138,7 +9492,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+197"/>
         <source>Keep Top Field</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9154,31 +9508,31 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>_Ivtc:</source>
+        <source>_IVTC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Resize:</source>
+        <source>_Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>_Deint Mode:</source>
+        <location line="+2"/>
+        <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Width :</source>
+        <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Height :</source>
+        <location line="-2"/>
+        <source>_Deint Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>vdpau</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9196,13 +9550,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
-        <source>Width :</source>
+        <location line="+131"/>
+        <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9286,6 +9640,84 @@
     </message>
 </context>
 <context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vsWindow</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
@@ -9301,7 +9733,7 @@
 <context>
     <name>webmmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+68"/>
         <source>Unsupported Video.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
         <translation type="unfinished"></translation>
@@ -9313,7 +9745,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+89"/>
         <source>Saving Webm</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9336,22 +9768,22 @@
 <context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
         <source>Processing</source>
         <translation type="unfinished">Обрада</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+33"/>
         <source>00:00:00</source>
         <translation type="unfinished">00:00:00</translation>
     </message>
     <message>
-        <location line="-13"/>
+        <location line="-27"/>
         <source>Elapsed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+14"/>
         <source>Time Remaining:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9359,7 +9791,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9375,7 +9807,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished">Произвољно</translation>
     </message>
@@ -9496,7 +9928,7 @@
         <translation type="unfinished">Контрола протока</translation>
     </message>
     <message>
-        <location line="+2882"/>
+        <location line="+2887"/>
         <source>Disable</source>
         <translation type="unfinished">Онемогући</translation>
     </message>
@@ -9506,18 +9938,18 @@
         <translation type="unfinished">Нађи сам</translation>
     </message>
     <message>
-        <location line="-2298"/>
+        <location line="-2303"/>
         <source>Motion Estimation</source>
         <translation type="unfinished">Процена покрета</translation>
     </message>
     <message>
         <location line="+392"/>
-        <location line="+2596"/>
+        <location line="+2601"/>
         <source>None</source>
         <translation type="unfinished">Ништа</translation>
     </message>
     <message>
-        <location line="-2591"/>
+        <location line="-2596"/>
         <source>Spatial</source>
         <translation type="unfinished">Просторно</translation>
     </message>
@@ -9543,12 +9975,12 @@
         <translation type="unfinished">Брзо</translation>
     </message>
     <message>
-        <location line="+1598"/>
+        <location line="+1603"/>
         <source>Output</source>
         <translation type="unfinished">Излаз</translation>
     </message>
     <message>
-        <location line="-3165"/>
+        <location line="-3170"/>
         <location line="+669"/>
         <source>1</source>
         <translation type="unfinished">1</translation>
@@ -9655,7 +10087,17 @@
         <translation type="unfinished">Нормано</translation>
     </message>
     <message>
-        <location line="+590"/>
+        <location line="+5"/>
+        <source>Auto Variance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+585"/>
         <source>Pixel Aspect Ratio</source>
         <translation type="unfinished">Размера пиксела</translation>
     </message>
@@ -9675,7 +10117,7 @@
         <translation type="unfinished">CBR</translation>
     </message>
     <message>
-        <location line="-3949"/>
+        <location line="-3954"/>
         <source>x264 Configuraton</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9691,12 +10133,12 @@
     </message>
     <message>
         <location line="+7"/>
-        <location line="+3152"/>
+        <location line="+3157"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3110"/>
+        <location line="-3115"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9836,12 +10278,12 @@
     </message>
     <message>
         <location line="+14"/>
-        <location line="+2490"/>
+        <location line="+2495"/>
         <source>frames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2466"/>
+        <location line="-2471"/>
         <source>Sequence Parameter Set Identifer:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10009,12 +10451,12 @@
     </message>
     <message>
         <location line="+12"/>
-        <location line="+1328"/>
+        <location line="+1333"/>
         <source>Strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1289"/>
+        <location line="-1294"/>
         <source>Threshold:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10216,12 +10658,12 @@
     </message>
     <message>
         <location line="+10"/>
-        <location line="+856"/>
+        <location line="+861"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-809"/>
+        <location line="-814"/>
         <source>Quantiser Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10238,12 +10680,12 @@
     <message>
         <location line="+85"/>
         <location line="+179"/>
-        <location line="+302"/>
+        <location line="+307"/>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-459"/>
+        <location line="-464"/>
         <source>Maximum Quantiser Step:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10298,12 +10740,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Auto Variance AQ</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+91"/>
+        <location line="+114"/>
         <source>Advanced 1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10708,7 +11145,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished">Произвољно</translation>
     </message>
@@ -11912,7 +12349,7 @@
 <context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+37"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+32"/>
         <location line="+24"/>
         <source>None</source>
         <translation type="unfinished">Ништа</translation>
@@ -11973,22 +12410,38 @@
         <translation type="unfinished">Више нити</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="-2"/>
         <source>Motion Estimation</source>
         <translation type="unfinished">Процена покрета</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+35"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+25"/>
         <source>Rate Control</source>
         <translation type="unfinished">Контрола протока</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-52"/>
         <source>Aspect Ratio:</source>
         <translation type="unfinished">Размера:</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-46"/>
         <source>DCT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12033,12 +12486,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>MotionEstimation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+15"/>
         <source>Mi_n. quantizer:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12059,6 +12507,16 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>_Quantization type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12083,12 +12541,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Advanced Simple Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+25"/>
         <source>Quantization</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12121,23 +12574,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Temporal &amp; spatial check</source>
-        <translation type="obsolete">Темпорална и спатиална провера</translation>
-    </message>
-    <message>
-        <source>Bob, temporal &amp; spatial check</source>
-        <translation type="obsolete">Bob, темпорална и спатиална провера</translation>
-    </message>
-    <message>
-        <source>Skip spatial temporal check</source>
-        <translation type="obsolete">Прескочи спатиалну темпоралну проверу</translation>
-    </message>
-    <message>
-        <source>Bob, skip spatial temporal check</source>
-        <translation type="obsolete">Bob, прескочи спатиалну темпоралну проверу</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+70"/>
         <source>Bottom field first</source>
         <translation type="unfinished">Најпре доња поља</translation>
     </message>

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_sr@latin.ts -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_sr@latin.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">Pokušaj da otvorim %s nije uspeo!</translation>
     </message>
@@ -51,12 +51,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+47"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -370,27 +370,27 @@
 <context>
     <name>DialogProcessing</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+26"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+33"/>
         <source>00:00:00</source>
         <translation type="unfinished">00:00:00</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+51"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location line="-19"/>
+        <location line="-70"/>
         <source>Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+6"/>
         <source>TimeLeft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+41"/>
         <source>ProcessImages</source>
         <translation type="unfinished"></translation>
     </message>
@@ -400,7 +400,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-14"/>
         <source>0 fps</source>
         <translation type="unfinished"></translation>
     </message>
@@ -436,30 +436,28 @@
 <context>
     <name>FDK-AAC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
-        <source>_Profile::</source>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+9"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+2"/>
         <source>SBR enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+7"/>
-        <source>After burner</source>
+        <location line="+2"/>
+        <source>Afterburner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>FDK-AAC Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -609,12 +607,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>   (0 track(s))</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+145"/>
+        <location line="+155"/>
         <source>&amp;Shift:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -630,12 +623,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+946"/>
+        <location line="+931"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-871"/>
+        <location line="-856"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -753,17 +746,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+210"/>
         <source>Play filtered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-169"/>
         <source>Vol&amp;ume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-1006"/>
+        <source> (0 tracks)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+981"/>
         <source>Selection: 000000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -788,11 +786,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Alt+Return</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location line="+9"/>
         <source>Save &amp;Video...</source>
         <translation type="unfinished"></translation>
@@ -826,16 +819,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>&amp;Calculator...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>F7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location line="+15"/>
         <source>&amp;Input</source>
         <translation type="unfinished"></translation>
@@ -909,7 +892,7 @@
 <context>
     <name>Opus</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -931,11 +914,6 @@
         <source>Evaluate</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+3"/>
-        <source>Ctrl+Return</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>VapourSynthProxy</name>
@@ -989,7 +967,7 @@
     </message>
     <message>
         <location line="+10"/>
-        <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1050,7 +1028,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1192,21 +1170,27 @@
         <translation type="unfinished">Postavljanje prioriteta</translation>
     </message>
     <message>
-        <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="obsolete">Koristi _alternativni tag za MP3 u .mp4</translation>
-    </message>
-    <message>
         <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Auto-Append Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>XVideo (best)</source>
         <translation type="unfinished">XVideo (najbolje)</translation>
     </message>
@@ -1247,7 +1231,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+213"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
         <translation type="unfinished">PCM</translation>
     </message>
@@ -1341,18 +1325,18 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+277"/>
+        <location line="+283"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+423"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
         <source>Audio</source>
         <translation type="unfinished">Zvuk</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-73"/>
+        <location filename="../../common/gui_savenew.cpp" line="-239"/>
+        <location line="+170"/>
         <location line="+12"/>
         <location line="+16"/>
-        <location line="+8"/>
         <source>Video</source>
         <translation type="unfinished">Video</translation>
     </message>
@@ -1374,16 +1358,12 @@
         <translation type="unfinished">Postavke</translation>
     </message>
     <message>
-        <source>-</source>
-        <translation type="obsolete">-</translation>
-    </message>
-    <message>
         <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+72"/>
         <source>Copy</source>
         <translation type="unfinished">Bez izmene</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation type="unfinished">Filteri</translation>
@@ -1547,12 +1527,12 @@
         <translation type="unfinished">Greška u kodecima</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+369"/>
+        <location filename="../../common/gui_main.cpp" line="+370"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">Nije kodirano u ovoj verziji</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+214"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
@@ -1688,8 +1668,7 @@
         <translation type="unfinished">Nešto nije uspelo prilikom dodavanja</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+321"/>
+        <location line="+320"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">Nešto loše se desilo (II)</translation>
     </message>
@@ -1747,7 +1726,7 @@
         <translation type="unfinished">Glavna zvučna staza</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+264"/>
         <source>AvsProxy</source>
         <translation type="unfinished">AvsProxy</translation>
     </message>
@@ -1825,30 +1804,35 @@
         <translation type="unfinished">Snimam zvuk</translation>
     </message>
     <message>
-        <location line="+318"/>
-        <location line="+83"/>
+        <location line="+322"/>
+        <source>Maximum number of 99999 images reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+76"/>
         <source>Done</source>
         <translation type="unfinished">Završeno</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-76"/>
         <source>Saved %d images.</source>
         <translation type="unfinished">Sačuvano %d slika.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="-250"/>
+        <location filename="../../common/gui_main.cpp" line="-251"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
         <location line="+4"/>
         <location filename="../../common/gui_save.cpp" line="+2"/>
-        <location line="+99"/>
+        <location line="+92"/>
         <location line="+7"/>
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
@@ -2041,7 +2025,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-290"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-296"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2071,7 +2055,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2154,7 +2138,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-68"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-72"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2276,12 +2260,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <location line="+2"/>
         <source>Save current settings as default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Load saved settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2401,7 +2386,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2421,8 +2406,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
-        <location line="+44"/>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-43"/>
+        <location line="+43"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished"></translation>
@@ -2452,7 +2442,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="-144"/>
-        <location filename="../../common/gui_save.cpp" line="-597"/>
+        <location filename="../../common/gui_save.cpp" line="-602"/>
         <source>No audio track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2500,7 +2490,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1449"/>
+        <location filename="../../common/gui_main.cpp" line="-1447"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2525,13 +2515,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+68"/>
+        <location line="+126"/>
+        <location line="+73"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-48"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2541,7 +2531,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2564,7 +2554,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+795"/>
+        <location line="+789"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -2595,7 +2585,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+297"/>
+        <location line="+298"/>
         <source>Oops</source>
         <translation type="unfinished">Ups...</translation>
     </message>
@@ -2615,7 +2605,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>No</source>
         <translation type="unfinished">Ne</translation>
     </message>
@@ -2625,7 +2615,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Job</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2635,7 +2625,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Output file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2650,7 +2640,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Select PNG to Save</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2686,22 +2676,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Maximum number of 9999 images reached, aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Saving images failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+25"/>
         <source>PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2731,29 +2716,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-207"/>
+        <location filename="../../common/gui_savenew.cpp" line="-210"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+182"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+24"/>
         <source>Cannot create encoder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-8"/>
-        <source>Cannot setup codec. Bitrate too low?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+57"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2765,20 +2744,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-253"/>
-        <location line="+286"/>
+        <location line="-257"/>
+        <location line="+290"/>
         <location line="+26"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-312"/>
-        <location line="+286"/>
+        <location line="-326"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+290"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="-102"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The choice of cut points may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Do you want to continue anyway?</source>
         <translation type="unfinished"></translation>
@@ -3126,7 +3115,7 @@
         <translation type="unfinished">MP4</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>AAC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3176,12 +3165,12 @@
         <translation type="unfinished">Greška u memoriji</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+495"/>
         <source>Saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+181"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3192,7 +3181,7 @@
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
-        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+374"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+382"/>
         <source>Unknown</source>
         <translation type="unfinished">Nepoznato</translation>
     </message>
@@ -3283,20 +3272,20 @@
         <translation type="unfinished">1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
-        <location line="+30"/>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
-        <location line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
         <source>Codec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
         <source>Internal error finding codec 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Internal error opening 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3312,31 +3301,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+812"/>
-        <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
-Dropping a keyframe will result in severely corrupted video.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
-Dropping a frame may result in some video corruption.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Do not warn again and drop frames silently while saving this video?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3574,7 +3539,7 @@
 <context>
     <name>avimuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+75"/>
         <source>Bad Idea</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3651,7 +3616,7 @@
 <context>
     <name>bitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+51"/>
         <source>Constant Bitrate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3768,34 +3733,39 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+23"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+51"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>blackframes</name>
@@ -3816,6 +3786,29 @@
     </message>
 </context>
 <context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -3844,7 +3837,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
+        <source>59.94  (NTSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3858,7 +3851,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+141"/>
+        <location line="+146"/>
         <source>Source Fps:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4188,7 +4181,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4449,20 +4442,25 @@
         <translation type="unfinished">Kodiranje...</translation>
     </message>
     <message>
-        <location line="+44"/>
-        <location line="+220"/>
+        <location line="+41"/>
+        <location line="+247"/>
         <location line="+21"/>
         <source>None</source>
         <translation type="unfinished">Ništa</translation>
     </message>
     <message>
-        <location line="-258"/>
-        <location line="+251"/>
+        <location line="-261"/>
+        <location line="+254"/>
         <source>Unknown</source>
         <translation type="unfinished">Nepoznato</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-157"/>
+        <source>Keep dialog open when finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>Audio Codec:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4536,17 +4534,17 @@
         <translation type="unfinished">0 kB/s</translation>
     </message>
     <message>
-        <location line="-385"/>
+        <location line="-396"/>
         <source>Shut down computer when finished</source>
         <translation type="unfinished">Ugasi računar nakon završenog posla</translation>
     </message>
     <message>
-        <location line="-11"/>
+        <location line="-58"/>
         <source>Time Remaining:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+78"/>
         <source>Priority:</source>
         <translation type="unfinished">Prioritet:</translation>
     </message>
@@ -4576,32 +4574,32 @@
         <translation type="unfinished">Nisko</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+69"/>
         <source>Pause / Abort</source>
         <translation type="unfinished">Pauza / Prekid</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+13"/>
         <source>Advanced</source>
         <translation type="unfinished">Naprednije</translation>
     </message>
     <message>
-        <location line="-175"/>
+        <location line="-199"/>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Phase:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+127"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+154"/>
+        <location line="+141"/>
         <source>Video Codec:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4694,7 +4692,7 @@
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished"></translation>
@@ -4705,7 +4703,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+13"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4718,13 +4741,13 @@
 <context>
     <name>fadeToBlack</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
-        <location line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+55"/>
+        <location line="+20"/>
         <source>Fade to black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-19"/>
         <source>Fade to black in/out.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4749,7 +4772,7 @@
         <translation type="unfinished">Bledi ulaz</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>_Fade type:</source>
         <translation type="unfinished">Tip _izbleđivanja:</translation>
     </message>
@@ -4767,7 +4790,7 @@
 <context>
     <name>ffVAEncH264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4782,12 +4805,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Profile:</source>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4798,16 +4842,21 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Bitrate (kbps):</source>
+        <source>Quality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4817,7 +4866,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4825,27 +4874,53 @@
 <context>
     <name>ffVAEncHEVC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+343"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4855,7 +4930,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4863,7 +4938,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+223"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+256"/>
         <source>Default</source>
         <translation type="unfinished">Podrazumevano</translation>
     </message>
@@ -5332,8 +5407,32 @@
 <context>
     <name>ffnvenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+229"/>
+        <source>Controlled by Preset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
         <source>Low Quality</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5385,6 +5484,12 @@
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+        <source>RC Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Preset:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5394,6 +5499,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Bitrate (kbps):</source>
@@ -5407,32 +5518,48 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Frame Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>NVENC H.264 configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
-        <source>nvEnc HEVC  configuration</source>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+28"/>
+        <source>NVENC HEVC configuration</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5444,7 +5571,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+87"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5540,7 +5667,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5613,7 +5740,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5769,7 +5896,7 @@
 <context>
     <name>flvdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6300,7 +6427,7 @@
 <context>
     <name>jobs</name>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Oops</source>
         <translation type="unfinished">Ups...</translation>
     </message>
@@ -6310,7 +6437,7 @@
         <translation type="unfinished">Nešto veoma loše se desilo prilikom pravljenja liste zadataka</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>There are no jobs stored</source>
         <translation type="unfinished">Nema sačuvanih zadataka.</translation>
     </message>
@@ -6798,12 +6925,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+523"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6903,7 +7030,7 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+167"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
         <source>Saving Mkv</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7002,31 +7129,46 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Problem pri čitanju SVQ3 zaglavlja</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+67"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <location line="+17"/>
         <source>Unsupported</source>
         <translation type="unfinished">Nije podržano</translation>
     </message>
     <message>
-        <location line="-9"/>
-        <source>Only MP4Video, H264, and H265 supported for video</source>
+        <location line="-17"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+182"/>
         <source>Saving mp4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7036,7 +7178,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7071,7 +7213,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Do not rotate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7097,6 +7239,51 @@
     </message>
     <message>
         <location line="+3"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>MP4 Muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7268,7 +7455,7 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+242"/>
+        <location filename="../../common/gui_navigate.cpp" line="+232"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7498,21 +7685,17 @@
 <context>
     <name>psdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Greška</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
         <translation type="unfinished">Pravim indeks</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -7582,7 +7765,7 @@
         <translation type="unfinished">Administratorska ovlašćenja su potrebna za izvršavanje ove operacije.</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+126"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7597,7 +7780,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+185"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7635,7 +7818,7 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+212"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+206"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7715,21 +7898,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+626"/>
+        <location line="+681"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+262"/>
+        <location line="+230"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+334"/>
-        <source> (%d track(s))</source>
+        <location line="+70"/>
+        <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>qgui2menu</name>
@@ -7964,8 +8157,18 @@
         <source>Yes</source>
         <translation type="unfinished">Da</translation>
     </message>
+    <message numerus="yes">
+        <location line="+72"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
     <message>
-        <location line="+98"/>
+        <location line="+34"/>
         <source>Mono</source>
         <translation type="unfinished">Mono</translation>
     </message>
@@ -8001,12 +8204,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+27"/>
+        <location line="+33"/>
         <source>Total Duration:	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-31"/>
         <source>Extra Video Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8021,12 +8224,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Codec:		</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8051,18 +8254,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-155"/>
+        <location line="-170"/>
         <source>%2.3f fps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+81"/>
+        <location line="+90"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-87"/>
+        <location line="-96"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8070,7 +8273,7 @@
 <context>
     <name>qshell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+53"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
         <translation type="unfinished"></translation>
@@ -8082,6 +8285,19 @@
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>qtalert</name>
@@ -8143,6 +8359,16 @@
         <source>Video Only Muxer Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>removeplane</name>
@@ -8195,7 +8421,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
         <source>_Mode:</source>
         <translation type="unfinished">_Režim:</translation>
     </message>
@@ -8205,7 +8431,7 @@
         <translation type="unfinished">_Nova učestanost kadrova:</translation>
     </message>
     <message>
-        <location line="-319"/>
+        <location line="-323"/>
         <source>Custom</source>
         <translation type="unfinished">Proizvoljno</translation>
     </message>
@@ -8231,7 +8457,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
+        <source>59.94  (NTSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8245,7 +8471,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+284"/>
+        <location line="+288"/>
         <source>Resample fps</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8253,7 +8479,7 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished">Visina i širina ne mogu biti neparni brojevi</translation>
     </message>
@@ -8358,17 +8584,31 @@
         <translation type="unfinished">16:9</translation>
     </message>
     <message>
+        <location line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+338"/>
+        <source>Lanzcos3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+251"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+172"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-166"/>
         <source>1%</source>
         <translation type="unfinished">1%</translation>
     </message>
@@ -8613,17 +8853,7 @@
     </message>
     <message>
         <location line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+18"/>
-        <source>Lanzcos3</source>
+        <source>Lanczos-3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8982,26 +9212,32 @@
 <context>
     <name>tsdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Greška</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+183"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+325"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+84"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+207"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+19"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
         <translation type="unfinished">Pravim indeks</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -9093,19 +9329,137 @@
     </message>
 </context>
 <context>
+    <name>vaapiDeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Adaptive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Compensated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vaapiResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
-        <source>vaapi: Resize</source>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>vaapi: Resize image using vaapi.</source>
+        <source>Resize image using VA-API.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+129"/>
         <source>Width :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9116,7 +9470,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>mpeg-&gt;PC:</source>
+        <source>mpeg-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9138,7 +9492,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+197"/>
         <source>Keep Top Field</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9154,31 +9508,31 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>_Ivtc:</source>
+        <source>_IVTC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Resize:</source>
+        <source>_Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>_Deint Mode:</source>
+        <location line="+2"/>
+        <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Width :</source>
+        <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Height :</source>
+        <location line="-2"/>
+        <source>_Deint Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>vdpau</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9196,13 +9550,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
-        <source>Width :</source>
+        <location line="+131"/>
+        <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9286,6 +9640,84 @@
     </message>
 </context>
 <context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vsWindow</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
@@ -9301,7 +9733,7 @@
 <context>
     <name>webmmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+68"/>
         <source>Unsupported Video.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
         <translation type="unfinished"></translation>
@@ -9313,7 +9745,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+89"/>
         <source>Saving Webm</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9336,22 +9768,22 @@
 <context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
         <source>Processing</source>
         <translation type="unfinished">Obrada</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+33"/>
         <source>00:00:00</source>
         <translation type="unfinished">00:00:00</translation>
     </message>
     <message>
-        <location line="-13"/>
+        <location line="-27"/>
         <source>Elapsed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+14"/>
         <source>Time Remaining:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9359,7 +9791,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9375,7 +9807,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished">Proizvoljno</translation>
     </message>
@@ -9496,7 +9928,7 @@
         <translation type="unfinished">Kontrola protoka</translation>
     </message>
     <message>
-        <location line="+2882"/>
+        <location line="+2887"/>
         <source>Disable</source>
         <translation type="unfinished">Onemogući</translation>
     </message>
@@ -9506,18 +9938,18 @@
         <translation type="unfinished">Nađi sam</translation>
     </message>
     <message>
-        <location line="-2298"/>
+        <location line="-2303"/>
         <source>Motion Estimation</source>
         <translation type="unfinished">Procena pokreta</translation>
     </message>
     <message>
         <location line="+392"/>
-        <location line="+2596"/>
+        <location line="+2601"/>
         <source>None</source>
         <translation type="unfinished">Ništa</translation>
     </message>
     <message>
-        <location line="-2591"/>
+        <location line="-2596"/>
         <source>Spatial</source>
         <translation type="unfinished">Prostorno</translation>
     </message>
@@ -9543,12 +9975,12 @@
         <translation type="unfinished">Brzo</translation>
     </message>
     <message>
-        <location line="+1598"/>
+        <location line="+1603"/>
         <source>Output</source>
         <translation type="unfinished">Izlaz</translation>
     </message>
     <message>
-        <location line="-3165"/>
+        <location line="-3170"/>
         <location line="+669"/>
         <source>1</source>
         <translation type="unfinished">1</translation>
@@ -9655,7 +10087,17 @@
         <translation type="unfinished">Normano</translation>
     </message>
     <message>
-        <location line="+590"/>
+        <location line="+5"/>
+        <source>Auto Variance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+585"/>
         <source>Pixel Aspect Ratio</source>
         <translation type="unfinished">Razmera piksela</translation>
     </message>
@@ -9675,7 +10117,7 @@
         <translation type="unfinished">CBR</translation>
     </message>
     <message>
-        <location line="-3949"/>
+        <location line="-3954"/>
         <source>x264 Configuraton</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9691,12 +10133,12 @@
     </message>
     <message>
         <location line="+7"/>
-        <location line="+3152"/>
+        <location line="+3157"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3110"/>
+        <location line="-3115"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9836,12 +10278,12 @@
     </message>
     <message>
         <location line="+14"/>
-        <location line="+2490"/>
+        <location line="+2495"/>
         <source>frames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2466"/>
+        <location line="-2471"/>
         <source>Sequence Parameter Set Identifer:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10009,12 +10451,12 @@
     </message>
     <message>
         <location line="+12"/>
-        <location line="+1328"/>
+        <location line="+1333"/>
         <source>Strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1289"/>
+        <location line="-1294"/>
         <source>Threshold:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10216,12 +10658,12 @@
     </message>
     <message>
         <location line="+10"/>
-        <location line="+856"/>
+        <location line="+861"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-809"/>
+        <location line="-814"/>
         <source>Quantiser Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10238,12 +10680,12 @@
     <message>
         <location line="+85"/>
         <location line="+179"/>
-        <location line="+302"/>
+        <location line="+307"/>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-459"/>
+        <location line="-464"/>
         <source>Maximum Quantiser Step:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10298,12 +10740,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Auto Variance AQ</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+91"/>
+        <location line="+114"/>
         <source>Advanced 1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10708,7 +11145,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished">Proizvoljno</translation>
     </message>
@@ -11912,7 +12349,7 @@
 <context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+37"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+32"/>
         <location line="+24"/>
         <source>None</source>
         <translation type="unfinished">Ništa</translation>
@@ -11973,22 +12410,38 @@
         <translation type="unfinished">Više niti</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="-2"/>
         <source>Motion Estimation</source>
         <translation type="unfinished">Procena pokreta</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+35"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+25"/>
         <source>Rate Control</source>
         <translation type="unfinished">Kontrola protoka</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-52"/>
         <source>Aspect Ratio:</source>
         <translation type="unfinished">Razmera:</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-46"/>
         <source>DCT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12033,12 +12486,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>MotionEstimation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+15"/>
         <source>Mi_n. quantizer:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12059,6 +12507,16 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>_Quantization type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12083,12 +12541,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Advanced Simple Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+25"/>
         <source>Quantization</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12121,23 +12574,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Temporal &amp; spatial check</source>
-        <translation type="obsolete">Temporalna i spatialna provera</translation>
-    </message>
-    <message>
-        <source>Bob, temporal &amp; spatial check</source>
-        <translation type="obsolete">Bob, temporalna i spatialna provera</translation>
-    </message>
-    <message>
-        <source>Skip spatial temporal check</source>
-        <translation type="obsolete">Preskoči spatialnu temporalnu proveru</translation>
-    </message>
-    <message>
-        <source>Bob, skip spatial temporal check</source>
-        <translation type="obsolete">Bob, preskoči spatialnu temporalnu proveru</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+70"/>
         <source>Bottom field first</source>
         <translation type="unfinished">Najpre donja polja</translation>
     </message>

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_tr.ts -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_tr.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">%s açma teşebbüsü başarısız oldu!</translation>
     </message>
@@ -51,12 +51,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+47"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -244,8 +244,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+64"/>
         <source>Indexing</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -335,8 +334,7 @@
     <message>
         <location line="+7"/>
         <source>Timecode:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
@@ -372,27 +370,27 @@
 <context>
     <name>DialogProcessing</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+26"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+33"/>
         <source>00:00:00</source>
         <translation type="unfinished">00:00:00</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+51"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location line="-19"/>
+        <location line="-70"/>
         <source>Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+6"/>
         <source>TimeLeft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+41"/>
         <source>ProcessImages</source>
         <translation type="unfinished"></translation>
     </message>
@@ -402,7 +400,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-14"/>
         <source>0 fps</source>
         <translation type="unfinished"></translation>
     </message>
@@ -438,30 +436,28 @@
 <context>
     <name>FDK-AAC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
-        <source>_Profile::</source>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+9"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="+2"/>
         <source>SBR enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+7"/>
-        <source>After burner</source>
+        <location line="+2"/>
+        <source>Afterburner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>FDK-AAC Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -506,8 +502,7 @@
     <message>
         <location line="+22"/>
         <source>/ 00:00:00.000</source>
-        <translation type="unfinished">
-             {00:00:00.000?}</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+170"/>
@@ -528,8 +523,7 @@
     <message>
         <location line="-131"/>
         <source>Frame type:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-1266"/>
@@ -613,12 +607,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>   (0 track(s))</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+145"/>
+        <location line="+155"/>
         <source>&amp;Shift:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -634,12 +623,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+946"/>
+        <location line="+931"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-871"/>
+        <location line="-856"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -757,17 +746,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+210"/>
         <source>Play filtered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-169"/>
         <source>Vol&amp;ume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-1006"/>
+        <source> (0 tracks)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+981"/>
         <source>Selection: 000000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -792,11 +786,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Alt+Return</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location line="+9"/>
         <source>Save &amp;Video...</source>
         <translation type="unfinished"></translation>
@@ -830,16 +819,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>&amp;Calculator...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>F7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location line="+15"/>
         <source>&amp;Input</source>
         <translation type="unfinished"></translation>
@@ -913,7 +892,7 @@
 <context>
     <name>Opus</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -935,11 +914,6 @@
         <source>Evaluate</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+3"/>
-        <source>Ctrl+Return</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>VapourSynthProxy</name>
@@ -993,7 +967,7 @@
     </message>
     <message>
         <location line="+10"/>
-        <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1054,7 +1028,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1071,8 +1045,7 @@
     <message>
         <location line="+12"/>
         <source>_Accept non-standard audio frequency for DVD</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1092,87 +1065,73 @@
     <message>
         <location line="+4"/>
         <source>SIMD</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Enable all SIMD</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable MMX</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable MMXEXT</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable 3DNOW</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable 3DNOWEXT</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable SSE</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable SSE2</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable SSE3</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable SSSE3</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
         <source>_lavc threads:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Multi-threading</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+47"/>
         <source>High</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Above normal</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1182,44 +1141,33 @@
     <message>
         <location line="+1"/>
         <source>Below normal</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-2"/>
         <source>Low</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Encoding priority:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Indexing/unpacking priority:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Playback priority:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Prioritisation</source>
-        <translation type="unfinished">
-            </translation>
-    </message>
-    <message>
-        <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="obsolete">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
@@ -1227,15 +1175,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Auto-Append Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>XVideo (best)</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
@@ -1245,14 +1202,12 @@
     <message>
         <location line="+11"/>
         <source>SDL (good)</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Video _display:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+29"/>
@@ -1272,12 +1227,11 @@
     <message>
         <location line="+2"/>
         <source>_Message level:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+213"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
         <translation type="unfinished">PCM</translation>
     </message>
@@ -1289,8 +1243,7 @@
     <message>
         <location line="+1"/>
         <source>_Volume control:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
@@ -1306,20 +1259,17 @@
     <message>
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
         <source>Pro Logic</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Pro Logic II</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Local playback downmixing:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+26"/>
@@ -1346,8 +1296,7 @@
     <message>
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
         <source>De_ringing</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1376,18 +1325,18 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+277"/>
+        <location line="+283"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+423"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
         <source>Audio</source>
         <translation type="unfinished">Ses</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-73"/>
+        <location filename="../../common/gui_savenew.cpp" line="-239"/>
+        <location line="+170"/>
         <location line="+12"/>
         <location line="+16"/>
-        <location line="+8"/>
         <source>Video</source>
         <translation type="unfinished">Video</translation>
     </message>
@@ -1395,14 +1344,12 @@
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
         <source>CPU</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+4"/>
         <source>Threading</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
@@ -1411,17 +1358,12 @@
         <translation type="unfinished">Tercihler</translation>
     </message>
     <message>
-        <source>-</source>
-        <translation type="obsolete">
-            </translation>
-    </message>
-    <message>
         <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+72"/>
         <source>Copy</source>
         <translation type="unfinished">Kopyala</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation type="unfinished">Süzgeçler</translation>
@@ -1429,14 +1371,12 @@
     <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-15"/>
         <source>R_esampling (Hz):</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Resampling frequency (Hz)</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1448,20 +1388,17 @@
     <message>
         <location line="-24"/>
         <source>Film to PAL</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>PAL to Film</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>_Frame rate change:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1476,26 +1413,22 @@
     <message>
         <location line="+2"/>
         <source>Stereo+surround</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Stereo+center</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Stereo+center+surround</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Stereo front+stereo rear</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1510,80 +1443,67 @@
     <message>
         <location line="+1"/>
         <source>Dolby Pro Logic</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Dolby Pro Logic II</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
         <source>_Gain mode:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>G_ain value:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
         <source>_Mixer:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Audio Filters</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-16"/>
         <source>Fontconfig</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>SDL</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>XVideo</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>x86</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>x86-64</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Libraries</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Built-in Support</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="+8"/>
@@ -1607,12 +1527,12 @@
         <translation type="unfinished">Kodek Hatası</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+369"/>
+        <location filename="../../common/gui_main.cpp" line="+370"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">Bu sürümde kodlanmamış</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+214"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
@@ -1633,8 +1553,7 @@
     <message>
         <location line="+60"/>
         <source>Are you sure?</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+48"/>
@@ -1749,8 +1668,7 @@
         <translation type="unfinished">Eklerken birşeyler başarısız oldu</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+321"/>
+        <location line="+320"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">Kötü birşeyler oldu (II)</translation>
     </message>
@@ -1764,8 +1682,7 @@
     <message>
         <location line="+103"/>
         <source>Checking video</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+16"/>
@@ -1801,51 +1718,43 @@
     <message>
         <location line="+88"/>
         <source>_Track from video:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Main Audio Track</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+264"/>
         <source>AvsProxy</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Failed to connect to avsproxy.
 Is it running ?</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>avsproxy</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Frame type:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Frame size:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Frame Hex Dump</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="-15"/>
@@ -1860,39 +1769,33 @@
     <message>
         <location filename="../../common/gui_save.cpp" line="-228"/>
         <source>Select Workbench to Save</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
         <location line="+2"/>
         <source>Select File to Save Audio</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Select JPEG Sequence to Save</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Select BMP to Save</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Select JPEG to Save</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Select File to Save</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+62"/>
@@ -1900,30 +1803,35 @@
         <translation type="unfinished">Ses kaydediliyor</translation>
     </message>
     <message>
-        <location line="+318"/>
-        <location line="+83"/>
+        <location line="+322"/>
+        <source>Maximum number of 99999 images reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+76"/>
         <source>Done</source>
         <translation type="unfinished">Tamamlandı</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-76"/>
         <source>Saved %d images.</source>
         <translation type="unfinished">%d resim kaydedildi.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="-250"/>
+        <location filename="../../common/gui_main.cpp" line="-251"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
         <location line="+4"/>
         <location filename="../../common/gui_save.cpp" line="+2"/>
-        <location line="+99"/>
+        <location line="+92"/>
         <location line="+7"/>
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
@@ -2116,7 +2024,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-290"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-296"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2146,7 +2054,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2229,7 +2137,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-68"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-72"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2351,12 +2259,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <location line="+2"/>
         <source>Save current settings as default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Load saved settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2476,7 +2385,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2496,8 +2405,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
-        <location line="+44"/>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-43"/>
+        <location line="+43"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished"></translation>
@@ -2527,7 +2441,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="-144"/>
-        <location filename="../../common/gui_save.cpp" line="-597"/>
+        <location filename="../../common/gui_save.cpp" line="-602"/>
         <source>No audio track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2575,7 +2489,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1449"/>
+        <location filename="../../common/gui_main.cpp" line="-1447"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2600,13 +2514,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+68"/>
+        <location line="+126"/>
+        <location line="+73"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-48"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2616,7 +2530,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2639,7 +2553,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+795"/>
+        <location line="+789"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -2670,7 +2584,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+297"/>
+        <location line="+298"/>
         <source>Oops</source>
         <translation type="unfinished">Ah</translation>
     </message>
@@ -2690,10 +2604,9 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>No</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
@@ -2701,7 +2614,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Job</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2711,7 +2624,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Output file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2726,7 +2639,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Select PNG to Save</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2762,22 +2675,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Maximum number of 9999 images reached, aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Saving images failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+25"/>
         <source>PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2807,29 +2715,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-207"/>
+        <location filename="../../common/gui_savenew.cpp" line="-210"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+182"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+24"/>
         <source>Cannot create encoder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-8"/>
-        <source>Cannot setup codec. Bitrate too low?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+57"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2841,20 +2743,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-253"/>
-        <location line="+286"/>
+        <location line="-257"/>
+        <location line="+290"/>
         <location line="+26"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-312"/>
-        <location line="+286"/>
+        <location line="-326"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+290"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="-102"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The choice of cut points may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Do you want to continue anyway?</source>
         <translation type="unfinished"></translation>
@@ -2884,8 +2796,7 @@
     <message>
         <location line="+1"/>
         <source>Auto-detect</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-12"/>
@@ -3203,7 +3114,7 @@
         <translation type="unfinished">MP4</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>AAC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3253,12 +3164,12 @@
         <translation type="unfinished">Hafıza hatası</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+495"/>
         <source>Saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+181"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3269,10 +3180,9 @@
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
-        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+374"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+382"/>
         <source>Unknown</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="-4"/>
@@ -3337,27 +3247,23 @@
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="-7"/>
         <source>NTSC 4:3</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+1"/>
         <source>NTSC 16:9</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>PAL 4:3</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>PAL 16:9</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3365,20 +3271,20 @@
         <translation type="unfinished">1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
-        <location line="+30"/>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
-        <location line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
         <source>Codec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
         <source>Internal error finding codec 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Internal error opening 0x%x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3394,31 +3300,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+812"/>
-        <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
-Dropping a keyframe will result in severely corrupted video.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
-Dropping a frame may result in some video corruption.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Do not warn again and drop frames silently while saving this video?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3456,8 +3338,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
         <source>_Bitrate:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
@@ -3494,8 +3375,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfHeaders.cpp" line="+468"/>
         <source>Indexing</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3544,32 +3424,27 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="+180"/>
         <source>_Subtitle file (ASS/SSA):</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Line spacing:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Font scale:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Top margin:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Botto_m margin:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-108"/>
@@ -3663,7 +3538,7 @@
 <context>
     <name>avimuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+75"/>
         <source>Bad Idea</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3740,7 +3615,7 @@
 <context>
     <name>bitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+51"/>
         <source>Constant Bitrate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3803,8 +3678,7 @@
     <message>
         <location line="+5"/>
         <source>-</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3858,34 +3732,39 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+23"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+51"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-44"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>blackframes</name>
@@ -3906,6 +3785,29 @@
     </message>
 </context>
 <context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -3934,7 +3836,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
+        <source>59.94  (NTSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3948,7 +3850,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+141"/>
+        <location line="+146"/>
         <source>Source Fps:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4235,22 +4137,19 @@
     <message>
         <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
         <source>Load it</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Crash file</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>I have detected a crash file. 
 Do you want to load it  ?
 (It will be deleted in all cases, you should save it if you want to keep it)</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4278,7 +4177,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4343,8 +4242,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.cpp" line="+272"/>
         <source>_Bitrate:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
@@ -4357,8 +4255,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+74"/>
         <source>Discard closer</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -4368,8 +4265,7 @@
     <message>
         <location line="+2"/>
         <source>Pulldown dupe removal</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -4379,8 +4275,7 @@
     <message>
         <location line="+2"/>
         <source>Medium (full luma, no chroma)</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
@@ -4390,20 +4285,17 @@
     <message>
         <location line="+1"/>
         <source>_Quality:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Threshold 1:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>T_hreshold 2:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-34"/>
@@ -4543,25 +4435,28 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+26"/>
         <source>Encoding...</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
-        <location line="+220"/>
+        <location line="+41"/>
+        <location line="+247"/>
         <location line="+21"/>
         <source>None</source>
         <translation type="unfinished">Hiçbiri</translation>
     </message>
     <message>
-        <location line="-258"/>
-        <location line="+251"/>
+        <location line="-261"/>
+        <location line="+254"/>
         <source>Unknown</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-157"/>
+        <source>Keep dialog open when finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>Audio Codec:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4627,43 +4522,37 @@
         <location line="+7"/>
         <location line="+14"/>
         <source>0 MB</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+77"/>
         <source>0 kB/s</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-385"/>
+        <location line="-396"/>
         <source>Shut down computer when finished</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-11"/>
+        <location line="-58"/>
         <source>Time Remaining:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+78"/>
         <source>Priority:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
         <source>High</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Above Normal</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
@@ -4673,42 +4562,40 @@
     <message>
         <location line="+5"/>
         <source>Below Normal</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Low</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+69"/>
         <source>Pause / Abort</source>
         <translation type="unfinished">Duraklat / İptâl et</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+13"/>
         <source>Advanced</source>
         <translation type="unfinished">Gelişmiş</translation>
     </message>
     <message>
-        <location line="-175"/>
+        <location line="-199"/>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <source>Phase:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+127"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+154"/>
+        <location line="+141"/>
         <source>Video Codec:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4785,8 +4672,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/faac/audioencoder_faac.cpp" line="+292"/>
         <source>_Bitrate:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
@@ -4802,7 +4688,7 @@
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished"></translation>
@@ -4813,7 +4699,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+13"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4826,13 +4737,13 @@
 <context>
     <name>fadeToBlack</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
-        <location line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+55"/>
+        <location line="+20"/>
         <source>Fade to black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-19"/>
         <source>Fade to black in/out.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4857,7 +4768,7 @@
         <translation type="unfinished">İçeri doğru solma</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>_Fade type:</source>
         <translation type="unfinished">So_lma tipi:</translation>
     </message>
@@ -4875,7 +4786,7 @@
 <context>
     <name>ffVAEncH264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4890,12 +4801,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Profile:</source>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4906,16 +4838,21 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Bitrate (kbps):</source>
+        <source>Quality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4925,7 +4862,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4933,27 +4870,53 @@
 <context>
     <name>ffVAEncHEVC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+343"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4963,7 +4926,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4971,7 +4934,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+223"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+256"/>
         <source>Default</source>
         <translation type="unfinished">Varsayılan</translation>
     </message>
@@ -4988,8 +4951,7 @@
     <message>
         <location line="+14"/>
         <source>Threading</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+36"/>
@@ -5177,8 +5139,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
         <source>H.263</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5188,8 +5149,7 @@
     <message>
         <location line="+21"/>
         <source>Threading</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+23"/>
@@ -5352,8 +5312,7 @@
     <message>
         <location line="+5"/>
         <source>H.263</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5444,8 +5403,32 @@
 <context>
     <name>ffnvenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+229"/>
+        <source>Controlled by Preset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
         <source>Low Quality</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5497,6 +5480,12 @@
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+        <source>RC Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Preset:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5506,6 +5495,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Bitrate (kbps):</source>
@@ -5519,32 +5514,48 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Frame Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>NVENC H.264 configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
-        <source>nvEnc HEVC  configuration</source>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+28"/>
+        <source>NVENC HEVC configuration</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5556,7 +5567,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+87"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5652,7 +5663,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5725,7 +5736,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5795,8 +5806,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="+162"/>
         <source>H.263</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5882,7 +5892,7 @@
 <context>
     <name>flvdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6154,14 +6164,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.cpp" line="+260"/>
         <source>Temporal &amp; spatial check</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bob, temporal &amp; spatial check</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6171,20 +6179,17 @@
     <message>
         <location line="+1"/>
         <source>Bob, skip spatial temporal check</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Bottom field first</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Top field first</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -6194,8 +6199,7 @@
     <message>
         <location line="+1"/>
         <source>_Order:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-194"/>
@@ -6289,8 +6293,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/hue.ui" line="+14"/>
         <location line="+45"/>
         <source>Hue</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
@@ -6408,8 +6411,7 @@
         <location line="+5"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
         <source>_Frame rate change:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -6421,21 +6423,19 @@
 <context>
     <name>jobs</name>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Oops</source>
         <translation type="unfinished">Ah</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Something very wrong happened when building joblist.</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>There are no jobs stored</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ADM_jobs/src/uiJobs.ui" line="+17"/>
@@ -6622,20 +6622,17 @@
     <message>
         <location line="+2"/>
         <source>Bit_rate mode:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+18"/>
         <source>_Bitrate:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Quality:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -6686,8 +6683,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
         <source>_Bitrate:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6695,14 +6691,12 @@
     <message>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/DIA_lavDecoder.cpp" line="+23"/>
         <source>_Swap U and V</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Decoder Options</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6927,12 +6921,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+523"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7032,7 +7026,7 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+167"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
         <source>Saving Mkv</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7131,31 +7125,46 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">SVQ3 başlıklarının okunmasında hata</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+67"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <location line="+17"/>
         <source>Unsupported</source>
         <translation type="unfinished">Desteklenmiyor</translation>
     </message>
     <message>
-        <location line="-9"/>
-        <source>Only MP4Video, H264, and H265 supported for video</source>
+        <location line="-17"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+182"/>
         <source>Saving mp4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7165,7 +7174,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7200,7 +7209,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Do not rotate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7226,6 +7235,51 @@
     </message>
     <message>
         <location line="+3"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>MP4 Muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7397,7 +7451,7 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+242"/>
+        <location filename="../../common/gui_navigate.cpp" line="+232"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7482,8 +7536,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
         <source>Unpacking bitstream</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7527,8 +7580,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="+14"/>
         <source>Properties</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
@@ -7538,33 +7590,28 @@
     <message>
         <location line="+31"/>
         <source>Frame Rate:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+14"/>
         <location line="+135"/>
         <source>Total Duration:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-121"/>
         <source>Aspect Ratio:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Image Size:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Codec 4CC:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+62"/>
@@ -7574,32 +7621,27 @@
     <message>
         <location line="+38"/>
         <source>Frequency:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Variable Bitrate:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Bitrate:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Channels:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Codec:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-226"/>
@@ -7639,22 +7681,17 @@
 <context>
     <name>psdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Hata</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -7715,18 +7752,16 @@
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="+65"/>
         <location line="+20"/>
         <source>Privileges Required</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-20"/>
         <location line="+20"/>
         <source>Root privileges are required to perform this operation.</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+126"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7741,7 +7776,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+185"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7779,7 +7814,7 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+212"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+206"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7859,21 +7894,29 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+626"/>
+        <location line="+681"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+262"/>
+        <location line="+230"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+334"/>
-        <source> (%d track(s))</source>
+        <location line="+70"/>
+        <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>qgui2menu</name>
@@ -8078,8 +8121,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
         <source>Unknown</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+94"/>
@@ -8102,17 +8144,23 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
         <source>No</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+72"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
         <translation type="unfinished">
-            </translation>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+34"/>
         <source>Mono</source>
         <translation type="unfinished">Tek kanal</translation>
     </message>
@@ -8148,12 +8196,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+27"/>
+        <location line="+33"/>
         <source>Total Duration:	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-31"/>
         <source>Extra Video Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8168,12 +8216,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Codec:		</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8198,18 +8246,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-155"/>
+        <location line="-170"/>
         <source>%2.3f fps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+81"/>
+        <location line="+90"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-87"/>
+        <location line="-96"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8217,7 +8265,7 @@
 <context>
     <name>qshell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+53"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
         <translation type="unfinished"></translation>
@@ -8229,6 +8277,19 @@
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>qtalert</name>
@@ -8290,6 +8351,16 @@
         <source>Video Only Muxer Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>removeplane</name>
@@ -8342,7 +8413,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
         <source>_Mode:</source>
         <translation type="unfinished">_Kip:</translation>
     </message>
@@ -8352,7 +8423,7 @@
         <translation type="unfinished">_Yeni kare hızı:</translation>
     </message>
     <message>
-        <location line="-319"/>
+        <location line="-323"/>
         <source>Custom</source>
         <translation type="unfinished">Özel</translation>
     </message>
@@ -8378,7 +8449,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>59.93  (NTSC)</source>
+        <source>59.94  (NTSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8392,7 +8463,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+284"/>
+        <location line="+288"/>
         <source>Resample fps</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8400,7 +8471,7 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished">Genişlik ve yükseklik tekil olamaz</translation>
     </message>
@@ -8505,17 +8576,31 @@
         <translation type="unfinished">16:9</translation>
     </message>
     <message>
+        <location line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+338"/>
+        <source>Lanzcos3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+251"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+172"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+172"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-166"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-166"/>
         <source>1%</source>
         <translation type="unfinished">1%</translation>
     </message>
@@ -8760,17 +8845,7 @@
     </message>
     <message>
         <location line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+18"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+18"/>
-        <source>Lanzcos3</source>
+        <source>Lanczos-3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8780,8 +8855,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
         <location line="+163"/>
         <source>Rotate</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
@@ -8806,8 +8880,7 @@
     <message>
         <location line="+2"/>
         <source>_Angle:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-4"/>
@@ -8972,20 +9045,17 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="+186"/>
         <source>No strategy</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>3:2 pulldown</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>PAL/SECAM</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9035,8 +9105,7 @@
     <message>
         <location line="+1"/>
         <source>Postproc and show zones (debug)</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9046,14 +9115,12 @@
     <message>
         <location line="+1"/>
         <source>Process image (not fields), debug</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
         <source>_Strategy:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9063,62 +9130,52 @@
     <message>
         <location line="+1"/>
         <source>_Postprocessing:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Try backward:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Direct threshold:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Backward threshold:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Noise threshold:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Postp_rocessing threshold:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Use chroma to decide</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Sho_w info</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Debu_g</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bl_end</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
@@ -9147,27 +9204,32 @@
 <context>
     <name>tsdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Hata</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+183"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+325"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+84"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+207"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+19"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -9178,8 +9240,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/twolame/audioencoder_twolame.cpp" line="+205"/>
         <source>_Bitrate:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
@@ -9260,19 +9321,137 @@
     </message>
 </context>
 <context>
+    <name>vaapiDeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Adaptive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Compensated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vaapiResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
-        <source>vaapi: Resize</source>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>vaapi: Resize image using vaapi.</source>
+        <source>Resize image using VA-API.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+129"/>
         <source>Width :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9283,7 +9462,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>mpeg-&gt;PC:</source>
+        <source>mpeg-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9305,7 +9484,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+197"/>
         <source>Keep Top Field</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9321,31 +9500,31 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>_Ivtc:</source>
+        <source>_IVTC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Resize:</source>
+        <source>_Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>_Deint Mode:</source>
+        <location line="+2"/>
+        <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Width :</source>
+        <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Height :</source>
+        <location line="-2"/>
+        <source>_Deint Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>vdpau</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9363,13 +9542,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
-        <source>Width :</source>
+        <location line="+131"/>
+        <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Height :</source>
+        <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9429,8 +9608,7 @@
     <message>
         <location line="+1"/>
         <source>Quality based</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -9440,14 +9618,12 @@
     <message>
         <location line="+14"/>
         <source>_Bitrate:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Quality:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
@@ -9456,6 +9632,84 @@
     </message>
 </context>
 <context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vsWindow</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
@@ -9471,7 +9725,7 @@
 <context>
     <name>webmmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+68"/>
         <source>Unsupported Video.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
         <translation type="unfinished"></translation>
@@ -9483,7 +9737,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+89"/>
         <source>Saving Webm</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9506,23 +9760,22 @@
 <context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
         <source>Processing</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+33"/>
         <source>00:00:00</source>
         <translation type="unfinished">00:00:00</translation>
     </message>
     <message>
-        <location line="-13"/>
+        <location line="-27"/>
         <source>Elapsed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+14"/>
         <source>Time Remaining:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9530,7 +9783,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9546,7 +9799,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished">Özel</translation>
     </message>
@@ -9667,30 +9920,28 @@
         <translation type="unfinished">Oran Kontrol</translation>
     </message>
     <message>
-        <location line="+2882"/>
+        <location line="+2887"/>
         <source>Disable</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Auto-detect</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2298"/>
+        <location line="-2303"/>
         <source>Motion Estimation</source>
         <translation type="unfinished">Hareket Tahmini</translation>
     </message>
     <message>
         <location line="+392"/>
-        <location line="+2596"/>
+        <location line="+2601"/>
         <source>None</source>
         <translation type="unfinished">Hiçbiri</translation>
     </message>
     <message>
-        <location line="-2591"/>
+        <location line="-2596"/>
         <source>Spatial</source>
         <translation type="unfinished">Uzamsal</translation>
     </message>
@@ -9716,12 +9967,12 @@
         <translation type="unfinished">Hızlı</translation>
     </message>
     <message>
-        <location line="+1598"/>
+        <location line="+1603"/>
         <source>Output</source>
         <translation type="unfinished">Çıktı</translation>
     </message>
     <message>
-        <location line="-3165"/>
+        <location line="-3170"/>
         <location line="+669"/>
         <source>1</source>
         <translation type="unfinished">1</translation>
@@ -9744,8 +9995,7 @@
     <message>
         <location line="+5"/>
         <source>2</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
@@ -9829,7 +10079,17 @@
         <translation type="unfinished">Normal</translation>
     </message>
     <message>
-        <location line="+590"/>
+        <location line="+5"/>
+        <source>Auto Variance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+585"/>
         <source>Pixel Aspect Ratio</source>
         <translation type="unfinished">Piksel En/Boy Oranı</translation>
     </message>
@@ -9849,7 +10109,7 @@
         <translation type="unfinished">CBR</translation>
     </message>
     <message>
-        <location line="-3949"/>
+        <location line="-3954"/>
         <source>x264 Configuraton</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9865,12 +10125,12 @@
     </message>
     <message>
         <location line="+7"/>
-        <location line="+3152"/>
+        <location line="+3157"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3110"/>
+        <location line="-3115"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10010,12 +10270,12 @@
     </message>
     <message>
         <location line="+14"/>
-        <location line="+2490"/>
+        <location line="+2495"/>
         <source>frames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2466"/>
+        <location line="-2471"/>
         <source>Sequence Parameter Set Identifer:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10183,12 +10443,12 @@
     </message>
     <message>
         <location line="+12"/>
-        <location line="+1328"/>
+        <location line="+1333"/>
         <source>Strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1289"/>
+        <location line="-1294"/>
         <source>Threshold:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10390,12 +10650,12 @@
     </message>
     <message>
         <location line="+10"/>
-        <location line="+856"/>
+        <location line="+861"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-809"/>
+        <location line="-814"/>
         <source>Quantiser Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10412,12 +10672,12 @@
     <message>
         <location line="+85"/>
         <location line="+179"/>
-        <location line="+302"/>
+        <location line="+307"/>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-459"/>
+        <location line="-464"/>
         <source>Maximum Quantiser Step:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10472,12 +10732,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Auto Variance AQ</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+91"/>
+        <location line="+114"/>
         <source>Advanced 1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10882,7 +11137,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+51"/>
         <source>Custom</source>
         <translation type="unfinished">Özel</translation>
     </message>
@@ -11082,8 +11337,7 @@
     <message>
         <location line="+5"/>
         <source>2</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
@@ -11750,14 +12004,12 @@
     <message>
         <location line="+8"/>
         <source>Disable</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Auto-detect</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
@@ -12089,7 +12341,7 @@
 <context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+37"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+32"/>
         <location line="+24"/>
         <source>None</source>
         <translation type="unfinished">Hiçbiri</translation>
@@ -12097,8 +12349,7 @@
     <message>
         <location line="-23"/>
         <source>Low</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -12113,8 +12364,7 @@
     <message>
         <location line="+4"/>
         <source>H.263</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -12149,27 +12399,41 @@
     <message>
         <location line="+9"/>
         <source>Threading</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="-2"/>
         <source>Motion Estimation</source>
         <translation type="unfinished">Hareket Tahmini</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+35"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+25"/>
         <source>Rate Control</source>
         <translation type="unfinished">Oran Kontrol</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-52"/>
         <source>Aspect Ratio:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-46"/>
         <source>DCT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12214,12 +12478,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>MotionEstimation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+15"/>
         <source>Mi_n. quantizer:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12240,6 +12499,16 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>_Quantization type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12264,12 +12533,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Advanced Simple Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+25"/>
         <source>Quantization</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12302,35 +12566,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Temporal &amp; spatial check</source>
-        <translation type="obsolete">
-            </translation>
-    </message>
-    <message>
-        <source>Bob, temporal &amp; spatial check</source>
-        <translation type="obsolete">
-            </translation>
-    </message>
-    <message>
-        <source>Skip spatial temporal check</source>
-        <translation type="obsolete">Uzamsal zamansal kontrolü atla</translation>
-    </message>
-    <message>
-        <source>Bob, skip spatial temporal check</source>
-        <translation type="obsolete">
-            </translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+70"/>
         <source>Bottom field first</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-1"/>
         <source>Top field first</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
@@ -12375,8 +12618,7 @@
     <message>
         <location line="+1"/>
         <source>_Order:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_zh_CN.ts -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_zh_CN.ts Changed

@@ -4,12 +4,12 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
         <source>Checking if timestamps are valid..</source>
         <translation>检查时间戳是否有效..</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+47"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19,7 +19,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+258"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+489"/>
         <source>width</source>
         <translation type="unfinished"></translation>
     </message>
@@ -377,22 +377,22 @@
 <context>
     <name>DialogProcessing</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+33"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+84"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-44"/>
         <source>0 fps</source>
         <translation>0 fps</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-20"/>
         <source>TimeLeft</source>
         <translation>剩余时间</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+34"/>
         <source>Speed</source>
         <translation>速率</translation>
     </message>
@@ -402,12 +402,12 @@
         <translation>序列图像</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-28"/>
         <source>00:00:00</source>
         <translation>00:00:00</translation>
     </message>
     <message>
-        <location line="-12"/>
+        <location line="-19"/>
         <source>Dialog</source>
         <translation>对话窗</translation>
     </message>
@@ -443,30 +443,28 @@
 <context>
     <name>FDK-AAC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+434"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Bitrate:</source>
         <translation>比特率：</translation>
     </message>
     <message>
-        <location line="-6"/>
-        <location line="+7"/>
-        <source>After burner</source>
-        <translation>后燃器</translation>
+        <location line="+4"/>
+        <source>Afterburner</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>FDK-AAC Configuration</source>
         <translation>FDK-AAC 配置</translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>_Profile::</source>
-        <translation>配置文件:</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="-8"/>
         <source>SBR enabled</source>
         <translation>SBR 启用</translation>
     </message>
@@ -489,12 +487,11 @@
         <translation>B:</translation>
     </message>
     <message>
-        <location line="+272"/>
         <source>F7</source>
-        <translation>F7</translation>
+        <translation type="vanished">F7</translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <location line="-771"/>
         <source>ms</source>
         <translation>ms</translation>
     </message>
@@ -522,12 +519,12 @@
         <translation>...</translation>
     </message>
     <message>
-        <location line="+308"/>
+        <location line="+293"/>
         <source>&amp;Top</source>
         <translation>上下并排(&amp;T)</translation>
     </message>
     <message>
-        <location line="-1425"/>
+        <location line="-1410"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation>复制</translation>
@@ -574,28 +571,27 @@
         <translation>开启视频</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+199"/>
         <source>Si&amp;de</source>
         <translation>左右并排(&amp;D</translation>
     </message>
     <message>
-        <location line="-606"/>
+        <location line="-591"/>
         <source>Time:</source>
         <translation>时间:</translation>
     </message>
     <message>
-        <location line="+404"/>
         <source>Alt+Return</source>
-        <translation>Alt+Return</translation>
+        <translation type="vanished">Alt+Return</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+440"/>
         <location line="+3"/>
         <source>Load/Run Project</source>
         <translation>加载/执行项目</translation>
     </message>
     <message>
-        <location line="-599"/>
+        <location line="-596"/>
         <source>Search next black frame</source>
         <translation>搜寻下一帧黑框</translation>
     </message>
@@ -610,28 +606,27 @@
         <translation>转到下一帧(关键帧或I帧) [UP]</translation>
     </message>
     <message>
-        <location line="+718"/>
         <source>&amp;Calculator...</source>
-        <translation>计算器(&amp;C)...</translation>
+        <translation type="vanished">计算器(&amp;C)...</translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="+456"/>
         <source>Go to marker A [PAGE UP]</source>
         <translation>转到标记 A [PAGE UP]</translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+247"/>
         <location line="+3"/>
         <source>Save Project</source>
         <translation>保存项目</translation>
     </message>
     <message>
-        <location line="-1606"/>
+        <location line="-1603"/>
         <source>&amp;Audio</source>
         <translation>音频(&amp;A)</translation>
     </message>
     <message>
-        <location line="+1633"/>
+        <location line="+1618"/>
         <source>&amp;Input</source>
         <translation>输入(&amp;I)</translation>
     </message>
@@ -641,7 +636,7 @@
         <translation>标志区段(&amp;S)</translation>
     </message>
     <message>
-        <location line="-1689"/>
+        <location line="-1674"/>
         <source>&amp;Tools</source>
         <translation>工具(&amp;T)</translation>
     </message>
@@ -662,12 +657,12 @@
         <translation>000000</translation>
     </message>
     <message>
-        <location line="+346"/>
+        <location line="+331"/>
         <source>&amp;Audio Metre</source>
         <translation>音频画面(&amp;A)</translation>
     </message>
     <message>
-        <location line="-1523"/>
+        <location line="-1508"/>
         <location line="+142"/>
         <location line="+169"/>
         <location line="+181"/>
@@ -675,12 +670,7 @@
         <translation>配置</translation>
     </message>
     <message>
-        <location line="-283"/>
-        <source>   (0 track(s))</source>
-        <translation>   ((0 轨k(s))</translation>
-    </message>
-    <message>
-        <location line="-444"/>
+        <location line="-727"/>
         <source>Vi&amp;deo</source>
         <translation>视频(&amp;D)</translation>
     </message>
@@ -710,7 +700,7 @@
         <translation>帧类型:</translation>
     </message>
     <message>
-        <location line="+346"/>
+        <location line="+343"/>
         <location line="+3"/>
         <source>Save Video</source>
         <translation>保存视频</translation>
@@ -721,7 +711,7 @@
         <translation>保存视频&amp;V)...</translation>
     </message>
     <message>
-        <location line="-589"/>
+        <location line="-586"/>
         <source>Search previous black frame</source>
         <translation>搜寻上一帧黑框</translation>
     </message>
@@ -736,12 +726,12 @@
         <translation>编译码器选项(&amp;P)</translation>
     </message>
     <message>
-        <location line="+1520"/>
+        <location line="+1517"/>
         <source>Play filtered</source>
         <translation>过滤播放(&amp;P)</translation>
     </message>
     <message>
-        <location line="-213"/>
+        <location line="-210"/>
         <source>Go to Marker B [PAGE DOWN]</source>
         <translation>转到标记 B [PAGE DOWN]</translation>
     </message>
@@ -756,12 +746,12 @@
         <translation>&lt;b&gt;视频输出格式(容器)佳Mp4/Mkv&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+975"/>
+        <location line="+972"/>
         <source>&amp;Load/Run Project...</source>
         <translation>加载/执行项目(&amp;L)...</translation>
     </message>
     <message>
-        <location line="-547"/>
+        <location line="-544"/>
         <source>Go to last frame [END]</source>
         <translation>G转到最后一帧 [END]</translation>
     </message>
@@ -771,12 +761,12 @@
         <translation>自定义(&amp;C)</translation>
     </message>
     <message>
-        <location line="+1660"/>
+        <location line="+1645"/>
         <source>&amp;Output</source>
         <translation>输出(&amp;O)</translation>
     </message>
     <message>
-        <location line="-1635"/>
+        <location line="-1620"/>
         <source>&amp;Recent</source>
         <translation>最近(&amp;R)</translation>
     </message>
@@ -791,7 +781,7 @@
         <translation>位移(±)(&amp;S):</translation>
     </message>
     <message>
-        <location line="+1155"/>
+        <location line="+1140"/>
         <source>&amp;Volume</source>
         <translation>音量(&amp;V)</translation>
     </message>
@@ -801,17 +791,17 @@
         <translation>编译码器选项(&amp;C)</translation>
     </message>
     <message>
-        <location line="-572"/>
+        <location line="-557"/>
         <source>Forward one minute [CTRL+UP]</source>
         <translation>前进一分钟 [CTRL+UP]</translation>
     </message>
     <message>
-        <location line="+643"/>
+        <location line="+628"/>
         <source>&amp;Separate</source>
         <translation>分离窗口(&amp;S)</translation>
     </message>
     <message>
-        <location line="-807"/>
+        <location line="-792"/>
         <source>Set start marker [CTRL+PAGEUP]</source>
         <translation>设定开始标记 [CTRL+PAGEUP]</translation>
     </message>
@@ -842,7 +832,12 @@
         <translation>&lt;b&gt;输出视频编码佳x264/x265&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+936"/>
+        <location line="+170"/>
+        <source> (0 tracks)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+766"/>
         <source>00:00:00.000</source>
         <translation>00:00:00.000</translation>
     </message>
@@ -857,12 +852,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+218"/>
         <source>Save &amp;Project</source>
         <translation>保存项目(&amp;P)</translation>
     </message>
     <message>
-        <location line="-54"/>
+        <location line="-51"/>
         <source>&amp;Information...</source>
         <translation>属性(&amp;I)...</translation>
     </message>
@@ -877,7 +872,7 @@
         <translation>倒退一分钟 [CTRL+DOWN]</translation>
     </message>
     <message>
-        <location line="+598"/>
+        <location line="+583"/>
         <source>Ctrl+Alt+C</source>
         <translation>Ctrl+Alt+C</translation>
     </message>
@@ -902,13 +897,13 @@
         <translation>Ctrl+Alt+V</translation>
     </message>
     <message>
-        <location line="-827"/>
+        <location line="-812"/>
         <source>Go to previous keyframe [DOWN]</source>
         <translation>转到上一帧(关键帧或I帧) [DOWN]</translation>
     </message>
     <message>
         <location line="-150"/>
-        <location line="+946"/>
+        <location line="+931"/>
         <source>&amp;Navigation</source>
         <translation>视频导航栏(&amp;N)</translation>
     </message>
@@ -916,7 +911,7 @@
 <context>
     <name>Opus</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -934,12 +929,11 @@
         <translation>壳(Shell)</translation>
     </message>
     <message>
-        <location line="+75"/>
         <source>Ctrl+Return</source>
-        <translation>Ctrl+Return</translation>
+        <translation type="vanished">Ctrl+Return</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="+72"/>
         <source>Evaluate</source>
         <translation>求值</translation>
     </message>
@@ -999,7 +993,7 @@
     </message>
     <message>
         <location line="+10"/>
-        <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1060,21 +1054,17 @@
 <context>
     <name>adm</name>
     <message>
-        <source>-</source>
-        <translation type="vanished">-</translation>
-    </message>
-    <message>
         <location filename="../../common/gui_save.cpp" line="+67"/>
         <source>Audio encoder index out of bounds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>No</source>
         <translation>否</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+73"/>
         <source>Select PNG to Save</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1089,22 +1079,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <source>Maximum number of 9999 images reached, aborting.</source>
+        <source>Maximum number of 99999 images reached.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Saving images failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+25"/>
         <source>PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1129,7 +1119,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+372"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+380"/>
         <source>1:1</source>
         <translation>1:1</translation>
     </message>
@@ -1144,18 +1134,18 @@
         <translation>4MV</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+226"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+231"/>
         <source>AAC</source>
         <translation>AAC</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-8"/>
         <source>AC3</source>
         <translation>AC3</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+510"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+518"/>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
@@ -1180,7 +1170,7 @@
         <translation>GMC</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-571"/>
+        <location filename="../../common/gui_save.cpp" line="-572"/>
         <source>Job</source>
         <translation>工作</translation>
     </message>
@@ -1205,13 +1195,13 @@
         <translation>MP4</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-216"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-222"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-19"/>
         <source>Low</source>
         <translation>低</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+85"/>
         <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-12"/>
         <source>PCM</source>
         <translation>PCM</translation>
@@ -1257,8 +1247,8 @@
         <translation>H263</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+450"/>
-        <location line="+83"/>
+        <location filename="../../common/gui_save.cpp" line="+458"/>
+        <location line="+76"/>
         <source>Done</source>
         <translation>完成</translation>
     </message>
@@ -1268,7 +1258,7 @@
         <translation>增益</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-83"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-89"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-45"/>
         <source>High</source>
         <translation>高</translation>
@@ -1279,7 +1269,7 @@
         <translation>LPCM</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-196"/>
+        <location filename="../../common/gui_save.cpp" line="-195"/>
         <source>Jpeg</source>
         <translation>Jpeg</translation>
     </message>
@@ -1311,12 +1301,12 @@
         <translation>无</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+7"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+8"/>
         <source>QDM2</source>
         <translation>QDM2</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1901"/>
+        <location filename="../../common/gui_main.cpp" line="+1902"/>
         <source>Oops</source>
         <translation>Oops</translation>
     </message>
@@ -1362,7 +1352,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
-        <location filename="../../common/gui_save.cpp" line="-397"/>
+        <location filename="../../common/gui_save.cpp" line="-403"/>
         <source>No audio track</source>
         <translation>没有音轨</translation>
     </message>
@@ -1388,44 +1378,44 @@
         <translation>它没&apos;有LAME！，它需要去建立 FLV视频。</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+597"/>
+        <location filename="../../common/gui_save.cpp" line="+602"/>
         <source>File %s was NOT saved correctly.</source>
         <translation>文件 %s 保存不正确。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+51"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+55"/>
         <source>About</source>
         <translation>关于(&amp;U)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-8"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-9"/>
         <source>E-AC3</source>
         <translation>E-AC3</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-86"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+211"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="-597"/>
+        <location filename="../../common/gui_save.cpp" line="-602"/>
         <location line="+10"/>
-        <location line="+277"/>
+        <location line="+283"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+423"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
         <source>Audio</source>
         <translation>音频</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-74"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-78"/>
         <source>Close</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
-        <location line="+30"/>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
-        <location line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
         <source>Codec</source>
         <translation>编译码器</translation>
     </message>
@@ -1435,19 +1425,19 @@
         <translation>只显示错误警告</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="-361"/>
+        <location filename="../../common/gui_main.cpp" line="-362"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
         <location line="+4"/>
-        <location filename="../../common/gui_save.cpp" line="+199"/>
-        <location line="+99"/>
+        <location filename="../../common/gui_save.cpp" line="+205"/>
+        <location line="+92"/>
         <location line="+7"/>
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
@@ -1465,8 +1455,8 @@
         <translation>混音频</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-225"/>
-        <location line="+286"/>
+        <location filename="../../common/gui_savenew.cpp" line="-229"/>
+        <location line="+290"/>
         <location line="+26"/>
         <source>Muxer</source>
         <translation>复合器</translation>
@@ -1497,15 +1487,25 @@
         <translation>改进最大溢出(%)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-160"/>
+        <location filename="../../common/gui_savenew.cpp" line="-326"/>
+        <location line="+170"/>
         <location line="+12"/>
         <location line="+16"/>
-        <location line="+8"/>
         <source>Video</source>
         <translation>视频</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="-198"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+198"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
         <translation>不能设置音频编码器，请确保您的数据流是兼容音频编码器(数字频道、比特速率、格式）</translation>
     </message>
@@ -1549,17 +1549,17 @@
         <translation>第二代定向逻辑</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-118"/>
+        <location filename="../../common/gui_savenew.cpp" line="-114"/>
         <source>Cannot instantiate video chain</source>
         <translation>不能安装视频链</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+54"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+58"/>
         <source>Decoder Option</source>
         <translation>译码器选项(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-124"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-130"/>
         <source>Enable 3DNOWEXT</source>
         <translation>启用 3DNOWEXT</translation>
     </message>
@@ -1588,7 +1588,7 @@
         <translation>转变音量 (ms):</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-766"/>
+        <location filename="../../common/gui_main.cpp" line="-760"/>
         <source>Error while cutting out.</source>
         <translation>剪切时发生错误.</translation>
     </message>
@@ -1603,12 +1603,12 @@
         <translation>不能增加工作 %s</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+123"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
         <source>Pro Logic</source>
         <translation>定向逻辑</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+628"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+676"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1618,7 +1618,7 @@
         <translation>太短</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+662"/>
+        <location filename="../../common/gui_main.cpp" line="+656"/>
         <source>Marker A &gt; B</source>
         <translation>标记 A &gt; B</translation>
     </message>
@@ -1629,7 +1629,7 @@
         <translation>请释放一些空间，然后按重试再试一次。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-82"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-86"/>
         <source>Connect to avsproxy</source>
         <translation>联机至 avsproxy</translation>
     </message>
@@ -1639,13 +1639,13 @@
         <translation>GUI 渲染选项</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-152"/>
-        <location line="+286"/>
+        <location filename="../../common/gui_savenew.cpp" line="-160"/>
+        <location line="+290"/>
         <source>Cannot instantiate muxer</source>
         <translation>不能安装复合器</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+521"/>
+        <location filename="../../common/gui_main.cpp" line="+522"/>
         <source>This function is disabled or no longer valid</source>
         <translation>此功能被禁用或不再有效</translation>
     </message>
@@ -1665,7 +1665,7 @@
         <translation>立体+中央+环绕</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+61"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+65"/>
         <source>Build Option</source>
         <translation>建立选项(&amp;B)</translation>
     </message>
@@ -1696,7 +1696,7 @@
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1723"/>
+        <location filename="../../common/gui_main.cpp" line="-1722"/>
         <source>Select script to run</source>
         <translation>选择脚本去执行</translation>
     </message>
@@ -1706,7 +1706,7 @@
         <translation>没降混合</translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-125"/>
         <source>Enable SSE2</source>
         <translation>启用 SSE2</translation>
     </message>
@@ -1741,13 +1741,13 @@
         <translation>插件-音频装置(ADM)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1215"/>
+        <location filename="../../common/gui_main.cpp" line="+1213"/>
         <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+120"/>
         <source>Something bad happened</source>
         <translation>有些事发生问题</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+7"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+8"/>
         <source>MSADPCM</source>
         <translation>MSADPCM</translation>
     </message>
@@ -1757,7 +1757,7 @@
         <translation>无法删除此选取范围。</translation>
     </message>
     <message>
-        <location line="-412"/>
+        <location line="-406"/>
         <source>Multiple Audio Tracks</source>
         <translation>多音轨</translation>
     </message>
@@ -1853,7 +1853,7 @@
         <translation>当增加时某些事情失败</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-488"/>
+        <location filename="../../common/gui_save.cpp" line="-487"/>
         <source>Select Workbench to Save</source>
         <translation>选择工作台进行保存</translation>
     </message>
@@ -1863,7 +1863,7 @@
         <translation>反转向上和向下箭头键进行导航</translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+89"/>
         <source>SDL (good)</source>
         <translation>SDL (好)</translation>
     </message>
@@ -1909,7 +1909,7 @@
         <translation>最大Gop(图像群组)大小</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-331"/>
+        <location filename="../../common/gui_savenew.cpp" line="-338"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation>重用以前首先传递数据？警告，设定必须关闭.</translation>
@@ -1925,12 +1925,12 @@
         <translation>开启应用程序文件夹目录(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-160"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-166"/>
         <source>Above normal</source>
         <translation>高于一般</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-888"/>
+        <location filename="../../common/gui_main.cpp" line="-892"/>
         <source>Select script to save</source>
         <translation>选择脚本去保存</translation>
     </message>
@@ -1947,7 +1947,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+265"/>
+        <location filename="../../common/gui_main.cpp" line="+269"/>
         <source>Select Video File to Append...</source>
         <translation>选择视频去附加合并(二视带宽高比要一致)...</translation>
     </message>
@@ -1967,7 +1967,7 @@
         <translation>插件-视频译码器(ADM)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1141"/>
+        <location filename="../../common/gui_main.cpp" line="+1135"/>
         <source>Unable to set the audio language: No video loaded yet!</source>
         <translation>无法设置音频语言：仍然未载入视频！</translation>
     </message>
@@ -2038,7 +2038,7 @@
         <translation>最小Gop(图像群组)大小</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-683"/>
+        <location filename="../../common/gui_main.cpp" line="-677"/>
         <source>Try &apos;File&apos; -&gt; &apos;Load/Run Project...&apos;</source>
         <translation>尝试 &apos;文件&apos; -&gt; &apos;加载/执行 项目...&apos;</translation>
     </message>
@@ -2048,7 +2048,7 @@
         <translation>发现没有 AAC 音频编码器插件程序。</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+881"/>
+        <location filename="../../common/gui_main.cpp" line="+876"/>
         <source>Frame Hex Dump</source>
         <translation>帧十六进制转储</translation>
     </message>
@@ -2073,7 +2073,7 @@
         <translation>AMR-NB</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-922"/>
+        <location filename="../../common/gui_main.cpp" line="-917"/>
         <source>Permission error</source>
         <translation>权限许可错误</translation>
     </message>
@@ -2089,12 +2089,12 @@
         <translation>核心已编译，没有 LIBVA 的支持，但它已编译应用程序，安装不匹配</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+732"/>
+        <location filename="../../common/gui_main.cpp" line="+726"/>
         <source>Setting the language for the given track index is not possible: Video has no audio file!</source>
         <translation>设定语言提供跟踪索引是不可能的：视频有没有音频檔！</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+66"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+72"/>
         <source>OpenGL (best)</source>
         <translation>OpenGL (最好)</translation>
     </message>
@@ -2104,7 +2104,7 @@
         <translation>选择 JPEG 顺序进行保存</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-65"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-69"/>
         <source>Append</source>
         <translation>同宽高视频合并</translation>
     </message>
@@ -2127,12 +2127,12 @@
         <translation>自定义</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1231"/>
+        <location filename="../../common/gui_main.cpp" line="-1230"/>
         <source>Not coded in this version</source>
         <translation>没有编进这个版本</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+493"/>
+        <location filename="../../common/gui_save.cpp" line="+492"/>
         <source>Failed</source>
         <translation>已失败</translation>
     </message>
@@ -2152,12 +2152,12 @@
         <translation>忽略</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+991"/>
+        <location filename="../../common/gui_main.cpp" line="+990"/>
         <source>No error found</source>
         <translation>没有找到错误</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+53"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+57"/>
         <source>Next Intra Frame</source>
         <translation>转到下一帧(关键帧或I帧)</translation>
     </message>
@@ -2173,7 +2173,7 @@
         <translation>编译码器错误</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
         <source>Internal error finding codec 0x%x</source>
         <translation>发现编译码器内部错误</translation>
     </message>
@@ -2203,17 +2203,17 @@
         <translation>复合器</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+443"/>
+        <location filename="../../common/gui_save.cpp" line="+450"/>
         <source>Saved %d images.</source>
         <translation>已保存 %d 个图像。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-82"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-88"/>
         <source>Normal</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-71"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-75"/>
         <location line="+2"/>
         <source>Clear recent items</source>
         <translation>清除最近使用的 文件 及 项目</translation>
@@ -2229,17 +2229,17 @@
         <translation>运动搜索精度</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+226"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
         <source>Output</source>
         <translation>输出</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-204"/>
+        <location filename="../../common/gui_save.cpp" line="-210"/>
         <source>Cannot create stream</source>
         <translation>不能建立流</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-203"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-209"/>
         <source>Enable all SIMD</source>
         <translation>启用所有 SIMD</translation>
     </message>
@@ -2249,24 +2249,20 @@
         <translation>重新混合:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-43"/>
+        <location line="+43"/>
         <source>You cannot remove *all* the video
 </source>
         <translation>你不能删除*所有*的视频
 </translation>
     </message>
     <message>
-        <source>Decode video using XVBA (AMD)</source>
-        <translation type="vanished">译码视频使用 XVBA (AMD)</translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+144"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+150"/>
         <source>_AudioDevice</source>
         <translation>音频装置</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="-170"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="-187"/>
         <source>Saving</source>
         <translation>保存中</translation>
     </message>
@@ -2277,7 +2273,7 @@
         <translation>立体声</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-12"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-13"/>
         <source>WMAPRO</source>
         <translation>WMAPRO</translation>
     </message>
@@ -2287,7 +2283,7 @@
         <translation>广泛搜寻</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1178"/>
+        <location filename="../../common/gui_main.cpp" line="-1176"/>
         <source>Select script to debug</source>
         <translation>选择脚本去调试</translation>
     </message>
@@ -2317,12 +2313,12 @@
         <translation>PAL 16:9</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+72"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+76"/>
         <source>First Frame</source>
         <translation>转到第一帧(开始)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+686"/>
+        <location filename="../../common/gui_main.cpp" line="+690"/>
         <source>Cannot open &quot;%s&quot;.</source>
         <translation>无法开启 &quot;%s&quot;。</translation>
     </message>
@@ -2347,12 +2343,12 @@
         <translation>转到下一帧</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-246"/>
+        <location filename="../../common/gui_save.cpp" line="-248"/>
         <source>Cannot reach database. Do you have Job control running ?</source>
         <translation>不能到达数据库，你有工作控制执行吗？</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+19"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+20"/>
         <source>Zoom 1:1</source>
         <translation>缩放 1:1</translation>
     </message>
@@ -2362,7 +2358,7 @@
         <translation>缩放 1:2</translation>
     </message>
     <message>
-        <location line="-104"/>
+        <location line="-109"/>
         <source>Save as PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2372,12 +2368,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+56"/>
         <source>Play filtered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Zoom 1:4</source>
         <translation>缩放 1:4</translation>
     </message>
@@ -2387,6 +2383,11 @@
         <translation>缩放 2:1</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="+34"/>
         <source>Audio Encoder Plugins</source>
         <translation>插件-音频编码器(ADM)</translation>
@@ -2426,7 +2427,7 @@
         <translation>没有改变</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-615"/>
+        <location filename="../../common/gui_main.cpp" line="-619"/>
         <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
         <translation>你是要清除最近使用的文件和项目的列表，这不&apos;能撤销，是否继续？</translation>
     </message>
@@ -2437,17 +2438,17 @@
         <translation>Sdl 驱动程序r</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+152"/>
+        <location filename="../../common/gui_main.cpp" line="+151"/>
         <source>No engine</source>
         <translation>没有引擎</translation>
     </message>
     <message>
-        <location line="+467"/>
+        <location line="+472"/>
         <source>&quot;%s&quot; does not exist.</source>
         <translation>&quot;%s&quot; 不存在。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-107"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-114"/>
         <source>Save as BMP</source>
         <translation>另存 BMP</translation>
     </message>
@@ -2457,7 +2458,7 @@
         <translation>建立时间轴</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-120"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-126"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation>译码视频使用 VDPAU (NVIDIA)</translation>
     </message>
@@ -2468,12 +2469,12 @@
         <translation>你没&apos;有FAAC!，它是建立 PSP 兼容视频所需。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+46"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+50"/>
         <source>Load saved settings</source>
         <translation>加载保存设定</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+916"/>
+        <location filename="../../common/gui_main.cpp" line="+911"/>
         <source>Frame size:</source>
         <translation>帧大小:</translation>
     </message>
@@ -2488,7 +2489,7 @@
         <translation>插件程序(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+80"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+86"/>
         <source>VDPAU (best)</source>
         <translation>VDPAU (最好)</translation>
     </message>
@@ -2504,7 +2505,7 @@
         <translation>NTSC 16:9</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="+272"/>
+        <location filename="../../common/gui_savenew.cpp" line="+279"/>
         <source>The video is in copy mode but the cut points are not on keyframes.
 The video will be saved but there will be corruption at cut point(s).
 Do you want to continue anyway ?</source>
@@ -2513,7 +2514,7 @@
 您要继续吗 ?</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-915"/>
+        <location filename="../../common/gui_main.cpp" line="-910"/>
         <source>File error</source>
         <translation>文件错误</translation>
     </message>
@@ -2538,8 +2539,7 @@
         <translation>默认的后置处理</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-89"/>
-        <location line="+24"/>
+        <location filename="../../common/gui_savenew.cpp" line="-85"/>
         <source>Cannot create encoder</source>
         <translation>不能建立编码器</translation>
     </message>
@@ -2554,17 +2554,17 @@
         <translation>x86-64</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+472"/>
+        <location filename="../../common/gui_main.cpp" line="+466"/>
         <source>Checking video</source>
         <translation>正在检查视频</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+513"/>
+        <location filename="../../common/gui_save.cpp" line="+514"/>
         <source>Saving %s as a BMP file failed.</source>
         <translation>另存 %s 为 BMP 档失败。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-158"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-164"/>
         <source>_Enable alternative keyboard shortcuts</source>
         <translation>启用备用的键盘快捷方式</translation>
     </message>
@@ -2574,12 +2574,12 @@
         <translation>译码视频使用 LIBVA (INTEL)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-436"/>
+        <location filename="../../common/gui_main.cpp" line="-430"/>
         <source>Cannot open project using the video loader.</source>
         <translation>使用视频加载器时无法开启项目。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+88"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+94"/>
         <source>LIBVA (best)</source>
         <translation>LIBVA (最好)</translation>
     </message>
@@ -2589,7 +2589,7 @@
         <translation>Film 转成 PAL</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-443"/>
+        <location filename="../../common/gui_save.cpp" line="-442"/>
         <source>Select File to Save</source>
         <translation>选择文件进行保存</translation>
     </message>
@@ -2614,27 +2614,27 @@
         <translation>重复取样频率 (Hz)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+696"/>
+        <location filename="../../common/gui_main.cpp" line="+690"/>
         <source>Setting the language for the given track index is not possible: Invalid track index!</source>
         <translation>设定的语言无法提供跟踪索引：无效跟踪指标！</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-172"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-178"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation>默认为保存最后读取文件的目录</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+144"/>
         <source>_Language</source>
         <translation>语言</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-64"/>
+        <location filename="../../common/gui_save.cpp" line="-67"/>
         <source>No file loaded</source>
         <translation>没有文件加载</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-636"/>
+        <location filename="../../common/gui_main.cpp" line="-630"/>
         <source>The file you just loaded contains several audio tracks.
 Go to Audio-&gt;MainTrack to select the active one.</source>
         <translation>这文件刚刚加载包含一些音频轨道。
@@ -2666,7 +2666,7 @@
         <translation>保存工作</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-155"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-161"/>
         <source>_Check for new release</source>
         <translation>检查有新版本</translation>
     </message>
@@ -2676,12 +2676,22 @@
         <translation>索引/拆开打包的优先次序:</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+        <location line="+10"/>
+        <source>Auto-Append Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2701,7 +2711,7 @@
         <translation>去除环状色斑</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+8"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+9"/>
         <source>8-bit PCM</source>
         <translation>8比特 PCM</translation>
     </message>
@@ -2716,7 +2726,7 @@
         <translation>关键帧提高(%)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-148"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-154"/>
         <source>Enable MMX</source>
         <translation>启用 MMX</translation>
     </message>
@@ -2737,14 +2747,14 @@
         <translation>文件系统已满</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+257"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+263"/>
         <location line="+3"/>
         <location line="+3"/>
         <source>HW Accel</source>
         <translation>HW 硬件加速器</translation>
     </message>
     <message>
-        <location line="-259"/>
+        <location line="-265"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>同意在 DVD 使用非标准的音频频率</translation>
     </message>
@@ -2759,7 +2769,7 @@
         <translation>启用 MMXEXT</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-79"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-83"/>
         <source>Information</source>
         <translation>属性(&amp;I)</translation>
     </message>
@@ -2779,7 +2789,7 @@
         <translation>音频轨道有必要建立这样的档</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+572"/>
+        <location filename="../../common/gui_main.cpp" line="+566"/>
         <source>Cannot use that file as audio track</source>
         <translation>不能使用该档作为音频轨道</translation>
     </message>
@@ -2804,17 +2814,17 @@
         <translation>非常高</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1386"/>
+        <location filename="../../common/gui_main.cpp" line="-1384"/>
         <source>Select script/project to run</source>
         <translation>选择要执行的脚本/项目</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+223"/>
         <source>_Always ask which port to use</source>
         <translation>制作视频始终询问要使用哪个埠(Avidemux+Avisynth)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+89"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+93"/>
         <source>Go To Marker A</source>
         <translation>将标记A(选择开始)</translation>
     </message>
@@ -2829,7 +2839,7 @@
         <translation>前段立体+后段立体</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-53"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-57"/>
         <source>Pr&amp;eferences</source>
         <translation>首选项-偏好设定(&amp;E)</translation>
     </message>
@@ -2866,7 +2876,7 @@
         <translation>去除垂直方向块状色斑</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1210"/>
+        <location filename="../../common/gui_main.cpp" line="+1208"/>
         <source>Errors found in %u frames</source>
         <translation>在 %u 帧中发现错误</translation>
     </message>
@@ -2896,13 +2906,13 @@
         <translation>自由型 2</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-667"/>
+        <location filename="../../common/gui_main.cpp" line="-661"/>
         <location line="+21"/>
         <source>Cutting</source>
         <translation>剪切</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+58"/>
+        <location filename="../../common/gui_save.cpp" line="+61"/>
         <source>Select BMP to Save</source>
         <translation>选择 BMP 进行保存</translation>
     </message>
@@ -2912,7 +2922,7 @@
         <translation>几秒钟</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+484"/>
+        <location filename="../../common/gui_save.cpp" line="+483"/>
         <source>File %s has been successfully saved.</source>
         <translation>文件 %s 已经成功地保存。</translation>
     </message>
@@ -2922,7 +2932,7 @@
         <translation>不到一分钟</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+48"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+52"/>
         <source>Next Black Frame</source>
         <translation>转到下一帧黑框</translation>
     </message>
@@ -2942,7 +2952,7 @@
         <translation>前往时间点</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-209"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-215"/>
         <source>Multi-threading</source>
         <translation>多线程</translation>
     </message>
@@ -2967,12 +2977,12 @@
         <translation>PAL 转成 Film</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-57"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-61"/>
         <source>Reset Markers</source>
         <translation>取消标记</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+238"/>
         <source>Default port to use</source>
         <translation>制作视频要使用默认埠(Avidemux)</translation>
     </message>
@@ -2982,29 +2992,28 @@
         <translation>信息等级:</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+667"/>
+        <location filename="../../common/gui_main.cpp" line="+661"/>
         <source>You can&apos;t remove all frames</source>
         <translation>你不&apos;能移除所有的帧</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+32"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+36"/>
         <source>&amp;Advanced</source>
         <translation>高级(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-123"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-129"/>
         <source>Enable openGl support</source>
         <translation>启用openGl支援</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-980"/>
+        <location filename="../../common/gui_main.cpp" line="-979"/>
         <source>tinyPy script is not enabled in this build</source>
         <translation>在生成中未启用 tinyPy 脚本</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-8"/>
         <source>Cannot setup codec. Bitrate too low?</source>
-        <translation>无法安装编译码器，比特率太低？</translation>
+        <translation type="vanished">无法安装编译码器，比特率太低？</translation>
     </message>
     <message>
         <location filename="../../common/gui_save.cpp" line="-527"/>
@@ -3013,7 +3022,7 @@
     </message>
     <message>
         <location filename="../../common/gui_main.cpp" line="-25"/>
-        <location line="+68"/>
+        <location line="+73"/>
         <source>Select Video File...</source>
         <translation>选择视频檔...</translation>
     </message>
@@ -3039,19 +3048,20 @@
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-44"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-48"/>
         <source>Reset Edit</source>
         <translation>取消编辑(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1299"/>
+        <location filename="../../common/gui_main.cpp" line="+1294"/>
         <source>Failed to connect to avsproxy.
 Is it running ?</source>
         <translation>无法联机到 avs代理，
 要继续执行吗?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+16"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+17"/>
+        <location line="+2"/>
         <source>Save current settings as default</source>
         <translation>将当前设置保存为默认值</translation>
     </message>
@@ -3072,18 +3082,18 @@
         <translation>MP3 编译码器不允许禁用资源，安装了 lame插件程序</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-46"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-49"/>
         <source>Save as Image</source>
         <translation>另存图片(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+280"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+286"/>
         <location line="+3"/>
         <source>Preferences</source>
         <translation>首选项-偏好设定</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-266"/>
+        <location filename="../../common/gui_main.cpp" line="-267"/>
         <source>_Track from video:</source>
         <translation>视频中的轨道:</translation>
     </message>
@@ -3093,21 +3103,17 @@
         <translation>1/4像素</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+126"/>
+        <location filename="../../common/gui_save.cpp" line="+127"/>
         <source>Saving audio</source>
         <translation>正在保存音频</translation>
     </message>
     <message>
-        <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="vanished">在 .mp4 对 MP3 使用选择对象卷标</translation>
-    </message>
-    <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-29"/>
         <source>_Interlaced</source>
         <translation>交错扫描</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+75"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+79"/>
         <source>Open Application &amp;Log</source>
         <translation>开启应用程序Log(&amp;L)</translation>
     </message>
@@ -3125,7 +3131,7 @@
         <translation>过滤器(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-244"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-250"/>
         <source>_lavc threads:</source>
         <translation>lavc 线程:</translation>
     </message>
@@ -3140,12 +3146,12 @@
         <translation>灰阶</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+194"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+200"/>
         <source>Refresh Rate Cap (ms)</source>
         <translation>重整速率上限 (ms)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-24"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-28"/>
         <source>Set Marker A</source>
         <translation>设定标记 A</translation>
     </message>
@@ -3171,17 +3177,17 @@
         <translation>卡通模式</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+46"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+50"/>
         <source>Previous Frame</source>
         <translation>转到上一帧</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+227"/>
+        <location filename="../../common/gui_main.cpp" line="+228"/>
         <source>AvsProxy</source>
         <translation>AvsProxy</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-180"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-186"/>
         <source>_Playback priority:</source>
         <translation>倒带优先次序:</translation>
     </message>
@@ -3192,7 +3198,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="-1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+104"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+110"/>
         <source>_Horizontal deblocking</source>
         <translation>去除水平方向块状色斑</translation>
     </message>
@@ -3212,7 +3218,7 @@
         <translation>Gettext</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-84"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-88"/>
         <source>Save as JPEG</source>
         <translation>另存JPEG</translation>
     </message>
@@ -3222,7 +3228,7 @@
         <translation>2通</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-839"/>
+        <location filename="../../common/gui_main.cpp" line="-834"/>
         <source>Could not open the file</source>
         <translation>无法开启此文件</translation>
     </message>
@@ -3247,7 +3253,7 @@
         <translation>介...是减少(%)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+86"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+90"/>
         <source>Previous Intra Frame</source>
         <translation>转到上一帧(关键帧或I帧)</translation>
     </message>
@@ -3262,7 +3268,7 @@
         <translation>XVideo (最好)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+285"/>
+        <location filename="../../common/gui_main.cpp" line="+279"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
@@ -3274,8 +3280,7 @@
         <translation>音频编码器</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-162"/>
-        <location line="+321"/>
+        <location filename="../../common/gui_main.cpp" line="+159"/>
         <source>Something bad happened (II)</source>
         <translation>不幸的事情发生 (II)</translation>
     </message>
@@ -3311,10 +3316,6 @@
         <translation>插件-音频(ADM)</translation>
     </message>
     <message>
-        <source>Cannot get tinyPÿ script engine</source>
-        <translation type="vanished">不能获得tinyPÿ脚本引擎</translation>
-    </message>
-    <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+6"/>
         <source>Curve Compression</source>
         <translation>曲线压缩</translation>
@@ -3325,46 +3326,22 @@
         <translation>模式决定</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-29"/>
+        <location filename="../../common/gui_save.cpp" line="-30"/>
         <source>Queue job to jobList</source>
         <translation>工作清单</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
         <source>Internal error opening 0x%x</source>
         <translation>内部开启错误中 0x%x</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-918"/>
+        <location filename="../../common/gui_main.cpp" line="-912"/>
         <source>Are you sure?</source>
         <translation>确定吗?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+812"/>
-        <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
-Dropping a keyframe will result in severely corrupted video.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
-Dropping a frame may result in some video corruption.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Do not warn again and drop frames silently while saving this video?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3608,7 +3585,7 @@
         <translation>复合格式</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+84"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+85"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
@@ -3680,7 +3657,7 @@
 <context>
     <name>bitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+168"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+169"/>
         <source>-</source>
         <translation>-</translation>
     </message>
@@ -3791,40 +3768,45 @@
     <name>blackenDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/blackenBorders.ui" line="+59"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+59"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+112"/>
         <source>Top:</source>
         <translation>顶边:</translation>
     </message>
     <message>
         <location line="+71"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+71"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+14"/>
         <source>Left:</source>
         <translation>左边:</translation>
     </message>
     <message>
         <location line="-28"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-7"/>
         <source>Reset</source>
         <translation>重设</translation>
     </message>
     <message>
         <location line="-88"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-88"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-105"/>
         <source>Blacken Borders</source>
         <translation>1.3-加入内边框填黑-框厚度不限</translation>
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
         <source>Right:</source>
         <translation>右边:</translation>
     </message>
     <message>
         <location line="+71"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+71"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-14"/>
         <source>Bottom:</source>
         <translation>下边:</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>blackframes</name>
@@ -3845,14 +3827,37 @@
     </message>
 </context>
 <context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+238"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+243"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-200"/>
         <source>29.97 (NTSC)</source>
         <translation>29.97 (NTSC)</translation>
     </message>
@@ -3867,22 +3872,27 @@
         <translation>25  (PAL)</translation>
     </message>
     <message>
-        <location line="+197"/>
+        <location line="+202"/>
         <source>Invalid fps</source>
         <translation>无效FPS(帧数/秒)</translation>
     </message>
     <message>
-        <location line="-198"/>
+        <location line="-203"/>
         <source>Custom</source>
         <translation>自定义</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+5"/>
+        <source>59.94  (NTSC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
         <source>Change FPS</source>
         <translation>1.0-改变帧速度</translation>
     </message>
     <message>
-        <location line="+156"/>
+        <location line="+161"/>
         <source>Change fps</source>
         <translation>改变FPS(帧数/秒)</translation>
     </message>
@@ -3897,27 +3907,22 @@
         <translation>目的地帧播放速率 :</translation>
     </message>
     <message>
-        <location line="-183"/>
+        <location line="-188"/>
         <source>23.976 (Film)</source>
         <translation>23.976 (Film)</translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+182"/>
         <source>Source Fps:</source>
         <translation>源头 Fps :</translation>
     </message>
     <message>
-        <location line="-174"/>
-        <source>59.93  (NTSC)</source>
-        <translation>59.93  (NTSC)</translation>
-    </message>
-    <message>
-        <location line="+33"/>
+        <location line="-146"/>
         <source>Speed up/slow down the video as if altering fps. This filter changes duration.</source>
         <translation>视频快慢改变fps(帧/秒)的速度，这过滤可以改变时间.</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+151"/>
         <source>Destination Fps:</source>
         <translation>目的地 Fps:</translation>
     </message>
@@ -4216,7 +4221,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4472,37 +4477,37 @@
 <context>
     <name>encodingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+456"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+480"/>
         <location line="+31"/>
         <location line="+57"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="-398"/>
+        <location line="-409"/>
         <source>Low</source>
         <translation>低</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+247"/>
         <location line="+7"/>
         <location line="+14"/>
         <source>0 MB</source>
         <translation>0 MB</translation>
     </message>
     <message>
-        <location line="-277"/>
+        <location line="-288"/>
         <source>High</source>
         <translation>高</translation>
     </message>
     <message>
-        <location line="-84"/>
+        <location line="-97"/>
         <source>Main</source>
         <translation>主要</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+220"/>
+        <location line="+25"/>
+        <location line="+247"/>
         <location line="+21"/>
         <source>None</source>
         <translation>无</translation>
@@ -4513,12 +4518,12 @@
         <translation>音频编译码器:</translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-193"/>
         <source>Priority:</source>
         <translation>优先权:</translation>
     </message>
     <message>
-        <location line="+281"/>
+        <location line="+292"/>
         <source>Video Size:</source>
         <translation>视频大小:</translation>
     </message>
@@ -4528,12 +4533,12 @@
         <translation>音频大小:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-248"/>
         <source>Above Normal</source>
         <translation>高于一般</translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+205"/>
         <source>Video Codec:</source>
         <translation>视频编译码器:</translation>
     </message>
@@ -4543,12 +4548,12 @@
         <translation>已处理的帧:</translation>
     </message>
     <message>
-        <location line="-325"/>
+        <location line="-336"/>
         <source>Below Normal</source>
         <translation>低于一般</translation>
     </message>
     <message>
-        <location line="+389"/>
+        <location line="+400"/>
         <source>Elapsed:</source>
         <translation>经过时间:</translation>
     </message>
@@ -4563,37 +4568,37 @@
         <translation>00:00:00</translation>
     </message>
     <message>
-        <location line="-453"/>
+        <location line="-511"/>
         <source>Time Remaining:</source>
         <translation>剩余时间:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+99"/>
         <source>Normal</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="-68"/>
         <source>Phase:</source>
         <translation>阶段:</translation>
     </message>
     <message>
-        <location line="+396"/>
+        <location line="+416"/>
         <source>Quantiser:</source>
         <translation>量化器:</translation>
     </message>
     <message>
-        <location line="-378"/>
+        <location line="-389"/>
         <source>Shut down computer when finished</source>
         <translation>完成后关闭计算器</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+120"/>
         <source>Pause / Abort</source>
         <translation>暂停 / 停止</translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+245"/>
         <source>Average Bitrate:</source>
         <translation>平均比特率(ABR):</translation>
     </message>
@@ -4603,17 +4608,22 @@
         <translation>容器:</translation>
     </message>
     <message>
-        <location line="-292"/>
+        <location line="-316"/>
         <source>Encoding...</source>
         <translation>正在编码...</translation>
     </message>
     <message>
         <location line="+145"/>
+        <source>Keep dialog open when finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
         <source>Minimize to Tray</source>
         <translation>缩到工具栏上</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+33"/>
         <source>Advanced</source>
         <translation>高级</translation>
     </message>
@@ -4623,8 +4633,8 @@
         <translation>帧/秒:</translation>
     </message>
     <message>
-        <location line="-498"/>
-        <location line="+251"/>
+        <location line="-501"/>
+        <location line="+254"/>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
@@ -4722,7 +4732,7 @@
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation>1.4-淡化效果</translation>
@@ -4733,7 +4743,32 @@
         <translation>淡化某一段时间效果.</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+13"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4746,7 +4781,7 @@
 <context>
     <name>fadeToBlack</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+67"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+66"/>
         <source>In</source>
         <translation>淡入</translation>
     </message>
@@ -4756,7 +4791,7 @@
         <translation>淡出</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4771,7 +4806,7 @@
         <translation>淡化型式:</translation>
     </message>
     <message>
-        <location line="-8"/>
+        <location line="-4"/>
         <source>Fade out</source>
         <translation>淡出</translation>
     </message>
@@ -4782,12 +4817,12 @@
     </message>
     <message>
         <location line="-11"/>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Fade to black</source>
         <translation>1.4-由淡到黑(淡入/淡出)</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-19"/>
         <source>Fade to black in/out.</source>
         <translation>由淡到黑 淡入/淡出-某一段时间效果。</translation>
     </message>
@@ -4795,7 +4830,7 @@
 <context>
     <name>ffVAEncH264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4810,12 +4845,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Profile:</source>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4826,16 +4882,21 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Bitrate (kbps):</source>
+        <source>Quality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4845,7 +4906,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4853,27 +4914,53 @@
 <context>
     <name>ffVAEncHEVC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+343"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4883,7 +4970,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4891,7 +4978,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+237"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+270"/>
         <source>Three threads</source>
         <translation>三个线程</translation>
     </message>
@@ -5360,8 +5447,8 @@
 <context>
     <name>ffnvenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+221"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+195"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+262"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+238"/>
         <source>Low Latency</source>
         <translation>低延迟</translation>
     </message>
@@ -5372,7 +5459,31 @@
         <translation>BluRay蓝光</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-8"/>
+        <source>Controlled by Preset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5387,13 +5498,25 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+15"/>
+        <source>RC Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+11"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Bitrate (kbps):</source>
         <translation>比特率 (kbps):</translation>
     </message>
@@ -5404,39 +5527,55 @@
         <translation>比特率 (kbps):</translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-2"/>
+        <location line="-5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-4"/>
         <source>Preset:</source>
         <translation>默认定:</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+5"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Frame Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>NVENC H.264 configuration</source>
         <translation>NVENC H.264 配置</translation>
     </message>
     <message>
-        <location line="-34"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-12"/>
+        <location line="-63"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-25"/>
         <source>Low Quality</source>
         <translation>低品质</translation>
     </message>
@@ -5447,13 +5586,8 @@
         <translation>高质量</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+17"/>
-        <source>nvEnc HEVC  configuration</source>
-        <translation>nvEnc HEVC  配置</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-13"/>
+        <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
         <source>Low Latency (HQ)</source>
         <translation>低延迟 (HQ)</translation>
     </message>
@@ -5463,6 +5597,11 @@
         <source>Low Latency (LQ)</source>
         <translation>低延迟 (LQ)</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+49"/>
+        <source>NVENC HEVC configuration</source>
+        <translation>NVENC HEVC 配置</translation>
+    </message>
 </context>
 <context>
     <name>ffpsmuxer</name>
@@ -5482,7 +5621,7 @@
         <translation>Mpeg PS 复合器</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+196"/>
         <source> video not compatible
 </source>
         <translation> 视频不相容
@@ -5532,12 +5671,12 @@
 </translation>
     </message>
     <message>
-        <location line="-179"/>
+        <location line="-188"/>
         <source>[Mismatch]</source>
         <translation>[Mismatch]</translation>
     </message>
     <message>
-        <location line="+144"/>
+        <location line="+153"/>
         <source> Bad width/height for DVD
 </source>
         <translation> 不对的宽度/高度为 DVD
@@ -5591,7 +5730,7 @@
         <translation>VBR 复合</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
         <source>Saving mpeg TS (ff)</source>
         <translation>保存 mpeg TS (ff)</translation>
     </message>
@@ -5649,7 +5788,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5807,7 +5946,7 @@
 <context>
     <name>flvdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>This FLV file says it has no video.
 I will assume it has and try to continue</source>
         <translation>这个 FLV 档说它有没有视频。我将假设已并尝试继续</translation>
@@ -6338,7 +6477,7 @@
 <context>
     <name>jobs</name>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Oops</source>
         <translation>Oops</translation>
     </message>
@@ -6363,7 +6502,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+6"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+5"/>
         <source>There are no jobs stored</source>
         <translation>没有保存任何工作</translation>
     </message>
@@ -6378,7 +6517,7 @@
         <translation>执行工作</translation>
     </message>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="-6"/>
+        <location filename="../../common/GUI_jobs.cpp" line="-5"/>
         <source>Something very wrong happened when building joblist.</source>
         <translation>建立任务栏表时发生某些重大错误。</translation>
     </message>
@@ -6836,12 +6975,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+477"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+570"/>
         <source>Matroska clusters</source>
         <translation>Matroska 集群</translation>
     </message>
     <message>
-        <location line="-431"/>
+        <location line="-523"/>
         <source>Matroska Images</source>
         <translation>Matroska 图像</translation>
     </message>
@@ -6941,7 +7080,7 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+167"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
         <source>Saving Mkv</source>
         <translation>保存 Mkv中</translation>
     </message>
@@ -7040,15 +7179,20 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
         <source>Problem reading SVQ3 headers</source>
         <translation>读取 SVQ3 档头时发生问题</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
         <source>Muxing Format</source>
         <translation>复合器格式</translation>
     </message>
@@ -7083,7 +7227,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Do not rotate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7108,7 +7252,72 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+223"/>
+        <location line="+3"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+183"/>
         <source>Saving PSP</source>
         <translation>保存 PSP</translation>
     </message>
@@ -7118,30 +7327,16 @@
         <translation>保存 mp4</translation>
     </message>
     <message>
-        <source>Use alternate MP3 tag</source>
-        <translation type="vanished">使用备用的 MP3 标记</translation>
-    </message>
-    <message>
-        <location line="-155"/>
-        <source>Only MP4Video, H264, and H265 supported for video</source>
-        <translation>唯一的 MP4视频， H264、H265、ASP(ff)、ASP(xvid4) 支持视频编码</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+4"/>
         <source>MP4 Muxer</source>
         <translation>复合器</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+0"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="-212"/>
+        <location line="+17"/>
         <source>Unsupported</source>
         <translation>未支援的</translation>
     </message>
-    <message>
-        <location line="+0"/>
-        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
-        <translation>只有 AAC、 AC3、 E AC3 和mpeg音频支援音频</translation>
-    </message>
 </context>
 <context>
     <name>mp4v2muxer</name>
@@ -7311,7 +7506,7 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+494"/>
+        <location filename="../../common/gui_navigate.cpp" line="+484"/>
         <source>Seek</source>
         <translation>寻求</translation>
     </message>
@@ -7541,26 +7736,17 @@
 <context>
     <name>psdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="vanished">错误</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
         <translation>正在索引</translation>
     </message>
     <message>
-        <source>This file&apos;s index has been created with an older version of avidemux.
-Please delete the idx2 file and reopen.</source>
-        <translation type="vanished">用旧版本的剪切建立此档&apos;案索引，请删除 idx2 档，然后重新打开。</translation>
-    </message>
-    <message>
-        <location line="+42"/>
+        <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>有几个文件使用顺序文件名称，所有加载他们吗？</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -7618,34 +7804,34 @@
 <context>
     <name>qencoding</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="+378"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="+401"/>
         <source>Abort</source>
         <translation>中止</translation>
     </message>
     <message>
-        <location line="-313"/>
+        <location line="-336"/>
         <location line="+20"/>
         <source>Privileges Required</source>
         <translation>需要特殊权限</translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+127"/>
         <source>Pass 1</source>
         <translation>通过 1</translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+189"/>
         <source>Resume</source>
         <translation>继续</translation>
     </message>
     <message>
-        <location line="-313"/>
+        <location line="-336"/>
         <location line="+20"/>
         <source>Root privileges are required to perform this operation.</source>
         <translation>需要 Root 权限来实行这项操作。</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+126"/>
         <source>First Pass</source>
         <translation>快速第1通</translation>
     </message>
@@ -7655,7 +7841,7 @@
         <translation>编码中...</translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+185"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>编码已经暂停。您要继续或中止?</translation>
     </message>
@@ -7683,12 +7869,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+2068"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+2085"/>
         <source>%c-%s (%02d)</source>
         <translation>%c-%s (%02d)</translation>
     </message>
     <message>
-        <location line="-924"/>
+        <location line="-947"/>
         <source>Set start marker</source>
         <translation>设定开始标记</translation>
     </message>
@@ -7698,14 +7884,14 @@
         <translation>最近使用的 项目(&amp;P)</translation>
     </message>
     <message>
-        <location line="+1348"/>
+        <location line="+1403"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>应用程序遇到了一个致命的问题
 当前编辑已保保存, 将在下一开始重载</translation>
     </message>
     <message>
-        <location line="-668"/>
+        <location line="-723"/>
         <source>Go to previous keyframe</source>
         <translation>转到上一帧(关键帧或I帧)</translation>
     </message>
@@ -7730,7 +7916,20 @@
         <translation>倒退一分钟</translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="+984"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="-1288"/>
         <source>Go to first frame</source>
         <translation>转到第一帧</translation>
     </message>
@@ -7765,12 +7964,7 @@
         <translation>转到上一帧</translation>
     </message>
     <message>
-        <location line="+1270"/>
-        <source> (%d track(s))</source>
-        <translation> (%d 轨(s))</translation>
-    </message>
-    <message>
-        <location line="-1267"/>
+        <location line="+3"/>
         <source>Go to next frame</source>
         <translation>转到下一帧</translation>
     </message>
@@ -8013,18 +8207,26 @@
         <source>Yes</source>
         <translation>是</translation>
     </message>
+    <message numerus="yes">
+        <location line="+72"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
     <message>
-        <location line="+98"/>
+        <location line="+34"/>
         <source>Mono</source>
         <translation>单音</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
         <source>Audio</source>
         <translation>音频</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-27"/>
         <source>Video</source>
         <translation>视频</translation>
     </message>
@@ -8034,22 +8236,22 @@
         <translation>图片大小(DAR):	</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+42"/>
         <source>No Audio</source>
         <translation>没音频</translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="-38"/>
         <source>Frame Rate:	</source>
         <translation>帧率:	</translation>
     </message>
     <message>
-        <location line="-123"/>
+        <location line="-132"/>
         <source>%2.3f fps</source>
         <translation>%2.3f fps</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+144"/>
         <source>Extra data:	</source>
         <translation>额外数据：:	</translation>
     </message>
@@ -8064,18 +8266,18 @@
         <translation>额外视频属性</translation>
     </message>
     <message>
-        <location line="-123"/>
-        <location line="+81"/>
+        <location line="-132"/>
+        <location line="+90"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation>%02d:%02d:%02d.%03d</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+65"/>
         <source>Channels:	</source>
         <translation>频道:	</translation>
     </message>
     <message>
-        <location line="-27"/>
+        <location line="-33"/>
         <source>Codec 4CC:	</source>
         <translation>编译码器 4CC:	</translation>
     </message>
@@ -8085,17 +8287,17 @@
         <translation>立体声</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+79"/>
         <source>Codec:		</source>
         <translation>编译码器：		</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-159"/>
         <source>%s (%u:%u)</source>
         <translation>%s (%u:%u)</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+163"/>
         <source>Bitrate:	</source>
         <translation>比特率:	</translation>
     </message>
@@ -8105,13 +8307,13 @@
         <translation>频率:	</translation>
     </message>
     <message>
-        <location line="-21"/>
+        <location line="-27"/>
         <source>ExtraDataSize:	</source>
         <translation>额外的数据大小：	</translation>
     </message>
     <message>
         <location line="-4"/>
-        <location line="+27"/>
+        <location line="+33"/>
         <source>Total Duration:	</source>
         <translation>总持续时间：	</translation>
     </message>
@@ -8119,7 +8321,7 @@
 <context>
     <name>qshell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+44"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+54"/>
         <source>You can use CTRL+PageUP and CTRL+Page Down to recall previous commands
 Ready.
 </source>
@@ -8128,7 +8330,20 @@
 </translation>
     </message>
     <message>
-        <location line="-1"/>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-4"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
         <translation>输入您的命令，然后按下求值按钮或按 CTRL + ENTER。
@@ -8195,6 +8410,16 @@
         <source>Video Only Muxer Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>removeplane</name>
@@ -8262,42 +8487,42 @@
         <translation>25  (PAL)</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+4"/>
+        <source>59.94  (NTSC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Resample FPS</source>
         <translation>1.0-调整帧速度(重新取样)-用在数码转换DVD</translation>
     </message>
     <message>
-        <location line="+285"/>
+        <location line="+289"/>
         <source>Resample fps</source>
         <translation>重新取样 fps</translation>
     </message>
     <message>
-        <location line="-325"/>
+        <location line="-329"/>
         <source>Custom</source>
         <translation>自定义</translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+322"/>
         <source>_Mode:</source>
         <translation>模式:</translation>
     </message>
     <message>
-        <location line="-316"/>
+        <location line="-320"/>
         <source>23.976 (Film)</source>
         <translation>23.976 (电影)</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>59.93  (NTSC)</source>
-        <translation>59.93  (NTSC)</translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+39"/>
         <source>Change and enforce FPS. Keep duration and sync.</source>
         <translation>结束时间仍然一样，例如15 fps电影从数码转换 DVD，一般PC上看不出来效果。</translation>
     </message>
     <message>
-        <location line="+278"/>
+        <location line="+282"/>
         <source>_New frame rate:</source>
         <translation>新帧率:</translation>
     </message>
@@ -8310,7 +8535,7 @@
         <translation>调整比例像素大小。</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
         <source>Width and height cannot be odd</source>
         <translation>宽度和高度不能为奇数</translation>
     </message>
@@ -8410,17 +8635,31 @@
         <translation>16:9</translation>
     </message>
     <message>
+        <location line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+338"/>
+        <source>Lanzcos3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+40"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+212"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+212"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+212"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+212"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+212"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+212"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+212"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+212"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+212"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+212"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-126"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-126"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-126"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-126"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-126"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-126"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-126"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-126"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-126"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-126"/>
         <source>200%</source>
         <translation>200%</translation>
     </message>
@@ -8576,31 +8815,21 @@
     </message>
     <message>
         <location line="+146"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+146"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+146"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+146"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+146"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+146"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+146"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+146"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+146"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+146"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+146"/>
-        <source>Lanzcos3</source>
-        <translation>Lanzcos3三阶线性</translation>
+        <source>Lanczos-3</source>
+        <translation>Lanczos-3三阶线性</translation>
     </message>
     <message>
         <location line="-5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+141"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+141"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+141"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+141"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+141"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+141"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+141"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+141"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+141"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+141"/>
         <source>Bicubic</source>
         <translation>双立方</translation>
     </message>
@@ -9034,31 +9263,32 @@
 <context>
     <name>tsdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="vanished">错误</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+193"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+92"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+219"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+347"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+105"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
         <translation>正在索引</translation>
     </message>
     <message>
-        <source>This file&apos;s index has been created with an older version of avidemux.
-Please delete the idx2 file and reopen.</source>
-        <translation type="vanished">这是用旧版本Avidemux建立的索引文件 &apos;案，请删除 idx2 档，然后重新打开。</translation>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="-10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="-8"/>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-173"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="-12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="-19"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>有几个文件使用顺序文件名称，将所有加载他们吗？</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -9150,29 +9380,147 @@
     </message>
 </context>
 <context>
+    <name>vaapiDeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Adaptive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Compensated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vaapiResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+208"/>
-        <source>vaapi</source>
-        <translation>vaapi</translation>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
+        <translation type="unfinished">VA-API 重设大小</translation>
     </message>
     <message>
-        <location line="-140"/>
-        <source>vaapi: Resize image using vaapi.</source>
-        <translation>vaapi： 使用 vaapi 的大小调整图像。</translation>
+        <location line="+1"/>
+        <source>Resize image using VA-API.</source>
+        <translation>使用 VA-API 的大小调整图像。</translation>
     </message>
     <message>
-        <location line="-1"/>
-        <source>vaapi: Resize</source>
-        <translation>vaapi: 重设大小</translation>
+        <location line="+131"/>
+        <source>mpeg-&gt;PC</source>
+        <translation>mpeg-&gt;PC</translation>
     </message>
     <message>
-        <location line="+137"/>
-        <source>mpeg-&gt;PC:</source>
-        <translation>mpeg-&gt;PC:</translation>
+        <location line="+4"/>
+        <source>vaapi</source>
+        <translation>vaapi</translation>
     </message>
     <message>
-        <location line="-1"/>
+        <location line="-5"/>
         <source>Height :</source>
         <translation>高 :</translation>
     </message>
@@ -9185,7 +9533,7 @@
 <context>
     <name>vdpaudeint</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+332"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+344"/>
         <source>vdpau</source>
         <translation>vdpau</translation>
     </message>
@@ -9196,18 +9544,18 @@
     </message>
     <message>
         <location line="-2"/>
-        <source>_Ivtc:</source>
-        <translation>Ivtc:</translation>
+        <source>_IVTC</source>
+        <translation>Ivtc</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-205"/>
         <source>vdpauDeint</source>
         <translation>vdpau去交错</translation>
     </message>
     <message>
-        <location line="+194"/>
-        <source>_Resize:</source>
-        <translation>重设大小:</translation>
+        <location line="+206"/>
+        <source>_Resize</source>
+        <translation>重设大小</translation>
     </message>
     <message>
         <location line="-8"/>
@@ -9221,18 +9569,18 @@
     </message>
     <message>
         <location line="+10"/>
-        <source>Height :</source>
-        <translation>高 :</translation>
+        <source>Height:</source>
+        <translation>高:</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-208"/>
         <source>VDPAU deinterlacer (+resize).</source>
         <translation>VDPAU 去交错化 （+ 重设大小）.</translation>
     </message>
     <message>
-        <location line="+195"/>
-        <source>Width :</source>
-        <translation>宽 :</translation>
+        <location line="+207"/>
+        <source>Width:</source>
+        <translation>宽:</translation>
     </message>
     <message>
         <location line="-8"/>
@@ -9243,12 +9591,12 @@
 <context>
     <name>vdpresize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="+208"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="+206"/>
         <source>vdpau</source>
         <translation>vdpau</translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-136"/>
         <source>vdpau: Resize image using vdpau.</source>
         <translation>vdpau: 使用vdpau调整图像大小。</translation>
     </message>
@@ -9258,14 +9606,14 @@
         <translation>vdpau: 重设大小</translation>
     </message>
     <message>
-        <location line="+135"/>
-        <source>Height :</source>
-        <translation>高 :</translation>
+        <location line="+133"/>
+        <source>Height:</source>
+        <translation>高:</translation>
     </message>
     <message>
         <location line="-1"/>
-        <source>Width :</source>
-        <translation>宽 :</translation>
+        <source>Width:</source>
+        <translation>宽:</translation>
     </message>
 </context>
 <context>
@@ -9343,6 +9691,84 @@
     </message>
 </context>
 <context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vsWindow</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
@@ -9368,12 +9794,12 @@
         <translation>强制显示宽度</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+169"/>
         <source>Saving Webm</source>
         <translation>保存 Webm</translation>
     </message>
     <message>
-        <location line="-78"/>
+        <location line="-89"/>
         <source>Unsupported Audio.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
         <translation>只有 VP8/VP9 视频和 Vorbis/s/Opus音频支援</translation>
@@ -9393,22 +9819,22 @@
 <context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+19"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+20"/>
         <source>Elapsed:</source>
         <translation>已过时间:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+27"/>
         <source>00:00:00</source>
         <translation>00:00:00</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-13"/>
         <source>Time Remaining:</source>
         <translation>剩余时间:</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-20"/>
         <source>Processing</source>
         <translation>处理中</translation>
     </message>
@@ -9416,17 +9842,17 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+643"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+656"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-465"/>
+        <location line="-478"/>
         <source>none</source>
         <translation>无</translation>
     </message>
     <message>
-        <location line="+616"/>
+        <location line="+629"/>
         <location line="+70"/>
         <location line="+14"/>
         <source>Error</source>
@@ -9480,7 +9906,7 @@
         <translation>量化器:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
         <source>Not coded</source>
         <translation>不编码</translation>
     </message>
@@ -9491,10 +9917,6 @@
         <translation>kbit/s</translation>
     </message>
     <message>
-        <source>my profile</source>
-        <translation type="vanished">我的配置文件</translation>
-    </message>
-    <message>
         <location line="+207"/>
         <source>Replace the following preset ?:</source>
         <translation>替代以下的默认定吗?:</translation>
@@ -9556,12 +9978,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui" line="+2526"/>
         <location line="+179"/>
-        <location line="+302"/>
+        <location line="+307"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location line="-2114"/>
+        <location line="-2119"/>
         <source>0</source>
         <translation>0</translation>
     </message>
@@ -9598,12 +10020,12 @@
         <translation>7</translation>
     </message>
     <message>
-        <location line="+2583"/>
+        <location line="+2588"/>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
-        <location line="-2578"/>
+        <location line="-2583"/>
         <source>15</source>
         <translation>15</translation>
     </message>
@@ -9668,7 +10090,17 @@
         <translation>5.1</translation>
     </message>
     <message>
-        <location line="+2977"/>
+        <location line="+2540"/>
+        <source>Auto Variance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+437"/>
         <source>Custom:</source>
         <comment>multithreading</comment>
         <translation type="unfinished"></translation>
@@ -9709,7 +10141,7 @@
         <translation>VBR</translation>
     </message>
     <message>
-        <location line="-3621"/>
+        <location line="-3626"/>
         <source>Fast First Pass</source>
         <translation>快速第1通</translation>
     </message>
@@ -9720,23 +10152,23 @@
         <translation>自动</translation>
     </message>
     <message>
-        <location line="+2283"/>
+        <location line="+2288"/>
         <source>Crop</source>
         <translation>剪切</translation>
     </message>
     <message>
-        <location line="-1304"/>
-        <location line="+856"/>
+        <location line="-1309"/>
+        <location line="+861"/>
         <source>Edit</source>
         <translation>编辑</translation>
     </message>
     <message>
-        <location line="-1412"/>
+        <location line="-1417"/>
         <source>Fast</source>
         <translation>快</translation>
     </message>
     <message>
-        <location line="+1984"/>
+        <location line="+1989"/>
         <source>Film</source>
         <translation>电影</translation>
     </message>
@@ -9746,8 +10178,8 @@
         <translation>NTSC国家电视系统委员会</translation>
     </message>
     <message>
-        <location line="-2349"/>
-        <location line="+2596"/>
+        <location line="-2354"/>
+        <location line="+2601"/>
         <source>None</source>
         <translation>无</translation>
     </message>
@@ -9762,19 +10194,19 @@
         <translation>kbit</translation>
     </message>
     <message>
-        <location line="-1457"/>
+        <location line="-1462"/>
         <source>CABAC</source>
         <translation>CABAC（上下文自适应二进制算术编码）</translation>
     </message>
     <message>
-        <location line="+2239"/>
+        <location line="+2244"/>
         <location line="+63"/>
         <location line="+73"/>
         <source>BT709</source>
         <translation>BT709</translation>
     </message>
     <message>
-        <location line="-3780"/>
+        <location line="-3785"/>
         <source>Basic</source>
         <translation>基本</translation>
     </message>
@@ -9789,7 +10221,7 @@
         <translation>最小:</translation>
     </message>
     <message>
-        <location line="+1796"/>
+        <location line="+1801"/>
         <source>SECAM</source>
         <translation>SECAM顺序彩色与记忆</translation>
     </message>
@@ -9814,7 +10246,7 @@
         <translation>bytes比特</translation>
     </message>
     <message>
-        <location line="-1796"/>
+        <location line="-1801"/>
         <location line="+450"/>
         <location line="+36"/>
         <source>Disabled</source>
@@ -9826,7 +10258,7 @@
         <translation>直接预测模式:</translation>
     </message>
     <message>
-        <location line="+2270"/>
+        <location line="+2275"/>
         <source>These settings are only suggestions for the playback equipment.  Use at your own risk.</source>
         <translation>这些设定只是建议播放设备，使用您自担风险。</translation>
     </message>
@@ -9836,7 +10268,7 @@
         <translation>VBV 缓冲容量 :</translation>
     </message>
     <message>
-        <location line="-1715"/>
+        <location line="-1720"/>
         <source>Weighted Prediction for P-frames:</source>
         <translation>P-帧的加权预测:</translation>
     </message>
@@ -9846,12 +10278,12 @@
         <translation>最大量化步骤:</translation>
     </message>
     <message>
-        <location line="+537"/>
+        <location line="+542"/>
         <source>Maximum Size per Slice:</source>
         <translation>切割每帧最大容量:</translation>
     </message>
     <message>
-        <location line="-264"/>
+        <location line="-269"/>
         <source>Variance AQ:</source>
         <translation>可变 AQ:</translation>
     </message>
@@ -9861,7 +10293,7 @@
         <translation>高级速率控制(RC)</translation>
     </message>
     <message>
-        <location line="+3007"/>
+        <location line="+3012"/>
         <source>Video Format:</source>
         <translation>视频格式 :</translation>
     </message>
@@ -9871,7 +10303,7 @@
         <translation>生成假去错</translation>
     </message>
     <message>
-        <location line="-2247"/>
+        <location line="-2252"/>
         <source>Motion Vector</source>
         <translation>向量运动</translation>
     </message>
@@ -9886,12 +10318,12 @@
         <translation>P:I , P-帧量化率:</translation>
     </message>
     <message>
-        <location line="+872"/>
+        <location line="+877"/>
         <source>Enforce Repeatability</source>
         <translation>强制回放</translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-736"/>
         <source>P and B-frame Quantiser Ratio:</source>
         <translation>B:P, B-帧量化率:</translation>
     </message>
@@ -9961,12 +10393,12 @@
         <translation>平均比特率(ABR)(2通)</translation>
     </message>
     <message>
-        <location line="+2991"/>
+        <location line="+2996"/>
         <source>BluRay compatibility</source>
         <translation>BluRay兼容</translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-734"/>
         <source>Quantiser Curve Compression</source>
         <translation>量化曲线压缩(QCComp)</translation>
     </message>
@@ -9986,12 +10418,12 @@
         <translation>B-帧 (介于前I帧与后P帧间连续预测帧，例如: IBBBPBBBPBBBPBBBIBBBP....)</translation>
     </message>
     <message>
-        <location line="+1525"/>
+        <location line="+1530"/>
         <source>Auto-detect</source>
         <translation>自动侦测</translation>
     </message>
     <message>
-        <location line="-1375"/>
+        <location line="-1380"/>
         <source>Adaptive B-frame Decision:</source>
         <translation>自适应 B-帧的决定：</translation>
     </message>
@@ -10021,7 +10453,7 @@
         <translation>减少波动曲线压缩之前：</translation>
     </message>
     <message>
-        <location line="+966"/>
+        <location line="+971"/>
         <source>Component</source>
         <translation>合成的</translation>
     </message>
@@ -10032,7 +10464,7 @@
         <translation>BT470M</translation>
     </message>
     <message>
-        <location line="-1782"/>
+        <location line="-1787"/>
         <location line="+6"/>
         <source>Analysis</source>
         <translation>分析</translation>
@@ -10048,13 +10480,13 @@
         <translation>最大恒定速率系数(CRF模式)</translation>
     </message>
     <message>
-        <location line="+2571"/>
+        <location line="+2576"/>
         <source>Multithreading</source>
         <translation>多线程</translation>
     </message>
     <message>
-        <location line="-3186"/>
-        <location line="+3152"/>
+        <location line="-3191"/>
+        <location line="+3157"/>
         <source>Delete</source>
         <translation>删除</translation>
     </message>
@@ -10064,7 +10496,7 @@
         <translation>预定义PAR:</translation>
     </message>
     <message>
-        <location line="-2529"/>
+        <location line="-2534"/>
         <source>Uneven Multi-hexagonal Search</source>
         <translation>六角形搜索</translation>
     </message>
@@ -10084,7 +10516,7 @@
         <translation>加权参考+重复</translation>
     </message>
     <message>
-        <location line="+2523"/>
+        <location line="+2528"/>
         <source>LOG100</source>
         <translation>LOG100</translation>
     </message>
@@ -10094,7 +10526,7 @@
         <translation>LOG316</translation>
     </message>
     <message>
-        <location line="-1247"/>
+        <location line="-1252"/>
         <source>Chroma to Luma Quantiser Offset:</source>
         <translation>从色度到明度量化偏移量：</translation>
     </message>
@@ -10104,12 +10536,12 @@
         <translation>IDC等级:</translation>
     </message>
     <message>
-        <location line="+3642"/>
+        <location line="+3647"/>
         <source>Linear</source>
         <translation>线性</translation>
     </message>
     <message>
-        <location line="-1500"/>
+        <location line="-1505"/>
         <source>JVT Matrix</source>
         <translation>JVT 矩阵</translation>
     </message>
@@ -10124,7 +10556,7 @@
         <translation>运动</translation>
     </message>
     <message>
-        <location line="+2482"/>
+        <location line="+2487"/>
         <source>As Input</source>
         <translation>另输出为其他输入档(保留原始视频的PAR)</translation>
     </message>
@@ -10134,22 +10566,22 @@
         <translation>生成存取单元分隔符</translation>
     </message>
     <message>
-        <location line="-566"/>
+        <location line="-571"/>
         <source>Normal</source>
         <translation>正常</translation>
     </message>
     <message>
-        <location line="+560"/>
+        <location line="+565"/>
         <source>Output</source>
         <translation>输出</translation>
     </message>
     <message>
-        <location line="-1071"/>
+        <location line="-1076"/>
         <source>Flat Matrix</source>
         <translation>平面矩阵</translation>
     </message>
     <message>
-        <location line="+1452"/>
+        <location line="+1457"/>
         <location line="+78"/>
         <location line="+58"/>
         <source>SMPTE240M</source>
@@ -10167,7 +10599,7 @@
         <translation>HRD 参数：</translation>
     </message>
     <message>
-        <location line="-3423"/>
+        <location line="-3428"/>
         <location line="+200"/>
         <source>0 (High Quality)</source>
         <translation>0 (高质量)</translation>
@@ -10178,22 +10610,22 @@
         <translation>B 帧作为参考:</translation>
     </message>
     <message>
-        <location line="+2131"/>
+        <location line="+2136"/>
         <source>Colour Matrix:</source>
         <translation>颜色矩阵：</translation>
     </message>
     <message>
-        <location line="-3480"/>
+        <location line="-3485"/>
         <source>Constant Bitrate (Single Pass)</source>
         <translation>固定比特率(CBR)(1通)</translation>
     </message>
     <message>
-        <location line="+3624"/>
+        <location line="+3629"/>
         <source>Full Range Samples</source>
         <translation>全范围色度样品</translation>
     </message>
     <message>
-        <location line="-1705"/>
+        <location line="-1710"/>
         <source>Quantisation Matrix</source>
         <translation>量化矩阵</translation>
     </message>
@@ -10210,12 +10642,12 @@
     </message>
     <message>
         <location line="-942"/>
-        <location line="+2490"/>
+        <location line="+2495"/>
         <source>frames</source>
         <translation>帧</translation>
     </message>
     <message>
-        <location line="-1269"/>
+        <location line="-1274"/>
         <source>Final Macroblock Only</source>
         <translation>最终的宏块(更快，中等质量)</translation>
     </message>
@@ -10225,12 +10657,7 @@
         <translation>B-帧的加权预测</translation>
     </message>
     <message>
-        <location line="+1441"/>
-        <source>Auto Variance AQ</source>
-        <translation>自动变量(AQ)</translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+1645"/>
         <source>kbit/s</source>
         <translation>kbit/s</translation>
     </message>
@@ -10240,29 +10667,29 @@
         <translation>初始 VBV 缓冲区占用：</translation>
     </message>
     <message>
-        <location line="-1752"/>
+        <location line="-1757"/>
         <source>Maximum Motion Vector Length:</source>
         <translation>最大向量运动长度:</translation>
     </message>
     <message>
-        <location line="+2560"/>
+        <location line="+2565"/>
         <location line="+63"/>
         <location line="+73"/>
         <source>BT470BG</source>
         <translation>BT470BG</translation>
     </message>
     <message>
-        <location line="-3768"/>
+        <location line="-3773"/>
         <source>Preset:</source>
         <translation>默认定:</translation>
     </message>
     <message>
-        <location line="+3291"/>
+        <location line="+3296"/>
         <source>Pixel Aspect Ratio</source>
         <translation>像素宽高比(PAR)-(不同于外观比的显示宽高比(DAR))</translation>
     </message>
     <message>
-        <location line="-1316"/>
+        <location line="-1321"/>
         <source>Fast Skip Detection on P-frames</source>
         <translation>快速跳过检测 P-帧 (场景中如有虚影时按取消)</translation>
     </message>
@@ -10282,7 +10709,7 @@
         <translation>混合参考</translation>
     </message>
     <message>
-        <location line="+877"/>
+        <location line="+882"/>
         <source>Advanced 1</source>
         <translation>高级 1</translation>
     </message>
@@ -10292,14 +10719,14 @@
         <translation>高级 2</translation>
     </message>
     <message>
-        <location line="-2699"/>
+        <location line="-2704"/>
         <location line="+200"/>
         <location line="+1649"/>
         <source>Quantiser</source>
         <translation>量化器</translation>
     </message>
     <message>
-        <location line="+1455"/>
+        <location line="+1460"/>
         <source>SMPTEL170M</source>
         <translation>SMPTEL170M</translation>
     </message>
@@ -10309,7 +10736,7 @@
         <translation>16:15 (PAL 4:3)</translation>
     </message>
     <message>
-        <location line="-2656"/>
+        <location line="-2661"/>
         <source>Sequence Parameter Set Identifer:</source>
         <translation>序列参数设定标识符:</translation>
     </message>
@@ -10320,22 +10747,22 @@
     </message>
     <message>
         <location line="-480"/>
-        <location line="+1328"/>
+        <location line="+1333"/>
         <source>Strength:</source>
         <translation>强度：</translation>
     </message>
     <message>
-        <location line="-1858"/>
+        <location line="-1863"/>
         <source>Hadamard Exhaustive Search</source>
         <translation>Hadamard彻底搜寻（TESA）</translation>
     </message>
     <message>
-        <location line="+2071"/>
+        <location line="+2076"/>
         <source>Slices per Frame:</source>
         <translation>切割每帧:</translation>
     </message>
     <message>
-        <location line="-1129"/>
+        <location line="-1134"/>
         <source>Maximum:</source>
         <translation>最大 :</translation>
     </message>
@@ -10345,12 +10772,12 @@
         <translation>量化曲线压缩(QCComp):</translation>
     </message>
     <message>
-        <location line="+858"/>
+        <location line="+863"/>
         <source>64:45 (PAL 16:9)</source>
         <translation>64:45 (PAL 16:9)</translation>
     </message>
     <message>
-        <location line="-3418"/>
+        <location line="-3423"/>
         <source>Profile:</source>
         <translation>配置文件：</translation>
     </message>
@@ -10395,12 +10822,12 @@
         <translation>菱形搜寻</translation>
     </message>
     <message>
-        <location line="+2085"/>
+        <location line="+2090"/>
         <source>Slicing</source>
         <translation>切割</translation>
     </message>
     <message>
-        <location line="-3057"/>
+        <location line="-3062"/>
         <source>x264 Configuraton</source>
         <translation>x264 配置</translation>
     </message>
@@ -10420,7 +10847,7 @@
         <translation>空间性</translation>
     </message>
     <message>
-        <location line="+1579"/>
+        <location line="+1584"/>
         <source>Video Buffer Verifier</source>
         <translation>视频缓冲验证器(VBV)</translation>
     </message>
@@ -10434,27 +10861,27 @@
         <translation>未定义</translation>
     </message>
     <message>
-        <location line="-3050"/>
+        <location line="-3055"/>
         <source>Macroblock-tree Rate Control</source>
         <translation>宏块-树速率控制</translation>
     </message>
     <message>
-        <location line="+2713"/>
+        <location line="+2718"/>
         <source>8:9 (NTSC 4:3)</source>
         <translation>8:9 (NTSC 4:3)</translation>
     </message>
     <message>
-        <location line="-2255"/>
+        <location line="-2260"/>
         <source>Prediction</source>
         <translation>预测</translation>
     </message>
     <message>
-        <location line="+1963"/>
+        <location line="+1968"/>
         <source>Disable</source>
         <translation>禁用</translation>
     </message>
     <message>
-        <location line="-627"/>
+        <location line="-632"/>
         <source>Minimum Quantiser:</source>
         <translation>最小量化:</translation>
     </message>
@@ -10464,13 +10891,13 @@
         <translation>I-帧线程:</translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1456"/>
         <source>Custom:</source>
         <comment>PAR</comment>
         <translation>自定义 :</translation>
     </message>
     <message>
-        <location line="-998"/>
+        <location line="-1003"/>
         <source>Maximum Quantiser:</source>
         <translation>最大量化:</translation>
     </message>
@@ -10515,12 +10942,12 @@
         <translation>蓝ray光模式</translation>
     </message>
     <message>
-        <location line="+1925"/>
+        <location line="+1930"/>
         <source>32:27 (NTSC 16:9)</source>
         <translation>32:27 (NTSC 16:9)</translation>
     </message>
     <message>
-        <location line="-1672"/>
+        <location line="-1677"/>
         <source>Maximum Consecutive B-frames:</source>
         <translation>最大的连续 B 帧：</translation>
     </message>
@@ -10530,17 +10957,17 @@
         <translation>时间性</translation>
     </message>
     <message>
-        <location line="+2268"/>
+        <location line="+2273"/>
         <source>Overscan:</source>
         <translation>过度扫描:</translation>
     </message>
     <message>
-        <location line="-2060"/>
+        <location line="-2065"/>
         <source>Threshold:</source>
         <translation>界限:</translation>
     </message>
     <message>
-        <location line="+1812"/>
+        <location line="+1817"/>
         <source>Output 1</source>
         <translation>输出 1</translation>
     </message>
@@ -10550,7 +10977,7 @@
         <translation>输出 2</translation>
     </message>
     <message>
-        <location line="-2118"/>
+        <location line="-2123"/>
         <source>4x4 Intra-predicted Blocks</source>
         <translation>4x4 内预测块状</translation>
     </message>
@@ -10590,12 +11017,12 @@
         <translation>色度运动估计(CME)</translation>
     </message>
     <message>
-        <location line="+1269"/>
+        <location line="+1274"/>
         <source>Custom Threaded Lookahead Buffer:</source>
         <translation>自定义线程预测先行缓冲区：</translation>
     </message>
     <message>
-        <location line="-1858"/>
+        <location line="-1863"/>
         <source>8x8 Intra-predicted Blocks</source>
         <translation>8x8 内预测块状</translation>
     </message>
@@ -10605,12 +11032,12 @@
         <translation>速率控制</translation>
     </message>
     <message>
-        <location line="+2575"/>
+        <location line="+2580"/>
         <source>Maximum VBV Bitrate:</source>
         <translation>最大 VBV 比特率 :</translation>
     </message>
     <message>
-        <location line="-2511"/>
+        <location line="-2516"/>
         <source>Encoding Mode:</source>
         <translation>编码模式:</translation>
     </message>
@@ -10625,12 +11052,12 @@
         <translation>画分搜寻</translation>
     </message>
     <message>
-        <location line="+1885"/>
+        <location line="+1890"/>
         <source>Slice-based Threading</source>
         <translation>切割基本线程</translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-736"/>
         <source>Average Bitrate Tolerance:</source>
         <translation>平均比特率误差(ABR):</translation>
     </message>
@@ -10645,22 +11072,22 @@
         <translation>次像素精细化(次ME)</translation>
     </message>
     <message>
-        <location line="+2734"/>
+        <location line="+2739"/>
         <source>Transfer Characteristics:</source>
         <translation>转移特性：</translation>
     </message>
     <message>
-        <location line="-1679"/>
+        <location line="-1684"/>
         <source>Psychovisual Rate Distortion Optimisation:</source>
         <translation>心理视觉优化(Psy RDO)：</translation>
     </message>
     <message>
-        <location line="+1478"/>
+        <location line="+1483"/>
         <source>Video Usability Information</source>
         <translation>视频可用性信息</translation>
     </message>
     <message>
-        <location line="-3196"/>
+        <location line="-3201"/>
         <source>Constant Rate Factor (Single Pass)</source>
         <translation>恒定速率系数(CRF)(1通)</translation>
     </message>
@@ -10670,22 +11097,22 @@
         <translation>帧类型预测先行:</translation>
     </message>
     <message>
-        <location line="+2895"/>
+        <location line="+2900"/>
         <source>Colour Primaries:</source>
         <translation>基色 :</translation>
     </message>
     <message>
-        <location line="-3393"/>
+        <location line="-3398"/>
         <source>Threads </source>
         <translation>线程s </translation>
     </message>
     <message>
-        <location line="+3640"/>
+        <location line="+3645"/>
         <source>Chroma Sample Location:</source>
         <translation>色度采样位置：</translation>
     </message>
     <message>
-        <location line="-1186"/>
+        <location line="-1191"/>
         <source>Reduce Fluctuation After Curve Compression:</source>
         <translation>减少波动曲线压缩之后：</translation>
     </message>
@@ -10755,17 +11182,17 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+600"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+613"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-416"/>
+        <location line="-429"/>
         <source>none</source>
         <translation>无</translation>
     </message>
     <message>
-        <location line="+574"/>
+        <location line="+587"/>
         <location line="+70"/>
         <location line="+14"/>
         <source>Error</source>
@@ -11977,7 +12404,7 @@
 <context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+71"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+66"/>
         <source>Three threads</source>
         <translation>三个线程</translation>
     </message>
@@ -12023,32 +12450,27 @@
         <translation>Qpel8</translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>MotionEstimation</source>
-        <translation>运动估计</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+99"/>
         <source>Xvid4 MPEG-4 ASP configuration</source>
         <translation>Xvid4 MPEG-4 ASP配置</translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-47"/>
         <source>_Gop Size:</source>
         <translation>Gop大小：</translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="-38"/>
         <source>4:3 (NTSC)</source>
         <translation>4:3 (NTSC)</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="+77"/>
         <source>Aspect Ratio</source>
         <translation>像素比例</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-83"/>
         <source>Auto (#cpu)</source>
         <translation>自动 (#cpu)</translation>
     </message>
@@ -12089,16 +12511,42 @@
     </message>
     <message>
         <location line="+34"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>_Quantization type:</source>
         <translation>量化型式:</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+20"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Quantization</source>
         <translation>量化</translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="-75"/>
         <source>One thread</source>
         <translation>一个线程</translation>
     </message>
@@ -12113,37 +12561,32 @@
         <translation>B帧的数量:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+9"/>
         <source>Profile:</source>
         <translation>配置文件:</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-36"/>
         <source>Two threads)</source>
         <translation>两个线程</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+17"/>
         <source>Motion Estimation</source>
         <translation>运动估计</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+61"/>
         <source>Threads</source>
         <translation>线程</translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="-69"/>
         <source>16:9 (PAL)</source>
         <translation>16:9 (PAL)</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Advanced Simple Profile</source>
-        <translation>高级简单的配置文件</translation>
-    </message>
-    <message>
-        <location line="-19"/>
+        <location line="+25"/>
         <source>_Macroblock decision:</source>
         <translation>宏块决定:</translation>
     </message>
@@ -12153,22 +12596,22 @@
         <translation>像素比例(PAR):</translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-32"/>
         <source>1:1 (PC)</source>
         <translation>1:1 (PC)</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+43"/>
         <source>Use XVID fcc (else DIVX)</source>
         <translation>使用 XVID fcc (其他 DIVX)</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+41"/>
         <source>Rate Control</source>
         <translation>比率控制</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-68"/>
         <source>Ma_x. quantizer:</source>
         <translation>最大.量化器:</translation>
     </message>
@@ -12181,7 +12624,7 @@
         <translation>2.1-亚迪夫(yadif)过滤器</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+63"/>
         <source>Frame : Temporal &amp; spatial check</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12236,28 +12679,12 @@
         <translation>模式:</translation>
     </message>
     <message>
-        <location line="-85"/>
+        <location line="-80"/>
         <source>Yadif, port of avisynth version (c) Fizick.</source>
         <translation>Yadif阜，Avisynth出口商Fizick版本(c).</translation>
     </message>
     <message>
-        <source>Temporal &amp; spatial check</source>
-        <translation type="vanished">时间l &amp; 空间检查</translation>
-    </message>
-    <message>
-        <source>Bob, temporal &amp; spatial check</source>
-        <translation type="vanished">振动，空间 &amp; 时间检查</translation>
-    </message>
-    <message>
-        <source>Bob, skip spatial temporal check</source>
-        <translation type="vanished">振动，略过空间时间检查</translation>
-    </message>
-    <message>
-        <source>Skip spatial temporal check</source>
-        <translation type="vanished">略过空间时间检查</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+70"/>
         <source>Bottom field first</source>
         <translation>底部首先扫描</translation>
     </message>

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_zh_TW.ts -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/avidemux_zh_TW.ts Changed

@@ -4,12 +4,12 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
         <source>Checking if timestamps are valid..</source>
         <translation>檢查時間戳記是否有效..</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+47"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19,7 +19,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+258"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+489"/>
         <source>width</source>
         <translation type="unfinished"></translation>
     </message>
@@ -377,22 +377,22 @@
 <context>
     <name>DialogProcessing</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+33"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+84"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-44"/>
         <source>0 fps</source>
         <translation>0 fps</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-20"/>
         <source>TimeLeft</source>
         <translation>剩餘時間</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+34"/>
         <source>Speed</source>
         <translation>速率</translation>
     </message>
@@ -402,12 +402,12 @@
         <translation>處理圖像</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-28"/>
         <source>00:00:00</source>
         <translation>00:00:00</translation>
     </message>
     <message>
-        <location line="-12"/>
+        <location line="-19"/>
         <source>Dialog</source>
         <translation>對話窗</translation>
     </message>
@@ -443,30 +443,28 @@
 <context>
     <name>FDK-AAC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+434"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+436"/>
+        <source>_Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Bitrate:</source>
         <translation>位元率：</translation>
     </message>
     <message>
-        <location line="-6"/>
-        <location line="+7"/>
-        <source>After burner</source>
-        <translation>後燃器</translation>
+        <location line="+4"/>
+        <source>Afterburner</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>FDK-AAC Configuration</source>
         <translation>FDK-AAC 配置</translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>_Profile::</source>
-        <translation>設定檔:</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="-8"/>
         <source>SBR enabled</source>
         <translation>SBR 啟用</translation>
     </message>
@@ -489,12 +487,11 @@
         <translation>B:</translation>
     </message>
     <message>
-        <location line="+272"/>
         <source>F7</source>
-        <translation>F7</translation>
+        <translation type="vanished">F7</translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <location line="-771"/>
         <source>ms</source>
         <translation>ms</translation>
     </message>
@@ -522,12 +519,12 @@
         <translation>...</translation>
     </message>
     <message>
-        <location line="+308"/>
+        <location line="+293"/>
         <source>&amp;Top</source>
         <translation>上下並排(&amp;T)</translation>
     </message>
     <message>
-        <location line="-1425"/>
+        <location line="-1410"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation>複製</translation>
@@ -574,28 +571,27 @@
         <translation>開啟影片</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+199"/>
         <source>Si&amp;de</source>
         <translation>左右並排(&amp;D</translation>
     </message>
     <message>
-        <location line="-606"/>
+        <location line="-591"/>
         <source>Time:</source>
         <translation>時間:</translation>
     </message>
     <message>
-        <location line="+404"/>
         <source>Alt+Return</source>
-        <translation>Alt+Return</translation>
+        <translation type="vanished">Alt+Return</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+440"/>
         <location line="+3"/>
         <source>Load/Run Project</source>
         <translation>載入/執行專案</translation>
     </message>
     <message>
-        <location line="-599"/>
+        <location line="-596"/>
         <source>Search next black frame</source>
         <translation>搜尋下一幀黑框</translation>
     </message>
@@ -610,28 +606,27 @@
         <translation>轉到下一幀(關鍵幀或I幀) [UP]</translation>
     </message>
     <message>
-        <location line="+718"/>
         <source>&amp;Calculator...</source>
-        <translation>計算機(&amp;C)...</translation>
+        <translation type="vanished">計算機(&amp;C)...</translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="+456"/>
         <source>Go to marker A [PAGE UP]</source>
         <translation>轉到標記 A [PAGE UP]</translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+247"/>
         <location line="+3"/>
         <source>Save Project</source>
         <translation>儲存專案</translation>
     </message>
     <message>
-        <location line="-1606"/>
+        <location line="-1603"/>
         <source>&amp;Audio</source>
         <translation>音訊(&amp;A)</translation>
     </message>
     <message>
-        <location line="+1633"/>
+        <location line="+1618"/>
         <source>&amp;Input</source>
         <translation>輸入(&amp;I)</translation>
     </message>
@@ -641,7 +636,7 @@
         <translation>標誌區段(&amp;S)</translation>
     </message>
     <message>
-        <location line="-1689"/>
+        <location line="-1674"/>
         <source>&amp;Tools</source>
         <translation>工具(&amp;T)</translation>
     </message>
@@ -662,12 +657,12 @@
         <translation>000000</translation>
     </message>
     <message>
-        <location line="+346"/>
+        <location line="+331"/>
         <source>&amp;Audio Metre</source>
         <translation>音訊畫面(&amp;A)</translation>
     </message>
     <message>
-        <location line="-1523"/>
+        <location line="-1508"/>
         <location line="+142"/>
         <location line="+169"/>
         <location line="+181"/>
@@ -675,12 +670,7 @@
         <translation>配置</translation>
     </message>
     <message>
-        <location line="-283"/>
-        <source>   (0 track(s))</source>
-        <translation>   ((0 軌k(s))</translation>
-    </message>
-    <message>
-        <location line="-444"/>
+        <location line="-727"/>
         <source>Vi&amp;deo</source>
         <translation>影片(&amp;D)</translation>
     </message>
@@ -710,7 +700,7 @@
         <translation>幀類型:</translation>
     </message>
     <message>
-        <location line="+346"/>
+        <location line="+343"/>
         <location line="+3"/>
         <source>Save Video</source>
         <translation>儲存影片</translation>
@@ -721,7 +711,7 @@
         <translation>儲存影片&amp;V)...</translation>
     </message>
     <message>
-        <location line="-589"/>
+        <location line="-586"/>
         <source>Search previous black frame</source>
         <translation>搜尋上一幀黑框</translation>
     </message>
@@ -736,12 +726,12 @@
         <translation>編解碼器選項(&amp;P)</translation>
     </message>
     <message>
-        <location line="+1520"/>
+        <location line="+1517"/>
         <source>Play filtered</source>
         <translation>濾鏡播放(&amp;P)</translation>
     </message>
     <message>
-        <location line="-213"/>
+        <location line="-210"/>
         <source>Go to Marker B [PAGE DOWN]</source>
         <translation>轉到標記 B [PAGE DOWN]</translation>
     </message>
@@ -756,12 +746,12 @@
         <translation>&lt;b&gt;影片輸出格式(容器)佳Mp4/Mkv&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+975"/>
+        <location line="+972"/>
         <source>&amp;Load/Run Project...</source>
         <translation>載入/執行專案(&amp;L)...</translation>
     </message>
     <message>
-        <location line="-547"/>
+        <location line="-544"/>
         <source>Go to last frame [END]</source>
         <translation>G轉到最後一幀 [END]</translation>
     </message>
@@ -771,12 +761,12 @@
         <translation>自訂(&amp;C)</translation>
     </message>
     <message>
-        <location line="+1660"/>
+        <location line="+1645"/>
         <source>&amp;Output</source>
         <translation>輸出(&amp;O)</translation>
     </message>
     <message>
-        <location line="-1635"/>
+        <location line="-1620"/>
         <source>&amp;Recent</source>
         <translation>最近(&amp;R)</translation>
     </message>
@@ -791,7 +781,7 @@
         <translation>位移(±)(&amp;S):</translation>
     </message>
     <message>
-        <location line="+1155"/>
+        <location line="+1140"/>
         <source>&amp;Volume</source>
         <translation>音量(&amp;V)</translation>
     </message>
@@ -801,17 +791,17 @@
         <translation>編解碼器選項(&amp;C)</translation>
     </message>
     <message>
-        <location line="-572"/>
+        <location line="-557"/>
         <source>Forward one minute [CTRL+UP]</source>
         <translation>前進一分鐘 [CTRL+UP]</translation>
     </message>
     <message>
-        <location line="+643"/>
+        <location line="+628"/>
         <source>&amp;Separate</source>
         <translation>分離視窗(&amp;S)</translation>
     </message>
     <message>
-        <location line="-807"/>
+        <location line="-792"/>
         <source>Set start marker [CTRL+PAGEUP]</source>
         <translation>設定開始標記 [CTRL+PAGEUP]</translation>
     </message>
@@ -842,7 +832,12 @@
         <translation>&lt;b&gt;輸出影片編碼佳x264/x265&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+936"/>
+        <location line="+170"/>
+        <source> (0 tracks)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+766"/>
         <source>00:00:00.000</source>
         <translation>00:00:00.000</translation>
     </message>
@@ -857,12 +852,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+218"/>
         <source>Save &amp;Project</source>
         <translation>儲存專案(&amp;P)</translation>
     </message>
     <message>
-        <location line="-54"/>
+        <location line="-51"/>
         <source>&amp;Information...</source>
         <translation>屬性(&amp;I)...</translation>
     </message>
@@ -877,7 +872,7 @@
         <translation>倒退一分鐘 [CTRL+DOWN]</translation>
     </message>
     <message>
-        <location line="+598"/>
+        <location line="+583"/>
         <source>Ctrl+Alt+C</source>
         <translation>Ctrl+Alt+C</translation>
     </message>
@@ -902,13 +897,13 @@
         <translation>Ctrl+Alt+V</translation>
     </message>
     <message>
-        <location line="-827"/>
+        <location line="-812"/>
         <source>Go to previous keyframe [DOWN]</source>
         <translation>轉到上一幀(關鍵幀或I幀) [DOWN]</translation>
     </message>
     <message>
         <location line="-150"/>
-        <location line="+946"/>
+        <location line="+931"/>
         <source>&amp;Navigation</source>
         <translation>影片導航欄(&amp;N)</translation>
     </message>
@@ -916,7 +911,7 @@
 <context>
     <name>Opus</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -934,12 +929,11 @@
         <translation>殼(Shell)</translation>
     </message>
     <message>
-        <location line="+75"/>
         <source>Ctrl+Return</source>
-        <translation>Ctrl+Return</translation>
+        <translation type="vanished">Ctrl+Return</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="+72"/>
         <source>Evaluate</source>
         <translation>求值</translation>
     </message>
@@ -999,7 +993,7 @@
     </message>
     <message>
         <location line="+10"/>
-        <source>© 2001 - 2019  Mean / Eumagga0x2a</source>
+        <source>© 2001 - 2020  Mean / Eumagga0x2a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1060,21 +1054,17 @@
 <context>
     <name>adm</name>
     <message>
-        <source>-</source>
-        <translation type="vanished">-</translation>
-    </message>
-    <message>
         <location filename="../../common/gui_save.cpp" line="+67"/>
         <source>Audio encoder index out of bounds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>No</source>
         <translation>否</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+73"/>
         <source>Select PNG to Save</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1089,22 +1079,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <source>Maximum number of 9999 images reached, aborting.</source>
+        <source>Maximum number of 99999 images reached.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Saving images failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+25"/>
         <source>PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1129,7 +1119,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+372"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+380"/>
         <source>1:1</source>
         <translation>1:1</translation>
     </message>
@@ -1144,18 +1134,18 @@
         <translation>4MV</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+226"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+231"/>
         <source>AAC</source>
         <translation>AAC</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-8"/>
         <source>AC3</source>
         <translation>AC3</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+510"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+518"/>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
@@ -1180,7 +1170,7 @@
         <translation>GMC</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-571"/>
+        <location filename="../../common/gui_save.cpp" line="-572"/>
         <source>Job</source>
         <translation>工作</translation>
     </message>
@@ -1205,13 +1195,13 @@
         <translation>MP4</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-216"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-222"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-19"/>
         <source>Low</source>
         <translation>低</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+85"/>
         <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-12"/>
         <source>PCM</source>
         <translation>PCM</translation>
@@ -1257,8 +1247,8 @@
         <translation>H263</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+450"/>
-        <location line="+83"/>
+        <location filename="../../common/gui_save.cpp" line="+458"/>
+        <location line="+76"/>
         <source>Done</source>
         <translation>完成</translation>
     </message>
@@ -1268,7 +1258,7 @@
         <translation>增音</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-83"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-89"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-45"/>
         <source>High</source>
         <translation>高</translation>
@@ -1279,7 +1269,7 @@
         <translation>LPCM</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-196"/>
+        <location filename="../../common/gui_save.cpp" line="-195"/>
         <source>Jpeg</source>
         <translation>Jpeg</translation>
     </message>
@@ -1311,12 +1301,12 @@
         <translation>無</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+7"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+8"/>
         <source>QDM2</source>
         <translation>QDM2</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1901"/>
+        <location filename="../../common/gui_main.cpp" line="+1902"/>
         <source>Oops</source>
         <translation>Oops</translation>
     </message>
@@ -1362,7 +1352,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
-        <location filename="../../common/gui_save.cpp" line="-397"/>
+        <location filename="../../common/gui_save.cpp" line="-403"/>
         <source>No audio track</source>
         <translation>沒有音軌</translation>
     </message>
@@ -1388,44 +1378,44 @@
         <translation>它沒&apos;有LAME！，它需要去建立 FLV影片。</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+597"/>
+        <location filename="../../common/gui_save.cpp" line="+602"/>
         <source>File %s was NOT saved correctly.</source>
         <translation>檔案 %s 儲存不正確。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+51"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+55"/>
         <source>About</source>
         <translation>關於(&amp;U)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-8"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-9"/>
         <source>E-AC3</source>
         <translation>E-AC3</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-86"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+211"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="-597"/>
+        <location filename="../../common/gui_save.cpp" line="-602"/>
         <location line="+10"/>
-        <location line="+277"/>
+        <location line="+283"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+423"/>
+        <location filename="../../common/gui_savenew.cpp" line="+432"/>
         <source>Audio</source>
         <translation>音訊</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-74"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-78"/>
         <source>Close</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
-        <location line="+30"/>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
-        <location line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+175"/>
+        <location line="+31"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
+        <location line="+39"/>
         <source>Codec</source>
         <translation>編解碼器</translation>
     </message>
@@ -1435,19 +1425,19 @@
         <translation>只顯示錯誤警告</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+673"/>
+        <location line="+43"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="-361"/>
+        <location filename="../../common/gui_main.cpp" line="-362"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
         <location line="+4"/>
-        <location filename="../../common/gui_save.cpp" line="+199"/>
-        <location line="+99"/>
+        <location filename="../../common/gui_save.cpp" line="+205"/>
+        <location line="+92"/>
         <location line="+7"/>
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
@@ -1465,8 +1455,8 @@
         <translation>混音訊</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-225"/>
-        <location line="+286"/>
+        <location filename="../../common/gui_savenew.cpp" line="-229"/>
+        <location line="+290"/>
         <location line="+26"/>
         <source>Muxer</source>
         <translation>複合器</translation>
@@ -1497,15 +1487,25 @@
         <translation>改進最大溢出(%)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-160"/>
+        <location filename="../../common/gui_savenew.cpp" line="-326"/>
+        <location line="+170"/>
         <location line="+12"/>
         <location line="+16"/>
-        <location line="+8"/>
         <source>Video</source>
         <translation>影片</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="-198"/>
+        <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+198"/>
+        <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
         <translation>不能設置音訊編碼器，請確保您的數據流是相容音訊編碼器(數位頻道、位元速率、格式）</translation>
     </message>
@@ -1549,17 +1549,17 @@
         <translation>第二代定向邏輯</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-118"/>
+        <location filename="../../common/gui_savenew.cpp" line="-114"/>
         <source>Cannot instantiate video chain</source>
         <translation>不能安裝影片鏈</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+54"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+58"/>
         <source>Decoder Option</source>
         <translation>解碼器選項(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-124"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-130"/>
         <source>Enable 3DNOWEXT</source>
         <translation>啟用 3DNOWEXT</translation>
     </message>
@@ -1588,7 +1588,7 @@
         <translation>位移音量 (ms):</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-766"/>
+        <location filename="../../common/gui_main.cpp" line="-760"/>
         <source>Error while cutting out.</source>
         <translation>剪下時發生錯誤.</translation>
     </message>
@@ -1603,12 +1603,12 @@
         <translation>不能增加工作 %s</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+123"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
         <source>Pro Logic</source>
         <translation>定向邏輯</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+628"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+676"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1618,7 +1618,7 @@
         <translation>太短</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+662"/>
+        <location filename="../../common/gui_main.cpp" line="+656"/>
         <source>Marker A &gt; B</source>
         <translation>標記 A &gt; B</translation>
     </message>
@@ -1629,7 +1629,7 @@
         <translation>請釋放一些空間，然後按重試再試一次。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-82"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-86"/>
         <source>Connect to avsproxy</source>
         <translation>連線至 avsproxy</translation>
     </message>
@@ -1639,13 +1639,13 @@
         <translation>GUI 渲染選項</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-152"/>
-        <location line="+286"/>
+        <location filename="../../common/gui_savenew.cpp" line="-160"/>
+        <location line="+290"/>
         <source>Cannot instantiate muxer</source>
         <translation>不能安裝複合器</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+521"/>
+        <location filename="../../common/gui_main.cpp" line="+522"/>
         <source>This function is disabled or no longer valid</source>
         <translation>此功能被停用或不再有效</translation>
     </message>
@@ -1665,7 +1665,7 @@
         <translation>立體+中央+環繞</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+61"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+65"/>
         <source>Build Option</source>
         <translation>建立選項(&amp;B)</translation>
     </message>
@@ -1696,7 +1696,7 @@
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1723"/>
+        <location filename="../../common/gui_main.cpp" line="-1722"/>
         <source>Select script to run</source>
         <translation>選擇腳本去執行</translation>
     </message>
@@ -1706,7 +1706,7 @@
         <translation>沒降混合</translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-125"/>
         <source>Enable SSE2</source>
         <translation>啟用 SSE2</translation>
     </message>
@@ -1741,13 +1741,13 @@
         <translation>外掛-音訊裝置(ADM)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1215"/>
+        <location filename="../../common/gui_main.cpp" line="+1213"/>
         <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+120"/>
         <source>Something bad happened</source>
         <translation>有些事發生問題</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+7"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+8"/>
         <source>MSADPCM</source>
         <translation>MSADPCM</translation>
     </message>
@@ -1757,7 +1757,7 @@
         <translation>無法刪除此選取範圍。</translation>
     </message>
     <message>
-        <location line="-412"/>
+        <location line="-406"/>
         <source>Multiple Audio Tracks</source>
         <translation>多音軌</translation>
     </message>
@@ -1853,7 +1853,7 @@
         <translation>當增加時某些事情失敗</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-488"/>
+        <location filename="../../common/gui_save.cpp" line="-487"/>
         <source>Select Workbench to Save</source>
         <translation>選擇工作台進行儲存</translation>
     </message>
@@ -1863,7 +1863,7 @@
         <translation>反轉向上和向下方向鍵進行導航</translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+89"/>
         <source>SDL (good)</source>
         <translation>SDL (好)</translation>
     </message>
@@ -1909,7 +1909,7 @@
         <translation>最大Gop(圖像群組)大小</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-331"/>
+        <location filename="../../common/gui_savenew.cpp" line="-338"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation>重用以前首先傳遞資料？警告，設定必須關閉.</translation>
@@ -1925,12 +1925,12 @@
         <translation>開啟應用程式資料夾目錄(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-160"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-166"/>
         <source>Above normal</source>
         <translation>高於一般</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-888"/>
+        <location filename="../../common/gui_main.cpp" line="-892"/>
         <source>Select script to save</source>
         <translation>選擇腳本去儲存</translation>
     </message>
@@ -1947,7 +1947,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+265"/>
+        <location filename="../../common/gui_main.cpp" line="+269"/>
         <source>Select Video File to Append...</source>
         <translation>選擇影片去附加合併(二影片寬高比要一致)...</translation>
     </message>
@@ -1967,7 +1967,7 @@
         <translation>外掛-影片解碼器(ADM)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1141"/>
+        <location filename="../../common/gui_main.cpp" line="+1135"/>
         <source>Unable to set the audio language: No video loaded yet!</source>
         <translation>無法設置音訊語言：仍然未載入影片！</translation>
     </message>
@@ -2038,7 +2038,7 @@
         <translation>最小Gop(圖像群組)大小</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-683"/>
+        <location filename="../../common/gui_main.cpp" line="-677"/>
         <source>Try &apos;File&apos; -&gt; &apos;Load/Run Project...&apos;</source>
         <translation>嘗試 &apos;檔案&apos; -&gt; &apos;載入/執行 專案...&apos;</translation>
     </message>
@@ -2048,7 +2048,7 @@
         <translation>發現沒有 AAC 音訊編碼器外掛程式。</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+881"/>
+        <location filename="../../common/gui_main.cpp" line="+876"/>
         <source>Frame Hex Dump</source>
         <translation>幀十六進位轉儲</translation>
     </message>
@@ -2073,7 +2073,7 @@
         <translation>AMR-NB</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-922"/>
+        <location filename="../../common/gui_main.cpp" line="-917"/>
         <source>Permission error</source>
         <translation>權限許可錯誤</translation>
     </message>
@@ -2089,12 +2089,12 @@
         <translation>核心已編譯，沒有 LIBVA 的支援，但它已編譯應用程式，安裝不匹配</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+732"/>
+        <location filename="../../common/gui_main.cpp" line="+726"/>
         <source>Setting the language for the given track index is not possible: Video has no audio file!</source>
         <translation>設定語言提供跟蹤索引是不可能的：影片有沒有音訊檔！</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+66"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+72"/>
         <source>OpenGL (best)</source>
         <translation>OpenGL (最好)</translation>
     </message>
@@ -2104,7 +2104,7 @@
         <translation>選擇 JPEG 順序進行儲存</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-65"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-69"/>
         <source>Append</source>
         <translation>同寬高影片合併</translation>
     </message>
@@ -2127,12 +2127,12 @@
         <translation>自訂</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1231"/>
+        <location filename="../../common/gui_main.cpp" line="-1230"/>
         <source>Not coded in this version</source>
         <translation>沒有編進這個版本</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+493"/>
+        <location filename="../../common/gui_save.cpp" line="+492"/>
         <source>Failed</source>
         <translation>已失敗</translation>
     </message>
@@ -2152,12 +2152,12 @@
         <translation>忽略</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+991"/>
+        <location filename="../../common/gui_main.cpp" line="+990"/>
         <source>No error found</source>
         <translation>沒有找到錯誤</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+53"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+57"/>
         <source>Next Intra Frame</source>
         <translation>轉到下一幀(關鍵幀或I幀)</translation>
     </message>
@@ -2173,7 +2173,7 @@
         <translation>編解碼器錯誤</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-39"/>
         <source>Internal error finding codec 0x%x</source>
         <translation>發現編解碼器內部錯誤</translation>
     </message>
@@ -2203,17 +2203,17 @@
         <translation>複合器</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+443"/>
+        <location filename="../../common/gui_save.cpp" line="+450"/>
         <source>Saved %d images.</source>
         <translation>已儲存 %d 個圖像。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-82"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-88"/>
         <source>Normal</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-71"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-75"/>
         <location line="+2"/>
         <source>Clear recent items</source>
         <translation>清除最近使用的 檔案 及 專案</translation>
@@ -2229,17 +2229,17 @@
         <translation>運動搜索精度</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+226"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
         <source>Output</source>
         <translation>輸出</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-204"/>
+        <location filename="../../common/gui_save.cpp" line="-210"/>
         <source>Cannot create stream</source>
         <translation>不能建立流</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-203"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-209"/>
         <source>Enable all SIMD</source>
         <translation>啟用所有 SIMD</translation>
     </message>
@@ -2249,24 +2249,20 @@
         <translation>重新混合:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
-        <location line="+44"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-43"/>
+        <location line="+43"/>
         <source>You cannot remove *all* the video
 </source>
         <translation>你不能刪除*所有*的影片
 </translation>
     </message>
     <message>
-        <source>Decode video using XVBA (AMD)</source>
-        <translation type="vanished">解碼影片使用 XVBA (AMD)</translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+144"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+150"/>
         <source>_AudioDevice</source>
         <translation>音訊裝置</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="-170"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="-187"/>
         <source>Saving</source>
         <translation>儲存中</translation>
     </message>
@@ -2277,7 +2273,7 @@
         <translation>立體聲</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-12"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-13"/>
         <source>WMAPRO</source>
         <translation>WMAPRO</translation>
     </message>
@@ -2287,7 +2283,7 @@
         <translation>廣泛搜尋</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1178"/>
+        <location filename="../../common/gui_main.cpp" line="-1176"/>
         <source>Select script to debug</source>
         <translation>選擇腳本去除錯</translation>
     </message>
@@ -2317,12 +2313,12 @@
         <translation>PAL 16:9</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+72"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+76"/>
         <source>First Frame</source>
         <translation>轉到第一幀(開始)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+686"/>
+        <location filename="../../common/gui_main.cpp" line="+690"/>
         <source>Cannot open &quot;%s&quot;.</source>
         <translation>無法開啟 &quot;%s&quot;。</translation>
     </message>
@@ -2347,12 +2343,12 @@
         <translation>轉到下一幀</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-246"/>
+        <location filename="../../common/gui_save.cpp" line="-248"/>
         <source>Cannot reach database. Do you have Job control running ?</source>
         <translation>不能到達資料庫，你有工作控制執行嗎？</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+19"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+20"/>
         <source>Zoom 1:1</source>
         <translation>縮放 1:1</translation>
     </message>
@@ -2362,7 +2358,7 @@
         <translation>縮放 1:2</translation>
     </message>
     <message>
-        <location line="-104"/>
+        <location line="-109"/>
         <source>Save as PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2372,12 +2368,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+56"/>
         <source>Play filtered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Zoom 1:4</source>
         <translation>縮放 1:4</translation>
     </message>
@@ -2387,6 +2383,11 @@
         <translation>縮放 2:1</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Fit to window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="+34"/>
         <source>Audio Encoder Plugins</source>
         <translation>外掛-音訊編碼器(ADM)</translation>
@@ -2426,7 +2427,7 @@
         <translation>沒有改變</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-615"/>
+        <location filename="../../common/gui_main.cpp" line="-619"/>
         <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
         <translation>你是要清除最近使用的檔和專案的清單，這不&apos;能撤銷，是否繼續？</translation>
     </message>
@@ -2437,17 +2438,17 @@
         <translation>Sdl 驅動程式r</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+152"/>
+        <location filename="../../common/gui_main.cpp" line="+151"/>
         <source>No engine</source>
         <translation>沒有引擎</translation>
     </message>
     <message>
-        <location line="+467"/>
+        <location line="+472"/>
         <source>&quot;%s&quot; does not exist.</source>
         <translation>&quot;%s&quot; 不存在。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-107"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-114"/>
         <source>Save as BMP</source>
         <translation>另存 BMP</translation>
     </message>
@@ -2457,7 +2458,7 @@
         <translation>建立時間軸</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-120"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-126"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation>解碼影片使用 VDPAU (NVIDIA)</translation>
     </message>
@@ -2468,12 +2469,12 @@
         <translation>你沒&apos;有FAAC!，它是建立 PSP 相容影片所需。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+46"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+50"/>
         <source>Load saved settings</source>
         <translation>載入儲存設定</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+916"/>
+        <location filename="../../common/gui_main.cpp" line="+911"/>
         <source>Frame size:</source>
         <translation>幀大小:</translation>
     </message>
@@ -2488,7 +2489,7 @@
         <translation>外掛程式(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+80"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+86"/>
         <source>VDPAU (best)</source>
         <translation>VDPAU (最好)</translation>
     </message>
@@ -2504,7 +2505,7 @@
         <translation>NTSC 16:9</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="+272"/>
+        <location filename="../../common/gui_savenew.cpp" line="+279"/>
         <source>The video is in copy mode but the cut points are not on keyframes.
 The video will be saved but there will be corruption at cut point(s).
 Do you want to continue anyway ?</source>
@@ -2513,7 +2514,7 @@
 您要繼續嗎 ?</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-915"/>
+        <location filename="../../common/gui_main.cpp" line="-910"/>
         <source>File error</source>
         <translation>檔案錯誤</translation>
     </message>
@@ -2538,8 +2539,7 @@
         <translation>預設的後置處理</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-89"/>
-        <location line="+24"/>
+        <location filename="../../common/gui_savenew.cpp" line="-85"/>
         <source>Cannot create encoder</source>
         <translation>不能建立編碼器</translation>
     </message>
@@ -2554,17 +2554,17 @@
         <translation>x86-64</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+472"/>
+        <location filename="../../common/gui_main.cpp" line="+466"/>
         <source>Checking video</source>
         <translation>正在檢查影片</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+513"/>
+        <location filename="../../common/gui_save.cpp" line="+514"/>
         <source>Saving %s as a BMP file failed.</source>
         <translation>另存 %s 為 BMP 檔失敗。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-158"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-164"/>
         <source>_Enable alternative keyboard shortcuts</source>
         <translation>啟用備用的鍵盤快速鍵</translation>
     </message>
@@ -2574,12 +2574,12 @@
         <translation>解碼影片使用 LIBVA (INTEL)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-436"/>
+        <location filename="../../common/gui_main.cpp" line="-430"/>
         <source>Cannot open project using the video loader.</source>
         <translation>使用影片載入器時無法開啟專案。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+88"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+94"/>
         <source>LIBVA (best)</source>
         <translation>LIBVA (最好)</translation>
     </message>
@@ -2589,7 +2589,7 @@
         <translation>Film 轉成 PAL</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-443"/>
+        <location filename="../../common/gui_save.cpp" line="-442"/>
         <source>Select File to Save</source>
         <translation>選擇檔案進行儲存</translation>
     </message>
@@ -2614,27 +2614,27 @@
         <translation>重新取樣頻率 (Hz)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+696"/>
+        <location filename="../../common/gui_main.cpp" line="+690"/>
         <source>Setting the language for the given track index is not possible: Invalid track index!</source>
         <translation>設定的語言無法提供跟蹤索引：無效跟蹤指標！</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-172"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-178"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation>預設為儲存最後讀取檔案的目錄</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+144"/>
         <source>_Language</source>
         <translation>語言</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-64"/>
+        <location filename="../../common/gui_save.cpp" line="-67"/>
         <source>No file loaded</source>
         <translation>沒有檔案載入</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-636"/>
+        <location filename="../../common/gui_main.cpp" line="-630"/>
         <source>The file you just loaded contains several audio tracks.
 Go to Audio-&gt;MainTrack to select the active one.</source>
         <translation>這檔案剛剛載入包含一些音訊軌道。
@@ -2666,7 +2666,7 @@
         <translation>儲存工作</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-155"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-161"/>
         <source>_Check for new release</source>
         <translation>檢查有新版本</translation>
     </message>
@@ -2676,12 +2676,22 @@
         <translation>索引/拆開打包的優先次序:</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+        <location line="+10"/>
+        <source>Auto-Append Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Fragment size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2701,7 +2711,7 @@
         <translation>去除環狀色斑</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+8"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+9"/>
         <source>8-bit PCM</source>
         <translation>8位元 PCM</translation>
     </message>
@@ -2716,7 +2726,7 @@
         <translation>關鍵幀提高(%)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-148"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-154"/>
         <source>Enable MMX</source>
         <translation>啟用 MMX</translation>
     </message>
@@ -2737,14 +2747,14 @@
         <translation>檔系統已滿</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+257"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+263"/>
         <location line="+3"/>
         <location line="+3"/>
         <source>HW Accel</source>
         <translation>HW 硬體加速器</translation>
     </message>
     <message>
-        <location line="-259"/>
+        <location line="-265"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>同意在 DVD 使用非標準的音訊頻率</translation>
     </message>
@@ -2759,7 +2769,7 @@
         <translation>啟用 MMXEXT</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-79"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-83"/>
         <source>Information</source>
         <translation>屬性(&amp;I)</translation>
     </message>
@@ -2779,7 +2789,7 @@
         <translation>音訊軌道有必要建立這樣的檔</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+572"/>
+        <location filename="../../common/gui_main.cpp" line="+566"/>
         <source>Cannot use that file as audio track</source>
         <translation>不能使用該檔作為音訊軌道</translation>
     </message>
@@ -2804,17 +2814,17 @@
         <translation>非常高</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1386"/>
+        <location filename="../../common/gui_main.cpp" line="-1384"/>
         <source>Select script/project to run</source>
         <translation>選擇要執行的腳本/專案</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+223"/>
         <source>_Always ask which port to use</source>
         <translation>製作影片始終詢問要使用哪個埠(Avidemux+Avisynth)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+89"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+93"/>
         <source>Go To Marker A</source>
         <translation>將標記A(選擇開始)</translation>
     </message>
@@ -2829,7 +2839,7 @@
         <translation>前段立體+後段立體</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-53"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-57"/>
         <source>Pr&amp;eferences</source>
         <translation>首選項-偏好設定(&amp;E)</translation>
     </message>
@@ -2866,7 +2876,7 @@
         <translation>去除垂直方向塊狀色斑</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1210"/>
+        <location filename="../../common/gui_main.cpp" line="+1208"/>
         <source>Errors found in %u frames</source>
         <translation>在 %u 幀中發現錯誤</translation>
     </message>
@@ -2896,13 +2906,13 @@
         <translation>自由型 2</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-667"/>
+        <location filename="../../common/gui_main.cpp" line="-661"/>
         <location line="+21"/>
         <source>Cutting</source>
         <translation>剪下</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+58"/>
+        <location filename="../../common/gui_save.cpp" line="+61"/>
         <source>Select BMP to Save</source>
         <translation>選擇 BMP 進行儲存</translation>
     </message>
@@ -2912,7 +2922,7 @@
         <translation>幾秒鐘</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+484"/>
+        <location filename="../../common/gui_save.cpp" line="+483"/>
         <source>File %s has been successfully saved.</source>
         <translation>檔案 %s 已經成功地儲存。</translation>
     </message>
@@ -2922,7 +2932,7 @@
         <translation>不到一分鐘</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+48"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+52"/>
         <source>Next Black Frame</source>
         <translation>轉到下一幀黑框</translation>
     </message>
@@ -2942,7 +2952,7 @@
         <translation>前往時間點</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-209"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-215"/>
         <source>Multi-threading</source>
         <translation>多線程</translation>
     </message>
@@ -2967,12 +2977,12 @@
         <translation>PAL 轉成 Film</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-57"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-61"/>
         <source>Reset Markers</source>
         <translation>取消標記</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+238"/>
         <source>Default port to use</source>
         <translation>製作影片要使用預設埠(Avidemux)</translation>
     </message>
@@ -2982,29 +2992,28 @@
         <translation>訊息等級:</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+667"/>
+        <location filename="../../common/gui_main.cpp" line="+661"/>
         <source>You can&apos;t remove all frames</source>
         <translation>你不&apos;能移除所有的幀</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+32"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+36"/>
         <source>&amp;Advanced</source>
         <translation>進階(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-123"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-129"/>
         <source>Enable openGl support</source>
         <translation>啟用openGl支援</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-980"/>
+        <location filename="../../common/gui_main.cpp" line="-979"/>
         <source>tinyPy script is not enabled in this build</source>
         <translation>在生成中未啟用 tinyPy 腳本</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-8"/>
         <source>Cannot setup codec. Bitrate too low?</source>
-        <translation>無法安裝編解碼器，位元率太低？</translation>
+        <translation type="vanished">無法安裝編解碼器，位元率太低？</translation>
     </message>
     <message>
         <location filename="../../common/gui_save.cpp" line="-527"/>
@@ -3013,7 +3022,7 @@
     </message>
     <message>
         <location filename="../../common/gui_main.cpp" line="-25"/>
-        <location line="+68"/>
+        <location line="+73"/>
         <source>Select Video File...</source>
         <translation>選擇影片檔...</translation>
     </message>
@@ -3039,19 +3048,20 @@
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-44"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-48"/>
         <source>Reset Edit</source>
         <translation>取消編輯(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1299"/>
+        <location filename="../../common/gui_main.cpp" line="+1294"/>
         <source>Failed to connect to avsproxy.
 Is it running ?</source>
         <translation>無法連線到 avs代理，
 要繼續執行嗎?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+16"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+17"/>
+        <location line="+2"/>
         <source>Save current settings as default</source>
         <translation>將當前設置儲存為預設值</translation>
     </message>
@@ -3072,18 +3082,18 @@
         <translation>MP3 編解碼器不允許停用資源，安裝了 lame外掛程式</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-46"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-49"/>
         <source>Save as Image</source>
         <translation>另存圖片(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+280"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+286"/>
         <location line="+3"/>
         <source>Preferences</source>
         <translation>首選項-偏好設定</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-266"/>
+        <location filename="../../common/gui_main.cpp" line="-267"/>
         <source>_Track from video:</source>
         <translation>影片中的軌道:</translation>
     </message>
@@ -3093,21 +3103,17 @@
         <translation>1/4像素</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+126"/>
+        <location filename="../../common/gui_save.cpp" line="+127"/>
         <source>Saving audio</source>
         <translation>正在儲存音訊</translation>
     </message>
     <message>
-        <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="vanished">在 .mp4 對 MP3 使用選擇對象標籤</translation>
-    </message>
-    <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-29"/>
         <source>_Interlaced</source>
         <translation>交錯掃描</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+75"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+79"/>
         <source>Open Application &amp;Log</source>
         <translation>開啟應用程式Log(&amp;L)</translation>
     </message>
@@ -3125,7 +3131,7 @@
         <translation>濾鏡器(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-244"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-250"/>
         <source>_lavc threads:</source>
         <translation>lavc 線程:</translation>
     </message>
@@ -3140,12 +3146,12 @@
         <translation>灰階</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+194"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+200"/>
         <source>Refresh Rate Cap (ms)</source>
         <translation>重整速率上限 (ms)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-24"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-28"/>
         <source>Set Marker A</source>
         <translation>設定標記 A</translation>
     </message>
@@ -3171,17 +3177,17 @@
         <translation>卡通模式</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+46"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+50"/>
         <source>Previous Frame</source>
         <translation>轉到上一幀</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+227"/>
+        <location filename="../../common/gui_main.cpp" line="+228"/>
         <source>AvsProxy</source>
         <translation>AvsProxy</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-180"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-186"/>
         <source>_Playback priority:</source>
         <translation>倒帶優先次序:</translation>
     </message>
@@ -3192,7 +3198,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="-1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+104"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+110"/>
         <source>_Horizontal deblocking</source>
         <translation>去除水平方向塊狀色斑</translation>
     </message>
@@ -3212,7 +3218,7 @@
         <translation>Gettext</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-84"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-88"/>
         <source>Save as JPEG</source>
         <translation>另存JPEG</translation>
     </message>
@@ -3222,7 +3228,7 @@
         <translation>2通</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-839"/>
+        <location filename="../../common/gui_main.cpp" line="-834"/>
         <source>Could not open the file</source>
         <translation>無法開啟此檔案</translation>
     </message>
@@ -3247,7 +3253,7 @@
         <translation>介...是減少(%)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+86"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+90"/>
         <source>Previous Intra Frame</source>
         <translation>轉到上一幀(關鍵幀或I幀)</translation>
     </message>
@@ -3262,7 +3268,7 @@
         <translation>XVideo (最好)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+285"/>
+        <location filename="../../common/gui_main.cpp" line="+279"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
@@ -3274,8 +3280,7 @@
         <translation>音訊編碼器</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-162"/>
-        <location line="+321"/>
+        <location filename="../../common/gui_main.cpp" line="+159"/>
         <source>Something bad happened (II)</source>
         <translation>不幸的事情發生 (II)</translation>
     </message>
@@ -3311,10 +3316,6 @@
         <translation>外掛-音訊(ADM)</translation>
     </message>
     <message>
-        <source>Cannot get tinyPÿ script engine</source>
-        <translation type="vanished">不能獲得tinyPÿ腳本引擎</translation>
-    </message>
-    <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+6"/>
         <source>Curve Compression</source>
         <translation>曲線壓縮</translation>
@@ -3325,46 +3326,22 @@
         <translation>模式決定</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-29"/>
+        <location filename="../../common/gui_save.cpp" line="-30"/>
         <source>Queue job to jobList</source>
         <translation>工作清單</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+35"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+39"/>
         <source>Internal error opening 0x%x</source>
         <translation>內部開啟錯誤中 0x%x</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-918"/>
+        <location filename="../../common/gui_main.cpp" line="-912"/>
         <source>Are you sure?</source>
         <translation>確定嗎?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+812"/>
-        <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
-Dropping a keyframe will result in severely corrupted video.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
-Dropping a frame may result in some video corruption.
-Proceed anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Do not warn again and drop frames silently while saving this video?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
+        <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3608,7 +3585,7 @@
         <translation>複合格式</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+84"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+85"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
@@ -3680,7 +3657,7 @@
 <context>
     <name>bitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+168"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+169"/>
         <source>-</source>
         <translation>-</translation>
     </message>
@@ -3791,40 +3768,45 @@
     <name>blackenDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/blackenBorders.ui" line="+59"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+59"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+112"/>
         <source>Top:</source>
         <translation>頂邊:</translation>
     </message>
     <message>
         <location line="+71"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+71"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+14"/>
         <source>Left:</source>
         <translation>左邊:</translation>
     </message>
     <message>
         <location line="-28"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-7"/>
         <source>Reset</source>
         <translation>重設</translation>
     </message>
     <message>
         <location line="-88"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-88"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-105"/>
         <source>Blacken Borders</source>
         <translation>1.3-加入內邊框填黑-框厚度不限</translation>
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+75"/>
         <source>Right:</source>
         <translation>右邊:</translation>
     </message>
     <message>
         <location line="+71"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+71"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-14"/>
         <source>Bottom:</source>
         <translation>下邊:</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>blackframes</name>
@@ -3845,14 +3827,37 @@
     </message>
 </context>
 <context>
+    <name>blend</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
+        <source>Blend Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+238"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+243"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-200"/>
         <source>29.97 (NTSC)</source>
         <translation>29.97 (NTSC)</translation>
     </message>
@@ -3867,22 +3872,27 @@
         <translation>25  (PAL)</translation>
     </message>
     <message>
-        <location line="+197"/>
+        <location line="+202"/>
         <source>Invalid fps</source>
         <translation>無效FPS(幀數/秒)</translation>
     </message>
     <message>
-        <location line="-198"/>
+        <location line="-203"/>
         <source>Custom</source>
         <translation>自訂</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+5"/>
+        <source>59.94  (NTSC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
         <source>Change FPS</source>
         <translation>1.0-改變幀速度</translation>
     </message>
     <message>
-        <location line="+156"/>
+        <location line="+161"/>
         <source>Change fps</source>
         <translation>改變FPS(幀數/秒)</translation>
     </message>
@@ -3897,27 +3907,22 @@
         <translation>目的地幀播放速率 :</translation>
     </message>
     <message>
-        <location line="-183"/>
+        <location line="-188"/>
         <source>23.976 (Film)</source>
         <translation>23.976 (Film)</translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+182"/>
         <source>Source Fps:</source>
         <translation>源頭 Fps :</translation>
     </message>
     <message>
-        <location line="-174"/>
-        <source>59.93  (NTSC)</source>
-        <translation>59.93  (NTSC)</translation>
-    </message>
-    <message>
-        <location line="+33"/>
+        <location line="-146"/>
         <source>Speed up/slow down the video as if altering fps. This filter changes duration.</source>
         <translation>影片快慢改變fps(幀/秒)的速度，這濾鏡可以改變時間.</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+151"/>
         <source>Destination Fps:</source>
         <translation>目的地 Fps:</translation>
     </message>
@@ -4218,7 +4223,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+344"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4474,37 +4479,37 @@
 <context>
     <name>encodingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+456"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+480"/>
         <location line="+31"/>
         <location line="+57"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="-398"/>
+        <location line="-409"/>
         <source>Low</source>
         <translation>低</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+247"/>
         <location line="+7"/>
         <location line="+14"/>
         <source>0 MB</source>
         <translation>0 MB</translation>
     </message>
     <message>
-        <location line="-277"/>
+        <location line="-288"/>
         <source>High</source>
         <translation>高</translation>
     </message>
     <message>
-        <location line="-84"/>
+        <location line="-97"/>
         <source>Main</source>
         <translation>主要</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+220"/>
+        <location line="+25"/>
+        <location line="+247"/>
         <location line="+21"/>
         <source>None</source>
         <translation>無</translation>
@@ -4515,12 +4520,12 @@
         <translation>音訊編解碼器:</translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-193"/>
         <source>Priority:</source>
         <translation>優先權:</translation>
     </message>
     <message>
-        <location line="+281"/>
+        <location line="+292"/>
         <source>Video Size:</source>
         <translation>影片大小:</translation>
     </message>
@@ -4530,12 +4535,12 @@
         <translation>音訊大小:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-248"/>
         <source>Above Normal</source>
         <translation>高於一般</translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+205"/>
         <source>Video Codec:</source>
         <translation>影片編解碼器:</translation>
     </message>
@@ -4545,12 +4550,12 @@
         <translation>已處理的幀:</translation>
     </message>
     <message>
-        <location line="-325"/>
+        <location line="-336"/>
         <source>Below Normal</source>
         <translation>低於一般</translation>
     </message>
     <message>
-        <location line="+389"/>
+        <location line="+400"/>
         <source>Elapsed:</source>
         <translation>經過時間:</translation>
     </message>
@@ -4565,37 +4570,37 @@
         <translation>00:00:00</translation>
     </message>
     <message>
-        <location line="-453"/>
+        <location line="-511"/>
         <source>Time Remaining:</source>
         <translation>剩餘時間:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+99"/>
         <source>Normal</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="-68"/>
         <source>Phase:</source>
         <translation>階段:</translation>
     </message>
     <message>
-        <location line="+396"/>
+        <location line="+416"/>
         <source>Quantiser:</source>
         <translation>量化器:</translation>
     </message>
     <message>
-        <location line="-378"/>
+        <location line="-389"/>
         <source>Shut down computer when finished</source>
         <translation>完成後關閉電腦</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+120"/>
         <source>Pause / Abort</source>
         <translation>暫停 / 停止</translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+245"/>
         <source>Average Bitrate:</source>
         <translation>平均位元率(ABR):</translation>
     </message>
@@ -4605,17 +4610,22 @@
         <translation>容器:</translation>
     </message>
     <message>
-        <location line="-292"/>
+        <location line="-316"/>
         <source>Encoding...</source>
         <translation>正在編碼...</translation>
     </message>
     <message>
         <location line="+145"/>
+        <source>Keep dialog open when finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
         <source>Minimize to Tray</source>
         <translation>縮到工具列上</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+33"/>
         <source>Advanced</source>
         <translation>進階</translation>
     </message>
@@ -4625,8 +4635,8 @@
         <translation>幀/秒:</translation>
     </message>
     <message>
-        <location line="-498"/>
-        <location line="+251"/>
+        <location line="-501"/>
+        <location line="+254"/>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
@@ -4724,7 +4734,7 @@
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation>1.4-淡化效果</translation>
@@ -4735,7 +4745,32 @@
         <translation>淡化某一段時間效果.</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+13"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from the first picture into movie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade from movie to the first picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Fade direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4748,7 +4783,7 @@
 <context>
     <name>fadeToBlack</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+67"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+66"/>
         <source>In</source>
         <translation>淡入</translation>
     </message>
@@ -4758,7 +4793,7 @@
         <translation>淡出</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4773,7 +4808,7 @@
         <translation>淡化型式:</translation>
     </message>
     <message>
-        <location line="-8"/>
+        <location line="-4"/>
         <source>Fade out</source>
         <translation>淡出</translation>
     </message>
@@ -4784,12 +4819,12 @@
     </message>
     <message>
         <location line="-11"/>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Fade to black</source>
         <translation>1.4-由淡到黑(淡入/淡出)</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-19"/>
         <source>Fade to black in/out.</source>
         <translation>由淡到黑 淡入/淡出-某一段時間效果。</translation>
     </message>
@@ -4797,7 +4832,7 @@
 <context>
     <name>ffVAEncH264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4812,12 +4847,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Profile:</source>
+        <location line="+3"/>
+        <source>Constant Rate Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4828,16 +4884,21 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Bitrate (kbps):</source>
+        <source>Quality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4847,7 +4908,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4855,27 +4916,53 @@
 <context>
     <name>ffVAEncHEVC</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+343"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-11"/>
+        <source>Constant Rate Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Rate Control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4885,7 +4972,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4893,7 +4980,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+237"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+270"/>
         <source>Three threads</source>
         <translation>三個線程</translation>
     </message>
@@ -5362,8 +5449,8 @@
 <context>
     <name>ffnvenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+221"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+195"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+262"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+238"/>
         <source>Low Latency</source>
         <translation>低延遲</translation>
     </message>
@@ -5374,7 +5461,31 @@
         <translation>BluRay藍光</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-8"/>
+        <source>Controlled by Preset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Constant Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Variable Bitrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5389,13 +5500,25 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+15"/>
+        <source>RC Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+3"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+11"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Bitrate (kbps):</source>
         <translation>位元率 (kbps):</translation>
     </message>
@@ -5406,39 +5529,55 @@
         <translation>位元率 (kbps):</translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-2"/>
+        <location line="-5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-4"/>
         <source>Preset:</source>
         <translation>預設定:</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+5"/>
         <source>GOP Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
+        <source>2-Pass Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <source>Low Latency presets always use 2-pass mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+2"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
         <source>Frame Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>NVENC H.264 configuration</source>
         <translation>NVENC H.264 配置</translation>
     </message>
     <message>
-        <location line="-34"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-12"/>
+        <location line="-63"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-25"/>
         <source>Low Quality</source>
         <translation>低品質</translation>
     </message>
@@ -5449,13 +5588,8 @@
         <translation>高品質</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+17"/>
-        <source>nvEnc HEVC  configuration</source>
-        <translation>nvEnc HEVC  配置</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-13"/>
+        <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
         <source>Low Latency (HQ)</source>
         <translation>低延遲 (HQ)</translation>
     </message>
@@ -5465,6 +5599,11 @@
         <source>Low Latency (LQ)</source>
         <translation>低延遲 (LQ)</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+49"/>
+        <source>NVENC HEVC configuration</source>
+        <translation>NVENC HEVC 配置</translation>
+    </message>
 </context>
 <context>
     <name>ffpsmuxer</name>
@@ -5484,7 +5623,7 @@
         <translation>Mpeg PS 複合器</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+196"/>
         <source> video not compatible
 </source>
         <translation> 影片不相容
@@ -5534,12 +5673,12 @@
 </translation>
     </message>
     <message>
-        <location line="-179"/>
+        <location line="-188"/>
         <source>[Mismatch]</source>
         <translation>[Mismatch]</translation>
     </message>
     <message>
-        <location line="+144"/>
+        <location line="+153"/>
         <source> Bad width/height for DVD
 </source>
         <translation> 不對的寬度/高度為 DVD
@@ -5593,7 +5732,7 @@
         <translation>VBR 複合</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+151"/>
         <source>Saving mpeg TS (ff)</source>
         <translation>儲存 mpeg TS (ff)</translation>
     </message>
@@ -5651,7 +5790,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5809,7 +5948,7 @@
 <context>
     <name>flvdemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>This FLV file says it has no video.
 I will assume it has and try to continue</source>
         <translation>這個 FLV 檔說它有沒有影片。我將假設已並嘗試繼續</translation>
@@ -6340,7 +6479,7 @@
 <context>
     <name>jobs</name>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Oops</source>
         <translation>Oops</translation>
     </message>
@@ -6365,7 +6504,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="+6"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+5"/>
         <source>There are no jobs stored</source>
         <translation>沒有儲存任何工作</translation>
     </message>
@@ -6380,7 +6519,7 @@
         <translation>執行工作</translation>
     </message>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="-6"/>
+        <location filename="../../common/GUI_jobs.cpp" line="-5"/>
         <source>Something very wrong happened when building joblist.</source>
         <translation>建立工作列表時發生某些重大錯誤。</translation>
     </message>
@@ -6838,12 +6977,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+477"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+570"/>
         <source>Matroska clusters</source>
         <translation>Matroska 集群</translation>
     </message>
     <message>
-        <location line="-431"/>
+        <location line="-523"/>
         <source>Matroska Images</source>
         <translation>Matroska 圖像</translation>
     </message>
@@ -6943,7 +7082,7 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+167"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+176"/>
         <source>Saving Mkv</source>
         <translation>儲存 Mkv中</translation>
     </message>
@@ -7042,15 +7181,20 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
         <source>Problem reading SVQ3 headers</source>
         <translation>讀取 SVQ3 檔頭時發生問題</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+492"/>
+        <source>Decoding frame type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+32"/>
         <source>Muxing Format</source>
         <translation>複合器格式</translation>
     </message>
@@ -7085,7 +7229,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Do not rotate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7110,7 +7254,72 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+223"/>
+        <location line="+3"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>24 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>30 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>60 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 kHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+88"/>
+        <source>Only MP4Video, H264, H265 and AV1 supported for video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Incompatible Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PSP format is incompatible with LPCM audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+183"/>
         <source>Saving PSP</source>
         <translation>儲存 PSP</translation>
     </message>
@@ -7120,30 +7329,16 @@
         <translation>儲存 mp4</translation>
     </message>
     <message>
-        <source>Use alternate MP3 tag</source>
-        <translation type="vanished">使用備用的 MP3 標記</translation>
-    </message>
-    <message>
-        <location line="-155"/>
-        <source>Only MP4Video, H264, and H265 supported for video</source>
-        <translation>唯一的 MP4影片， H264、H265、ASP(ff)、ASP(xvid4) 支援影片編碼</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+4"/>
         <source>MP4 Muxer</source>
         <translation>複合器</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+0"/>
-        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="-212"/>
+        <location line="+17"/>
         <source>Unsupported</source>
         <translation>未支援的</translation>
     </message>
-    <message>
-        <location line="+0"/>
-        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
-        <translation>只有 AAC、 AC3、 E AC3 和mpeg音訊支援音訊</translation>
-    </message>
 </context>
 <context>
     <name>mp4v2muxer</name>
@@ -7313,7 +7508,7 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+494"/>
+        <location filename="../../common/gui_navigate.cpp" line="+484"/>
         <source>Seek</source>
         <translation>尋求</translation>
     </message>
@@ -7543,26 +7738,17 @@
 <context>
     <name>psdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="vanished">錯誤</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
         <translation>正在索引</translation>
     </message>
     <message>
-        <source>This file&apos;s index has been created with an older version of avidemux.
-Please delete the idx2 file and reopen.</source>
-        <translation type="vanished">用舊版本的剪切建立此檔&apos;案索引，請刪除 idx2 檔，然後重新打開。</translation>
-    </message>
-    <message>
-        <location line="+42"/>
+        <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>有幾個檔使用順序檔案名稱，所有載入他們嗎？</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -7620,34 +7806,34 @@
 <context>
     <name>qencoding</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="+378"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="+401"/>
         <source>Abort</source>
         <translation>中止</translation>
     </message>
     <message>
-        <location line="-313"/>
+        <location line="-336"/>
         <location line="+20"/>
         <source>Privileges Required</source>
         <translation>需要特殊權限</translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+127"/>
         <source>Pass 1</source>
         <translation>通過 1</translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+189"/>
         <source>Resume</source>
         <translation>繼續</translation>
     </message>
     <message>
-        <location line="-313"/>
+        <location line="-336"/>
         <location line="+20"/>
         <source>Root privileges are required to perform this operation.</source>
         <translation>需要 Root 權限來實行這項操作。</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+126"/>
         <source>First Pass</source>
         <translation>快速第1通</translation>
     </message>
@@ -7657,7 +7843,7 @@
         <translation>編碼中...</translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+185"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>編碼已經暫停。您要繼續或中止?</translation>
     </message>
@@ -7685,12 +7871,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+2068"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+2085"/>
         <source>%c-%s (%02d)</source>
         <translation>%c-%s (%02d)</translation>
     </message>
     <message>
-        <location line="-924"/>
+        <location line="-947"/>
         <source>Set start marker</source>
         <translation>設定開始標記</translation>
     </message>
@@ -7700,14 +7886,14 @@
         <translation>最近使用的 專案(&amp;P)</translation>
     </message>
     <message>
-        <location line="+1348"/>
+        <location line="+1403"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>應用程式遇到了一個致命的問題
 當前編輯已保儲存, 將在下一開始重新載入</translation>
     </message>
     <message>
-        <location line="-668"/>
+        <location line="-723"/>
         <source>Go to previous keyframe</source>
         <translation>轉到上一幀(關鍵幀或I幀)</translation>
     </message>
@@ -7732,7 +7918,20 @@
         <translation>倒退一分鐘</translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="+984"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+277"/>
+        <location line="+2"/>
+        <source> (%n track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="-1288"/>
         <source>Go to first frame</source>
         <translation>轉到第一幀</translation>
     </message>
@@ -7767,12 +7966,7 @@
         <translation>轉到上一幀</translation>
     </message>
     <message>
-        <location line="+1270"/>
-        <source> (%d track(s))</source>
-        <translation> (%d 軌(s))</translation>
-    </message>
-    <message>
-        <location line="-1267"/>
+        <location line="+3"/>
         <source>Go to next frame</source>
         <translation>轉到下一幀</translation>
     </message>
@@ -8015,18 +8209,26 @@
         <source>Yes</source>
         <translation>是</translation>
     </message>
+    <message numerus="yes">
+        <location line="+72"/>
+        <location line="+2"/>
+        <source>Audio (%n active track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
     <message>
-        <location line="+98"/>
+        <location line="+34"/>
         <source>Mono</source>
         <translation>單音</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
         <source>Audio</source>
         <translation>音訊</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-27"/>
         <source>Video</source>
         <translation>影片</translation>
     </message>
@@ -8036,22 +8238,22 @@
         <translation>圖片大小(SAR):	</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+42"/>
         <source>No Audio</source>
         <translation>沒音訊</translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="-38"/>
         <source>Frame Rate:	</source>
         <translation>幀率:	</translation>
     </message>
     <message>
-        <location line="-123"/>
+        <location line="-132"/>
         <source>%2.3f fps</source>
         <translation>%2.3f fps</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+144"/>
         <source>Extra data:	</source>
         <translation>額外資料：:	</translation>
     </message>
@@ -8066,18 +8268,18 @@
         <translation>額外影片屬性</translation>
     </message>
     <message>
-        <location line="-123"/>
-        <location line="+81"/>
+        <location line="-132"/>
+        <location line="+90"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation>%02d:%02d:%02d.%03d</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+65"/>
         <source>Channels:	</source>
         <translation>頻道:	</translation>
     </message>
     <message>
-        <location line="-27"/>
+        <location line="-33"/>
         <source>Codec 4CC:	</source>
         <translation>編解碼器 4CC:	</translation>
     </message>
@@ -8087,17 +8289,17 @@
         <translation>立體聲</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+79"/>
         <source>Codec:		</source>
         <translation>編解碼器：		</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-159"/>
         <source>%s (%u:%u)</source>
         <translation>%s (%u:%u)</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+163"/>
         <source>Bitrate:	</source>
         <translation>位元率:	</translation>
     </message>
@@ -8107,13 +8309,13 @@
         <translation>頻率:	</translation>
     </message>
     <message>
-        <location line="-21"/>
+        <location line="-27"/>
         <source>ExtraDataSize:	</source>
         <translation>額外的資料大小：	</translation>
     </message>
     <message>
         <location line="-4"/>
-        <location line="+27"/>
+        <location line="+33"/>
         <source>Total Duration:	</source>
         <translation>總持續時間：	</translation>
     </message>
@@ -8121,7 +8323,7 @@
 <context>
     <name>qshell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+44"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+54"/>
         <source>You can use CTRL+PageUP and CTRL+Page Down to recall previous commands
 Ready.
 </source>
@@ -8130,7 +8332,20 @@
 </translation>
     </message>
     <message>
-        <location line="-1"/>
+        <location line="+2"/>
+        <source>Enter your commands then press the evaluate button or ⌘⏎.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use ⌥⌘▲ and ⌥⌘▼ to recall previous commands.
+Ready.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-4"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
         <translation>輸入您的命令，然後按下求值按鈕或按 CTRL + ENTER。
@@ -8197,6 +8412,16 @@
         <source>Video Only Muxer Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <source>Saving raw video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>removeplane</name>
@@ -8264,42 +8489,42 @@
         <translation>25  (PAL)</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+4"/>
+        <source>59.94  (NTSC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Resample FPS</source>
         <translation>1.0-調整幀速度(重新取樣)-用在數碼轉換DVD</translation>
     </message>
     <message>
-        <location line="+285"/>
+        <location line="+289"/>
         <source>Resample fps</source>
         <translation>重新取樣 fps</translation>
     </message>
     <message>
-        <location line="-325"/>
+        <location line="-329"/>
         <source>Custom</source>
         <translation>自訂</translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+322"/>
         <source>_Mode:</source>
         <translation>模式:</translation>
     </message>
     <message>
-        <location line="-316"/>
+        <location line="-320"/>
         <source>23.976 (Film)</source>
         <translation>23.976 (電影)</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>59.93  (NTSC)</source>
-        <translation>59.93  (NTSC)</translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+39"/>
         <source>Change and enforce FPS. Keep duration and sync.</source>
         <translation>結束時間仍然一樣，例如15 fps電影從數碼轉換 DVD，一般PC上看不出來效果。</translation>
     </message>
     <message>
-        <location line="+278"/>
+        <location line="+282"/>
         <source>_New frame rate:</source>
         <translation>新幀率:</translation>
     </message>
@@ -8312,7 +8537,7 @@
         <translation>調整比例像素大小。</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+326"/>
         <source>Width and height cannot be odd</source>
         <translation>寬度和高度不能為奇數</translation>
     </message>
@@ -8412,17 +8637,31 @@
         <translation>16:9</translation>
     </message>
     <message>
+        <location line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+338"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+338"/>
+        <source>Lanzcos3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+40"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+212"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+212"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+212"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+212"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+212"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+212"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+212"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+212"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+212"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+212"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-126"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-126"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-126"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-126"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-126"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-126"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-126"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-126"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-126"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-126"/>
         <source>200%</source>
         <translation>200%</translation>
     </message>
@@ -8578,31 +8817,21 @@
     </message>
     <message>
         <location line="+146"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+146"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+146"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+146"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+146"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+146"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+146"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+146"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+146"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+146"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+146"/>
-        <source>Lanzcos3</source>
-        <translation>Lanzcos3三階線性</translation>
+        <source>Lanczos-3</source>
+        <translation>Lanczos-3三階線性</translation>
     </message>
     <message>
         <location line="-5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+141"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+141"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+141"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+141"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+141"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+141"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+141"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+141"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+141"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+141"/>
         <source>Bicubic</source>
         <translation>雙立方</translation>
     </message>
@@ -9036,31 +9265,32 @@
 <context>
     <name>tsdemuxer</name>
     <message>
-        <source>Error</source>
-        <translation type="vanished">錯誤</translation>
-    </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+193"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+335"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+92"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+219"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+347"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+105"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
         <translation>正在索引</translation>
     </message>
     <message>
-        <source>This file&apos;s index has been created with an older version of avidemux.
-Please delete the idx2 file and reopen.</source>
-        <translation type="vanished">這是用舊版本Avidemux建立的索引檔 &apos;案，請刪除 idx2 檔，然後重新打開。</translation>
+        <location line="+160"/>
+        <source>Size Change</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="-10"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="-8"/>
+        <location line="+1"/>
+        <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-173"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="-12"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="-19"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>有幾個檔使用順序檔案名稱，將所有載入他們嗎？</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
         <translation type="unfinished"></translation>
@@ -9152,29 +9382,147 @@
     </message>
 </context>
 <context>
+    <name>vaapiDeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp" line="+121"/>
+        <source>VA-API Deinterlacer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Deinterlace and optionally resize video using VA-API.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+316"/>
+        <source>Bob</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Adaptive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion-Compensated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Frame per Frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double Framerate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field Order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Output:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deinterlacing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>VA-API Deinterlacer and Resizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unsupported Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specified deinterlacing mode %s is not supported, replaced with %s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>VA-API Setup Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not setup VA-API, purely passthrough operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vaapiResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+208"/>
-        <source>vaapi</source>
-        <translation>vaapi</translation>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
+        <source>VA-API Resize</source>
+        <translation>VA-API 調整大小</translation>
     </message>
     <message>
-        <location line="-140"/>
-        <source>vaapi: Resize image using vaapi.</source>
-        <translation>vaapi： 使用 vaapi 的大小調整圖像。</translation>
+        <location line="+1"/>
+        <source>Resize image using VA-API.</source>
+        <translation>使用 VA-API 的大小調整圖像。</translation>
     </message>
     <message>
-        <location line="-1"/>
-        <source>vaapi: Resize</source>
-        <translation>vaapi: 調整大小</translation>
+        <location line="+131"/>
+        <source>mpeg-&gt;PC</source>
+        <translation>mpeg-&gt;PC</translation>
     </message>
     <message>
-        <location line="+137"/>
-        <source>mpeg-&gt;PC:</source>
-        <translation>mpeg-&gt;PC:</translation>
+        <location line="+4"/>
+        <source>vaapi</source>
+        <translation>vaapi</translation>
     </message>
     <message>
-        <location line="-1"/>
+        <location line="-5"/>
         <source>Height :</source>
         <translation>高 :</translation>
     </message>
@@ -9187,7 +9535,7 @@
 <context>
     <name>vdpaudeint</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+332"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+344"/>
         <source>vdpau</source>
         <translation>vdpau</translation>
     </message>
@@ -9198,18 +9546,18 @@
     </message>
     <message>
         <location line="-2"/>
-        <source>_Ivtc:</source>
-        <translation>Ivtc:</translation>
+        <source>_IVTC</source>
+        <translation>Ivtc</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-205"/>
         <source>vdpauDeint</source>
         <translation>vdpau去交錯</translation>
     </message>
     <message>
-        <location line="+194"/>
-        <source>_Resize:</source>
-        <translation>調整大小:</translation>
+        <location line="+206"/>
+        <source>_Resize</source>
+        <translation>調整大小</translation>
     </message>
     <message>
         <location line="-8"/>
@@ -9223,18 +9571,18 @@
     </message>
     <message>
         <location line="+10"/>
-        <source>Height :</source>
-        <translation>高 :</translation>
+        <source>Height:</source>
+        <translation>高:</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-208"/>
         <source>VDPAU deinterlacer (+resize).</source>
         <translation>VDPAU 去交錯化 （+ 調整大小）.</translation>
     </message>
     <message>
-        <location line="+195"/>
-        <source>Width :</source>
-        <translation>寬 :</translation>
+        <location line="+207"/>
+        <source>Width:</source>
+        <translation>寬:</translation>
     </message>
     <message>
         <location line="-8"/>
@@ -9245,12 +9593,12 @@
 <context>
     <name>vdpresize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="+208"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="+206"/>
         <source>vdpau</source>
         <translation>vdpau</translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-136"/>
         <source>vdpau: Resize image using vdpau.</source>
         <translation>vdpau: 使用vdpau調整圖像大小。</translation>
     </message>
@@ -9260,14 +9608,22 @@
         <translation>vdpau: 調整大小</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+132"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Height :</source>
-        <translation>高 :</translation>
+        <translation type="vanished">高 :</translation>
     </message>
     <message>
-        <location line="-1"/>
         <source>Width :</source>
-        <translation>寬 :</translation>
+        <translation type="vanished">寬 :</translation>
     </message>
 </context>
 <context>
@@ -9345,6 +9701,84 @@
     </message>
 </context>
 <context>
+    <name>vp9encoder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp" line="+28"/>
+        <source>Realtime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Good quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Best quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use as many threads as CPU cores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GOP Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use full color range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Speed vs Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Keyframes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libvpx VP9 Encoder Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vsWindow</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
@@ -9370,12 +9804,12 @@
         <translation>強制顯示寬度</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+169"/>
         <source>Saving Webm</source>
         <translation>儲存 Webm</translation>
     </message>
     <message>
-        <location line="-78"/>
+        <location line="-89"/>
         <source>Unsupported Audio.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
         <translation>只有 VP8/VP9 影片和 Vorbis/s/Opus音訊支援</translation>
@@ -9395,22 +9829,22 @@
 <context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+19"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+20"/>
         <source>Elapsed:</source>
         <translation>已過時間:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+27"/>
         <source>00:00:00</source>
         <translation>00:00:00</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-13"/>
         <source>Time Remaining:</source>
         <translation>剩餘時間:</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-20"/>
         <source>Processing</source>
         <translation>處理中</translation>
     </message>
@@ -9418,17 +9852,17 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+643"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+656"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-465"/>
+        <location line="-478"/>
         <source>none</source>
         <translation>無</translation>
     </message>
     <message>
-        <location line="+616"/>
+        <location line="+629"/>
         <location line="+70"/>
         <location line="+14"/>
         <source>Error</source>
@@ -9482,7 +9916,7 @@
         <translation>量化器:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
         <source>Not coded</source>
         <translation>不編碼</translation>
     </message>
@@ -9493,10 +9927,6 @@
         <translation>kbit/s</translation>
     </message>
     <message>
-        <source>my profile</source>
-        <translation type="vanished">我的設定檔</translation>
-    </message>
-    <message>
         <location line="+207"/>
         <source>Replace the following preset ?:</source>
         <translation>替代以下的預設定嗎?:</translation>
@@ -9558,12 +9988,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui" line="+2526"/>
         <location line="+179"/>
-        <location line="+302"/>
+        <location line="+307"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location line="-2114"/>
+        <location line="-2119"/>
         <source>0</source>
         <translation>0</translation>
     </message>
@@ -9600,12 +10030,12 @@
         <translation>7</translation>
     </message>
     <message>
-        <location line="+2583"/>
+        <location line="+2588"/>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
-        <location line="-2578"/>
+        <location line="-2583"/>
         <source>15</source>
         <translation>15</translation>
     </message>
@@ -9670,7 +10100,17 @@
         <translation>5.1</translation>
     </message>
     <message>
-        <location line="+2977"/>
+        <location line="+2540"/>
+        <source>Auto Variance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance Biased</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+437"/>
         <source>Custom:</source>
         <comment>multithreading</comment>
         <translation type="unfinished"></translation>
@@ -9711,7 +10151,7 @@
         <translation>VBR</translation>
     </message>
     <message>
-        <location line="-3621"/>
+        <location line="-3626"/>
         <source>Fast First Pass</source>
         <translation>快速第1通</translation>
     </message>
@@ -9722,23 +10162,23 @@
         <translation>自動</translation>
     </message>
     <message>
-        <location line="+2283"/>
+        <location line="+2288"/>
         <source>Crop</source>
         <translation>裁剪</translation>
     </message>
     <message>
-        <location line="-1304"/>
-        <location line="+856"/>
+        <location line="-1309"/>
+        <location line="+861"/>
         <source>Edit</source>
         <translation>編輯</translation>
     </message>
     <message>
-        <location line="-1412"/>
+        <location line="-1417"/>
         <source>Fast</source>
         <translation>快</translation>
     </message>
     <message>
-        <location line="+1984"/>
+        <location line="+1989"/>
         <source>Film</source>
         <translation>電影</translation>
     </message>
@@ -9748,8 +10188,8 @@
         <translation>NTSC國家電視系統委員會</translation>
     </message>
     <message>
-        <location line="-2349"/>
-        <location line="+2596"/>
+        <location line="-2354"/>
+        <location line="+2601"/>
         <source>None</source>
         <translation>無</translation>
     </message>
@@ -9764,19 +10204,19 @@
         <translation>kbit</translation>
     </message>
     <message>
-        <location line="-1457"/>
+        <location line="-1462"/>
         <source>CABAC</source>
         <translation>CABAC（內文自適應二進制算術編碼）</translation>
     </message>
     <message>
-        <location line="+2239"/>
+        <location line="+2244"/>
         <location line="+63"/>
         <location line="+73"/>
         <source>BT709</source>
         <translation>BT709</translation>
     </message>
     <message>
-        <location line="-3780"/>
+        <location line="-3785"/>
         <source>Basic</source>
         <translation>基本</translation>
     </message>
@@ -9791,7 +10231,7 @@
         <translation>最小:</translation>
     </message>
     <message>
-        <location line="+1796"/>
+        <location line="+1801"/>
         <source>SECAM</source>
         <translation>SECAM順序彩色與記憶</translation>
     </message>
@@ -9816,7 +10256,7 @@
         <translation>bytes位元</translation>
     </message>
     <message>
-        <location line="-1796"/>
+        <location line="-1801"/>
         <location line="+450"/>
         <location line="+36"/>
         <source>Disabled</source>
@@ -9828,7 +10268,7 @@
         <translation>直接預測模式:</translation>
     </message>
     <message>
-        <location line="+2270"/>
+        <location line="+2275"/>
         <source>These settings are only suggestions for the playback equipment.  Use at your own risk.</source>
         <translation>這些設定只是建議播放設備，使用您自擔風險。</translation>
     </message>
@@ -9838,7 +10278,7 @@
         <translation>最大 VBV 緩衝容量 :</translation>
     </message>
     <message>
-        <location line="-1715"/>
+        <location line="-1720"/>
         <source>Weighted Prediction for P-frames:</source>
         <translation>P-幀的加權預測:</translation>
     </message>
@@ -9848,12 +10288,12 @@
         <translation>最大量化步驟:</translation>
     </message>
     <message>
-        <location line="+537"/>
+        <location line="+542"/>
         <source>Maximum Size per Slice:</source>
         <translation>切割每幀最大容量:</translation>
     </message>
     <message>
-        <location line="-264"/>
+        <location line="-269"/>
         <source>Variance AQ:</source>
         <translation>可變 AQ:</translation>
     </message>
@@ -9863,7 +10303,7 @@
         <translation>進階速率控制(RC)</translation>
     </message>
     <message>
-        <location line="+3007"/>
+        <location line="+3012"/>
         <source>Video Format:</source>
         <translation>影片格式 :</translation>
     </message>
@@ -9873,7 +10313,7 @@
         <translation>生成假去錯</translation>
     </message>
     <message>
-        <location line="-2247"/>
+        <location line="-2252"/>
         <source>Motion Vector</source>
         <translation>向量運動</translation>
     </message>
@@ -9888,12 +10328,12 @@
         <translation>P:I , P-幀量化率:</translation>
     </message>
     <message>
-        <location line="+872"/>
+        <location line="+877"/>
         <source>Enforce Repeatability</source>
         <translation>強制重播</translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-736"/>
         <source>P and B-frame Quantiser Ratio:</source>
         <translation>B:P, B-幀量化率:</translation>
     </message>
@@ -9963,12 +10403,12 @@
         <translation>平均位元率(ABR)(2通)</translation>
     </message>
     <message>
-        <location line="+2991"/>
+        <location line="+2996"/>
         <source>BluRay compatibility</source>
         <translation>BluRay兼容</translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-734"/>
         <source>Quantiser Curve Compression</source>
         <translation>量化曲線壓縮(QCComp)</translation>
     </message>
@@ -9988,12 +10428,12 @@
         <translation>B-幀 (介於前I幀與後P幀間連續預測幀，例如: IBBBPBBBPBBBPBBBIBBBP....)</translation>
     </message>
     <message>
-        <location line="+1525"/>
+        <location line="+1530"/>
         <source>Auto-detect</source>
         <translation>自動偵測</translation>
     </message>
     <message>
-        <location line="-1375"/>
+        <location line="-1380"/>
         <source>Adaptive B-frame Decision:</source>
         <translation>自適應 B-幀的決定：</translation>
     </message>
@@ -10023,7 +10463,7 @@
         <translation>減少波動曲線壓縮之前：</translation>
     </message>
     <message>
-        <location line="+966"/>
+        <location line="+971"/>
         <source>Component</source>
         <translation>合成的</translation>
     </message>
@@ -10034,7 +10474,7 @@
         <translation>BT470M</translation>
     </message>
     <message>
-        <location line="-1782"/>
+        <location line="-1787"/>
         <location line="+6"/>
         <source>Analysis</source>
         <translation>分析</translation>
@@ -10050,13 +10490,13 @@
         <translation>最大恆定速率係數(CRF模式)</translation>
     </message>
     <message>
-        <location line="+2571"/>
+        <location line="+2576"/>
         <source>Multithreading</source>
         <translation>多線程</translation>
     </message>
     <message>
-        <location line="-3186"/>
-        <location line="+3152"/>
+        <location line="-3191"/>
+        <location line="+3157"/>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
@@ -10066,7 +10506,7 @@
         <translation>預定義PAR:</translation>
     </message>
     <message>
-        <location line="-2529"/>
+        <location line="-2534"/>
         <source>Uneven Multi-hexagonal Search</source>
         <translation>不均勻多邊形搜尋（UMH）</translation>
     </message>
@@ -10086,7 +10526,7 @@
         <translation>加權參考+重複</translation>
     </message>
     <message>
-        <location line="+2523"/>
+        <location line="+2528"/>
         <source>LOG100</source>
         <translation>LOG100</translation>
     </message>
@@ -10096,7 +10536,7 @@
         <translation>LOG316</translation>
     </message>
     <message>
-        <location line="-1247"/>
+        <location line="-1252"/>
         <source>Chroma to Luma Quantiser Offset:</source>
         <translation>從色度到明度量化偏移量：</translation>
     </message>
@@ -10106,12 +10546,12 @@
         <translation>IDC (網路資料中心)等級:</translation>
     </message>
     <message>
-        <location line="+3642"/>
+        <location line="+3647"/>
         <source>Linear</source>
         <translation>線性</translation>
     </message>
     <message>
-        <location line="-1500"/>
+        <location line="-1505"/>
         <source>JVT Matrix</source>
         <translation>JVT(聯合影片團隊) 矩陣</translation>
     </message>
@@ -10126,7 +10566,7 @@
         <translation>運動</translation>
     </message>
     <message>
-        <location line="+2482"/>
+        <location line="+2487"/>
         <source>As Input</source>
         <translation>另輸出為其他輸入檔(保留原始影片的PAR)</translation>
     </message>
@@ -10136,22 +10576,22 @@
         <translation>生成存取單元分隔符號</translation>
     </message>
     <message>
-        <location line="-566"/>
+        <location line="-571"/>
         <source>Normal</source>
         <translation>正常</translation>
     </message>
     <message>
-        <location line="+560"/>
+        <location line="+565"/>
         <source>Output</source>
         <translation>輸出</translation>
     </message>
     <message>
-        <location line="-1071"/>
+        <location line="-1076"/>
         <source>Flat Matrix</source>
         <translation>平面矩陣</translation>
     </message>
     <message>
-        <location line="+1452"/>
+        <location line="+1457"/>
         <location line="+78"/>
         <location line="+58"/>
         <source>SMPTE240M</source>
@@ -10169,7 +10609,7 @@
         <translation>HRD 參數：</translation>
     </message>
     <message>
-        <location line="-3423"/>
+        <location line="-3428"/>
         <location line="+200"/>
         <source>0 (High Quality)</source>
         <translation>0 (高品質)</translation>
@@ -10180,22 +10620,22 @@
         <translation>B 幀作為參考:</translation>
     </message>
     <message>
-        <location line="+2131"/>
+        <location line="+2136"/>
         <source>Colour Matrix:</source>
         <translation>顏色矩陣：</translation>
     </message>
     <message>
-        <location line="-3480"/>
+        <location line="-3485"/>
         <source>Constant Bitrate (Single Pass)</source>
         <translation>固定位元率(CBR)(1通)</translation>
     </message>
     <message>
-        <location line="+3624"/>
+        <location line="+3629"/>
         <source>Full Range Samples</source>
         <translation>全範圍色度樣品</translation>
     </message>
     <message>
-        <location line="-1705"/>
+        <location line="-1710"/>
         <source>Quantisation Matrix</source>
         <translation>量化矩陣</translation>
     </message>
@@ -10212,12 +10652,12 @@
     </message>
     <message>
         <location line="-942"/>
-        <location line="+2490"/>
+        <location line="+2495"/>
         <source>frames</source>
         <translation>幀</translation>
     </message>
     <message>
-        <location line="-1269"/>
+        <location line="-1274"/>
         <source>Final Macroblock Only</source>
         <translation>最終的宏塊(更快，中等品質)</translation>
     </message>
@@ -10227,12 +10667,7 @@
         <translation>B-幀的加權預測</translation>
     </message>
     <message>
-        <location line="+1441"/>
-        <source>Auto Variance AQ</source>
-        <translation>自動變量(AQ)</translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+1645"/>
         <source>kbit/s</source>
         <translation>kbit/s</translation>
     </message>
@@ -10242,29 +10677,29 @@
         <translation>初始 VBV 緩衝區佔用：</translation>
     </message>
     <message>
-        <location line="-1752"/>
+        <location line="-1757"/>
         <source>Maximum Motion Vector Length:</source>
         <translation>最大向量運動長度:</translation>
     </message>
     <message>
-        <location line="+2560"/>
+        <location line="+2565"/>
         <location line="+63"/>
         <location line="+73"/>
         <source>BT470BG</source>
         <translation>BT470BG</translation>
     </message>
     <message>
-        <location line="-3768"/>
+        <location line="-3773"/>
         <source>Preset:</source>
         <translation>預設定:</translation>
     </message>
     <message>
-        <location line="+3291"/>
+        <location line="+3296"/>
         <source>Pixel Aspect Ratio</source>
         <translation>像素寬高比PAR(PAL/NTSC-DAR))</translation>
     </message>
     <message>
-        <location line="-1316"/>
+        <location line="-1321"/>
         <source>Fast Skip Detection on P-frames</source>
         <translation>快速跳過檢測 P-幀 (場景中如有虛影時按取消)</translation>
     </message>
@@ -10284,7 +10719,7 @@
         <translation>混合參考</translation>
     </message>
     <message>
-        <location line="+877"/>
+        <location line="+882"/>
         <source>Advanced 1</source>
         <translation>進階 1</translation>
     </message>
@@ -10294,14 +10729,14 @@
         <translation>進階 2</translation>
     </message>
     <message>
-        <location line="-2699"/>
+        <location line="-2704"/>
         <location line="+200"/>
         <location line="+1649"/>
         <source>Quantiser</source>
         <translation>量化器</translation>
     </message>
     <message>
-        <location line="+1455"/>
+        <location line="+1460"/>
         <source>SMPTEL170M</source>
         <translation>SMPTEL170M</translation>
     </message>
@@ -10311,7 +10746,7 @@
         <translation>16:15 (PAL 4:3)</translation>
     </message>
     <message>
-        <location line="-2656"/>
+        <location line="-2661"/>
         <source>Sequence Parameter Set Identifer:</source>
         <translation>序列參數設定識別碼:</translation>
     </message>
@@ -10322,22 +10757,22 @@
     </message>
     <message>
         <location line="-480"/>
-        <location line="+1328"/>
+        <location line="+1333"/>
         <source>Strength:</source>
         <translation>強度：</translation>
     </message>
     <message>
-        <location line="-1858"/>
+        <location line="-1863"/>
         <source>Hadamard Exhaustive Search</source>
         <translation>Hadamard徹底搜尋（TESA）</translation>
     </message>
     <message>
-        <location line="+2071"/>
+        <location line="+2076"/>
         <source>Slices per Frame:</source>
         <translation>切割每幀:</translation>
     </message>
     <message>
-        <location line="-1129"/>
+        <location line="-1134"/>
         <source>Maximum:</source>
         <translation>最大 :</translation>
     </message>
@@ -10347,12 +10782,12 @@
         <translation>量化曲線壓縮(QCComp):</translation>
     </message>
     <message>
-        <location line="+858"/>
+        <location line="+863"/>
         <source>64:45 (PAL 16:9)</source>
         <translation>64:45 (PAL 16:9)</translation>
     </message>
     <message>
-        <location line="-3418"/>
+        <location line="-3423"/>
         <source>Profile:</source>
         <translation>設定檔：</translation>
     </message>
@@ -10397,12 +10832,12 @@
         <translation>菱形搜尋</translation>
     </message>
     <message>
-        <location line="+2085"/>
+        <location line="+2090"/>
         <source>Slicing</source>
         <translation>切割</translation>
     </message>
     <message>
-        <location line="-3057"/>
+        <location line="-3062"/>
         <source>x264 Configuraton</source>
         <translation>x264 配置</translation>
     </message>
@@ -10422,7 +10857,7 @@
         <translation>空間性</translation>
     </message>
     <message>
-        <location line="+1579"/>
+        <location line="+1584"/>
         <source>Video Buffer Verifier</source>
         <translation>影片緩衝驗證器(VBV)</translation>
     </message>
@@ -10436,27 +10871,27 @@
         <translation>未定義</translation>
     </message>
     <message>
-        <location line="-3050"/>
+        <location line="-3055"/>
         <source>Macroblock-tree Rate Control</source>
         <translation>宏塊-樹速率控制</translation>
     </message>
     <message>
-        <location line="+2713"/>
+        <location line="+2718"/>
         <source>8:9 (NTSC 4:3)</source>
         <translation>8:9 (NTSC 4:3)</translation>
     </message>
     <message>
-        <location line="-2255"/>
+        <location line="-2260"/>
         <source>Prediction</source>
         <translation>預測</translation>
     </message>
     <message>
-        <location line="+1963"/>
+        <location line="+1968"/>
         <source>Disable</source>
         <translation>停用</translation>
     </message>
     <message>
-        <location line="-627"/>
+        <location line="-632"/>
         <source>Minimum Quantiser:</source>
         <translation>最小量化:</translation>
     </message>
@@ -10466,13 +10901,13 @@
         <translation>I-幀界限值:</translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1456"/>
         <source>Custom:</source>
         <comment>PAR</comment>
         <translation>自訂 :</translation>
     </message>
     <message>
-        <location line="-998"/>
+        <location line="-1003"/>
         <source>Maximum Quantiser:</source>
         <translation>最大量化:</translation>
     </message>
@@ -10517,12 +10952,12 @@
         <translation>藍ray光模式</translation>
     </message>
     <message>
-        <location line="+1925"/>
+        <location line="+1930"/>
         <source>32:27 (NTSC 16:9)</source>
         <translation>32:27 (NTSC 16:9)</translation>
     </message>
     <message>
-        <location line="-1672"/>
+        <location line="-1677"/>
         <source>Maximum Consecutive B-frames:</source>
         <translation>最大的連續 B 幀：</translation>
     </message>
@@ -10532,17 +10967,17 @@
         <translation>時間性</translation>
     </message>
     <message>
-        <location line="+2268"/>
+        <location line="+2273"/>
         <source>Overscan:</source>
         <translation>過度掃描:</translation>
     </message>
     <message>
-        <location line="-2060"/>
+        <location line="-2065"/>
         <source>Threshold:</source>
         <translation>界限:</translation>
     </message>
     <message>
-        <location line="+1812"/>
+        <location line="+1817"/>
         <source>Output 1</source>
         <translation>輸出 1</translation>
     </message>
@@ -10552,7 +10987,7 @@
         <translation>輸出 2</translation>
     </message>
     <message>
-        <location line="-2118"/>
+        <location line="-2123"/>
         <source>4x4 Intra-predicted Blocks</source>
         <translation>4x4 I幀內預測塊狀</translation>
     </message>
@@ -10592,12 +11027,12 @@
         <translation>色度運動估計(CME)</translation>
     </message>
     <message>
-        <location line="+1269"/>
+        <location line="+1274"/>
         <source>Custom Threaded Lookahead Buffer:</source>
         <translation>自訂線程預測先行緩衝區：</translation>
     </message>
     <message>
-        <location line="-1858"/>
+        <location line="-1863"/>
         <source>8x8 Intra-predicted Blocks</source>
         <translation>8x8 I幀內預測塊狀</translation>
     </message>
@@ -10607,12 +11042,12 @@
         <translation>速率控制</translation>
     </message>
     <message>
-        <location line="+2575"/>
+        <location line="+2580"/>
         <source>Maximum VBV Bitrate:</source>
         <translation>最大 VBV 位元率 :</translation>
     </message>
     <message>
-        <location line="-2511"/>
+        <location line="-2516"/>
         <source>Encoding Mode:</source>
         <translation>編碼模式:</translation>
     </message>
@@ -10627,12 +11062,12 @@
         <translation>畫分搜尋</translation>
     </message>
     <message>
-        <location line="+1885"/>
+        <location line="+1890"/>
         <source>Slice-based Threading</source>
         <translation>切割基本線程</translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-736"/>
         <source>Average Bitrate Tolerance:</source>
         <translation>平均位元率誤差(ABR):</translation>
     </message>
@@ -10647,22 +11082,22 @@
         <translation>次像素精細化(次ME)</translation>
     </message>
     <message>
-        <location line="+2734"/>
+        <location line="+2739"/>
         <source>Transfer Characteristics:</source>
         <translation>轉移特性：</translation>
     </message>
     <message>
-        <location line="-1679"/>
+        <location line="-1684"/>
         <source>Psychovisual Rate Distortion Optimisation:</source>
         <translation>心理視覺優化(Psy RDO)：</translation>
     </message>
     <message>
-        <location line="+1478"/>
+        <location line="+1483"/>
         <source>Video Usability Information</source>
         <translation>影片可用性資訊</translation>
     </message>
     <message>
-        <location line="-3196"/>
+        <location line="-3201"/>
         <source>Constant Rate Factor (Single Pass)</source>
         <translation>恆定速率係數(CRF)(1通)</translation>
     </message>
@@ -10672,22 +11107,22 @@
         <translation>幀類型預測先行:</translation>
     </message>
     <message>
-        <location line="+2895"/>
+        <location line="+2900"/>
         <source>Colour Primaries:</source>
         <translation>基色 :</translation>
     </message>
     <message>
-        <location line="-3393"/>
+        <location line="-3398"/>
         <source>Threads </source>
         <translation>線程s </translation>
     </message>
     <message>
-        <location line="+3640"/>
+        <location line="+3645"/>
         <source>Chroma Sample Location:</source>
         <translation>色度採樣位置：</translation>
     </message>
     <message>
-        <location line="-1186"/>
+        <location line="-1191"/>
         <source>Reduce Fluctuation After Curve Compression:</source>
         <translation>減少曲線壓縮之後的波動：</translation>
     </message>
@@ -10757,17 +11192,17 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+600"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+613"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-416"/>
+        <location line="-429"/>
         <source>none</source>
         <translation>無</translation>
     </message>
     <message>
-        <location line="+574"/>
+        <location line="+587"/>
         <location line="+70"/>
         <location line="+14"/>
         <source>Error</source>
@@ -11979,7 +12414,7 @@
 <context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+71"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+66"/>
         <source>Three threads</source>
         <translation>三個線程</translation>
     </message>
@@ -12025,32 +12460,27 @@
         <translation>Qpel8</translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>MotionEstimation</source>
-        <translation>運動估計</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+99"/>
         <source>Xvid4 MPEG-4 ASP configuration</source>
         <translation>Xvid4 MPEG-4 ASP配置</translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-47"/>
         <source>_Gop Size:</source>
         <translation>Gop大小：</translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="-38"/>
         <source>4:3 (NTSC)</source>
         <translation>4:3 (NTSC)</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="+77"/>
         <source>Aspect Ratio</source>
         <translation>縱橫比例(AR)</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-83"/>
         <source>Auto (#cpu)</source>
         <translation>自動 (#cpu)</translation>
     </message>
@@ -12091,16 +12521,42 @@
     </message>
     <message>
         <location line="+34"/>
+        <source>_Drop identical frames (this disables B-frames)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Framedrop _Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>_Quantization type:</source>
         <translation>量化型式:</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+20"/>
+        <location line="+17"/>
+        <source>Encoding Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Frame Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Quantization</source>
         <translation>量化</translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="-75"/>
         <source>One thread</source>
         <translation>一個線程</translation>
     </message>
@@ -12115,37 +12571,32 @@
         <translation>B幀的數量:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+9"/>
         <source>Profile:</source>
         <translation>設定檔:</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-36"/>
         <source>Two threads)</source>
         <translation>兩個線程</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+17"/>
         <source>Motion Estimation</source>
         <translation>運動估計</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+61"/>
         <source>Threads</source>
         <translation>線程</translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="-69"/>
         <source>16:9 (PAL)</source>
         <translation>16:9 (PAL)</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Advanced Simple Profile</source>
-        <translation>進階簡單的設定檔</translation>
-    </message>
-    <message>
-        <location line="-19"/>
+        <location line="+25"/>
         <source>_Macroblock decision:</source>
         <translation>宏塊決定:</translation>
     </message>
@@ -12155,22 +12606,22 @@
         <translation>縱橫比例(AR):</translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-32"/>
         <source>1:1 (PC)</source>
         <translation>1:1 (PC)</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+43"/>
         <source>Use XVID fcc (else DIVX)</source>
         <translation>使用 XVID fcc (其他 DIVX)</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+41"/>
         <source>Rate Control</source>
         <translation>比率控制</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-68"/>
         <source>Ma_x. quantizer:</source>
         <translation>最大.量化器:</translation>
     </message>
@@ -12183,7 +12634,7 @@
         <translation>2.1-亞迪夫(yadif)濾鏡器</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+63"/>
         <source>Frame : Temporal &amp; spatial check</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12238,28 +12689,12 @@
         <translation>模式:</translation>
     </message>
     <message>
-        <location line="-85"/>
+        <location line="-80"/>
         <source>Yadif, port of avisynth version (c) Fizick.</source>
         <translation>Yadif阜，Avisynth出口商Fizick版本(c).</translation>
     </message>
     <message>
-        <source>Temporal &amp; spatial check</source>
-        <translation type="vanished">時間l &amp; 空間檢查</translation>
-    </message>
-    <message>
-        <source>Bob, temporal &amp; spatial check</source>
-        <translation type="vanished">振動，空間 &amp; 時間檢查</translation>
-    </message>
-    <message>
-        <source>Bob, skip spatial temporal check</source>
-        <translation type="vanished">振動，略過空間時間檢查</translation>
-    </message>
-    <message>
-        <source>Skip spatial temporal check</source>
-        <translation type="vanished">略過空間時間檢查</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+70"/>
         <source>Bottom field first</source>
         <translation>底部首先掃描</translation>
     </message>

avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/qt_update_pro.sh -> avidemux_2.7.6.tar.gz/avidemux/qt4/i18n/qt_update_pro.sh Changed

@@ -1,7 +1,9 @@
 #!/bin/bash
 # Manually generate project file so GTK sources can be excluded.
 # Otherwise use: qmake -project -o avidemux.pro2
-export QT_SELECT=5
+if [[ "x${QT_SELECT}" = "x" ]]; then
+    export QT_SELECT=5
+fi
 
 function findHeader()
 {
@@ -52,7 +54,24 @@
 find . -iname 'avidemux_*.ts' -printf "\"%p\" \\\ \n" >> avidemux.pro2
 echo "" >> avidemux.pro2
 echo "" >> avidemux.pro2
-cat avidemux.pro2 | sed 's/"//g' | grep -v "ADM_videoFilters\/" | grep -v qtScript | grep -v html |  grep -v build | grep -v cmake  | grep -v gtk | grep -v "cli\/" | grep -vi spidermon>     avidemux.pro
+cat avidemux.pro2 | sed 's/"//g' | \
+    grep -v attic | \
+    grep -v ffmpeg_package | \
+    grep -v "ADM_videoFilters\/" | \
+    grep -v qtScript | \
+    grep -v html | \
+    grep -v build | \
+    grep -v cmake | \
+    grep -v gtk | \
+    grep -v "cli\/" | \
+    grep -vi spidermon > avidemux.pro
 #
-lupdate -disable-heuristic number -disable-heuristic sametext -locations relative -pro avidemux.pro
-echo "DONE."
+for i in lupdate lupdate-qt${QT_SELECT}; do
+    which ${i} > /dev/null 2>&1;
+    if [[ "x$?" = "x0" ]]; then
+        echo ${i} found as $(which ${i});
+        ${i} -disable-heuristic number -disable-heuristic sametext -locations relative -pro avidemux.pro && echo "DONE" && exit 0 || \
+            echo "Update of translation files failed." && exit 1;
+    fi
+done
+echo "lupdate not found."

avidemux_2.7.4.tar.gz/avidemux/qt4/xdg_data/org.avidemux.Avidemux.appdata.xml.in -> avidemux_2.7.6.tar.gz/avidemux/qt4/xdg_data/org.avidemux.Avidemux.appdata.xml.in Changed

avidemux_2.7.4.tar.gz/avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop -> avidemux_2.7.6.tar.gz/avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop Changed

avidemux_2.7.4.tar.gz/avidemux/winInstaller/Build-Info.txt -> avidemux_2.7.6.tar.gz/avidemux/winInstaller/Build-Info.txt Changed

@@ -1,29 +1,27 @@
-Avidemux 2.6.7 
+Avidemux 2.7.5
 -----------------------
-Built using GCC 4.8.1 
-Packaged with NSIS 2.46.
+Built using GCC 5.5.0
+Packaged with NSIS 3.04
 
 Included libraries:
 Aften           git-89aee3d496bb2a89f046025402626ee12a12969f
-Expat           2.1.0
-FAAC            1.28
-FAAD2           2.7
-Fontconfig      2.10.2
-Freetype        2.4.10
-FriBidi         0.19.5
-LAME            3.99.5
-libogg          1.3.0
-libvorbis       1.3.3
-libvpx          1.1.0
-NSPR            4.9.4
+libaom          2.0.0
+Expat           2.2.9
+FAAD2           2.8.8
+fontconfig      2.13.1
+freetype        2.10.2
+FriBidi         1.0.8
+LAME            3.100
+libogg          1.3.4
+libvorbis       1.3.6
+libvpx          1.8.2
 opencore-amr    0.1.3
-Qt              4.8.4
-SpiderMonkey    1.7.0
-SQLite          3.7.15
+opus            1.3.1
+Qt              5.15.0
+SDL2            2.0.12
+SQLite          3320200
 TwoLAME         0.3.13
-x264            r2230
-Xvid            1.3.2
-zlib            1.2.8
-
-Included applications:
-Avisynth Proxy GUI 2.20
+x264            r2870
+x265            3.4
+xvidcore        1.3.4
+zlib            1.2.11

avidemux_2.7.4.tar.gz/avidemux/winInstaller/ChangeLog.release -> avidemux_2.7.6.tar.gz/avidemux/winInstaller/ChangeLog.release Changed

@@ -7,34 +7,36 @@
 </head>
 <body>
     <div id="inner">
-        <h1>Changes in Avidemux v2.7.2 – v2.7.4</h1>
+        <h1>Changes in Avidemux v2.7.4 – v2.7.6</h1>
         <table>
-            <tr><td>New Feature:</td><td>Detect and warn when cut points in H.264 video streams may result in playback issues despite being on keyframes</td></tr>
-            <tr><td>FFmpeg:</td><td>Update to the 4.1.4 release</td></tr>
-            <tr><td>Core:</td><td>Fix MSVC++ builds do not run when the path to user directory contains non-ASCII characters</td></tr>
-            <tr><td>Decoder:</td><td>Fix DXVA2 HW accelerated decoding on Windows 7</td></tr>
-            <tr><td>Decoder:</td><td>Fix DXVA2 HW accelerated decoding stops sometimes on cuts</td></tr>
-            <tr><td>Decoder:</td><td>Enable HW accelerated decoding of 8-bit HEVC for recent versions of Intel graphics driver on Windows</td></tr>
-            <tr><td>Encoder:</td><td>Fix regression with saved x264 and x265 profiles not found (MSVC++ only)</td></tr>
-            <tr><td>Demuxer:</td><td>Dynamically load VapourSynth Script library to avoid error messages on Windows if VapourSynth is not found</td></tr>
-            <tr><td>Demuxer:</td><td>Provide correct average audio bitrate in the Mp4 demuxer if the exact value for the particular codec is unknown</td></tr>
-            <tr><td>Demuxer:</td><td>Fix crash loading MP4 file with number of audio tracks exceeding the max supported</td></tr>
-            <tr><td>Demuxer:</td><td>Support audio tracks in fragmented MP4 files (the variety with empty moov only)</td></tr>
-            <tr><td>Demuxer:</td><td>Support E-AC3 audio tracks in MP4 files</td></tr>
-            <tr><td>Demuxer:</td><td>Fix ASF demuxer still broken by chance with MSVC++ only, the fix relevant for all platforms</td></tr>
-            <tr><td>Demuxer:</td><td>Support more varieties of BMP images</td></tr>
-            <tr><td>Muxer:</td><td>Optimize output of the Mp4 muxer for streaming on Windows too</td></tr>
-            <tr><td>Muxer:</td><td>Add option to the Mp4 muxer to output fragmented MP4 files</td></tr>
-            <tr><td>Muxer:</td><td>Label HEVC video in Mp4 in a way compatible with QuickTime on macOS</td></tr>
-            <tr><td>Filter:</td><td>Fix assembly in Yadif deinterlacer with MSVC++</td></tr>
-            <tr><td>UI:</td><td>Enable automatic application scaling on Windows for recent Qt versions</td></tr>
-            <tr><td>UI:</td><td>Fix silent mode, automatically confirm dialogs instead of choosing the default option</td></tr>
-            <tr><td>Audio:</td><td>Support WMAPRO audio codec for decoding</td></tr>
-            <tr><td>Audio:</td><td>Support AAC with signal band replication (SBR) in external audio tracks</td></tr>
-            <tr><td>Audio:</td><td>Fix saving AAC audio tracks with SBR to a file</td></tr>
-            <tr><td>Audio:</td><td>Improve resilience to false positives when probing external audio files for AAC</td></tr>
-            <tr><td>Miscellaneous:</td><td>Fix crash with OpenGL or DXVA2 video output in 32 bits Avidemux on Windows (better late than never)</td></tr>
-            <tr><td>Miscellaneous:</td><td>Fix regressed handling of empty frames in MPEG-4 and FRAPS video streams</td></tr>
+            <tr><td>New Feature:</td><td>Detect and warn when cut points in HEVC video streams may result in grave playback issues despite being on keyframes</td></tr>
+            <tr><td>New Video Decoder:</td><td>Add libaom-based AV1 decoder</td></tr>
+            <tr><td>New Video Encoder:</td><td>Add libvpx-based VP9 encoder</td></tr>
+            <tr><td>New Video Filter:</td><td>Add hardware accelerated deinterlacer and resizer based on VA-API (Linux only)</td></tr>
+            <tr><td>FFmpeg:</td><td>Update to the 4.2.3 release</td></tr>
+            <tr><td>Core:</td><td>Increase maximum supported resolution to 4096x4096</td></tr>
+            <tr><td>Core:</td><td>Fix crash on macOS with HW accel. decoding enabled and H.264 video streams containing both frame- and field-encoded slices</td></tr>
+            <tr><td>Encoder:</td><td>Extend configuration options for NVENC-based H.264 and HEVC encoders, add 2-pass mode</td></tr>
+            <tr><td>Demuxer:</td><td>Support MPEG-TS files with duration in excess of 13:15:36</td></tr>
+            <tr><td>Demuxer:</td><td>Use DTS core from DTS XLL audio in MPEG-TS files instead of rejecting the track</td></tr>
+            <tr><td>Demuxer:</td><td>Fix mono MP3 audio tracks in MP4 files misdetected as stereo</td></tr>
+            <tr><td>Demuxer:</td><td>Try to correct timestamp jitter in MP4 files produced by older Avidemux versions</td></tr>
+            <tr><td>Muxer:</td><td>Fix timestamp rounding which caused pseudo-VFR output from CFR sources</td></tr>
+            <tr><td>Muxer:</td><td>Fix saving to network shares on Windows using the Mp4 muxer when index should be moved to the start of the file</td></tr>
+            <tr><td>Muxer:</td><td>Support LPCM audio in the Mp4 muxer by silently switching to the MOV muxing mode</td></tr>
+            <tr><td>Muxer:</td><td>Add support for Vorbis audio to the Mp4 muxer</td></tr>
+            <tr><td>Filter:</td><td>Fix "Fade" and "Fade to black", broken on macOS</td></tr>
+            <tr><td>Filter:</td><td>Allow to toggle rubber band visibility in "Crop" and "Blacken Borders" video filters</td></tr>
+            <tr><td>Filter:</td><td>Fix keyboard input in "Resize" video filter by recalculating values only on moving focus to another field or on accepting dialog</td></tr>
+            <tr><td>Audio:</td><td>Add HE-AAC and HE-AACv2 profiles to the FDK AAC encoder plugin</td></tr>
+            <tr><td>Audio:</td><td>Support external audio tracks in DTS format</td></tr>
+            <tr><td>UI:</td><td>Fix navigation slider with RTL locales</td></tr>
+            <tr><td>UI:</td><td>Restore the shutdown option in encoding dialog on Windows</td></tr>
+            <tr><td>Scripting:</td><td>Add PTS query and keyframe seek methods to Python interface</td></tr>
+            <tr><td>Miscellaneous:</td><td>Allow user-defined fragment size for auto-append of chunked MPEG-TS files</td></tr>
+            <tr><td>Miscellaneous:</td><td>Improve handling of field-encoded video streams throughout the chain</td></tr>
+            <tr><td>Miscellaneous:</td><td>Improve handling of H.264 video streams with parameter sets changing on the fly</td></tr>
+            <tr><td>Miscellaneous:</td><td>Try to keep track of video time base throughout the chain</td></tr>
             <tr><td>Miscellaneous:</td><td>Numerous other fixes and polish</td></tr>
         </table>
     </div>

avidemux_2.7.4.tar.gz/avidemux/winInstaller/avidemux_crossQt5.nsi -> avidemux_2.7.6.tar.gz/avidemux/winInstaller/avidemux_crossQt5.nsi Changed

avidemux_2.7.4.tar.gz/avidemux/winInstaller/avidemux_crossQt5Tail.nsi -> avidemux_2.7.6.tar.gz/avidemux/winInstaller/avidemux_crossQt5Tail.nsi Changed

@@ -253,14 +253,14 @@
 FunctionEnd
 
 Function IsInstallOptionsRequired
-Goto end
-	!insertmacro SectionFlagIsSet ${SecUiQt} ${SF_SELECTED} end resetOptions
-resetOptions:
+#Goto end
+	#!insertmacro SectionFlagIsSet ${SecDesktopQt} ${SF_SELECTED} end resetOptions
+#resetOptions:
 
-    StrCpy $CreateDesktopIcon 0
-    StrCpy $CreateStartMenuGroup 0
-    StrCpy $CreateQuickLaunchIcon 0
-    Abort
+    #StrCpy $CreateDesktopIcon 0
+    #StrCpy $CreateStartMenuGroup 0
+    #StrCpy $CreateQuickLaunchIcon 0
+    #Abort
 
 end:
 FunctionEnd
@@ -272,16 +272,16 @@
 
 Function ActivateInternalSections
     #AVS Proxy GUI shortcut:
-    SectionGetFlags ${SecAvsProxy} $0
+    SectionGetFlags ${SecDesktopQt} $0 # Was SecAvsProxy
     IntOp $0 $0 & ${SF_SELECTED}
     IntOp $0 $0 & $CreateStartMenuGroup
-    SectionSetFlags ${SecStartMenuAvsProxyGui} $0
+    SectionSetFlags ${SecDesktopQt} $0
 
     #Change Log shortcut:
     SectionSetFlags ${SecStartMenuChangeLog} $CreateStartMenuGroup
 
     #Qt shortcuts:
-    SectionGetFlags ${SecUiQt} $0
+    SectionGetFlags ${SecDesktopQt} $0
     IntOp $0 $0 & ${SF_SELECTED}
 
     IntOp $1 $0 & $CreateDesktopIcon
@@ -314,7 +314,7 @@
 
 Function ConfigureFinishPage
 
-    SectionGetFlags ${SecUiQt} $0
+    SectionGetFlags ${SecDesktopQt} $0
     IntOp $0 $0 & ${SF_SELECTED}
     StrCmp $0 ${SF_SELECTED} end
 
@@ -326,7 +326,7 @@
 Function RunAvidemux
     SetOutPath $INSTDIR
 
-    SectionGetFlags ${SecUiQt} $0
+    SectionGetFlags ${SecDesktopQt} $0
     IntOp $0 $0 & ${SF_SELECTED}
 
 	!insertmacro UAC_AsUser_ExecShell "" "$INSTDIR\avidemux.exe" "" "" ""

avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/include/ADM_files.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_core/include/ADM_files.h Changed

@@ -25,16 +25,16 @@
 #ifdef _WIN32
 ADM_CORE6_EXPORT const char *ADM_getLogDir(void);
 #endif
-// Returns dir to ~/.avidemux/jobs, no need to free it
-ADM_CORE6_EXPORT const char *ADM_getJobDir(void);
-// Returns dir to ~/.avidemux/custom, no need to free it
-ADM_CORE6_EXPORT const char *ADM_getCustomDir(void);
-// Returns dir to ~/.avidemux/autoScript, no need to free it
-ADM_CORE6_EXPORT const char *ADM_getAutoDir(void);
-// Returns dir to ~/.avidemux/autoScript, no need to free it
-ADM_CORE6_EXPORT const char *ADM_getUserPluginSettingsDir(void);
-ADM_CORE6_EXPORT const char *ADM_getSystemPluginSettingsDir(void);
 #ifdef __cplusplus
+// Returns dir to ~/.avidemux/jobs
+ADM_CORE6_EXPORT const std::string ADM_getJobDir(void);
+// Returns dir to ~/.avidemux/custom
+ADM_CORE6_EXPORT const std::string ADM_getCustomDir(void);
+// Returns dir to ~/.avidemux/autoScript
+ADM_CORE6_EXPORT const std::string ADM_getAutoDir(void);
+// Returns dir to ~/.avidemux/pluginSettings
+ADM_CORE6_EXPORT const std::string ADM_getUserPluginSettingsDir(void);
+ADM_CORE6_EXPORT const std::string ADM_getSystemPluginSettingsDir(void);
 ADM_CORE6_EXPORT const std::string ADM_getI8NDir(const std::string &flavor);
 #endif

avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/include/ADM_inttype.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_core/include/ADM_inttype.h Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/include/ADM_misc.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_core/include/ADM_misc.h Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/include/ADM_threads.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_core/include/ADM_threads.h Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/include/ADM_vidMisc.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_core/include/ADM_vidMisc.h Changed

@@ -18,15 +18,17 @@
 
 #include "ADM_core6_export.h"
 
-ADM_CORE6_EXPORT void            frame2time(uint32_t frame, uint32_t fps, uint32_t * hh, uint32_t * mm, uint32_t * ss, uint32_t * ms);
-ADM_CORE6_EXPORT void            time2frame(uint32_t *frame, uint32_t fps, uint32_t hh, uint32_t mm, uint32_t ss, uint32_t ms);
+//ADM_CORE6_EXPORT void            frame2time(uint32_t frame, uint32_t fps, uint32_t * hh, uint32_t * mm, uint32_t * ss, uint32_t * ms);
+//ADM_CORE6_EXPORT void            time2frame(uint32_t *frame, uint32_t fps, uint32_t hh, uint32_t mm, uint32_t ss, uint32_t ms);
 char*			ms2timedisplay(uint32_t ms);
 ADM_CORE6_EXPORT uint8_t         ms2time(uint32_t ms, uint32_t *h,uint32_t *m, uint32_t *s,uint32_t *mms);
 
+#if 0
 #define FRAME_PAL 1
 #define FRAME_FILM 2
 #define FRAME_NTSC 3
 
-uint8_t 	identMovieType(uint32_t fps1000); // identify the movie type (mainly for mpeg1/2) 
+uint8_t 	identMovieType(uint32_t fps1000); // identify the movie type (mainly for mpeg1/2)
+#endif
 ADM_CORE6_EXPORT const char *ADM_us2plain(uint64_t ams);
 #endif

avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_fileio.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_core/src/ADM_fileio.cpp Changed

@@ -209,58 +209,67 @@
 
 
 /**
- * \fn ADM_getCustomDir
- * \brief      Get the  directory where jobs are stored
-*/
-static char *ADM_customdir = NULL;
-const char *ADM_getCustomDir(void)
+ *  \fn ADM_getCustomDir
+ *  \brief Get the directory where custom scripts are stored
+ */
+static std::string ADM_customdir;
+const std::string ADM_getCustomDir(void)
 {
-	if (ADM_customdir)
-		return ADM_customdir;
+    if (ADM_customdir.size())
+        return ADM_customdir;
 
-	ADM_customdir = ADM_getHomeRelativePath("custom");
+    const char *s = ADM_getHomeRelativePath("custom");
 
-	if (!ADM_mkdir(ADM_customdir))
-	{
-		printf("can't create custom directory (%s).\n", ADM_customdir);
-		return NULL;
-	}
+    if (ADM_mkdir(s))
+        ADM_customdir = std::string(s);
+    else
+        printf("can't create custom directory (%s).\n",s);
 
-	return ADM_customdir;
+    delete [] s;
+    s=NULL;
+
+    return ADM_customdir;
 }
 
 
 /**
- *      \fn ADM_getJobDir
-      \brief Get the  directory where jobs are stored
-*/
-static char *ADM_jobdir = NULL;
-const char *ADM_getJobDir(void)
+ *  \fn ADM_getJobDir
+ *  \brief Get the directory where jobs are stored
+ */
+static std::string ADM_jobdir;
+const std::string ADM_getJobDir(void)
 {
-	if (ADM_jobdir)
-		return ADM_jobdir;
+    if (ADM_jobdir.size())
+        return ADM_jobdir;
 
-	ADM_jobdir = ADM_getHomeRelativePath("jobs");
+    const char *s = ADM_getHomeRelativePath("jobs");
 
+    if (ADM_mkdir(s))
+        ADM_jobdir = std::string(s);
+    else
+        printf("can't create custom directory (%s).\n",s);
 
-	if (!ADM_mkdir(ADM_jobdir))
-	{
-		printf("can't create custom directory (%s).\n", ADM_jobdir);
-		return NULL;
-	}
+    delete [] s;
+    s=NULL;
 
-	return ADM_jobdir;
+    return ADM_jobdir;
 }
 
 /**
- * \fn  ADM_getUserPluginSettingsDir
- * \brief returns the user plugin setting 
-*/
-static char *ADM_userPluginSettings=NULL;
-const char *ADM_getUserPluginSettingsDir(void)
+ *  \fn ADM_getUserPluginSettingsDir
+ *  \brief returns the path to the user plugin setting directory
+ */
+static std::string ADM_userPluginSettings;
+const std::string ADM_getUserPluginSettingsDir(void)
 {
-    if(ADM_userPluginSettings) return ADM_userPluginSettings;
-    ADM_userPluginSettings=ADM_getHomeRelativePath("pluginSettings");
+    if(ADM_userPluginSettings.size())
+        return ADM_userPluginSettings;
+
+    const char *s = ADM_getHomeRelativePath("pluginSettings");
+    ADM_userPluginSettings = std::string(s);
+    delete [] s;
+    s=NULL;
+
     return ADM_userPluginSettings;
 }

avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_folder_linux.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_core/src/ADM_folder_linux.cpp Changed

@@ -24,12 +24,12 @@
 static bool isPortable=false;
 extern std::string pluginDir;
 
-char *ADM_getRelativePath(const char *base0, const char *base1, const char *base2, const char *base3);
+extern char *ADM_getRelativePath(const char *base0, const char *base1, const char *base2, const char *base3);
 
 static char ADM_basedir[1024] = {0};
 
-static char *ADM_autodir = NULL;
-static char *ADM_systemPluginSettings=NULL;
+static std::string ADM_autodir;
+static std::string ADM_systemPluginSettings;
 static std::string ADM_i18nDir;
 /**
  * 
@@ -60,25 +60,46 @@
 
 /**
     \fn ADM_getAutoDir
-    \brief  Get the  directory where auto script are stored. No need to free the string.
+    \brief  Get the  directory where auto script are stored.
 ******************************************************/
-const char *ADM_getAutoDir(void)
+const std::string ADM_getAutoDir(void)
 {
-    if (ADM_autodir )
+    if (ADM_autodir.size())
         return ADM_autodir;
-    const char *startDir=ADM_RELATIVE_LIB_DIR;
-    ADM_autodir = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "autoScripts");
-	return ADM_autodir;
+
+    const char *name="autoScripts";
+    if(isPortable)
+    {
+        ADM_autodir=pluginDir+std::string(name);
+    }else
+    {
+        const char *s = ADM_getInstallRelativePath(ADM_RELATIVE_LIB_DIR, ADM_PLUGIN_DIR, name);
+        ADM_autodir=std::string(s);
+        delete [] s;
+        s=NULL;
+    }
+    return ADM_autodir;
 }
 /**
     \fn ADM_getPluginSettingsDir
     \brief Get the folder containing the plugin settings (presets etc..)
 */
-const char *ADM_getSystemPluginSettingsDir(void)
+const std::string ADM_getSystemPluginSettingsDir(void)
 {
-    if(ADM_systemPluginSettings) return ADM_systemPluginSettings;
-    const char *startDir=ADM_RELATIVE_LIB_DIR;
-    ADM_systemPluginSettings=ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "pluginSettings");
+    if(ADM_systemPluginSettings.size())
+        return ADM_systemPluginSettings;
+
+    const char *name="pluginSettings";
+    if(isPortable)
+    {
+        ADM_systemPluginSettings=pluginDir+std::string(name);
+    }else
+    {
+        const char *s = ADM_getInstallRelativePath(ADM_RELATIVE_LIB_DIR, ADM_PLUGIN_DIR, name);
+        ADM_systemPluginSettings=std::string(s);
+        delete [] s;
+        s=NULL;
+    }
     return ADM_systemPluginSettings;
 }
 /**

avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_folder_mac.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_core/src/ADM_folder_mac.cpp Changed

@@ -21,10 +21,13 @@
 #include <unistd.h>
 
 #include "ADM_default.h"
-char *ADM_getRelativePath(const char *base0, const char *base1, const char *base2, const char *base3);
-static char ADM_basedir[1024] = {0};
-static char *ADM_autodir = NULL;
-static char *ADM_systemPluginSettings=NULL;
+extern char *ADM_getRelativePath(const char *base0, const char *base1, const char *base2, const char *base3);
+
+#define MAX_PATH_SIZE 1024
+
+static char ADM_basedir[MAX_PATH_SIZE] = {0};
+static std::string ADM_autodir;
+static std::string ADM_systemPluginSettings;
 
 
 #undef fread
@@ -36,24 +39,32 @@
     \fn ADM_getAutoDir
     \brief  Get the  directory where auto script are stored. No need to free the string.
 ******************************************************/
-const char *ADM_getAutoDir(void)
+const std::string ADM_getAutoDir(void)
 {
-    if (ADM_autodir )
+    if (ADM_autodir.size())
         return ADM_autodir;
 
     const char *startDir="../lib";
-    ADM_autodir = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "autoScripts");
+    const char *s = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "autoScripts");
+    ADM_autodir = std::string(s);
+    delete [] s;
+    s=NULL;
     return ADM_autodir;
 }
 /**
     \fn ADM_getPluginSettingsDir
     \brief Get the folder containing the plugin settings (presets etc..)
 */
-const char *ADM_getSystemPluginSettingsDir(void)
+const std::string ADM_getSystemPluginSettingsDir(void)
 {
-    if(ADM_systemPluginSettings) return ADM_systemPluginSettings;
+    if(ADM_systemPluginSettings.size())
+        return ADM_systemPluginSettings;
+
     const char *startDir="../lib";
-    ADM_systemPluginSettings=ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "pluginSettings");
+    const char *s = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "pluginSettings");
+    ADM_systemPluginSettings = std::string(s);
+    delete [] s;
+    s=NULL;
     return ADM_systemPluginSettings;
 }
 
@@ -75,9 +86,6 @@
 
 char *ADM_getInstallRelativePath(const char *base1, const char *base2, const char *base3)
 {
-
-#define MAX_PATH_SIZE 1024
-
     char buffer[MAX_PATH_SIZE];
 
     CFURLRef url(CFBundleCopyExecutableURL(CFBundleGetMainBundle()));

avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_folder_vs.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_core/src/ADM_folder_vs.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_folder_win32.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_core/src/ADM_folder_win32.cpp Changed

@@ -24,12 +24,11 @@
 #include "ADM_default.h"
 
 extern void simplify_path(char **buf);
-char *ADM_getRelativePath(const char *base0, const char *base1, const char *base2, const char *base3);
+extern char *ADM_getRelativePath(const char *base0, const char *base1, const char *base2, const char *base3);
 static char ADM_basedir[1024] = {0};
 static char ADM_logdir[1024] = {0};
-static char *ADM_autodir = NULL;
-static char *ADM_systemPluginSettings=NULL;
-
+static std::string ADM_autodir;
+static std::string ADM_systemPluginSettings;
 
 #undef fread
 #undef fwrite
@@ -40,23 +39,30 @@
     \fn ADM_getAutoDir
     \brief  Get the  directory where auto script are stored. No need to free the string.
 ******************************************************/
-const char *ADM_getAutoDir(void)
+const std::string ADM_getAutoDir(void)
 {
-    if (ADM_autodir )
+    if (ADM_autodir.size())
         return ADM_autodir;
     const char *startDir=ADM_RELATIVE_LIB_DIR;
-    ADM_autodir = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "autoScripts");
-	return ADM_autodir;
+    const char *s = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "autoScripts");
+    ADM_autodir = std::string(s);
+    delete [] s;
+    s=NULL;
+    return ADM_autodir;
 }
 /**
     \fn ADM_getPluginSettingsDir
     \brief Get the folder containing the plugin settings (presets etc..)
 */
-const char *ADM_getSystemPluginSettingsDir(void)
+const std::string ADM_getSystemPluginSettingsDir(void)
 {
-    if(ADM_systemPluginSettings) return ADM_systemPluginSettings;
+    if(ADM_systemPluginSettings.size())
+        return ADM_systemPluginSettings;
     const char *startDir=ADM_RELATIVE_LIB_DIR;
-    ADM_systemPluginSettings=ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "pluginSettings");
+    const char *s = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "pluginSettings");
+    ADM_systemPluginSettings = std::string(s);
+    delete [] s;
+    s=NULL;
     return ADM_systemPluginSettings;
 }

avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_misc.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_core/src/ADM_misc.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_threads.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_core/src/ADM_threads.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_win32.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_core/src/ADM_win32.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_win32_vs.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_core/src/ADM_win32_vs.cpp Changed

@@ -39,21 +39,18 @@
     remove(stderrPath);
 
     // Redirect output to log file in the user's profile directory
- #if 1
-    std::string filePath=std::string(ADM_getLogDir())+std::string(logFile);
-#else
-    std::string filePath=std::string("f:\\tmp\\élém\\")+std::string(logFile);
-#endif
-
-    int length = utf8StringToWideChar(filePath.c_str(), -1, NULL);
-    wchar_t *filePath2 = new wchar_t[length+1];
-    wchar_t mode[] = L"w";
-    utf8StringToWideChar(filePath.c_str(), -1, filePath2);
-    FILE *newFD=_wfreopen(filePath2, mode,stdout);
-    delete[] filePath2;
-    if (!newFD)
-    {
-        assert(0);
-        ADM_assert(0);
-    }
-}
+	const char* logDir = ADM_getLogDir();
+ 	std::string filePath = std::string(logDir);
+ 	filePath+=std::string(logFile);
+ 	int length = utf8StringToWideChar(filePath.c_str(), -1, NULL);
+ 	wchar_t* filePath2 = new wchar_t[length + 1];
+ 	wchar_t mode[] = L"w";
+ 	utf8StringToWideChar(filePath.c_str(), -1, filePath2);
+ 	FILE* newFD = _wfreopen(filePath2, mode, stdout);
+ 	delete[] filePath2;
+ 	if (!newFD)
+ 	{
+ 		assert(0);
+ 		ADM_assert(0);
+ 	}
+ }

avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_core/src/CMakeLists.txt Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioStream.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioStream.h Changed

@@ -23,6 +23,7 @@
 
 
 #define ADM_UNKNOWN_LANGUAGE std::string("und")
+#define AAC_DEFAULT_FRAME_LENGTH 1024
 
 /**
         \fn      ADM_audioAccess
@@ -84,6 +85,7 @@
 /// Access will be allocated externally, but will be destroy by ADM_audioStream when it is destroyed
                        ADM_audioAccess          *access;
                        uint32_t                 lengthInBytes;
+                       uint32_t                 samplesPerPacket;
                        uint64_t                 position;
                        uint64_t                 lastDts;
                        uint64_t                 durationInUs;
@@ -123,6 +125,8 @@
                                 if(!access) return true;
                                 return access->constantSamplesPerPacket();
                             }
+virtual bool            setSamplesPerPacket(uint32_t nbSamples) {samplesPerPacket=nbSamples; return true;}
+virtual uint32_t        getSamplesPerPacket(void) {return samplesPerPacket;} // use only for AAC
 virtual        const std::string &getLanguage() {return language;}
 virtual        void              setLanguage(const std::string &lan) {language=lan;}
 virtual        bool              isLanguageSet(void);

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioIdentify.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioIdentify.cpp Changed

@@ -23,6 +23,7 @@
 #include "ADM_audioIdentify.h"
 #include "fourcc.h"
 #include "ADM_aacadts.h"
+#include "ADM_dcainfo.h"
 
 extern void Endian_WavHeader(WAVHeader *w);
 #define INVALID_OFFSET 0XFFFFFFF
@@ -371,6 +372,70 @@
 }
 
 /**
+    \fn idDCA
+    \brief return true if the track is DTS
+*/
+static bool idDCA(int bufferSize, const uint8_t *data, WAVHeader &oinfo, uint32_t &offset)
+{
+    uint32_t syncOffset;
+    ADM_DCA_INFO info,info2;
+    uintptr_t tmp=(uintptr_t)data;
+    uint8_t *probe=(uint8_t *)tmp;
+
+    if( !ADM_DCAGetInfo(probe, bufferSize, &info, &syncOffset))
+    {
+        ADM_info("Not DTS.\n");
+        return false;
+    }
+
+    // Need 2 more frames to be sure...
+    bool r=true;
+
+    for(int i=0;i<2;i++)
+    {
+        ADM_info("\t pass %d\n",i);
+        bufferSize-=info.frameSizeInBytes+syncOffset;
+        if(bufferSize<=0)
+        {
+            ADM_warning("Not enough data to confirm DTS.\n");
+            return false;
+        }
+        probe+=syncOffset+info.frameSizeInBytes;
+
+        if( !ADM_DCAGetInfo(probe, bufferSize, &info2, &syncOffset))
+        {
+            ADM_info("Cannot sync (pass %d)\n",i);
+            return false;
+        }
+        if(info.frequency!=info2.frequency || info.channels!=info2.channels || info.bitrate!=info2.bitrate)
+        {
+            ADM_info("Info doesn't match (pass %d)\n",i);
+            r=false;
+            break;
+        }
+        if(syncOffset>2)
+        {
+            ADM_info("Offset between frames too big = %" PRIu32" (pass %d)\n",syncOffset,i);
+            r=false;
+            break;
+        }
+    }
+    if(r)
+    {
+        ADM_info("\tProbably DTS : freq=%d br=%d chan=%d, offset=%d\n",(int)info.frequency,(int)info.bitrate,(int)info.channels,(int)syncOffset);
+        oinfo.encoding=WAV_DTS;
+        oinfo.channels=info.channels;
+        oinfo.byterate=info.bitrate>>3;
+        oinfo.frequency=info.frequency;
+        return true;
+    }else
+    {
+        ADM_info("Cannot confirm DTS.\n");
+    }
+    return r;
+}
+
+/**
     \fn ADM_identifyAudioStream
     \param bufferSize : nb of bytes available for scanning
     \param buffer     : buffer containing the data to scan
@@ -385,6 +450,7 @@
     if(idEAC3(bufferSize,buffer,info,offset)) return true;
     if(idAC3(bufferSize,buffer,info,offset)) return true;
     if(idAAACADTS(bufferSize,buffer,info,offset)) return true;
+    if(idDCA(bufferSize,buffer,info,offset)) return true;
 
     return false;
 }

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp Changed

@@ -33,6 +33,12 @@
     lastDts=ADM_AUDIO_NO_DTS;
     lastDtsBase=0;
     sampleElapsed=0;
+    if(wavHeader.encoding==WAV_AAC)
+        samplesPerPacket=AAC_DEFAULT_FRAME_LENGTH;
+    else if(wavHeader.encoding==WAV_AAC_HE)
+        samplesPerPacket=AAC_DEFAULT_FRAME_LENGTH<<1;
+    else
+        samplesPerPacket=512; // dummy
     durationInUs=0;
     if(access && access->canGetDuration())
         durationInUs=access->getDurationInUs();
@@ -55,19 +61,19 @@
     }
     ADM_assert(true==access->canSeekOffset());
     // Convert time to offset in bytes
-    float f=nbUs*wavHeader.byterate;
+    double f=nbUs*wavHeader.byterate;
     f/=1000;
     f/=1000; // in bytes
-    if(access->setPos( (uint32_t)(f+0.5)))
+    if(access->setPos( (uint64_t)(f+0.5)))
     {
         // The seek might not be accurate, recompute the Dts
         // it is better to undershoot in most case
         uint64_t pos=access->getPos();
         // compute dts from pos & byterate
-        float r=pos;
-            r*=1000*1000;
-            r/=wavHeader.byterate;
-            setDts(r);
+        double r=pos;
+        r*=1000*1000;
+        r/=wavHeader.byterate;
+        setDts(r);
         return 1;
     }
     return false;
@@ -81,11 +87,9 @@
     if(!access->getPacket(buffer,size,sizeMax,&dts)) return 0;
     // We got the packet
     // Try to guess the nbSample
-    // if it is AAC, we hardcodec 1024 samples
-
-    if(wavHeader.encoding==WAV_AAC)
+    if(wavHeader.encoding==WAV_AAC || wavHeader.encoding==WAV_AAC_HE)
     {
-        *nbSample=1024;
+        *nbSample=samplesPerPacket;
         if(dts!=ADM_AUDIO_NO_DTS)
         {
             setDts(dts);
@@ -223,7 +227,8 @@
               case WAV_PCM_FLOAT:  return QT_TRANSLATE_NOOP("adm","Float PCM");
               case WAV_OGG_VORBIS: return QT_TRANSLATE_NOOP("adm","Ogg Vorbis");
               case WAV_MP4: return QT_TRANSLATE_NOOP("adm","MP4");
-              case WAV_AAC: return QT_TRANSLATE_NOOP("adm","AAC");
+              case WAV_AAC:
+              case WAV_AAC_HE: return QT_TRANSLATE_NOOP("adm","AAC");
               case WAV_QDM2: return QT_TRANSLATE_NOOP("adm","QDM2");
               case WAV_AMRNB: return QT_TRANSLATE_NOOP("adm","AMR-NB");
               case WAV_MSADPCM: return QT_TRANSLATE_NOOP("adm","MSADPCM");

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStreamAC3.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStreamAC3.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStreamDCA.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStreamDCA.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStreamEac3.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStreamEac3.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStreamPCM.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStreamPCM.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioXiphUtils.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioXiphUtils.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudioParser/include/ADM_aacLatm.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreAudioParser/include/ADM_aacLatm.h Changed

@@ -33,6 +33,7 @@
 #define AAC_LATM_MAX_EXTRA      10
 #define LATM_MAX_LAYER          64
 #define LATM_MAX_BUFFER_SIZE    8192
+#define INCOMING_BUFFER_SIZE    (LATM_MAX_BUFFER_SIZE*4)
 #define LATM_NB_BUFFERS         16
 
 typedef struct
@@ -67,6 +68,8 @@
                 latmBuffer buffers[LATM_NB_BUFFERS];
                 ADM_ptrQueue <latmBuffer > listOfFreeBuffers;
                 ADM_ptrQueue <latmBuffer > listOfUsedBuffers;
+                ADM_byteBuffer depot;
+                int head,tail;
                 uint32_t extraLen;
                 uint8_t  extraData[AAC_LATM_MAX_EXTRA];
                 uint32_t fq,channels;
@@ -80,8 +83,12 @@
                 latmConf_t conf;
 public:
                 bool getExtraData(uint32_t *len,uint8_t **data);
-                bool pushData (int incomingLen,uint8_t *intData,uint64_t date);
+                bool pushData (int incomingLen,uint8_t *intData);
                 bool empty(void);
+
+                typedef enum { LATM_OK, LATM_ERROR, LATM_MORE_DATA_NEEDED } LATM_STATE;
+                LATM_STATE convert(uint64_t dts=ADM_NO_PTS);
+
                 bool getData(uint64_t *date, uint32_t *len, uint8_t *data,uint32_t maxData);
                 bool flush(void);
                 int  getFrequency(void);

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_aacLatm.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_aacLatm.cpp Changed

@@ -412,7 +412,7 @@
 */
 bool ADM_latm2aac::demuxLatm(uint64_t date,uint8_t *start,uint32_t size)
 {
-    getBits  bits(size,start);
+    getBits bits(size+AV_INPUT_BUFFER_PADDING_SIZE,start);
     return readAudioMux(date,bits);
 }
 /**
@@ -420,35 +420,78 @@
     \brief Check for LOAS sync word, extract LATM frames
 */
 
-bool ADM_latm2aac::pushData(int incomingLen,uint8_t *inData,uint64_t dts)
+bool ADM_latm2aac::pushData(int incomingLen,uint8_t *inData)
 {
-    // Lookup sync
-    uint8_t *end=inData+incomingLen;
-    uint8_t *start=inData;
     xdebug("Pushing data %d bytes\n",incomingLen);
-    while(start<end)
+    // Compact incoming buffer
+    if(head==tail)
+    {
+        head=tail=0;
+    }
+    if(tail>INCOMING_BUFFER_SIZE>>1)
+    {
+        int size=head-tail;
+        memmove(depot.at(0),depot.at(tail),size);
+        head=size;
+        tail=0;
+    }
+    if(head+incomingLen>INCOMING_BUFFER_SIZE)
+    {
+        ADM_error("LATM incoming buffer overflow: incoming: %d available: %d\n",incomingLen,INCOMING_BUFFER_SIZE-head);
+        return false;
+    }
+    // Add data
+    memcpy(depot.at(head),inData,incomingLen);
+    head+=incomingLen;
+    memset(depot.at(head),0,AV_INPUT_BUFFER_PADDING_SIZE);
+    return true;
+}
+/**
+    \fn convert
+    \brief find LATM frame in the incoming buffer and demux it
+*/
+ADM_latm2aac::LATM_STATE ADM_latm2aac::convert(uint64_t dts)
+{
+    if(head==tail)
+        return LATM_MORE_DATA_NEEDED;
+    // Lookup sync
+    uint8_t *start=depot.at(tail);
+    uint8_t *end=depot.at(head);
+    uint32_t len=0;
+    while(start+2<end)
     {
         int key=(start[0]<<8)+start[1];
         if((key & 0xffe0)!=0x56e0)  // 0x2b7 shifted by one bit
         {
-            ADM_warning("Sync lost\n");
-            return true;
+            start++;
+            tail++;
+            continue;
         }
-        uint32_t len=start[2]+((key & 0x1f)<<8);
+        len=start[2]+((key & 0x1f)<<8);
         start+=3;
         if(start+len>end)
         {
-            ADM_warning("Not enough data, need %d, got %d\n",len,(int)(end-start));
-            return true;
+            xdebug("Not enough data, need %d, got %d\n",len,(int)(end-start));
+            int size=head-tail;
+            memmove(depot.at(0),depot.at(tail),size);
+            tail=0;
+            head=size;
+            return LATM_MORE_DATA_NEEDED;
         }
-        xdebug("Found LATM : size %d\n",len);
-        demuxLatm(dts,start,len);
-        dts=ADM_NO_PTS;
-        // LATM demux
-        start+=len;
+        break;
+    }
+    if(!len)
+    {
+        xdebug("No sync.\n");
+        return LATM_MORE_DATA_NEEDED;
     }
+    xdebug("Found LATM : size %d\n",len);
+    // Demux one LATM frame
+    bool r = demuxLatm(dts,start,len);
+    tail+=len;
+    ADM_assert(head>=tail);
     xdebug("-- end of this LATM frame --\n");
-    return true;
+    return r? LATM_OK : LATM_ERROR;
 }
 /**
     \fn ctor
@@ -463,6 +506,8 @@
                 conf.gotConfig=false;
                 for(int i=0;i<LATM_NB_BUFFERS;i++)
                     listOfFreeBuffers.pushBack(&(buffers[i]));
+                depot.setSize(INCOMING_BUFFER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE);
+                head=tail=0;
 }
 /**
     \fn dtor
@@ -492,6 +537,7 @@
    listOfUsedBuffers.clear();
    for(int i=0;i<LATM_NB_BUFFERS;i++)
                     listOfFreeBuffers.pushBack(&(buffers[i]));
+   head=tail=0;
    return true;
 }
 /**

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreDemuxer/include/ADM_Video.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreDemuxer/include/ADM_Video.h Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxerMpegTemplate.cpp.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxerMpegTemplate.cpp.h Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreDemuxer/src/ADM_demuxer.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreDemuxer/src/ADM_demuxer.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/ADM_indexFile.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/ADM_indexFile.h Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmxPSPacket.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmxPSPacket.h Changed

@@ -23,7 +23,7 @@
 public:
                         psPacket(void);
     virtual            ~psPacket();
-    virtual bool        open(const char *filenames,FP_TYPE append);
+    virtual bool        open(const char *filenames, int append);
     virtual bool        close(void);
     virtual bool        getPacket(uint32_t maxSize, uint8_t *pid, uint32_t *packetSize,uint64_t *pts,uint64_t *dts,uint8_t *buffer,uint64_t *startAt);
     virtual uint64_t    getPos(void);
@@ -142,6 +142,7 @@
         packetStats stats[256];
         uint64_t    lastVobuEnd;    // In 90 Khz tick
         uint64_t    nextVobuEnd;    // In 90 Khz tick
+        uint64_t    nextVobuStart;
         uint64_t    lastVobuPosition; 
         uint64_t    nextVobuPosition; 
         bool        decodeVobuPCI(uint32_t size,uint8_t *data);
@@ -149,13 +150,14 @@
 
 
 public:
-        uint64_t        getLastVobuEndTime(void) {return lastVobuEnd;}
+        uint64_t        getLastVobuEndTime(void) {return lastVobuEnd > nextVobuStart ? lastVobuEnd-nextVobuStart : 0;}
         uint64_t        getLastVobuPosition(void) {return lastVobuPosition;}
         uint64_t        getNextVobuPosition(void) {return nextVobuPosition;}
                         psPacketLinearTracker(uint8_t pid);
                         ~psPacketLinearTracker();
          packetStats    *getStat(int intdex);
          bool           resetStats(void);
+         bool           collectStats(uint8_t pid);
 virtual  bool           getPacketOfType(uint8_t pid,uint32_t maxSize, uint32_t *packetSize,uint64_t *pts,uint64_t *dts,uint8_t *buffer,uint64_t *startAt);
          int            findStartCode(void);
 };

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmxPacket.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmxPacket.h Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmx_io.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmx_io.h Changed

@@ -18,21 +18,9 @@
 #define FPARSER_
 #include "ADM_coreDemuxerMpeg6_export.h"
 #define DMX_BUFFER 1024*100
+#define DMX_BUFFER_MAX 4*1024*1024
 #include <BVector.h>
 
-/*
-        _off is the logical offset in the file
-        _head is the logical offset of the 1st byte in _buffer
-        _tail is the logical offset of the last byte in the buffer
-
-
-*/
-typedef enum 
-{
-        FP_PROBE=1,
-        FP_DONT_APPEND=2,
-        FP_APPEND=3
-}FP_TYPE;
 /**
     \class fdIo
     \brief Describe one file
@@ -51,9 +39,14 @@
 */
  class ADM_COREDEMUXER6_EXPORT fileParser
 {
+/*
+        _off is the logical offset in the file
+        _head is the logical offset of the 1st byte in _buffer
+        _tail is the logical offset of the last byte in the buffer
+*/
         private:
-         
             uint8_t  *_buffer;
+            uint32_t _bufferSize;
             uint64_t _off;              // Absolute offset
             
             uint32_t _curFd;        
@@ -61,9 +54,9 @@
             uint64_t _head,_tail,_size;       
            
         public:
-                                fileParser(void);
+                                fileParser(uint32_t cacheSize=DMX_BUFFER);
                                 ~fileParser();                                         
-                        uint8_t  open(const char *name,FP_TYPE *multi);
+                        uint8_t  open(const char *name, int *multi);
                         uint8_t  forward(uint64_t u);
                         uint8_t  sync(uint8_t *t );
                         uint8_t  syncH264(uint8_t *t );
@@ -71,6 +64,7 @@
                         uint8_t  setpos(uint64_t o);                
                         uint64_t getSize( void ) ;
                         uint32_t read32(uint32_t l, uint8_t *buffer);
+                        uint8_t  setBufferSize(uint32_t size);
                         uint8_t  end(void) { return _off>=_size-1;};
 						void hexDump(uint8_t *buf, int size);
                         uint8_t  peek8i(void); // Only call it once!!

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/src/dmxPSPacket.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/src/dmxPSPacket.cpp Changed

@@ -51,7 +51,7 @@
     \fn open
     \brief dtor
 */
-bool psPacket::open(const char *filenames,FP_TYPE append)
+bool psPacket::open(const char *filenames,int append)
 {
     _file=new fileParser();
     if(!_file->open(filenames,&append))
@@ -82,7 +82,9 @@
 */
 uint64_t    psPacket::getPos(void)
 {
-    return 0;
+    uint64_t pos;
+    _file->getpos(&pos);
+    return pos;
 }
 /**
     \fn setPos
@@ -669,10 +671,11 @@
         lastVobuPosition=nextVobuPosition;
         lastVobuEnd=nextVobuEnd;
 
+        nextVobuStart=start;
         nextVobuEnd=end;
         _file->getpos(&nextVobuPosition);
 #if 0
-        ADM_info("At : 0x%"PRIx64", Vobu start : %d end: %d seqEnd:%d\n",nextVobuPosition,start,end,seqEnd);
+        ADM_info("At : 0x%" PRIx64", Vobu start : %d end: %d seqEnd:%d\n",nextVobuPosition,start,end,seqEnd);
       
 #endif
 
@@ -762,6 +765,68 @@
     return true;
 }
 /**
+    \fn collectStats
+    \brief Read from current position until we get the stats for pid, then seek back
+*/
+bool psPacketLinearTracker::collectStats(uint8_t pid)
+{
+    packetStats *s=stats;
+    s+=pid;
+    memset(s,0,sizeof(packetStats));
+    s->startDts=ADM_NO_PTS;
+
+    const uint32_t len=100*1024;
+    uint8_t *buffer=(uint8_t *)malloc(len);
+    if(!buffer) return false;
+
+    const uint32_t remember=consumed;
+    uint32_t size;
+    uint64_t dts,pts,startAt;
+    bool success=false;
+    uint8_t tmppid;
+
+    dmxPacketInfo info;
+    getInfo(&info);
+
+#define MAX_CONSUMED (1<<24)
+
+    while(true)
+    {
+        if(false==getPacket(len,&tmppid,&size,&pts,&dts,buffer,&startAt))
+            break;
+        if(tmppid==0x60) // VOBU PCI
+        {
+            decodeVobuPCI(size,buffer);
+            continue;
+        }
+        if(tmppid!=pid)
+            continue;
+        uint64_t ts=pts;
+        if(ts==ADM_NO_PTS) ts=dts;
+        if(ts!=ADM_NO_PTS)
+        {
+            s->startCount=s->count;
+            s->startAt=startAt;
+            s->startSize=s->size;
+            s->startDts=ts;
+            success=true;
+            break;
+        }
+        s->count++;
+        s->size+=size;
+        if(consumed>remember && consumed-remember>MAX_CONSUMED)
+            break;
+    }
+
+#undef MAX_CONSUMED
+
+    free(buffer);
+    buffer=NULL;
+    consumed=remember;
+    seek(info.startAt,info.offset);
+    return success;
+}
+/**
     \fn findStartCode
     \brief Must check stillOk after calling this
 */

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/src/dmx_io.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/src/dmx_io.cpp Changed

@@ -22,18 +22,20 @@
 
 #include "ADM_default.h"
 #include "dmx_io.h"
+#include "ADM_coreUtils.h"
 #if 0
     #define aprintf(...) {}
 #else
     #define aprintf printf
 #endif
-extern bool ADM_splitSequencedFile(const char *filename, char **left, char **right,uint32_t *nbDigit,uint32_t *base);
 
-fileParser::fileParser( void )
+fileParser::fileParser(uint32_t cacheSize)
 {
                 _off=0;
                 _curFd=0;
-                _buffer=new uint8_t[DMX_BUFFER];
+                _bufferSize=cacheSize;
+                _buffer=(uint8_t *)ADM_alloc(_bufferSize);
+                ADM_assert(_buffer);
                 _head=_tail=0;
                 _size=0;
 }
@@ -50,36 +52,41 @@
                 }
         }
         listOfFd.clear();
-        if(_buffer) delete [] _buffer;
+        ADM_dealloc(_buffer);
         _buffer=NULL;
 }
 
-/*
-        Open one file, probe to see if there is several file with contiguous name
-        and handle them as one big file if that's the case
-
-        If multi is set to probe, return value will be APPEND if there is several files, dont_append if one
-        if multi is set to dont_append, file won't be auto appended even if they exist
-*/
-uint8_t fileParser::open( const char *filename,FP_TYPE *multi )
+/**
+ *  \fn    open
+ *  \brief Open one file, probe to see if there is several file with contiguous name
+ *         and handle them as one big file if that's the case
+ *  \param filename The path to the file to open
+ *  \param[in] multi Control file size pattern to match
+ *      0: don't append files even if they exist.
+ *      1: use default values
+ *      negative values: skip size check
+ *      else fragment size in MiB to match
+ *  \param[out] multi Size of the first file in MiB if there are several files, 0 if only one
+ *      do not use when size check was skipped
+ *  \return 1 on success, 0 on failure
+ */
+uint8_t fileParser::open( const char *filename, int *multi )
 {
 
         uint32_t decimals = 0;               // number of decimals
         char *left = NULL, *right = NULL; // parts of filename (after splitting)
 
-        uint8_t count = 0;                  // number of follow-ups
+        int nbFollowUps = 0;
         uint32_t base=0;
-        bool splitFile=false;
-//        int i = 0;      
-        // index (general use)
-        if(*multi!=FP_DONT_APPEND)
+        if(*multi)
         {
             aprintf("Checking if there are several files...\n");
-            splitFile=ADM_splitSequencedFile(filename, &left, &right,&decimals,&base);
-            if(splitFile)
-            {   
+            if(ADM_splitSequencedFile(filename, &left, &right, &decimals, &base))
+            {
                 aprintf("left:<%s>, right=<%s>,base=%" PRIu32",digit=%" PRIu32"\n",left,right,base,decimals);
-            }else       
+                nbFollowUps = ADM_probeSequencedFile(filename,multi);
+                if(nbFollowUps<0) return 0;
+            }else
             {
                 aprintf("No.\n");
             }
@@ -87,7 +94,8 @@
         // ____________________
         // Single loading
         // ____________________
-        if( false ==splitFile )
+
+        if(!nbFollowUps)
         {
                 fdIo newFd;
                 aprintf( "\nSimple loading: \n" );
@@ -107,12 +115,12 @@
                 aprintf( " file: %s, size: %" PRIu64"\n", filename, newFd.fileSize );
                 aprintf( " found 1 files \n" );
                 aprintf( "Done \n" );
+                *multi=0;
                 return 1;
         }
         // ____________________
         // Multi loading
         // ____________________
-        uint32_t tabSize;
         std::string leftPart(left);
         std::string rightPart(right);
         delete [] left;
@@ -121,13 +129,8 @@
         right=NULL;
     
         aprintf( "\nAuto adding: \n" );
-        uint32_t current=base;
         _curFd = 0;
         uint64_t total=0;
-        uint64_t threshold,tolerance;
-        threshold=tolerance=1;
-        threshold<<=28;
-        tolerance<<=20;
 
         // build match string
         char match[16];
@@ -138,19 +141,28 @@
         match[15]=0;
         aprintf("Using %s as match string\n",match);
         char number[16];
-        while(1)
+        for(int i=0; i<nbFollowUps+1; i++)
         {
-                sprintf(number,match,current);
+                sprintf(number,match,base+i);
                 std::string middle(number);
                 std::string outName=leftPart+middle+rightPart;
                 aprintf("Checking %s\n",outName.c_str());
 
+                // calculate file-size
+                int64_t sz=ADM_fileSize(outName.c_str());
+                if(sz<=0)
+                {
+                    if(!i) return 0;
+                    printf(" file: %s not found.\n",outName.c_str());
+                    nbFollowUps=i-1;
+                    break;
+                }
                 // open file
                 FILE *f= ADM_fopen(outName.c_str(), "rb");
                 if(!f)
                 {
                         // we need at least one file!
-                        if( !count  )
+                        if(!i)
                           { return 0; }
                         else
                           { 
@@ -159,55 +171,24 @@
                           }
                 }
 
-                // calculate file-size
                 fdIo myFd;
                 myFd.file=f;
-                myFd.fileSize=ADM_fileSize(outName.c_str());
-                // check whether the file likely belongs to a different stream
-                if(count && myFd.fileSize > threshold+tolerance)
-                {
-                    ADM_fclose(myFd.file);
-                    break;
-                }
-
+                myFd.fileSize=sz;
                 myFd.fileSizeCumul = total;
                 total+=  myFd.fileSize;
 
-                aprintf( " file %d: %s, size: %" PRIu64"\n", (count + 1), outName.c_str(),
+                aprintf( " file %d: %s, size: %" PRIu64"\n", i + 1, outName.c_str(),
                                             myFd.fileSize );
-
+                if(*multi>0 && !i)
+                    *multi=myFd.fileSize>>20;
                 listOfFd.append(myFd);
-                // append only if all files but the last one are of ~ equal size: 256 or 512 MiB,
-                // 1, 2 or 4 GiB, the usual threshold for automatically split streams
-                if(myFd.fileSize < threshold-tolerance)
-                    break;
-                if(!count)
-                {
-                    for(int i=0;i<5;i++)
-                    {
-                        if(myFd.fileSize >= threshold-tolerance && myFd.fileSize <= threshold+tolerance)
-                            break;
-                        threshold<<=1;
-                        if(i==1)
-                            tolerance<<=3; // 8 MiB starting with 1 GiB fragment size
-                    }
-                }
-                count++;
-                current++;
         } 
 
-      
         _size=total;
-        // clean up
-        if(*multi==FP_PROBE)
-        {
-                if(count>1)
-                        *multi=FP_APPEND;       //
-                else
-                        *multi=FP_DONT_APPEND;
-        }
+        if(nbFollowUps<1)
+                *multi=0;
 
-        aprintf( " found %d files \n", count );
+        aprintf( " found %d files \n", nbFollowUps+1 );
         aprintf( "Done \n" );
         return 1;
 } // fileParser::open()
@@ -416,18 +397,40 @@
                 fseeko(listOfFd[_curFd].file,0,SEEK_SET);
                 return mx+read32(len,buffer);
         }
-        // Read what is available in file, store leftover in the buffer
-        fread(buffer,len,1,listOfFd[_curFd].file);
-        _off+=len;
-        // available in that file
-        mx-=len;
-        if(mx>DMX_BUFFER) mx=DMX_BUFFER;
+        if(len>_bufferSize)
+        {
+                // Read what is available in file, store leftover in the buffer
+                fread(buffer,len,1,listOfFd[_curFd].file);
+                _off+=len;
+                // available in that file
+                mx-=len;
+                if(mx>_bufferSize) mx=_bufferSize;
+                fread(_buffer,mx,1,listOfFd[_curFd].file);
+                _head=_off;
+                _tail=_head+mx;
+
+                return len;
+        }
+        // Fill the buffer first
+        if(mx>_bufferSize) mx=_bufferSize;
         fread(_buffer,mx,1,listOfFd[_curFd].file);
         _head=_off;
         _tail=_head+mx;
-
-         return len;
-
+        return read32(len,buffer);
+}
+/**
+ *  \fn setBufferSize
+ */
+uint8_t fileParser::setBufferSize(uint32_t size)
+{
+    if(size>DMX_BUFFER_MAX)
+        return 0;
+    setpos(0);
+    ADM_dealloc(_buffer);
+    _buffer=(uint8_t *)ADM_alloc(size);
+    ADM_assert(_buffer);
+    _bufferSize=size;
+    return 1;
 }
 #ifdef NO_INLINE_FP
 uint32_t fileParser::read32i(void )
@@ -510,7 +513,7 @@
             fseeko(listOfFd[_curFd].file,0,SEEK_SET);
             mx=listOfFd[_curFd].fileSize;
         }
-        if(mx>DMX_BUFFER) mx=DMX_BUFFER;
+        if(mx>_bufferSize) mx=_bufferSize;
         // Fill the buffer
         fread(_buffer,mx,1,listOfFd[_curFd].file);
         _head=_off;

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreImage/include/ADM_imageFlags.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreImage/include/ADM_imageFlags.h Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreImage/src/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreImage/src/CMakeLists.txt Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreJobs/src/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreJobs/src/CMakeLists.txt Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreMuxer/include/ADM_muxer.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreMuxer/include/ADM_muxer.h Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp Changed

@@ -23,6 +23,7 @@
 #include "ADM_coreMuxerFfmpeg.h"
 #include "ADM_muxerUtils.h"
 #include "ADM_coreCodecMapping.h"
+#include "ADM_audioXiphUtils.h"
 
 extern "C" {
 #include "libavformat/url.h"
@@ -87,11 +88,14 @@
 */
 bool muxerFFmpeg::closeMuxer()
 {
+    int res=0;
     if(oc)
     {
         if(initialized==true)
         {
-            av_write_trailer(oc);
+            res=av_write_trailer(oc);
+            if(res<0)
+                ADM_warning("Error %d writing trailer.\n",res);
             avio_close(oc->pb);
         }
         avformat_free_context(oc);
@@ -103,7 +107,7 @@
         audio_st[i]=NULL;
     }
     video_st=NULL;
-    return true;
+    return !res;
 }
 /**
     \fn muxerFFmpeg
@@ -125,15 +129,27 @@
             return false;
     }
     oc = avformat_alloc_context();
-	if (!oc)
-	{
-       		printf("[FF] alloc format context failed\n");
-            return false;
-	}
-	oc->oformat = fmt;
-	snprintf(oc->filename,1000,"file://%s",filename);
-    // probably a memeleak here
-
+    if (!oc)
+    {
+        printf("[FF] alloc format context failed\n");
+        return false;
+    }
+    oc->oformat = fmt;
+#if defined(__APPLE__)
+ #define MAX_LEN 1024
+#else
+ #define MAX_LEN 4096
+#endif
+    uint32_t len=strlen(filename);
+    if(len>MAX_LEN)
+    {
+        ADM_error("Filename length %u exceeds limit %u\n",len,MAX_LEN);
+        return false;
+    }
+    char *url=(char *)ADM_alloc(len+8);
+    snprintf(url,len+8,"file://%s",filename);
+    url[len+7]=0;
+    oc->url=url;
 //#warning use AV METADATA
     printf("[FF] Muxer opened\n");
     return true;
@@ -155,6 +171,7 @@
 bool muxerFFmpeg::initVideo(ADM_videoStream *stream)
 {
     audioDelay=stream->getVideoDelay();
+    printf("[muxerFFmpeg::initVideo] Initial audio delay: %" PRIu64" ms\n",audioDelay/1000);
     video_st = avformat_new_stream(oc, NULL);
 	if (!video_st)
 	{
@@ -330,7 +347,19 @@
           {
                   case WAV_OGG_VORBIS:
                                 par->codec_id = AV_CODEC_ID_VORBIS;par->frame_size=6*256;
-                                ffmpuxerSetExtradata(par,audioextraSize,audioextraData);
+                                if(!strcmp(fmt->name,"mp4") || !strcmp(fmt->name,"psp")) // Need to translate from adm to xiph
+                                {
+                                    int xiphLen=(int)audioextraSize+(audioextraSize/255)+4+5;
+                                    uint8_t *xiph=new uint8_t[xiphLen+AV_INPUT_BUFFER_PADDING_SIZE];
+                                    memset(xiph,0,xiphLen+AV_INPUT_BUFFER_PADDING_SIZE);
+                                    xiphLen=ADMXiph::admExtraData2xiph(audioextraSize,audioextraData,xiph);
+                                    ffmpuxerSetExtradata(par,xiphLen,xiph);
+                                    delete [] xiph;
+                                    xiph=NULL;
+                                }else
+                                {
+                                    ffmpuxerSetExtradata(par,audioextraSize,audioextraData);
+                                }
                                 break;
                   case WAV_FLAC:
                                 par->codec_id = AV_CODEC_ID_FLAC;
@@ -369,9 +398,10 @@
                                   par->codec_id = AV_CODEC_ID_PCM_S16LE;break;
                                 }
                   case WAV_AAC:
+                  case WAV_AAC_HE:
                                   ffmpuxerSetExtradata(par,audioextraSize,audioextraData);
                                   par->codec_id = AV_CODEC_ID_AAC;
-                                  par->frame_size=1024;
+                                  par->frame_size=audio[i]->getSamplesPerPacket();
                                   break;
                   default:
                                  printf("[FF]: Unsupported audio\n");
@@ -449,6 +479,7 @@
     bool ret=true;
     uint32_t written=0;
     bool result=true;
+    bool gotVideoPacket=true;
     int missingPts=0;
     
     float f=(float)vStream->getAvgFps1000();
@@ -465,14 +496,16 @@
     encoding->setContainer(getContainerName());
     MuxAudioPacket *audioPackets=new MuxAudioPacket[nbAStreams];
     for(int i=0;i<nbAStreams;i++) // ugly...
-            audioPackets[i].clock=new audioClock(aStreams[i]->getInfo()->frequency);
+        audioPackets[i].clock=new audioClock(aStreams[i]->getInfo()->frequency);
     ADMBitstream out(bufSize);
     out.data=buffer;
 
-    while(true==vStream->getPacket(&out))
+    while(gotVideoPacket)
     {
-	AVPacket pkt;
-
+        gotVideoPacket=vStream->getPacket(&out);
+        uint64_t maxAudioDts;
+        if(gotVideoPacket)
+        {
             encoding->refresh();
             if(!encoding->isAlive())
             {
@@ -486,74 +519,29 @@
             aprintf("[FF:V] Pts: %" PRId64" DTS:%" PRId64" ms\n",xpts/1000,xdts/1000);
 
             aprintf("[FF:V] LastDts:%08" PRIu64" Dts:%08" PRIu64" (%04" PRIu64") Delta : %" PRIu64"\n",
-                        lastVideoDts,out.dts,out.dts/1000000,out.dts-lastVideoDts);
+                lastVideoDts,out.dts,out.dts/1000000,out.dts-lastVideoDts);
             rawDts=out.dts;
             if(rawDts==ADM_NO_PTS)
             {
                 ADM_warning("No DTS information for frame %" PRIu32"\n",written);
                 lastVideoDts+=videoIncrement;
-            }else if(lastVideoDts && rawDts<=lastVideoDts)
+            }else if(lastVideoDts && rawDts<lastVideoDts)
             {
-                ADM_warning("Duplicated or going back DTS for frame %" PRIu32", adding %" PRIu64" ms\n",written,(videoIncrement/2)/1000);
-                lastVideoDts+=videoIncrement/2;
+                ADM_warning("Duplicated or going back DTS for frame %" PRIu32"\n",written);
                 out.dts=lastVideoDts;
             }else
             {
                 lastVideoDts=out.dts;
             }
+            maxAudioDts=lastVideoDts+audioDelay;
+        }else
+        {
+            maxAudioDts=videoDuration;
+        }
 
-            if(out.pts==ADM_NO_PTS)
-            {
-                ADM_warning("No PTS information for frame %" PRIu32"\n",written);
-                missingPts++;
-                out.pts=lastVideoDts;
-            }
-            if(out.pts<lastVideoDts)
-            {
-                ADM_warning("Bumping PTS to keep PTS >= DTS for frame %" PRIu32"\n",written);
-                out.pts=lastVideoDts;
-            }
-
-            encoding->pushVideoFrame(out.len,out.out_quantizer,lastVideoDts);
-            muxerRescaleVideoTimeDts(&(out.dts),lastVideoDts);
-            if(!roundup && lastVideoDtsLav && out.dts==lastVideoDtsLav)
-            {
-                ADM_warning("Bumping lav DTS to avoid collision for frame %" PRIu32"\n",written);
-                out.dts++;
-            }
-            lastVideoDtsLav=out.dts;
-            muxerRescaleVideoTime(&(out.pts));
-            if(out.dts>out.pts)
-            {
-                ADM_warning("Bumping lav PTS to keep PTS >= DTS for frame %" PRIu32"\n",written);
-                out.pts=out.dts;
-            }
-            aprintf("[FF:V] RawDts:%lu Scaled Dts:%lu\n",rawDts,out.dts);
-            aprintf("[FF:V] Rescaled: Len : %d flags:%x Pts:%" PRIu64" Dts:%" PRIu64"\n",out.len,out.flags,out.pts,out.dts);
-
-            av_init_packet(&pkt);
-            pkt.dts=out.dts;
-            if(vStream->providePts()==true)
-            {
-                pkt.pts=out.pts;
-            }else
-            {
-                pkt.pts=pkt.dts;
-            }
-            pkt.stream_index=0;
-            pkt.data= buffer;
-            pkt.size= out.len;
-            if(out.flags & 0x10) // FIXME AVI_KEY_FRAME
-                        pkt.flags |= AV_PKT_FLAG_KEY;
-            ret =writePacket( &pkt);
-            aprintf("[FF]Frame:%u, DTS=%08lu PTS=%08lu\n",written,out.dts,out.pts);
-            if(false==ret)
-            {
-                printf("[FF]Error writing video packet\n");
-                break;
-            }
-            written++;
-            // Now send audio until they all have DTS > lastVideoDts+increment
+        if(written)
+        {
+            // Now send audio until they all have DTS > lastVideoDts
             for(int audio=0;audio<nbAStreams;audio++)
             {
                 MuxAudioPacket *audioTrack=&(audioPackets[audio]);
@@ -568,14 +556,14 @@
                     if(audioTrack->present==false)
                     {
                         if(false==a->getPacket(audioTrack->buffer,
-                                                &(audioTrack->size),
-                                                AUDIO_BUFFER_SIZE,
-                                                &(audioTrack->samples),
-                                                &(audioTrack->dts)))
+                                            &(audioTrack->size),
+                                            AUDIO_BUFFER_SIZE,
+                                            &(audioTrack->samples),
+                                            &(audioTrack->dts)))
                         {
-                                audioTrack->eof=true;
-                                ADM_info("No more audio packets for audio track %d\n",audio);
-                                break;
+                            audioTrack->eof=true;
+                            ADM_info("No more audio packets for audio track %d\n",audio);
+                            break;
                         }
                        // printf("Track %d , new audio packet DTS=%"PRId64" size=%"PRIu32"\n",audioTrack->dts,audioTrack->size);
                         audioTrack->present=true;
@@ -585,7 +573,7 @@
                     if(audioTrack->dts!=ADM_NO_PTS)
                     {
                         //printf("Audio PTS:%"PRId64", limit=%"PRId64"\n",audioTrack->dts,lastVideoDts+videoIncrement);
-                        if(audioTrack->dts>lastVideoDts+videoIncrement+audioDelay) break; // This packet is in the future
+                        if(audioTrack->dts>maxAudioDts) break; // This packet is in the future
                     }
                     // Write...
                     AVPacket pkt;
@@ -617,9 +605,69 @@
                     }
                    // printf("[FF] A:%"PRIu32" ms vs V: %"PRIu32" ms\n",(uint32_t)audioTrack->dts/1000,(uint32_t)(lastVideoDts+videoIncrement)/1000);
                 }
-                //if(!nb) printf("[FF] A: No audio for video frame %d\n",written);
             }
+        }
+
+        if(!gotVideoPacket) break;
 
+        if(out.pts==ADM_NO_PTS)
+        {
+            ADM_warning("No PTS information for frame %" PRIu32"\n",written);
+            missingPts++;
+            out.pts=lastVideoDts;
+        }
+        if(out.pts<lastVideoDts)
+        {
+            ADM_warning("Bumping PTS to keep PTS >= DTS for frame %" PRIu32"\n",written);
+            out.pts=lastVideoDts;
+        }
+
+        encoding->pushVideoFrame(out.len,out.out_quantizer,lastVideoDts);
+        muxerRescaleVideoTimeDts(&(out.dts),lastVideoDts);
+        if(!roundup && lastVideoDtsLav && out.dts==lastVideoDtsLav)
+        {
+            ADM_warning("Bumping lav DTS to avoid collision for frame %" PRIu32"\n",written);
+            out.dts++;
+        }
+        lastVideoDtsLav=out.dts;
+        muxerRescaleVideoTime(&(out.pts));
+        if(out.dts>out.pts)
+        {
+            ADM_warning("Bumping lav PTS to keep PTS >= DTS for frame %" PRIu32"\n",written);
+            out.pts=out.dts;
+        }
+        aprintf("[FF:V] RawDts:%lu Scaled Dts:%lu\n",rawDts,out.dts);
+        aprintf("[FF:V] Rescaled: Len : %d flags:%x Pts:%" PRIu64" Dts:%" PRIu64"\n",out.len,out.flags,out.pts,out.dts);
+
+        AVPacket pkt;
+
+        av_init_packet(&pkt);
+        pkt.dts=out.dts;
+        if(vStream->providePts()==true)
+        {
+            pkt.pts=out.pts;
+        }else
+        {
+            pkt.pts=pkt.dts;
+        }
+        pkt.stream_index=0;
+        pkt.data = buffer;
+        pkt.size = out.len;
+        if(out.flags & 0x10) // FIXME AVI_KEY_FRAME
+            pkt.flags |= AV_PKT_FLAG_KEY;
+        ret = writePacket( &pkt);
+        aprintf("[FF]Frame:%u, DTS=%08lu PTS=%08lu\n",written,out.dts,out.pts);
+        if(false==ret)
+        {
+            printf("[FF]Error writing video packet\n");
+            break;
+        }
+        if(!written)
+        {
+            audioDelay=vStream->getVideoDelay();
+            printf("[muxerFFmpeg::initVideo] Final audio delay: %" PRIu64" ms\n",audioDelay/1000);
+        }
+        written++;
     }
     delete [] buffer;
     if(false==ret)

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_dynaMuxer.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_dynaMuxer.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_muxerUtils.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_muxerUtils.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreSqlLight3/src/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreSqlLight3/src/CMakeLists.txt Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUI/include/DIA_encoding.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreUI/include/DIA_encoding.h Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUI/include/DIA_factory.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreUI/include/DIA_factory.h Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUI/include/DIA_factoryStubs.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreUI/include/DIA_factoryStubs.h Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUI/src/DIA_encoding.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreUI/src/DIA_encoding.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUI/src/DIA_factory.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreUI/src/DIA_factory.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_coreUtils.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_coreUtils.h Changed

@@ -23,7 +23,6 @@
 uint32_t    ADM_computeBitrate(uint32_t fps1000, uint32_t nbFrame, uint32_t sizeInMB);
 ADM_COREUTILS6_EXPORT uint32_t    ADM_UsecFromFps1000(uint32_t fps1000);
 ADM_COREUTILS6_EXPORT uint32_t    ADM_Fps1000FromUs(uint64_t us);
-ADM_COREUTILS6_EXPORT bool        ADM_splitSequencedFile(const char *filename, char **left, char **right, uint32_t *nbDigit, uint32_t *base);
 ADM_COREUTILS6_EXPORT bool        ADM_computeAverageBitrateFromDuration(uint64_t duration, uint32_t sizeInMB, uint32_t *avgInKbits);
 ADM_COREUTILS6_EXPORT ADM_ASPECT  getAspectRatioFromAR(uint32_t width, uint32_t height,const char **s);
 ADM_COREUTILS6_EXPORT int32_t     ADM_getNiceValue(uint32_t priorityLevel);
@@ -32,8 +31,10 @@
 void        Endian_AviStreamHeader(AVIStreamHeader *s);
 ADM_COREUTILS6_EXPORT void        Endian_WavHeader(WAVHeader *w);
 ADM_COREUTILS6_EXPORT void        printBih(ADM_BITMAPINFOHEADER *bi);
-ADM_COREUTILS6_EXPORT bool        ADM_probeSequencedFile(const char *fileName);
 ADM_COREUTILS6_EXPORT uint8_t     mk_hex(uint8_t a, uint8_t b);
 ADM_COREUTILS6_EXPORT void mixDump(uint8_t * ptr, uint32_t len);
 
+ADM_COREUTILS6_EXPORT bool        ADM_splitSequencedFile(const char *filename, char **left, char **right, uint32_t *nbDigit, uint32_t *base);
+ADM_COREUTILS6_EXPORT int         ADM_probeSequencedFile(const char *fileName, int *fragmentSize);
+
 #endif

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_h265_tag.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_h265_tag.h Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_videoInfoExtractor.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_videoInfoExtractor.h Changed

@@ -51,36 +51,51 @@
     ADM_SPSinfoH265()
     {
       width=height=fps1000=0;
+      log2_max_poc_lsb=0;
+      separate_colour_plane_flag=0;
       num_extra_slice_header_bits=0;  //copied from pps
+      dependent_slice_segments_enabled_flag=false; // from pps
+      output_flag_present_flag=false; // from pps
+      field_info_present=false;
       address_coding_length=0;
     }
     int     width;
     int     height;
     int     fps1000;
+    unsigned int log2_max_poc_lsb;
+    int     separate_colour_plane_flag;
     int     num_extra_slice_header_bits;
     bool    dependent_slice_segments_enabled_flag;
+    bool    output_flag_present_flag;
+    bool    field_info_present;
     int     address_coding_length;
 };
 
-
+#define MAX_H264_SPS_SIZE 2048
 
 ADM_COREUTILS6_EXPORT bool    ADM_SPSannexBToMP4(uint32_t dataLen,uint8_t *incoming, uint32_t *outLen, uint8_t *outData);
 
 ADM_COREUTILS6_EXPORT bool    extractSPSInfo(uint8_t *data, uint32_t len,ADM_SPSInfo *info);
 ADM_COREUTILS6_EXPORT bool    extractSPSInfo_mp4Header(uint8_t *data, uint32_t len,ADM_SPSInfo *info);
+ADM_COREUTILS6_EXPORT bool    extractSPSInfoFromData(uint8_t *data, uint32_t length, ADM_SPSInfo *spsinfo);
+ADM_COREUTILS6_EXPORT uint32_t getRawH264SPS(uint8_t *data, uint32_t len, uint32_t nalSize, uint8_t *dest, uint32_t maxsize);
+ADM_COREUTILS6_EXPORT uint32_t getRawH264SPS_startCode(uint8_t *data, uint32_t len, uint8_t *dest, uint32_t maxsize);
+ADM_COREUTILS6_EXPORT uint32_t ADM_getNalSizeH264(uint8_t *extra, uint32_t len);
 
-ADM_COREUTILS6_EXPORT uint8_t extractH264FrameType(uint8_t *buffer,uint32_t len,uint32_t *flags,int *pocLsb,ADM_SPSInfo *sps,uint32_t *recovery=NULL);
-ADM_COREUTILS6_EXPORT uint8_t extractH265FrameType(uint32_t nalSize,uint8_t *buffer,uint32_t len,uint32_t *flags);
+ADM_COREUTILS6_EXPORT uint8_t extractH264FrameType(uint8_t *buffer, uint32_t len, uint32_t nalSize, uint32_t *flags, int *pocLsb, ADM_SPSInfo *sps, uint32_t *recovery=NULL);
 ADM_COREUTILS6_EXPORT uint8_t extractH264FrameType_startCode(uint8_t *buffer,uint32_t len,uint32_t *flags,int *pocLsb,ADM_SPSInfo *sps,uint32_t *recovery=NULL);
+ADM_COREUTILS6_EXPORT bool    extractH264SEI(uint8_t *src, uint32_t inlen, uint32_t nalSize, uint8_t *dest, uint32_t bufsize, uint32_t *outlen); // dest may be NULL
+
 ADM_COREUTILS6_EXPORT bool    ADM_getH264SpsPpsFromExtraData(uint32_t extraLen,uint8_t *extra,
                                     uint32_t *spsLen,uint8_t **spsData,
                                     uint32_t *ppsLen,uint8_t **ppsData); // return a copy of pps/sps extracted
 
+ADM_COREUTILS6_EXPORT uint32_t ADM_getNalSizeH265(uint8_t *extra, uint32_t len);
 
 ADM_COREUTILS6_EXPORT bool    extractSPSInfoH265_mp4Header(uint8_t *data, uint32_t len,ADM_SPSinfoH265 *info); 
-ADM_COREUTILS6_EXPORT bool    extractSPSInfoH265(uint8_t *data, uint32_t len,ADM_SPSinfoH265 *info); 
-
-
+ADM_COREUTILS6_EXPORT bool    extractSPSInfoH265(uint8_t *data, uint32_t len, ADM_SPSinfoH265 *info);
+ADM_COREUTILS6_EXPORT bool    extractH265FrameType(uint8_t *buffer, uint32_t len, uint32_t nalSize, ADM_SPSinfoH265 *info, uint32_t *flags, int *poc);
+ADM_COREUTILS6_EXPORT bool    extractH265FrameType_startCode(uint8_t *buffer, uint32_t len, ADM_SPSinfoH265 *info, uint32_t *flags, int *poc);
 
 #define MAX_NALU_PER_CHUNK 60

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/include/prefs2_list.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreUtils/include/prefs2_list.h Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_coreCodecMapping.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_coreCodecMapping.cpp Changed

@@ -22,7 +22,7 @@
 #include "fourcc.h"
 const ffVideoCodec ffCodec[]=
 {
-                                // Refcopy // extrdata // Can have  B frame
+                            // extradata // Refcopy // Can have  B frame
   {"LAGS",  AV_CODEC_ID_LAGARITH,  false, false,    false},    
   {"SNOW",  AV_CODEC_ID_SNOW,      false, false,    false},
   {"cvid",  AV_CODEC_ID_CINEPAK,   false, false,    false},
@@ -30,6 +30,7 @@
   {"VP6F",  AV_CODEC_ID_VP6F,      false, false,    false},
   {"VP6A",  AV_CODEC_ID_VP6A,      false, false,    false},
   {"VP8 ",  AV_CODEC_ID_VP8,       false, false,    false},
+  {"VP9 ",  AV_CODEC_ID_VP9,       false, false,    false},
   {"SVQ1",  AV_CODEC_ID_SVQ1,      false, false,    false},
   {"FLV1",  AV_CODEC_ID_FLV1,      false, false,    false},
   {"AMV",   AV_CODEC_ID_AMV,       false, false,    false},
@@ -41,16 +42,15 @@
   {"cvid",  AV_CODEC_ID_CINEPAK,   false, false,    false},
   {"FICV",  AV_CODEC_ID_FIC,       false, false,    false},
   {"AVdn",  AV_CODEC_ID_DNXHD,     false, false,    false},
+  {"tscc",  AV_CODEC_ID_TSCC,      false, false,    false},
+  {"CSCD",  AV_CODEC_ID_CSCD,      false, false,    false},
 // Need extradata
+  {"av01", AV_CODEC_ID_AV1,        true, false,    false},
   {"WMV2", AV_CODEC_ID_WMV2,       true, false,    false},
   {"WMV1", AV_CODEC_ID_WMV1,       true, false,    false},
   {"WMV3", AV_CODEC_ID_WMV3,       true, false,    true},
   {"WVC1", AV_CODEC_ID_VC1,        true, false,    true},
   {"WMVA", AV_CODEC_ID_VC1,        true, false,    true},
-  {"VP8 ", AV_CODEC_ID_VP8,        true, false,    false},
-  {"VP9 ", AV_CODEC_ID_VP9,        true, false,    false},
-  {"tscc", AV_CODEC_ID_TSCC,       false,false,    false},
-  {"CSCD", AV_CODEC_ID_CSCD,       false,false,    false},
 
   
 // RefCopy

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH264.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH264.cpp Changed

@@ -53,6 +53,9 @@
 #define seiprintf(...) {}
 #endif
 
+extern bool ADM_findAnnexBStartCode(uint8_t *start, uint8_t *end, uint8_t *outstartcode,
+                uint32_t *offset, bool *fivebytes);
+
 /**
     \fn ADM_getH264SpsPpsFromExtraData
     \brief Returns a copy of PPS/SPS extracted from extrdata
@@ -93,8 +96,25 @@
     return true;
 }
 
-extern bool ADM_findAnnexBStartCode(uint8_t *start, uint8_t *end, uint8_t *outstartcode,
-                uint32_t *offset, bool *fivebytes);
+/**
+    \fn ADM_getNalSizeH264
+    \brief extract NALU length size from avcC header
+*/
+uint32_t ADM_getNalSizeH264(uint8_t *extra, uint32_t len)
+{
+    if(len < 9)
+    {
+        ADM_warning("Invalid H.264 extradata length %u\n",len);
+        return 0;
+    }
+    if(extra[0] != 1)
+    {
+        ADM_warning("Invalid H.264 extradata\n");
+        return 0;
+    }
+    return (extra[4] & 3) + 1;
+}
+
 /**
     \fn ADM_escapeH264
     \brief Add escape stuff
@@ -135,35 +155,36 @@
 */
 uint32_t ADM_unescapeH264 (uint32_t len, uint8_t * in, uint8_t * out)
 {
+  if (len < 3)
+    return 0;
+  uint8_t *offset = in;
   uint8_t *firstOut=out;
   uint32_t outlen = 0;
   uint8_t *tail = in + len;
   uint8_t *border=tail-3;
-  if (len < 3)
-    return 0;
+
   while (in < border)
   {
         if(in[1]) // cannot be 00 00 nor the next one
         {
-          out[0]=in[0];
-          out[1]=in[1];
-          out+=2;in+=2;
+          in += 2;
           continue;
         }
-        if (!in[0] && !in[1] && in[2] == 3)
+        if(!in[0] && !in[1] && in[2] == 3)
         {
-          out[0] = 0;
-          out[1] = 0;
-          out += 2;
+          uint32_t copy = in - offset + 2;
+          memcpy(out, offset, copy);
+          out += copy;
           in += 3;
+          offset = in;
           continue;
         }
-        *out++ = *in++;
+        in++;
   }
   outlen=(int)(out-firstOut);
   // copy last bytes
-  uint32_t left = tail - in;
-  memcpy (out, in, left);
+  uint32_t left = tail - offset;
+  memcpy (out, offset, left);
   outlen += left;
   return outlen;
 
@@ -458,33 +479,42 @@
     }
   return 1;
 }
+
 /**
-    \fn getRecoveryFromSei
-    \brief We dont unescape here, very unlikely needed as we only decode recovery which is small
+    \fn getInfoFromSei
+    \brief Get SEI type, decode recovery point
+    \return 0: failure, 1: recovery, 2: unregistered user data, 3: both
 */
-static bool getRecoveryFromSei(uint32_t nalSize, uint8_t *org,uint32_t *recoveryLength)
+enum {
+    ADM_H264_SEI_TYPE_OTHER = 0,
+    ADM_H264_SEI_TYPE_USER_DATA_UNREGISTERED = 1,
+    ADM_H264_SEI_TYPE_RECOVERY_POINT = 2
+};
+
+static int getInfoFromSei(uint32_t nalSize, uint8_t *org, uint32_t *recoveryLength, uint32_t *unregistered)
 {
     int originalNalSize=nalSize+16;
     uint8_t *payloadBuffer=(uint8_t *)malloc(originalNalSize+AV_INPUT_BUFFER_PADDING_SIZE);
     memset(payloadBuffer,0,originalNalSize+AV_INPUT_BUFFER_PADDING_SIZE);
     uint8_t *payload=payloadBuffer;
-    bool r=false;
+    int r=ADM_H264_SEI_TYPE_OTHER;
     nalSize=ADM_unescapeH264(nalSize,org,payload);
     if(nalSize>originalNalSize)
     {
         ADM_warning("NAL is way too big : %d, while we expected %d at most\n",nalSize,originalNalSize);
         free(payloadBuffer);
-        return false;
+        return r;
     }
 
     uint8_t *tail=payload+nalSize;
-    *recoveryLength=16;
-    while( payload<tail)
+
+    while(payload+2<tail)
     {
         uint32_t sei_type=0,sei_size=0;
         while(payload[0]==0xff)
         {
             sei_type+=0xff;payload++;
+            if(payload+2>=tail)
             {
                 seiprintf("Not enough data.\n");
                 goto abtSei;
@@ -506,24 +536,58 @@
             }
         }
         sei_size+=payload[0];payload++;
-        seiprintf("  [SEI] Type : 0x%x size:%d\n",sei_type,sei_size);
-        if(payload+sei_size>tail) break;
+        seiprintf("Type: %u size: %u remaining: %d\n",sei_type,sei_size,tail-payload);
+        if(payload+sei_size>tail)
+        {
+            seiprintf("Not enough data.\n");
+            break;
+        }
         switch(sei_type)
         {
+            case 5: // Unregistered user data
+            {
+                if(!unregistered) break;
+                if(sei_size<16)
+                {
+                    ADM_info("User data too short: %u\n",sei_size);
+                    break;
+                }
+                char *udata=(char *)malloc(16+sei_size+1);
+                getBits bits(sei_size,payload);
+                for(uint32_t i=0; i<sei_size; i++)
+                    udata[i]=bits.get(8);
+                udata[sei_size]=0;
+                int build;
+                if(1!=sscanf(udata+16,"x264 - core %d",&build))
+                {
+                    ADM_info("Unregistered user data doesn't match the one expected for x264\n");
+                    mixDump((uint8_t *)udata,sei_size);
+                    break;
+                }
+                free(udata);
+                *unregistered=sei_size;
+                ADM_info("Found unregistered user data from x264 build %d, size: %u\n",build,sei_size);
+                r |= ADM_H264_SEI_TYPE_USER_DATA_UNREGISTERED;
+                break;
+            }
             case 6: // Recovery point
             {
+                if(!recoveryLength) break;
                 getBits bits(sei_size,payload);
                 int distance=bits.getUEG();
+                if(distance<0)
+                {
+                    ADM_warning("Invalid UE golomb code encountered while decoding recovery distance.\n");
+                    break;
+                }
                 seiprintf("Recovery distance: %d\n",distance);
                 *recoveryLength=distance;
-                r=true;
-                goto abtSei;
+                r |= ADM_H264_SEI_TYPE_RECOVERY_POINT;
                 break;
             }
-            default:
-                payload+=sei_size;
-                break;
+            default:break;
         }
+        payload+=sei_size;
     }
 abtSei:
     free(payloadBuffer);
@@ -544,20 +608,30 @@
 
     getBits bits(size,out);
     uint32_t sliceType;
+    uint32_t fieldFlags=0;
     int frame = -1;
     *poc_lsb = -1;
 
     bits.getUEG();               // first mb in slice
     sliceType = bits.getUEG31(); // get_ue_golomb_31??
-    if(sps && sps->hasPocInfo && sps->log2MaxFrameNum > 3 && sps->log2MaxFrameNum < 17) // sanity check
+    if(sps && sps->log2MaxFrameNum > 3 && sps->log2MaxFrameNum < 17) // sanity check
     {
         bits.getUEG(); // skip PPS id
         frame = bits.get(sps->log2MaxFrameNum);
         if(!sps->frameMbsOnlyFlag && bits.get(1))
-            bits.get(1); // skip field_pic_flag
-        if(*flags & AVI_KEY_FRAME) // from NAL
-            bits.getUEG(); // skip idr_pic_id
-        *poc_lsb = bits.get(sps->log2MaxPocLsb);
+        {
+            fieldFlags |= AVI_FIELD_STRUCTURE;
+            if(bits.get(1))
+                fieldFlags |= AVI_BOTTOM_FIELD;
+            else
+                fieldFlags |= AVI_TOP_FIELD;
+        }
+        if(sps->hasPocInfo)
+        {
+            if(*flags & AVI_IDR_FRAME) // from NAL
+                bits.getUEG(); // skip idr_pic_id
+            *poc_lsb = bits.get(sps->log2MaxPocLsb);
+        }
     }
     if (sliceType > 9)
     {
@@ -571,36 +645,51 @@
     switch(sliceType)
     {
         case 3:
-        case 0: *flags=  AVI_P_FRAME;break;
+        case 0: *flags = AVI_P_FRAME;break;
         case 1: *flags = AVI_B_FRAME;break;
         case 2: case 4:
-                if(!recovery || !frame) *flags=AVI_KEY_FRAME;
-                    else      *flags=AVI_P_FRAME;
+                if((*flags & AVI_KEY_FRAME) && !sps)
+                    break; // trust NAL when we cannot verify
+                if(!recovery || !frame)
+                    *flags = AVI_KEY_FRAME;
+                else
+                    *flags = AVI_P_FRAME;
+                if(!frame)
+                    *flags |= AVI_IDR_FRAME;
                 break;
 
     }
-
-      free(out);
+    *flags |= fieldFlags;
+    free(out);
     return true;
 }
 
 /**
-      \fn extractH264FrameType
-      \brief return frametype in flags (KEY_FRAME or 0).
-             To be used only with  mkv/mp4 nal type (i.e. no startcode)
-                    but 4 bytes NALU
-
+    \fn extractH264FrameType
+    \brief Parse access unit in buffer of size len, return frametype in flags (KEY/P/B).
+           nalSize should be either the NALU length size value retrieved from extradata or 0 for autodetect.
+           If ADM_SPSInfo is provided, return POC LSB or -1 if implicit or on error.
+           Return value: 1 on success, 0 on failure.
+           To be used only with AVCC (mkv/mp4) nal type (i.e. no startcode)
 */
-uint8_t extractH264FrameType(uint8_t *buffer, uint32_t len, uint32_t *flags, int *pocLsb, ADM_SPSInfo *sps, uint32_t *extRecovery)
+uint8_t extractH264FrameType(uint8_t *buffer, uint32_t len, uint32_t nalSize, uint32_t *flags, int *pocLsb, ADM_SPSInfo *sps, uint32_t *extRecovery)
 {
     uint8_t *head = buffer, *tail = buffer + len;
     uint8_t stream;
+    uint32_t i, length = 0;
 
-    uint32_t nalSize=4;
-// Check for short nalSize, i.e. size coded on 3 bytes
-    {
-        uint32_t length =(head[0] << 24) + (head[1] << 16) + (head[2] << 8) + (head[3]);
-        if(length>len) nalSize=3;
+    if(!nalSize || nalSize > 4)
+    { // Try to detect number of bytes used to code NAL length. Shaky.
+        nalSize = 4;
+        for(i = 0; i < nalSize; i++)
+        {
+            length = (length << 8) + head[i];
+            if(i && length > len)
+            {
+                nalSize = i;
+                break;
+            }
+        }
     }
     uint32_t recovery=0xff;
     int p=-1;
@@ -608,10 +697,9 @@
     *flags=0;
     while (head + nalSize < tail)
     {
-
-        uint32_t length =(head[0] << 16) + (head[1] << 8) + (head[2] << 0) ;
-        if(nalSize==4)
-            length=(length<<8)+head[3];
+        length = 0;
+        for(i = 0; i < nalSize; i++)
+            length = (length << 8) + head[i];
         if (length > len)// || length < 2)
         {
             ADM_warning ("Warning , incomplete nal (%u/%u),(%0x/%0x)\n", length, len, length, len);
@@ -619,6 +707,7 @@
             return 0;
         }
         head += nalSize;        // Skip nal lenth
+        len = (len > nalSize)? len - nalSize : 0;
         int ref=(*(head)>>5) & 3;
         stream = *(head) & 0x1F;
 
@@ -626,10 +715,10 @@
         {
             case NAL_SEI:
                 {
-                    bool sei=getRecoveryFromSei(length-1, head+1,&recovery);
+                    int sei=getInfoFromSei(length-1, head+1, &recovery, NULL);
                     if(extRecovery)
                     {
-                        if(sei)
+                        if(sei & ADM_H264_SEI_TYPE_RECOVERY_POINT)
                             *extRecovery=recovery;
                         else
                             recovery=*extRecovery;
@@ -642,12 +731,15 @@
             case NAL_FILLER:
                 break;
             case NAL_IDR:
-                *flags = AVI_KEY_FRAME;
+                *flags = AVI_KEY_FRAME + AVI_IDR_FRAME;
                 if(!getNalType(head+1,head+length,flags,sps,&p,recovery))
                     return 0;
-                if(sps && *flags != AVI_KEY_FRAME)
+                if(sps && !(*flags & AVI_IDR_FRAME))
+                {
                     ADM_warning("Mismatched frame (flags: %d) in IDR NAL unit!\n",*flags);
-                *flags = AVI_KEY_FRAME; // FIXME
+                    *flags &= ~AVI_B_FRAME;
+                    *flags |= AVI_KEY_FRAME; // FIXME
+                }
                 if(pocLsb)
                     *pocLsb=p;
                 return 1;
@@ -664,6 +756,7 @@
                 break;
         }
         head+=length;
+        len = (len > length)? len - length : 0;
     }
     ADM_warning ("No stream\n");
     return 0;
@@ -682,7 +775,10 @@
     uint32_t hnt=0xffffffff;
     uint32_t recovery=0xff;
     int counter = 0, length = 0;
-    int p = -1;
+    int ref = 0, p = -1;
+    bool last = false;
+
+    *flags = 0;
 
     while (head + 2 < tail)
     {
@@ -691,27 +787,38 @@
         if((hnt & 0xffffff) != 1)
         {
             head++;
-            continue;
+            if(head + 2 < tail)
+                continue;
+            if(!counter) break;
+            last = true;
+            length = head - buffer + 2;
         }
-        head++;
-        counter++;
-        if(counter > 1)
+        int prevNaluRefIdc = 0;
+        uint8_t prevNaluType = 0;
+        if(!last)
         {
-            length = head - buffer - 3; // 3 bytes start code length no matter zero-prefixed or not
-            buffer = head;
+            head++;
+            counter++;
+            if(counter > 1)
+                length = head - buffer - 3; // 3 bytes start code length no matter zero-prefixed or not
+            prevNaluRefIdc = (*head >> 5) & 3;
+            prevNaluType = *(head++) & 0x1f;
+            if(!length)
+            {
+                buffer = head;
+                ref = prevNaluRefIdc;
+                stream = prevNaluType;
+                continue;
+            }
         }
-        if(!length)
-            continue;
-        int ref=(*head >> 5) & 3;
-        stream = *(head++) & 0x1f;
         switch (stream)
         {
             case NAL_SEI:
                 {
-                    bool sei=getRecoveryFromSei(length, head, &recovery);
+                    int sei=getInfoFromSei(length, buffer, &recovery, NULL);
                     if(extRecovery)
                     {
-                        if(sei)
+                        if(sei & ADM_H264_SEI_TYPE_RECOVERY_POINT)
                             *extRecovery=recovery;
                         else
                             recovery=*extRecovery;
@@ -720,17 +827,20 @@
                 break;
             case NAL_SPS: case NAL_PPS: case NAL_FILLER: case NAL_AU_DELIMITER: break;
             case NAL_IDR:
-                *flags = AVI_KEY_FRAME;
-                if(!getNalType(head, head+length, flags, sps, &p, recovery))
+                *flags = AVI_KEY_FRAME + AVI_IDR_FRAME;
+                if(!getNalType(buffer, buffer+length, flags, sps, &p, recovery))
                     return 0;
-                if(*flags != AVI_KEY_FRAME)
+                if(sps && !(*flags & AVI_IDR_FRAME))
+                {
                     ADM_warning("Mismatched frame (flags: %d) in IDR NAL unit!\n",*flags);
-                *flags = AVI_KEY_FRAME; // FIXME
+                    *flags &= ~AVI_B_FRAME;
+                    *flags |= AVI_KEY_FRAME; // FIXME
+                }
                 if(pocLsb)
                     *pocLsb=p;
                 return 1;
             case NAL_NON_IDR:
-                if(!getNalType(head, head+length, flags, sps, &p, recovery))
+                if(!getNalType(buffer, buffer+length, flags, sps, &p, recovery))
                     return 0;
                 if(!ref && (*flags & AVI_B_FRAME))
                     *flags |= AVI_NON_REF_FRAME;
@@ -741,11 +851,78 @@
                 ADM_warning("Unknown NAL type ??0x%x\n", stream);
                 break;
         }
+        buffer = head;
+        ref = prevNaluRefIdc;
+        stream = prevNaluType;
     }
   printf ("No stream\n");
   return 0;
 }
 
+/**
+ *  \fn extractH264SEI
+ *  \brief If present, copy SEI containing x264 version info from access unit src to dest
+ */
+bool extractH264SEI(uint8_t *src, uint32_t inlen, uint32_t nalSize, uint8_t *dest, uint32_t bufsize, uint32_t *outlen)
+{
+    uint8_t *tail = src, *head = src + inlen;
+    uint8_t stream;
+    uint32_t i, length = 0;
+
+    if(!nalSize || nalSize > 4)
+    { // Try to detect NAL length size.
+        nalSize = 4;
+        for(i = 0; i < nalSize; i++)
+        {
+            length = (length << 8) + tail[i];
+            if(i && length > inlen)
+            {
+                nalSize = i;
+                break;
+            }
+        }
+    }
+    uint32_t unregistered = 0;
+
+    while(tail + nalSize < head)
+    {
+        length = 0;
+        for(i = 0; i < nalSize; i++)
+            length = (length << 8) + tail[i];
+        if(length > inlen)
+        {
+            ADM_warning ("Incomplete NALU, length: %u, available: %u\n", length, inlen);
+            return false;
+        }
+        tail += nalSize;
+        inlen = (inlen > nalSize)? inlen - nalSize : 0;
+        stream = *(tail) & 0x1f;
+
+        if(stream == NAL_SEI)
+        {
+            if(getInfoFromSei(length-1,tail+1,NULL,&unregistered) & ADM_H264_SEI_TYPE_USER_DATA_UNREGISTERED)
+            {
+                uint32_t l = nalSize + length;
+                if(l > bufsize)
+                {
+                    ADM_warning("Insufficient destination buffer, need %u, got %u\n",l,bufsize);
+                    return false;
+                }
+                if(dest)
+                    memcpy(dest,tail-nalSize,l); // what about emulation prevention bytes??
+                if(outlen)
+                    *outlen = l;
+                return true;
+            }
+        }
+        tail += length;
+        inlen = (inlen > length)? inlen - length : 0;
+    }
+
+    return false;
+}
+
+
 
 /**
         \fn extractSPSInfo_mp4Header
@@ -848,6 +1025,155 @@
     return r;
 }
 
+/**
+    \fn getRawH264SPS
+    \brief Find the first SPS in mp4 style buffer and copy it to dest, return SPS length.
+*/
+uint32_t getRawH264SPS(uint8_t *data, uint32_t len, uint32_t nalSize, uint8_t *dest, uint32_t maxsize)
+{
+    if(!dest || !maxsize)
+        return 0;
+
+    uint8_t *head=data, *tail=data+len;
+    uint8_t stream;
+
+    uint32_t i, length=0;
+    if(!nalSize || nalSize > 4)
+    { // Try to detect NAL length size.
+        nalSize = 4;
+        for(i = 0; i < nalSize; i++)
+        {
+            length = (length << 8) + head[i];
+            if(i && length > len)
+            {
+                nalSize = i;
+                break;
+            }
+        }
+    }
+
+    while(head + nalSize < tail)
+    {
+        length=0;
+        for(i = 0; i < nalSize; i++)
+            length = (length << 8) + head[i];
+        if(length > len)
+        {
+            ADM_warning ("Incomplete NALU, length: %u, available: %u\n", length, len);
+            return 0;
+        }
+        head += nalSize;
+        len = (len>nalSize)? len-nalSize : 0;
+        stream = *head & 0x1F;
+
+        if(stream == NAL_SPS)
+        {
+            if(length>maxsize)
+            {
+                ADM_warning("Buffer too small for SPS: need %u got %u\n",length,maxsize);
+                return 0;
+            }
+            memcpy(dest,head,length);
+            return length;
+        }
+        head += length;
+        len = (len>length)? len-length : 0;
+    }
+
+    return 0;
+}
+
+/**
+    \fn getRawH264SPS_startCode
+    \brief Find the first SPS in AnnexB style buffer and copy it to dest, return SPS length.
+*/
+uint32_t getRawH264SPS_startCode(uint8_t *data, uint32_t len, uint8_t *dest, uint32_t maxsize)
+{
+    if(!dest || !maxsize)
+        return 0;
+
+    uint8_t *head = data;
+    uint8_t *tail = head + len;
+    uint8_t stream = 0;
+    uint32_t hnt = 0xffffffff;
+    int counter = 0, length = 0;
+    bool last = false;
+#define MAX_NALU_TO_CHECK 4
+    while(head + 2 < tail)
+    {
+        if(counter > MAX_NALU_TO_CHECK)
+            return 0;
+
+        hnt = (hnt << 8) + head[0];
+        if((hnt & 0xffffff) != 1)
+        {
+            head++;
+            if(head + 2 < tail)
+                continue;
+            if(!counter) break;
+            last = true;
+        }
+        length = head - data + 2;
+        uint8_t prevNaluType = 0;
+        if(!last)
+        {
+            head++;
+            counter++;
+            if(counter > 1)
+                length = head - data - 3; // likely one zerobyte too much, harmless
+            prevNaluType = *head & 0x1f;
+            if(!length)
+            {
+                data = head;
+                stream = prevNaluType;
+                continue;
+            }
+        }
+        if(stream == NAL_SPS)
+        {
+            if(length>maxsize)
+            {
+                ADM_warning("Buffer too small for SPS: need %d, got %u\n",length,maxsize);
+                return 0;
+            }
+            memcpy(dest,data,length);
+            return length;
+        }
+        data = head++;
+        stream = prevNaluType;
+    }
+#undef MAX_NALU_TO_CHECK
+    return 0;
+}
+
+/**
+    \fn extractSPSInfoFromData
+    \brief Decode raw SPS data
+*/
+bool extractSPSInfoFromData(uint8_t *data, uint32_t length, ADM_SPSInfo *spsinfo)
+{
+    uint32_t myExtraLen=length+8;
+    uint8_t *myExtra=new uint8_t[myExtraLen];
+    memset(myExtra,0,myExtraLen);
+    uint8_t *p=myExtra;
+    // Create fake avcC extradata
+    *p++=1;       // AVC version
+    *p++=data[1]; // Profile
+    *p++=data[2]; // Profile compatibility
+    *p++=data[3]; // Level
+    *p++=0xff;    // Nal size minus 1
+    *p++=0xe1;    // 1x SPS
+    *p++=length>>8;
+    *p++=length&0xFF;
+    memcpy(p,data,length);
+
+    bool r = extractSPSInfo_mp4Header(myExtra,myExtraLen,spsinfo);
+
+    delete [] myExtra;
+    myExtra=NULL;
+
+    return r;
+}
 
 /**
         \fn extractSPSInfo2

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH265.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH265.cpp Changed

@@ -39,11 +39,9 @@
 
 extern "C"
 {
-extern  HEVCSPS *ff_hevc_parser_get_sps(AVCodecParserContext *parser);
-extern  HEVCPPS *ff_hevc_parser_get_pps(AVCodecParserContext *parser);
-extern  HEVCVPS *ff_hevc_parser_get_vps(AVCodecParserContext *parser);
-   
-
+extern const HEVCSPS *ff_hevc_parser_get_sps(AVCodecParserContext *parser);
+extern const HEVCPPS *ff_hevc_parser_get_pps(AVCodecParserContext *parser);
+extern const HEVCVPS *ff_hevc_parser_get_vps(AVCodecParserContext *parser);
 }
 
 #include "../include/ADM_h265_tag.h"
@@ -127,27 +125,10 @@
     parser->flags|=PARSER_FLAG_COMPLETE_FRAMES;
     return true;
 }
+
 /**
- * 
- * @return 
+ *  \fn bitsNeeded
  */
-bool H265Parser::parseMpeg4(ADM_SPSinfoH265 *spsinfo)
-{
-    uint8_t *outptr=NULL;
-    int outsize=0;
-
-    ctx->extradata=myData;
-    ctx->extradata_size=myLen;
-    int used=av_parser_parse2(parser, ctx, &outptr, &outsize, NULL, 0, 0, 0,0);
-    printf("Used bytes %d, total = %d, outsize=%d (+5)\n",used,myLen,outsize);
-    if(!used)
-    {
-        ADM_warning("Failed to extract SPS info\n");
-        return false;
-    }
-    return  true;
-}
-
 static int bitsNeeded(int v)
 {
     int b=1;
@@ -160,6 +141,87 @@
 }
 
 /**
+ *  \fn spsInfoFromParserContext
+ */
+static bool spsInfoFromParserContext(AVCodecParserContext *parser, ADM_SPSinfoH265 *spsinfo)
+{
+    // Ok, let's see if we get a valid sps
+    const HEVCSPS *sps = ff_hevc_parser_get_sps(parser);
+    const HEVCVPS *vps = ff_hevc_parser_get_vps(parser);
+    const HEVCPPS *pps = ff_hevc_parser_get_pps(parser);
+    spsinfo-> num_extra_slice_header_bits=0;
+    spsinfo->output_flag_present_flag=false;
+    if(sps)
+    {
+        const HEVCWindow *ow=&sps->output_window;
+        printf("Coded dimensions = %d x %d\n",sps->width-ow->left_offset-ow->right_offset,sps->height-ow->top_offset-ow->bottom_offset);
+        spsinfo->width=sps->width-ow->left_offset-ow->right_offset;
+        spsinfo->height=sps->height-ow->top_offset-ow->bottom_offset;
+        spsinfo->fps1000=23976;
+        spsinfo->log2_max_poc_lsb=sps->log2_max_poc_lsb;
+        spsinfo->separate_colour_plane_flag=sps->separate_colour_plane_flag;
+        spsinfo->dependent_slice_segments_enabled_flag=0;
+        spsinfo->address_coding_length=bitsNeeded(sps->ctb_width*sps->ctb_height);
+        printf("VPS = %d  x %d ** %d\n",sps->ctb_width,sps->ctb_height, sps->ctb_size);
+        uint32_t timeBaseNum=0;
+        uint32_t timeBaseDen=0;
+        if(vps && vps->vps_timing_info_present_flag)
+        {
+            printf("VPS timescale = %u\n",vps->vps_time_scale);
+            printf("VPS num unit in tick = %u\n",vps->vps_num_units_in_tick);
+            timeBaseNum=vps->vps_num_units_in_tick;
+            timeBaseDen=vps->vps_time_scale;
+        }else if(sps->vui.vui_timing_info_present_flag)
+        {
+            printf("VUI timescale = %u\n",sps->vui.vui_time_scale);
+            printf("VUI num unit in tick = %u\n",sps->vui.vui_num_units_in_tick);
+            timeBaseNum=sps->vui.vui_num_units_in_tick;
+            timeBaseDen=sps->vui.vui_time_scale;
+        }
+        if(!timeBaseNum || !timeBaseDen)
+        {
+            ADM_warning("No framerate information, hardcoding to 50 fps\n");
+            spsinfo->fps1000=50*1000;
+        }else
+        {
+            double f=1000.;
+            f*=timeBaseDen;
+            f/=timeBaseNum;
+            f+=0.49;
+            spsinfo->fps1000=(int)f;
+        }
+        if(pps)
+        {
+            spsinfo-> num_extra_slice_header_bits=pps-> num_extra_slice_header_bits;
+            spsinfo->dependent_slice_segments_enabled_flag=pps->dependent_slice_segments_enabled_flag;
+            spsinfo->output_flag_present_flag=pps->output_flag_present_flag;
+        }
+        if(sps->vui.frame_field_info_present_flag)
+            spsinfo->field_info_present=true;
+        else
+            printf("No field info present\n");
+        return true;
+    }
+    return false;
+}
+
+/**
+ * 
+ * @return 
+ */
+bool H265Parser::parseMpeg4(ADM_SPSinfoH265 *spsinfo)
+{
+    uint8_t *outptr=NULL;
+    int outsize=0;
+
+    ctx->extradata=myData;
+    ctx->extradata_size=myLen;
+    // no use to evaluate the return value, it will be always 0
+    av_parser_parse2(parser, ctx, &outptr, &outsize, NULL, 0, 0, 0,0);
+    return spsInfoFromParserContext(parser,spsinfo);
+}
+
+/**
  * 
  * @return 
  */
@@ -182,7 +244,7 @@
     *p++=0X22;  
 #endif
     ctx->flags |= PARSER_FLAG_COMPLETE_FRAMES;
-    mixDump(myData,myLen);
+    //mixDump(myData,myLen);
     while(toConsume>5)
      {
          ADM_info("Left in buffer %d\n",toConsume);
@@ -200,42 +262,7 @@
          }
          break;
     }
-    // Ok, let's see if we get a valid sps
-   HEVCSPS *sps = ff_hevc_parser_get_sps(parser);
-   HEVCVPS *vps = ff_hevc_parser_get_vps(parser);
-   HEVCPPS *pps = ff_hevc_parser_get_pps(parser);
-   spsinfo-> num_extra_slice_header_bits=0;
-   if(sps)
-   {
-        HEVCWindow *ow=&sps->output_window;
-        printf("Coded dimensions = %d x %d\n",sps->width-ow->left_offset-ow->right_offset,sps->height-ow->top_offset-ow->bottom_offset);
-        spsinfo->width=sps->width-ow->left_offset-ow->right_offset;
-        spsinfo->height=sps->height-ow->top_offset-ow->bottom_offset;
-        spsinfo->fps1000=23976;
-        spsinfo->dependent_slice_segments_enabled_flag=0;
-        spsinfo->address_coding_length=bitsNeeded(sps->ctb_width*sps->ctb_height);
-        printf("VPS = %d  x %d ** %d\n",sps->ctb_width,sps->ctb_height, sps->ctb_size);
-        if(vps)
-        {
-            printf("VPS timescale =%d\n",(int)vps->vps_time_scale);
-            printf("VPS num unit in tick =%d\n",(int)vps->vps_num_units_in_tick);
-            if(vps->vps_time_scale && vps->vps_num_units_in_tick)
-                spsinfo->fps1000=(1000*vps->vps_time_scale)/vps->vps_num_units_in_tick;
-            else
-            {
-                ADM_warning("No framerate information, hardcoding to 50 fps\n");
-                spsinfo->fps1000=50*1000;
-            }
-        }
-        if(pps)
-        {
-            spsinfo-> num_extra_slice_header_bits=pps-> num_extra_slice_header_bits;
-            spsinfo->dependent_slice_segments_enabled_flag=pps->dependent_slice_segments_enabled_flag;
-            
-        }
-        return true;
-   }
-    return false;
+    return spsInfoFromParserContext(parser,spsinfo);
 }
 
 /**
@@ -335,4 +362,322 @@
     }
     return outputSize;
 }
+
+/**
+    \fn nalTypeToString
+*/
+static const char *nalTypeToString(int type)
+{
+    int nb=sizeof(nalDesc)/sizeof(NAL_DESC);
+    for(int i=0; i<nb; i++)
+    {
+        if(nalDesc[i].value == type)
+            return nalDesc[i].name;
+    }
+    return "Unknown";
+}
+
+/**
+    \fn decodeSliceHeaderH265
+*/
+static bool decodeSliceHeaderH265(uint8_t *head, uint8_t *tail, uint32_t *flags, ADM_SPSinfoH265 *info, int *poc)
+{
+    if(head+2>=tail)
+        return false;
+    uint8_t nal=(*head>>1) & 0x3F;
+    head+=2; // skip NALU type, layer ID and temporal ID
+    switch(nal)
+    {
+        case NAL_H265_TRAIL_N:
+        case NAL_H265_TRAIL_R:
+        case NAL_H265_TSA_N:
+        case NAL_H265_TSA_R:
+        case NAL_H265_STSA_N:
+        case NAL_H265_STSA_R:
+        case NAL_H265_BLA_W_LP:
+        case NAL_H265_BLA_W_RADL:
+        case NAL_H265_BLA_N_LP:
+        case NAL_H265_IDR_W_RADL:
+        case NAL_H265_IDR_N_LP:
+        case NAL_H265_CRA_NUT:
+        case NAL_H265_RADL_N:
+        case NAL_H265_RADL_R:
+        case NAL_H265_RASL_N:
+        case NAL_H265_RASL_R:
+            break;
+        default:
+            ADM_warning("Unsupported NAL type %d (%s)\n",nal,nalTypeToString(nal));
+            return false;
+    }
+    uint8_t *out=(uint8_t *)malloc(tail-head+AV_INPUT_BUFFER_PADDING_SIZE);
+    if(!out) return false;
+    memset(out,0,tail-head+AV_INPUT_BUFFER_PADDING_SIZE);
+    int size=ADM_unescapeH264(tail-head,head,out);
+    getBits bits(size,out);
+    int firstSliceInPic=bits.get(1);
+    bool keyframe = (nal >= NAL_H265_BLA_W_LP) && (nal <= NAL_H265_IRAP_VCL23);
+    if(keyframe)
+        bits.get(1); // no_output_of_prior_pics_flag
+    bits.getUEG(); // PPS id
+    if(!firstSliceInPic)
+    {
+        if(info->dependent_slice_segments_enabled_flag && bits.get(1))
+        {
+            ADM_warning("Dependent slice segments not handled.\n");
+            free(out);
+            return false;
+        }
+        bits.get(info->address_coding_length); // slice segment address
+    }
+    for(int i=0; i < info->num_extra_slice_header_bits; i++)
+        bits.skip(1);
+    int sliceType=bits.getUEG();
+    switch(sliceType)
+    {
+        case 0:
+            *flags=AVI_B_FRAME;
+            break;
+        case 1:
+            *flags=AVI_P_FRAME;
+            break;
+        case 2:
+            *flags=AVI_KEY_FRAME; // intra
+            break;
+        default:
+            ADM_warning("Unknown slice type %d\n",sliceType);
+            free(out);
+            return false;
+    }
+    if(*flags!=AVI_KEY_FRAME && keyframe)
+    {
+        ADM_warning("Slice type mismatch, NAL says keyframe, header says %s\n",(*flags==AVI_B_FRAME)? "B" : "P");
+    }
+    if(info->output_flag_present_flag)
+        bits.get(1); // pic_output_flag
+    if(info->separate_colour_plane_flag)
+        bits.get(2); // colour_plane_id
+    if((nal == NAL_H265_IDR_W_RADL) || (nal == NAL_H265_IDR_N_LP))
+    {
+        if(*flags!=AVI_KEY_FRAME)
+        {
+            ADM_warning("Slice type mismatch, NAL says IDR, header says %s\n",(*flags==AVI_B_FRAME)? "B" : "P");
+            free(out);
+            return false;
+        }else
+        {
+            *flags |= AVI_IDR_FRAME;
+        }
+        *poc=0;
+        free(out);
+        return true;
+    }
+    int pocLsb = bits.get(info->log2_max_poc_lsb);
+    const int maxPocLsb = 1 << info->log2_max_poc_lsb;
+
+    int lastPoc = 0;
+    if(*poc > INT_MIN) lastPoc = *poc;
+    int lastPocLsb = lastPoc % maxPocLsb;
+    int lastPocMsb = lastPoc - lastPocLsb;
+    int pocMsb = lastPocMsb;
+
+    if(pocLsb < lastPocLsb && lastPocLsb-pocLsb >= maxPocLsb/2)
+        pocMsb = lastPocMsb + maxPocLsb;
+    else if(pocLsb > lastPocLsb && pocLsb-lastPocLsb > maxPocLsb/2)
+        pocMsb = lastPocMsb - maxPocLsb;
+
+    if(nal == NAL_H265_BLA_W_LP || nal == NAL_H265_BLA_W_RADL || nal == NAL_H265_BLA_N_LP)
+        pocMsb = 0;
+    *poc = pocMsb + pocLsb;
+    free(out);
+    return true;
+}
+
+/**
+ *  \fn extractH265FrameType
+ *  \brief Parse access unit using given NALU length size nalSize (0: autodetect), find a slice and decode the header.
+ *         The caller must set *poc to previous POC if applicable, else to INT_MIN
+ */
+bool extractH265FrameType(uint8_t *buffer, uint32_t len, uint32_t nalSize, ADM_SPSinfoH265 *spsinfo, uint32_t *flags, int *poc)
+{
+    if(!spsinfo || !flags || !poc)
+        return false;
+
+    uint8_t *head = buffer;
+    uint8_t *tail = buffer + len;
+    uint8_t nalType;
+
+    uint32_t i, length = 0;
+    if(!nalSize || nalSize > 4)
+    { // Try to detect number of bytes used to code NAL length. Shaky.
+        nalSize = 4;
+        for(i = 0; i < nalSize; i++)
+        {
+            length = (length << 8) + head[i];
+            if(i && length > len)
+            {
+                nalSize = i;
+                break;
+            }
+        }
+    }
+    *flags = 0;
+
+    while(head + nalSize < tail)
+    {
+        length = 0;
+        for(int i=0; i < nalSize; i++)
+            length = (length << 8) + head[i];
+        if(!length)
+        {
+            ADM_warning("Zero length NAL unit?\n");
+            return false;
+        }
+        if(length > len)
+        {
+            ADM_warning("Incomplete NAL unit: need %u, got %u\n",length,len);
+            return false;
+        }
+        head += nalSize;
+        len = (len > nalSize)? len - nalSize : 0;
+        if(*(head) & 0x80)
+        {
+            ADM_warning("Invalid NAL header, skipping.\n");
+            head += length;
+            len = (len > length)? len - length : 0;
+            continue;
+        }
+        nalType = (*(head)>>1) & 0x3F;
+        switch(nalType)
+        {
+            case NAL_H265_TRAIL_N:
+            case NAL_H265_TRAIL_R:
+            case NAL_H265_TSA_N:
+            case NAL_H265_TSA_R:
+            case NAL_H265_STSA_N:
+            case NAL_H265_STSA_R:
+            case NAL_H265_BLA_W_LP:
+            case NAL_H265_BLA_W_RADL:
+            case NAL_H265_BLA_N_LP:
+            case NAL_H265_IDR_W_RADL:
+            case NAL_H265_IDR_N_LP:
+            case NAL_H265_CRA_NUT:
+            case NAL_H265_RADL_N:
+            case NAL_H265_RADL_R:
+            case NAL_H265_RASL_N:
+            case NAL_H265_RASL_R:
+            {
+#define SLICE_HEADER_SAMPLE_SIZE 32
+                if(length > SLICE_HEADER_SAMPLE_SIZE)
+                    length = SLICE_HEADER_SAMPLE_SIZE;
+                return decodeSliceHeaderH265(head, head+length, flags, spsinfo, poc);
+            }
+            default:
+                ADM_info("Skipping NALU of type %d (%s)\n",nalType,nalTypeToString(nalType));
+                break;
+        }
+        head+=length;
+        len = (len > length)? len - length : 0;
+    }
+    ADM_warning("No picture slice found in the buffer.\n");
+    return false;
+}
+
+/**
+ *  \fn extractH265FrameType_startCode
+ *  \brief Parse access unit in AnnexB type stream, find a slice and decode the header
+ *         The caller must set *poc to previous POC if applicable, else to a negative value
+ */
+bool extractH265FrameType_startCode(uint8_t *buffer, uint32_t len, ADM_SPSinfoH265 *spsinfo, uint32_t *flags, int *poc)
+{
+    if(!spsinfo || !flags || !poc)
+        return false;
+
+    uint8_t *head = buffer, *tail = buffer + len;
+    uint32_t hnt = 0xFFFFFFFF;
+    int nalType = -1, counter = 0, length = 0;
+    bool last = false;
+
+    *flags = 0;
+
+    while(head + 2 < tail)
+    {
+        // Search startcode
+        hnt = (hnt << 8) + head[0];
+        if((hnt & 0xFFFFFF) != 1)
+        {
+            head++;
+            if(head + 2 < tail)
+                continue;
+            if(!counter) break;
+            last = true;
+            length = head - buffer + 2;
+        }
+        int prevNaluType = -1;
+        if(!last)
+        {
+            head++;
+            counter++;
+            if(counter > 1)
+                length = head - buffer - 3; // 3 bytes start code length no matter zero-prefixed or not
+            prevNaluType = (*head>>1) & 0x3F;
+            if(!length)
+            {
+                buffer = head;
+                nalType = prevNaluType;
+                continue;
+            }
+        }
+        switch(nalType)
+        {
+            case NAL_H265_TRAIL_N:
+            case NAL_H265_TRAIL_R:
+            case NAL_H265_TSA_N:
+            case NAL_H265_TSA_R:
+            case NAL_H265_STSA_N:
+            case NAL_H265_STSA_R:
+            case NAL_H265_BLA_W_LP:
+            case NAL_H265_BLA_W_RADL:
+            case NAL_H265_BLA_N_LP:
+            case NAL_H265_IDR_W_RADL:
+            case NAL_H265_IDR_N_LP:
+            case NAL_H265_CRA_NUT:
+            case NAL_H265_RADL_N:
+            case NAL_H265_RADL_R:
+            case NAL_H265_RASL_N:
+            case NAL_H265_RASL_R:
+            {
+                if(length > SLICE_HEADER_SAMPLE_SIZE)
+                    length = SLICE_HEADER_SAMPLE_SIZE;
+                ADM_info("Trying to decode slice header, NALU %d (%s)\n",nalType,nalTypeToString(nalType));
+                return decodeSliceHeaderH265(buffer, buffer+length, flags, spsinfo, poc);
+            }
+            default:
+                ADM_info("Skipping NALU of type %d (%s)\n",nalType,nalTypeToString(nalType));
+                break;
+        }
+        buffer = head;
+        nalType = prevNaluType;
+    }
+    ADM_warning("No picture slice found in the buffer.\n");
+    return false;
+}
+
+/**
+ *  \fn ADM_getNalSizeH265
+ *  \brief extract NALU length size from hvcC header
+ */
+uint32_t ADM_getNalSizeH265(uint8_t *extra, uint32_t len)
+{
+    if(len < 24)
+    {
+        ADM_warning("Invalid HEVC extradata length %u\n",len);
+        return 0;
+    }
+    if(extra[0] != 1)
+    {
+        ADM_warning("Invalid HEVC extradata.\n");
+        return 0;
+    }
+    return (extra[22] & 3) + 1;
+}
 // EOF

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/avidemutils.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreUtils/src/avidemutils.cpp Changed

@@ -28,6 +28,7 @@
 
 #include "ADM_bitmap.h"
 #include "ADM_coreUtils.h"
+#include "prefs.h"
 
 
 uint8_t  mk_hex(uint8_t a, uint8_t b);
@@ -331,6 +332,13 @@
 uint32_t ADM_Fps1000FromUs(uint64_t us)
 {
     if(us<1000) return 1000;
+    // Avoid accumulation of rounding errors for std fps
+#define KNOW(x,y,z) if(us>=x && us<=y) return z;
+    KNOW(16666,16667,60000)
+    KNOW(16683,16684,59940)
+    KNOW(33333,33334,30000)
+    KNOW(33366,33367,29970)
+#undef KNOW
     double f;
     f=us;
     f=1000000./f;
@@ -481,40 +489,91 @@
         return true;
 }
 /**
-    \fn ADM_probeSequencedFile
-*/
-bool ADM_probeSequencedFile(const char *fileName)
+ *  \fn ADM_probeSequencedFile
+ *  \brief Check whether there are several sequentially named files with sizes matching the pattern.
+ *  \param fileName Path to the first file.
+ *  \param[in] fragmentSize Control file size pattern to match
+ *      0: disable probing alltogether
+ *      1: use defaults, either 256*2^n MiB up to 4 GiB or a custom value from preferences
+ *      negative values: skip size check
+ *      else fragment size in MiB to match
+ *  \param[out] fragmentSize Size of the first file in MiB if several files are found, 0 if only one
+ *      do not use when size check was skipped
+ *  \return Number of files or a negative value on error.
+ */
+int ADM_probeSequencedFile(const char *fileName, int *fragmentSize)
 {
+    if(!fragmentSize || !*fragmentSize)
+        return 0;
+
     char *left=NULL;
     char *right=NULL;
     uint32_t nbDigit,base;
-     if(false==ADM_splitSequencedFile(fileName, &left, &right,&nbDigit,&base))
-            return false;
+    if(false==ADM_splitSequencedFile(fileName, &left, &right,&nbDigit,&base))
+    {
+        *fragmentSize=0;
+        return 0;
+    }
+    // can we open the file?
+    int64_t sz=ADM_fileSize(fileName);
+    if(sz<0) // nope
+        return sz;
 
+    bool skipSizeCheck=*fragmentSize<0;
     // check whether the filesize approx. matches 2^n GiB, the usual
     // threshold for automatically split streams
-    bool success=false;
+    uint32_t count=0;
+    int rounds=5;
     uint64_t fileSize,threshold,tolerance;
-    threshold=tolerance=1;
-    threshold<<=28; // we start at 256 MiB, this value is hardcoded in some devices
-    tolerance<<=20; // 1 MiB
-    int64_t sz=ADM_fileSize(fileName);
-    if(sz<0)
-        return false;
-    fileSize=sz;
-    for(int i=0;i<5;i++)
+
+    if(!skipSizeCheck)
     {
-        if(fileSize >= threshold-tolerance && fileSize <= threshold+tolerance)
+        bool useCustomSize;
+        if(false==prefs->get(DEFAULT_MULTILOAD_USE_CUSTOM_SIZE,&useCustomSize))
+            useCustomSize=false;
+        uint32_t customSize;
+        if(false==prefs->get(DEFAULT_MULTILOAD_CUSTOM_SIZE_M,&customSize))
+            customSize=0;
+
+        tolerance=1<<20; // 1 MiB
+        if(*fragmentSize==1) // equivalent to FP_PROBE
         {
-            success=true;
-            break;
+            if(useCustomSize && customSize)
+                *fragmentSize=customSize;
+        }
+        if(*fragmentSize==1) // try out default values
+        {
+            threshold=1<<28; // we start at 256 MiB, this value is hardcoded in some devices
+        }else
+        {
+            threshold=((uint64_t)*fragmentSize)<<20;
+            if(*fragmentSize > 999)
+                tolerance<<=3; // 8 MiB from ~0.98 GiB on
+            rounds=1;
+        }
+        *fragmentSize=0;
+
+        fileSize=sz;
+        for(int i=0;i<rounds;i++)
+        {
+            if(!i && fileSize < threshold-tolerance)
+                return 0;
+            if(fileSize >= threshold-tolerance && fileSize <= threshold+tolerance)
+            {
+                count=1;
+                *fragmentSize=threshold>>20;
+                break;
+            }
+            threshold<<=1;
+            if(i==1)
+                tolerance<<=3; // 8 MiB starting with 1 GiB fragment size
         }
-        threshold<<=1;
-        if(i==1)
-            tolerance<<=3; // 8 MiB starting with 1 GiB fragment size
+        if(!count)
+            return 0;
+    }else
+    {
+        count=1; // the first sequence to check
     }
-    if(!success)
-        return false;
 
     // check if at least one sequence exists...
     std::string aLeft(left);
@@ -529,14 +588,32 @@
     strcat(match,"d");
     match[15]=0;
 
-    
-    char names[16];
-    sprintf(names,match,base+1);
-    std::string middle(names);
-    std::string target=aLeft+middle+aRight;
-    sz=ADM_fileSize(target.c_str());
-    if(sz<0 || sz > threshold+tolerance)
-        return false;
-    return true;
+    while(true)
+    {
+        char names[16];
+        sprintf(names,match,base+count);
+        std::string middle(names);
+        std::string target=aLeft+middle+aRight;
+        sz=ADM_fileSize(target.c_str());
+        if(sz<0) // no such file
+        {
+            count--;
+            break;
+        }
+        if(skipSizeCheck)
+        {
+            count++;
+            continue;
+        }
+        if(sz > threshold+tolerance) // the next set of files, reject it
+        {
+            count--;
+            break;
+        }
+        if(sz < threshold-tolerance) // the last one
+            break;
+        count++;
+    }
+    return count;
 }
 //EOF

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2.conf -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2.conf Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2.h Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_desc.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_desc.cpp Changed

@@ -22,7 +22,6 @@
  {"features.cap_refresh_value",offsetof(my_prefs_struct,features.cap_refresh_value),"uint32_t",ADM_param_uint32_t},
  {"features.sdlDriver",offsetof(my_prefs_struct,features.sdlDriver),"std::string",ADM_param_stdstring},
  {"features.use_last_read_dir_as_target",offsetof(my_prefs_struct,features.use_last_read_dir_as_target),"bool",ADM_param_bool},
- {"features.copy_mode_sanitize_dts",offsetof(my_prefs_struct,features.copy_mode_sanitize_dts),"bool",ADM_param_bool},
  {"keyboard_shortcuts.use_alternate_kbd_shortcuts",offsetof(my_prefs_struct,keyboard_shortcuts.use_alternate_kbd_shortcuts),"bool",ADM_param_bool},
  {"keyboard_shortcuts.swap_up_down_keys",offsetof(my_prefs_struct,keyboard_shortcuts.swap_up_down_keys),"bool",ADM_param_bool},
  {"keyboard_shortcuts.alt_mark_a",offsetof(my_prefs_struct,keyboard_shortcuts.alt_mark_a),"std::string",ADM_param_stdstring},
@@ -58,6 +57,8 @@
  {"Default.downmixing",offsetof(my_prefs_struct,Default.downmixing),"uint32_t",ADM_param_uint32_t},
  {"Default.language",offsetof(my_prefs_struct,Default.language),"std::string",ADM_param_stdstring},
  {"Default.warn_for_fonts",offsetof(my_prefs_struct,Default.warn_for_fonts),"bool",ADM_param_bool},
+ {"Default.multiload_use_custom_size",offsetof(my_prefs_struct,Default.multiload_use_custom_size),"bool",ADM_param_bool},
+ {"Default.multiload_custom_size_m",offsetof(my_prefs_struct,Default.multiload_custom_size_m),"uint32_t",ADM_param_uint32_t},
  {"avisynth.avisynth_always_ask",offsetof(my_prefs_struct,avisynth.avisynth_always_ask),"bool",ADM_param_bool},
  {"avisynth.avisynth_defaultport",offsetof(my_prefs_struct,avisynth.avisynth_defaultport),"uint32_t",ADM_param_uint32_t},
  {"avisynth.avisynth_localport",offsetof(my_prefs_struct,avisynth.avisynth_localport),"uint32_t",ADM_param_uint32_t},

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_json.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_json.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_pref.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_pref.h Changed

@@ -33,7 +33,6 @@
 { FEATURES_CAP_REFRESH_VALUE,"features.cap_refresh_value"             ,ADM_param_uint32_t	,"100",	10,	1000},
 { FEATURES_SDLDRIVER,"features.sdlDriver"                             ,ADM_param_stdstring  	,"",	0,	0},
 { FEATURES_USE_LAST_READ_DIR_AS_TARGET,"features.use_last_read_dir_as_target",ADM_param_bool    	,"0",	0,	1},
-{ FEATURES_COPY_MODE_SANITIZE_DTS,"features.copy_mode_sanitize_dts"   ,ADM_param_bool    	,"0",	0,	1},
 { KEYBOARD_SHORTCUTS_USE_ALTERNATE_KBD_SHORTCUTS,"keyboard_shortcuts.use_alternate_kbd_shortcuts",ADM_param_bool    	,"0",	0,	1},
 { KEYBOARD_SHORTCUTS_SWAP_UP_DOWN_KEYS,"keyboard_shortcuts.swap_up_down_keys",ADM_param_bool    	,"0",	0,	1},
 { KEYBOARD_SHORTCUTS_ALT_MARK_A,"keyboard_shortcuts.alt_mark_a"       ,ADM_param_stdstring  	,"I",	0,	0},
@@ -69,6 +68,8 @@
 { DEFAULT_DOWNMIXING,"Default.downmixing"                             ,ADM_param_uint32_t	,"2",	0,	3},
 { DEFAULT_LANGUAGE,"Default.language"                                 ,ADM_param_stdstring  	,"",	0,	0},
 { DEFAULT_WARN_FOR_FONTS,"Default.warn_for_fonts"                     ,ADM_param_bool    	,"1",	0,	1},
+{ DEFAULT_MULTILOAD_USE_CUSTOM_SIZE,"Default.multiload_use_custom_size",ADM_param_bool    	,"0",	0,	1},
+{ DEFAULT_MULTILOAD_CUSTOM_SIZE_M,"Default.multiload_custom_size_m"   ,ADM_param_uint32_t	,"4000",	250,	8192},
 { AVISYNTH_AVISYNTH_ALWAYS_ASK,"avisynth.avisynth_always_ask"         ,ADM_param_bool    	,"0",	0,	1},
 { AVISYNTH_AVISYNTH_DEFAULTPORT,"avisynth.avisynth_defaultport"       ,ADM_param_uint32_t	,"9999",	1024,	65535},
 { AVISYNTH_AVISYNTH_LOCALPORT,"avisynth.avisynth_localport"           ,ADM_param_uint32_t	,"0",	1024,	65535},

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/ADM_coreLibVA.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/ADM_coreLibVA.h Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_codecEmpty.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_codecEmpty.h Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h Changed

@@ -57,6 +57,7 @@
 
            uint8_t      _allowNull;
            bool         hurryUp;
+           bool         _initCompleted;
            bool         _drain;
            bool         _done;
            bool         _keepFeeding;
@@ -86,6 +87,7 @@
 public:
                         decoderFF (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp);
         virtual         ~ decoderFF ();
+        virtual bool initialized(void);
             bool        setHwDecoder(ADM_acceleratedDecoderFF *h)
                         {
                             if(h)
@@ -170,10 +172,11 @@
 #define WRAP_Open_Template(funcz,argz,display,codecid,extra) \
 {\
 AVCodec *codec=funcz(argz);\
-if(!codec) {GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Codec"),QT_TRANSLATE_NOOP("adm","Internal error finding codec" display));ADM_assert(0);} \
+  if(!codec) {GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Codec"),QT_TRANSLATE_NOOP("adm","Internal error finding codec" display));return;} \
+  if(!_frame) { ADM_error("Could not allocate AVFrame.\n"); return; } \
   codecId=codecid; \
   _context = avcodec_alloc_context3 (codec);\
-  ADM_assert (_context);\
+  if(!_context) { ADM_error("Could not allocate AVCodecContext.\n"); return; } \
   _context->max_b_frames = 0;\
   _context->width = _w;\
   _context->height = _h;\
@@ -201,12 +204,13 @@
                       { \
                                         ADM_info("[lavc] Decoder init: " display" video decoder failed!\n"); \
                                         GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Codec"),QT_TRANSLATE_NOOP("adm","Internal error opening " display)); \
-                                        ADM_assert(0); \
+                                        return; \
                                 } \
                                 else \
                                 { \
                                         ADM_info("[lavc] Decoder init: " display" video decoder initialized! (%s)\n",codec->long_name); \
                                 } \
+  _initCompleted=true; \
 }
 
 #define WRAP_Open(x)            {WRAP_Open_Template(avcodec_find_decoder,x,#x,x,;);}

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_hwAccel.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_hwAccel.h Changed

@@ -23,7 +23,7 @@
 {
 public:
                      ADM_acceleratedDecoderFF(struct AVCodecContext *avctx,decoderFF *p) 
-                     {_context=avctx;_parent=p;};
+                     {_context=avctx;_parent=p;handover=false;}
                      uint32_t admFrameTypeFromLav (AVFrame *pic);
         virtual      ~ADM_acceleratedDecoderFF()
                     {
@@ -33,10 +33,11 @@
         virtual const char      *getName()=0;
         virtual bool uncompress (ADMCompressedImage * in, ADMImage * out)=0;
         virtual bool dontcopy() {return true;} // by default take a ref, dont copy
-        
+                void skipSendFrame(void) {handover=true;}
 protected:
         struct AVCodecContext  *_context;
                 decoderFF       *_parent;
+                bool            handover; // taking over from sw decoder, compressed frame has been already sent to hw decoder
 public:                
   static const AVHWAccel *parseHwAccel(enum AVPixelFormat pix_fmt,AVCodecID id,AVPixelFormat searchedItem);
 };

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp Changed

@@ -25,19 +25,28 @@
 decoderFFSimple::decoderFFSimple (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp)
         : decoderFF(w,h,fcc,extraDataLen,extraData,bpp)
 {
-    const ffVideoCodec *c=getCodecIdFromFourcc(fcc);
     hasBFrame=false;
-    ADM_assert(c);
-    
+    if(!_frame)
+        return;
+    const ffVideoCodec *c=getCodecIdFromFourcc(fcc);
+    if(!c)
+        return;
+
     AVCodecID id=c->codecId;
     AVCodec *codec=avcodec_find_decoder(id);
-    if(!codec) {GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Codec"),QT_TRANSLATE_NOOP("adm","Internal error finding codec 0x%x"),fcc);ADM_assert(0);} 
-    codecId=id; 
-    ADM_assert(id!=AV_CODEC_ID_NONE);
-    
+    if(!codec)
+    {
+        GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Codec"),QT_TRANSLATE_NOOP("adm","Internal error finding codec 0x%x"),fcc);
+        return;
+    }
+    codecId=id;
+    if(id==AV_CODEC_ID_NONE)
+        return;
+
     _context = avcodec_alloc_context3(codec);
-    ADM_assert(_context);
-    
+    if(!_context)
+        return;
+
     if(true==c->extraData)
     {
          _context->extradata = (uint8_t *) _extraDataCopy;
@@ -63,17 +72,16 @@
      _context->get_format=ADM_FFgetFormat; 
      _context->opaque=this;
     //
-    if (avcodec_open2(_context, codec, NULL) < 0)  
-                      { 
-                            printf("[lavc] Decoder init: %x video decoder failed!\n",fcc); 
-                            GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Codec"),QT_TRANSLATE_NOOP("adm","Internal error opening 0x%x"),fcc); 
-                            ADM_assert(0); 
-                    } 
-                    else 
-                    { 
-                            printf("[lavc] Decoder init: %x video decoder initialized! (%s)\n",fcc,codec->long_name); 
-                    } 
-    
+    if (avcodec_open2(_context, codec, NULL) < 0)
+    {
+        printf("[lavc] Decoder init: %x video decoder failed!\n",fcc);
+        GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Codec"),QT_TRANSLATE_NOOP("adm","Internal error opening 0x%x"),fcc);
+        return;
+    }else
+    {
+        printf("[lavc] Decoder init: %x video decoder initialized! (%s)\n",fcc,codec->long_name);
+    }
+    _initCompleted=true;
 }
 /**
     \fn admCreateFFSimple
@@ -84,7 +92,12 @@
     if(!c) return NULL;
     AVCodecID id=c->codecId;
     if(id==AV_CODEC_ID_NONE) return NULL;
-    return new decoderFFSimple(w,h,fcc,extraDataLen,extraData,bpp);
+    decoderFFSimple *ffdec=new decoderFFSimple(w,h,fcc,extraDataLen,extraData,bpp);
+    if(ffdec->initialized())
+        return (decoders *)ffdec;
+    delete ffdec;
+    ffdec=NULL;
+    return NULL;
 }
 /**
     \fn admCoreCodecSupports

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_codecSearch.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_codecSearch.cpp Changed

@@ -46,46 +46,31 @@
 */
 decoders *ADM_coreCodecGetDecoder (uint32_t fcc, uint32_t w, uint32_t h, uint32_t extraLen, uint8_t * extraData,uint32_t bpp)
 {
-  ADM_info("Searching decoder in coreVideoCodec(%d x %d, extradataSize:%d)...\n",w,h,extraLen);
-  if (isMSMpeg4Compatible (fcc) == 1)
-    {
-      return (decoders *) (new decoderFFDiv3 (w,h,fcc,extraLen,extraData,bpp));
-    }
-  if (isDVCompatible(fcc))//"CDVC"))
-    {
-      return (decoders *) (new decoderFFDV (w,h,fcc,extraLen,extraData,bpp));
-    }
-  if (fourCC::check (fcc, (uint8_t *) "HFYU"))
-    {
-      return (decoders *) (new decoderFFhuff (w,h,fcc,extraLen,extraData,bpp));
-    }
-  if (fourCC::check (fcc, (uint8_t *) "PNG "))
-    {
-      return (decoders *) (new decoderFFPng (w,h,fcc,extraLen,extraData,bpp));
-    }
-  if (fourCC::check (fcc, (uint8_t *) "FFVH"))
-    {
-      return (decoders *) (new decoderFF_ffhuff (w,h,fcc,extraLen,extraData,bpp));
-    }
-  if (fourCC::check (fcc, (uint8_t *) "FICV"))
-    {
-      return (decoders *) (new decoderFFficv (w,h,fcc,extraLen,extraData,bpp));
-    }
-
-  if (isH264Compatible (fcc))
+    ADM_info("Searching decoder in coreVideoCodec(%d x %d, extradataSize:%d)...\n",w,h,extraLen);
+    decoderFF *ffdec = NULL;
+    if (isMSMpeg4Compatible (fcc))
+        ffdec = new decoderFFDiv3 (w,h,fcc,extraLen,extraData,bpp);
+    else if (isDVCompatible(fcc))//"CDVC"))
+        ffdec = new decoderFFDV (w,h,fcc,extraLen,extraData,bpp);
+    else if (fourCC::check (fcc, (uint8_t *) "HFYU"))
+        ffdec = new decoderFFhuff (w,h,fcc,extraLen,extraData,bpp);
+    else if (fourCC::check (fcc, (uint8_t *) "PNG "))
+        ffdec = new decoderFFPng (w,h,fcc,extraLen,extraData,bpp);
+    else if (fourCC::check (fcc, (uint8_t *) "FFVH"))
+        ffdec = new decoderFF_ffhuff (w,h,fcc,extraLen,extraData,bpp);
+    else if (fourCC::check (fcc, (uint8_t *) "FICV"))
+        ffdec = new decoderFFficv (w,h,fcc,extraLen,extraData,bpp);
+    else if (isH264Compatible (fcc))
     {
 #if defined(USE_VDPAU) && 0
         if(vdpauUsable()==true)
             return (decoders *) (new decoderFFVDPAU (w,h,fcc,extraLen,extraData,bpp));
         else
 #endif
-            return (decoders *) (new decoderFFH264 (w,h,fcc,extraLen,extraData,bpp));
-    }
-  
-  if (isH265Compatible (fcc))
-    {
-            return (decoders *) (new decoderFFH265 (w,h,fcc,extraLen,extraData,bpp));
+        ffdec = new decoderFFH264 (w,h,fcc,extraLen,extraData,bpp);
     }
+    else if (isH265Compatible (fcc))
+        ffdec = new decoderFFH265 (w,h,fcc,extraLen,extraData,bpp);
 
 /*
 	Could be either divx5 packed crap or xvid or ffmpeg
@@ -93,10 +78,23 @@
 		(ugly hack for ugly hack....)
 */
 
-  if (isMpeg4Compatible (fcc) == 1)
+    else if (isMpeg4Compatible (fcc))
+        ffdec = new decoderFFMpeg4 (w,h,fcc,extraLen,extraData,bpp);
+    else if (isMpeg12Compatible (fcc))
+        ffdec = new decoderFFMpeg12 (w,h,fcc,extraLen,extraData,bpp);
+    else if(isVP9Compatible(fcc))
+        ffdec = new decoderFFVP9 (w,h,fcc,extraLen,extraData,bpp);
+
+    bool ffailed=false;
+    if(ffdec)
     {
-      return (decoders *) (new decoderFFMpeg4 (w,h,fcc,extraLen,extraData,bpp));
+        if(ffdec->initialized())
+            return (decoders *)ffdec;
+        delete ffdec;
+        ffdec=NULL;
+        ffailed=true;
     }
+
   if (fourCC::check (fcc, (uint8_t *) "YV12")
       || fourCC::check (fcc, (uint8_t *) "yv12")
       || fourCC::check (fcc, (uint8_t *) "I420"))
@@ -131,21 +129,16 @@
       return (decoders *) (new decoderRGB16 (w,h,fcc,extraLen,extraData,bpp));  //0
 
     }
-  if (isMpeg12Compatible (fcc))
-	  return (decoders *) (new decoderFFMpeg12 (w,h,fcc,extraLen,extraData,bpp));
-
-  if(isVP9Compatible(fcc))
-  {
-       return (decoders *) (new decoderFFVP9 (w,h,fcc,extraLen,extraData,bpp));
-  }
-    // Search ffsimple
-    decoders *dec=admCreateFFSimple(w,h,fcc,extraLen,extraData,bpp);
-    if(dec)
+    if(!ffailed)
     {
-        printf("using ffSimple\n");
-        return dec;
+        // Search ffsimple
+        decoders *dec=admCreateFFSimple(w,h,fcc,extraLen,extraData,bpp);
+        if(dec)
+        {
+            printf("using ffSimple\n");
+            return dec;
+        }
     }
-
   // default : null decoder
   printf ("\n using invalid codec for ");
   fourCC::print (fcc);

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffVp9.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffVp9.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp Changed

@@ -162,8 +162,8 @@
             :decoders (w, h,fcc,extraDataLen,extraData,bpp)
 {
 	resetConfiguration();
-
   hurryUp=false;
+  _initCompleted=false;
   _drain=false;
   _done=false;
   _keepFeeding=false;
@@ -184,7 +184,7 @@
   _frame=av_frame_alloc();
   if(!_frame)
   {
-      ADM_assert (_frame);
+      return;
   }
 
   printf ("[lavc] Build: %d\n", LIBAVCODEC_BUILD);
@@ -233,6 +233,13 @@
   hwDecoder=NULL;
 }
 /**
+ * \fn initialized
+ */
+bool decoderFF::initialized(void)
+{
+    return _initCompleted;
+}
+/**
  * 
  * @param pic
  * @return 
@@ -348,8 +355,8 @@
                 return false;
             default:
             {
-                char er[2048]={0};
-                av_make_error_string(er, sizeof(er)-1, code);
+                char er[AV_ERROR_MAX_STRING_SIZE]={0};
+                av_make_error_string(er, AV_ERROR_MAX_STRING_SIZE, code);
                 ADM_warning("Error %d in lavcodec (%s)\n",code,er);
                 return false;
             }
@@ -373,7 +380,7 @@
  
   //printf("Frame size : %d\n",in->dataLength);
 
-    if (in->dataLength == 0 && !_allowNull) // Null frame, silently skipped
+    if (!_drain && in->dataLength == 0 && !_allowNull) // Null frame, silently skipped
     {
         printf ("[Codec] null frame\n");
         out->_noPicture = 1;
@@ -405,6 +412,13 @@
             pkt.flags=0;
 
         avcodec_send_packet(_context, &pkt);
+        // HW accel may be setup by now if this has been the very first packet. In this case
+        // ask the hw decoder to collect the decoded picture.
+        if(hwDecoder)
+        {
+            hwDecoder->skipSendFrame();
+            return hwDecoder->uncompress(in,out);
+        }
     }
 
     ret = avcodec_receive_frame(_context, _frame);

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoder.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoder.h Changed

@@ -69,12 +69,14 @@
                uint32_t    getWidth(void) {return source->getInfo()->width;}
                uint32_t    getHeight(void) {return source->getInfo()->height;}
                uint32_t    getFrameIncrement(void) {return source->getInfo()->frameIncrement;}
+               uint32_t    getTimeBaseDen(void) {return source->getInfo()->timeBaseDen;}
+               uint32_t    getTimeBaseNum(void) {return source->getInfo()->timeBaseNum;}
                uint64_t    getTotalDuration(void) {return source->getInfo()->totalDuration;}
 virtual        bool        setPassAndLogFile(int pass,const char *name) {return false;}
 virtual        uint64_t    getEncoderDelay(void){return encoderDelay;}
                uint64_t    lastDts; //
 };
-ADM_COREVIDEOENCODER6_EXPORT bool usSecondsToFrac(uint64_t useconds, int *n,int *d);
+ADM_COREVIDEOENCODER6_EXPORT bool usSecondsToFrac(uint64_t useconds, int *n, int *d, int maxclock=0xFFFF); // mpeg4 allows a maximum of 1<<16-1 as time base
 ADM_COREVIDEOENCODER6_EXPORT bool ADM_pluginGetPath(const std::string& pluginName,int pluginVersion,std::string &rootPath);
 ADM_COREVIDEOENCODER6_EXPORT bool ADM_pluginInstallSystem(const std::string& pluginName,const std::string& ext,int pluginVersion);
 ADM_COREVIDEOENCODER6_EXPORT bool ADM_listFile(const std::string& path,const std::string& extension,vector <std::string > & list);

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderFFmpeg.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderFFmpeg.h Changed

@@ -33,8 +33,9 @@
 {
 protected:
                FFcodecSettings  Settings;
-               AVCodecContext   *_context;      // Context 
-               AVFrame          *_frame;     
+               AVCodecContext   *_context;      // Context
+               AVDictionary     *_options;
+               AVFrame          *_frame;
                ADMColorScalerSimple    *colorSpace;    // Colorspace converter if needed
                ADM_byteBuffer   rgbByteBuffer;     // Buffer for colorspace converter if needed
                ADM_colorspace   targetColorSpace; // Wanted colorspace
@@ -44,7 +45,7 @@
                int              pass;   // Pass number = 1 or 2, valid only if we use 2 pass mode
                bool             _isMT; // True if multithreaded
                bool             _globalHeader;
-               double           timeScaler;
+               int              timeScalerNum,timeScalerDen;
                bool             _hasSettings;
                int64_t          lastLavPts;
                int64_t          lavPtsFromPacket;

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoder.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoder.cpp Changed

@@ -66,8 +66,10 @@
 
 TimeIncrementType fpsTable[]=
 {
-    {  40000,40000,1 ,25},
-    {  20000,20000,1 ,50},
+    {  40000,40000,1000,25000},
+    {  20000,20000,1000,50000},
+    {  16661,16671,1000,60000},
+    {  16678,16688,1001,60000},
     {  33360,33371,1001,30000},
     {  41700,41710,1001,24000},
 };
@@ -76,7 +78,7 @@
     \fn usSecondsToFrac
     \brief Convert a duration in useconds into Rationnal
 */
-bool usSecondsToFrac(uint64_t useconds, int *n,int *d)
+bool usSecondsToFrac(uint64_t useconds, int *n, int *d, int limit)
 {
     // First search for known value...
     int nb=sizeof(fpsTable)/sizeof(TimeIncrementType);
@@ -85,14 +87,21 @@
         TimeIncrementType *t=fpsTable+i;
         if( useconds>=t->mn && useconds<=t->mx)
         {
+            if(t->d>limit)
+            {
+                if(t->d%t->n) break;
+                *n=1;
+                *d=t->d/t->n;
+                return true;
+            }
             *n=t->n;
             *d=t->d;
             return true;
         }
     }
     int nn,dd;
-    av_reduce(&nn,&dd, useconds, 1000000, 0xFFF0); // mpeg4 allows a maximum of 1<<16-1 as time base, should be enough for most case
-    ADM_info("%" PRIu64" us -> %d / %d (old)\n",useconds,nn,dd);
+    av_reduce(&nn,&dd, useconds, 1000000, limit);
+    ADM_info("%" PRIu64" us -> %d / %d (max: %d)\n",useconds,nn,dd,limit);
     *n=nn;
     *d=dd;
 
@@ -172,7 +181,7 @@
 */
 bool ADM_pluginGetPath(const std::string& pluginName,int pluginVersion,std::string &rootPath)
 {
-    std::string path=std::string(ADM_getUserPluginSettingsDir());
+    std::string path=ADM_getUserPluginSettingsDir();
     std::string version;
     std::stringstream out;
     out << pluginVersion;

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoderFFmpeg.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoderFFmpeg.cpp Changed

@@ -27,6 +27,7 @@
 void *av_malloc(size_t size) ;
 }
 //#define TIME_TENTH_MILLISEC
+#define USE_REAL_TIME_BASE
 #if 1
     #define aprintf(...) {}
 #else
@@ -51,7 +52,7 @@
         memcpy(&Settings,set,sizeof(*set));
         _hasSettings=true;
     }
-
+    _options=NULL;
     targetColorSpace=ADM_COLOR_YV12;
     w=getWidth();
     h=getHeight();
@@ -68,6 +69,8 @@
     statFile=NULL;
     _globalHeader=globalHeader;
     _isMT=false;
+    timeScalerNum=0;
+    timeScalerDen=0;
 
     uint64_t inc=source->getInfo()->frameIncrement;
     if(inc<30000) // Less than 30 ms , fps > 30 fps it is probably field
@@ -101,7 +104,11 @@
         av_free (_context);
         _context = NULL;
     }
-    
+    if (_options)
+    {
+        av_dict_free(&_options);
+        _options=NULL;
+    }
     if (_frame)
     {
         av_frame_free(&_frame);
@@ -163,23 +170,29 @@
 int64_t          ADM_coreVideoEncoderFFmpeg::timingToLav(uint64_t val)
 {
     double q=(double)val;
-    q+=timeScaler/(double)2.;
-    q/=timeScaler;
-    
+    q/=1000.;
+    q*=timeScalerDen;
+    q/=timeScalerNum;
+    q/=1000.;
+    q+=0.49;
     int64_t v=floor(q);
-#if 0      
-  printf("Lav in=%d, scale=%lf,",(int)val,timeScaler);
-  printf(" q=%lf,out PTS=%lld\n",q,v);
+#if 0
+    printf("Lav in=%llu, scale=%d/%d,",val,timeScalerNum,timeScalerDen);
+    printf(" q=%lf,out PTS=%lld\n",q,v);
 #endif
-  return v;
+    return v;
 }
 /**
     \fn lavToTiming
 */
 uint64_t         ADM_coreVideoEncoderFFmpeg::lavToTiming(int64_t val)
 {
-    float v=(float)val;
-    return floor(v*timeScaler);
+    double v=val;
+    v*=timeScalerNum;
+    v/=timeScalerDen;
+    v*=1000.*1000.;
+    v+=0.49;
+    return floor(v);
 }
 
 /**
@@ -283,32 +296,44 @@
     return true;
 }
 
+static int printLavError(int er)
+{
+    if(er>=0)
+        return 0;
+    char msg[AV_ERROR_MAX_STRING_SIZE]={0};
+    av_make_error_string(msg, AV_ERROR_MAX_STRING_SIZE, er);
+    ADM_warning("Error %d encoding video (%s)\n",er,msg);
+    return er;
+}
+
 /**
  * \fn encodeWrapper
  */
-int              ADM_coreVideoEncoderFFmpeg::encodeWrapper(AVFrame *in,ADMBitstream *out)
+int ADM_coreVideoEncoderFFmpeg::encodeWrapper(AVFrame *in,ADMBitstream *out)
 {
-    int r,gotData;
-        AVPacket pkt;
-        av_init_packet(&pkt);
-        pkt.data=out->data;
-        pkt.size=out->bufferSize;
+    int r=avcodec_send_frame(_context,in);
+    if(r<0)
+        return printLavError(r);
 
+    AVPacket pkt;
+    av_init_packet(&pkt);
 
-        r= avcodec_encode_video2 (_context,&pkt,in, &gotData);
-        if(r<0)
-        {
-            ADM_warning("Error %d encoding video  \n",r);
-            return r;
-        }
-        if(!gotData)
-        {
-            ADM_warning("Encoder produced no data\n");
-            pkt.size=0;
-        }
-        lavPtsFromPacket=pkt.pts; // some encoders don't set pts in coded_frame
-        packetFlags=pkt.flags;
-        return pkt.size;            
+    r=avcodec_receive_packet(_context,&pkt);
+    if(r==AVERROR(EAGAIN))
+    {
+        ADM_info("Encoder needs more input to produce data.\n");
+        return 0;
+    }
+    if(r<0)
+        return printLavError(r);
+
+    ADM_assert(out->bufferSize>=pkt.size);
+    memcpy(out->data,pkt.data,pkt.size);
+    lavPtsFromPacket=pkt.pts; // some encoders don't set pts in coded_frame
+    packetFlags=pkt.flags;
+    r=pkt.size;
+    av_packet_unref(&pkt);
+    return r;
 }
 /**
  * 
@@ -329,18 +354,29 @@
                 ADM_info("Codec configured to use global header\n");
                 _context->flags|=AV_CODEC_FLAG_GLOBAL_HEADER;
     }
-   prolog(image);
-    uint64_t inc=source->getInfo()->frameIncrement;
-#ifdef TIME_TENTH_MILLISEC
+    prolog(image);
+
+    FilterInfo *info=source->getInfo();
+#if defined(TIME_TENTH_MILLISEC)
     _context->time_base.num=1;
     _context->time_base.den=10000LL;
+#elif defined(USE_REAL_TIME_BASE)
+    int n = timeScalerNum = info->timeBaseNum & 0x7FFFFFFF;
+    int d = timeScalerDen = info->timeBaseDen & 0x7FFFFFFF;
+    ADM_assert(timeScalerNum);
+    ADM_assert(timeScalerDen);
+    if(codec->id == AV_CODEC_ID_MPEG4)
+        av_reduce(&n,&d,timeScalerNum,timeScalerDen,0xFFFF);
+    _context->time_base.num=n;
+    _context->time_base.den=d;
 #else
     int n,d;
-    usSecondsToFrac(inc,&n,&d);
+    usSecondsToFrac(info->frameIncrement,&n,&d);
     _context->time_base.num=n;
     _context->time_base.den=d;
 #endif
-    timeScaler=1000000.*av_q2d(_context->time_base);
+    timeScalerNum=_context->time_base.num;
+    timeScalerDen=_context->time_base.den;
    printf("[ff] Time base %d/%d\n", _context->time_base.num,_context->time_base.den);
    if(_hasSettings && LAVS(MultiThreaded))
     {
@@ -351,7 +387,10 @@
      return false;
    }
    ADM_info("Opening context\n");
-   res=avcodec_open2(_context, codec, NULL);
+   if(_options)
+        res=avcodec_open2(_context, codec, &_options);
+   else
+        res=avcodec_open2(_context, codec, NULL);
    if(res<0)
     {   ADM_info("[ff] Opening context failed\n");
         return false;
@@ -359,7 +398,6 @@
 
     // Now allocate colorspace
     int w,h;
-    FilterInfo *info=source->getInfo();
     w=info->width;
     h=info->height;
     if(targetColorSpace!=ADM_COLOR_YV12)
@@ -585,13 +623,18 @@
       //SETX(_HQ);
       //SETX (_NORMALIZE_AQP);
 
-      if (set->lavcSettings.widescreen)
-        {
-          _context->sample_aspect_ratio.num = 16;
-          _context->sample_aspect_ratio.den = 9;
-          printf ("[LAVCODEC]16/9 aspect ratio is set.\n");
-
-        }
+    if(set->lavcSettings.widescreen)
+    {
+        float f=getHeight();
+        f*=16.;
+        f/=9.;
+        f+=0.49;
+        int num=1,den=1;
+        av_reduce(&num, &den, (uint32_t)f, getWidth(), 65535);
+        _context->sample_aspect_ratio.num = num;
+        _context->sample_aspect_ratio.den = den;
+        printf("[LAVCODEC] 16/9 display aspect ratio is set, pixel aspect = %d:%d\n",num,den);
+    }
 #undef SETX
   _context->bit_rate_tolerance = 8000000;
   _context->b_quant_factor = 1.25;
@@ -614,17 +657,6 @@
   _context->idct_algo = 0;
   _context->p_masking = 0.0;
 
-  // Set frame rate den/num
-  uint64_t inc=source->getInfo()->frameIncrement;
-#ifdef TIME_TENTH_MILLISEC
-  _context->time_base.num=1;
-  _context->time_base.den=10000LL;
-#else
-  int n,d;
-  usSecondsToFrac(inc,&n,&d);
-  _context->time_base.num=n;
-  _context->time_base.den=d;
-#endif
   prolog(image);
   return true;
 }

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilter.h -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilter.h Changed

avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoFilter/src/ADM_videoFilterBridge.cpp -> avidemux_2.7.6.tar.gz/avidemux_core/ADM_coreVideoFilter/src/ADM_videoFilterBridge.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_core/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux_core/CMakeLists.txt Changed

@@ -12,6 +12,7 @@
 SET(AVIDEMUX_CORE_BUILD_DIR ${CMAKE_BINARY_DIR})
 SET(AVIDEMUX_THIS_IS_CORE True)
 SET(CMAKE_MODULE_PATH "${AVIDEMUX_TOP_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
+SET(CMAKE_MODULE_PATH "${AVIDEMUX_TOP_SOURCE_DIR}/cmake/cmake_win32_rc" "${CMAKE_MODULE_PATH}")
 SET(ADM_PROJECT admCore)
 
 IF (WIN32)
@@ -31,6 +32,7 @@
 INCLUDE(admCheckVDPAU)
 INCLUDE(admCheckLibVA)
 INCLUDE(admCheckVideoToolbox)
+INCLUDE(admCheckSqlLite)
 
 #########################################
 # Debug Summary
@@ -52,12 +54,8 @@
 MESSAGE(STATUS "Checking for sqlite")
 MESSAGE(STATUS "*******************")
 
-IF (UNIX)
-	SET(SQLITE_REQUIRED_FLAGS "-ldl")
-ENDIF (UNIX)
-
-FIND_HEADER_AND_LIB(SQLITE sqlite3.h sqlite3 sqlite3_close ${SQLITE_REQUIRED_FLAGS})
-PRINT_LIBRARY_INFO("SQLite" SQLITE_FOUND "${SQLITE_INCLUDE_DIR}" "${SQLITE_LIBRARY_DIR}" FATAL_ERROR)
+checkSqlite3()
+PRINT_LIBRARY_INFO("SQLite" SQLITE3_FOUND "${SQLITE3_INCLUDEDIR}" "${SQLITE3_LINK_LIBRARIES}" FATAL_ERROR)
 MESSAGE("")
 
 ############################################"
@@ -161,10 +159,11 @@
     ADM_INSTALL_INCLUDE_FOLDER("${CMAKE_CURRENT_SOURCE_DIR}/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVideoToolbox/include/" ADM_coreVideoToolbox)
 ENDIF(USE_VIDEOTOOLBOX)
 
-SET(CMAKE_TOP_SOURCE_DIR "${CMAKE_SOURCE_DIR}/../cmake/")
+SET(CMAKE_TOP_SOURCE_DIR "${CMAKE_SOURCE_DIR}/../cmake")
 
-ADM_INSTALL_CMAKE_FOLDER("${CMAKE_TOP_SOURCE_DIR}/" cmake)     
-ADM_INSTALL_CMAKE_HELPER_FOLDER("${CMAKE_SOURCE_DIR}/../cmake/cmake_compile_check/" cmake_compile_check)     
+ADM_INSTALL_CMAKE_FOLDER("${CMAKE_TOP_SOURCE_DIR}/" cmake)
+ADM_INSTALL_CMAKE_HELPER_FOLDER("${CMAKE_TOP_SOURCE_DIR}/cmake_compile_check/" cmake_compile_check)
+ADM_INSTALL_CMAKE_HELPER_FOLDER("${CMAKE_TOP_SOURCE_DIR}/cmake_win32_rc/" cmake_win32_rc)
 # 
 
 INSTALL(FILES ${CMAKE_BINARY_DIR}/config/ADM_coreConfig.h DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}" COMPONENT dev)

avidemux_2.7.6.tar.gz/avidemux_core/ffmpeg_package/ffmpeg-4.2.3.tar.bz2 Added

avidemux_2.7.6.tar.gz/avidemux_core/ffmpeg_package/patches/attic/libavutil_lfg.c.patch Changed

avidemux_2.7.6.tar.gz/avidemux_core/ffmpeg_package/patches/attic/libavutil_lfg.h.patch Changed

avidemux_2.7.6.tar.gz/avidemux_core/ffmpeg_package/patches/attic/libavutil_lfg2.c.patch Changed

avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_avcodec.h.patch -> avidemux_2.7.6.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_avcodec.h.patch Changed

avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_h264_parser.c.patch -> avidemux_2.7.6.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_h264_parser.c.patch Changed

@@ -1,6 +1,6 @@
---- libavcodec/h264_parser.c.orig	2019-04-01 13:16:31.000000000 +0200
-+++ libavcodec/h264_parser.c	2019-07-15 23:20:28.365062563 +0200
-@@ -64,6 +64,112 @@
+--- libavcodec/h264_parser.c.orig	2019-10-20 09:07:02.000000000 +0200
++++ libavcodec/h264_parser.c	2019-10-20 09:15:43.000000000 +0200
+@@ -64,6 +64,106 @@
      int last_frame_num, last_picture_structure;
  } H264ParseContext;
  
@@ -91,19 +91,13 @@
 +//#warning fixme sar vs dar
 +    info->darNum=sps->sar.num;
 +    info->darDen=sps->sar.den;
-+/* */
-+    printf("Crop L: %d\n",(int)sps->crop_left);
-+    printf("Crop R: %d\n",(int)sps->crop_right);
-+    printf("Crop T: %d\n",(int)sps->crop_top);
-+    printf("Crop B: %d\n",(int)sps->crop_bottom);
-+    if(sps->crop_bottom)
++    if(sps->crop_left || sps->crop_right || sps->crop_top || sps->crop_bottom)
 +    {
-+         int mul=1;
-+         printf("Taking crop bottom into account\n");
-+         if(sps->frame_mbs_only_flag)
-+              mul=1;
-+         info->height-=sps->crop_bottom*mul;
-+
++        printf("Taking crop into account, left: %u, right: %u, top: %u, bottom: %u\n",
++            sps->crop_left, sps->crop_right, sps->crop_top, sps->crop_bottom);
++        // frame_cropping_flag and frame_mbs_only_flag have been taken into account by libavcodec already
++        info->width  -= sps->crop_left + sps->crop_right;
++        info->height -= sps->crop_top  + sps->crop_bottom;
 +    }
 +    info->refFrames=sps->ref_frame_count;
 +    return 1;

avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_hevc_parser.c.patch -> avidemux_2.7.6.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_hevc_parser.c.patch Changed

@@ -1,68 +1,171 @@
---- libavcodec/hevc_parser.c.orig	2017-10-15 17:59:37.000000000 +0200
-+++ libavcodec/hevc_parser.c	2017-10-20 20:05:01.724505874 +0200
+--- libavcodec/hevc_parser.c.orig	2019-12-31 22:35:23.000000000 +0100
++++ libavcodec/hevc_parser.c	2020-04-16 23:51:04.726124182 +0200
 @@ -31,6 +31,13 @@
  #include "internal.h"
  #include "parser.h"
  
 +/* MEANX */
-+HEVCSPS *ff_hevc_parser_get_sps(AVCodecParserContext *s);
-+HEVCPPS *ff_hevc_parser_get_pps(AVCodecParserContext *s);
-+HEVCVPS *ff_hevc_parser_get_vps(AVCodecParserContext *s);
++const HEVCSPS *ff_hevc_parser_get_sps(AVCodecParserContext *s);
++const HEVCPPS *ff_hevc_parser_get_pps(AVCodecParserContext *s);
++const HEVCVPS *ff_hevc_parser_get_vps(AVCodecParserContext *s);
 +/* /MEANX */
 +
 +
  #define START_CODE 0x000001 ///< start_code_prefix_one_3bytes
  
  #define IS_IRAP_NAL(nal) (nal->type >= 16 && nal->type <= 23)
-@@ -171,6 +178,53 @@
+@@ -171,6 +178,156 @@
  }
  
  /**
 + \fn ff_hevc_parser_get_sps
 +\brief meanx : extract sps from context
 +*/
-+HEVCSPS *ff_hevc_parser_get_sps(AVCodecParserContext *s)
++const HEVCSPS *ff_hevc_parser_get_sps(AVCodecParserContext *s)
 +{
-+      HEVCParserContext *ctx = s->priv_data;
-+      if(!ctx) return NULL;
-+      HEVCParamSets     *ps = &ctx->ps;
-+      if(!ps) return NULL;
++    HEVCParserContext *ctx;
++    HEVCParamSets *ps;
++    const HEVCPPS *pps;
++    const HEVCSPS *sps;
++    AVBufferRef *ref;
++    unsigned int i, sps_id;
 +
-+     HEVCSPS *sps = ps->sps;
-+     return sps;
++    ctx = s->priv_data;
++    if (!ctx)
++        return NULL;
++
++    ps = &ctx->ps;
++    if (!ps)
++        return NULL;
++
++    // Do we have an active SPS?
++    if (ps->sps)
++        return ps->sps;
++
++    // Nope, probably no slice header decoded yet. Pick the first PPS from the list and keep fingers crossed.
++    for (i = 0; i < HEVC_MAX_PPS_COUNT; i++)
++    {
++        ref = ps->pps_list[i];
++        if (!ref || !ref->data)
++            continue;
++        break;
++    }
++
++    if (!ref || !ref->data)
++        return NULL;
++
++    // From now on, follow the chain.
++    pps = (HEVCPPS *)ref->data;
++    sps_id = pps->sps_id;
++    if (sps_id >= HEVC_MAX_SPS_COUNT)
++        return NULL;
++
++    ref = ps->sps_list[sps_id];
++    if (!ref || !ref->data)
++        return NULL;
++
++    sps = (HEVCSPS *)ref->data;
++    return sps;
 +}
 +/**
-+ \fn ff_hevc_parser_get_sps
-+\brief meanx : extract sps from context
++ \fn ff_hevc_parser_get_pps
++\brief meanx : extract pps from context
 +*/
-+HEVCPPS *ff_hevc_parser_get_pps(AVCodecParserContext *s)
++const HEVCPPS *ff_hevc_parser_get_pps(AVCodecParserContext *s)
 +{
-+      HEVCParserContext *ctx = s->priv_data;
-+      if(!ctx) return NULL;
-+      HEVCParamSets     *ps = &ctx->ps;
-+      if(!ps) return NULL;
++    HEVCParserContext *ctx;
++    HEVCParamSets *ps;
++    const HEVCPPS *pps;
++    AVBufferRef *ref;
++    unsigned int i;
++
++    ctx = s->priv_data;
++    if (!ctx)
++        return NULL;
++
++    ps = &ctx->ps;
++    if (!ps)
++        return NULL;
++
++    // Do we have an active PPS?
++    if (ps->pps)
++        return ps->pps;
++
++    // Nope, pick the first one from the list.
++    for (i = 0; i < HEVC_MAX_PPS_COUNT; i++)
++    {
++        ref = ps->pps_list[i];
++        if (!ref || !ref->data)
++            continue;
++        break;
++    }
++
++    if (!ref || !ref->data)
++        return NULL;
 +
-+     HEVCPPS *pps = ps->pps;
-+     return pps;
++    pps = (HEVCPPS *)ref->data;
++    return pps;
 +}
 +/**
-+ \fn ff_hevc_parser_get_sps
-+\brief meanx : extract sps from context
++ \fn ff_hevc_parser_get_vps
++\brief meanx : extract vps from context
 +*/
-+HEVCVPS *ff_hevc_parser_get_vps(AVCodecParserContext *s)
++const HEVCVPS *ff_hevc_parser_get_vps(AVCodecParserContext *s)
 +{
-+      HEVCParserContext *ctx = s->priv_data;
-+      if(!ctx) return NULL;
-+      HEVCParamSets     *ps = &ctx->ps;
-+      if(!ps) return NULL;
++    HEVCParserContext *ctx;
++    HEVCParamSets *ps;
++    const HEVCPPS *pps;
++    const HEVCSPS *sps;
++    const HEVCVPS *vps;
++    AVBufferRef *ref;
++    unsigned int i, sps_id, vps_id;
 +
-+     HEVCVPS *vps = ps->vps;
-+     return vps;
-+}
-+// /MEANX
++    ctx = s->priv_data;
++    if (!ctx)
++        return NULL;
 +
-+/**
++    ps = &ctx->ps;
++    if (!ps)
++        return NULL;
++
++    // Do we have a VPS set as active?
++    if (ps->vps)
++        return ps->vps;
++
++    // Nope, take the first PPS from the list and follow the chain.
++    for (i = 0; i < HEVC_MAX_PPS_COUNT; i++)
++    {
++        ref = ps->pps_list[i];
++        if (!ref || !ref->data)
++            continue;
++        break;
++    }
 +
++    if (!ref || !ref->data)
++        return NULL;
++
++    pps = (HEVCPPS *)ref->data;
++    sps_id = pps->sps_id;
++    if (sps_id >= HEVC_MAX_SPS_COUNT)
++        return NULL;
++
++    ref = ps->sps_list[sps_id];
++    if (!ref || !ref->data)
++        return NULL;
++
++    sps = (HEVCSPS *)ref->data;
++    vps_id = sps->vps_id;
++    if (vps_id >= HEVC_MAX_VPS_COUNT)
++        return NULL;
++
++    ref = ps->vps_list[vps_id];
++    if (!ref || !ref->data)
++        return NULL;
++
++    vps = (HEVCVPS *)ref->data;
++    return vps;
++}
++// /MEANX
 +
 +/**
   * Parse NAL units of found picture and decode some basic information.

avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_internal_h_msvc.patch -> avidemux_2.7.6.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_internal_h_msvc.patch Changed

avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_mpeg12enc.c.patch -> avidemux_2.7.6.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_mpeg12enc.c.patch Changed

@@ -1,6 +1,6 @@
---- libavcodec/mpeg12enc.c.org	2016-03-29 04:25:18.000000000 +0200
-+++ libavcodec/mpeg12enc.c	2016-09-15 07:10:15.734644778 +0200
-@@ -254,7 +254,7 @@
+--- libavcodec/mpeg12enc.c.orig	2019-08-05 22:52:21.000000000 +0200
++++ libavcodec/mpeg12enc.c	2019-09-08 19:21:09.578572070 +0200
+@@ -256,7 +256,7 @@
  
          put_sbits(&s->pb, 12, s->width  & 0xFFF);
          put_sbits(&s->pb, 12, s->height & 0xFFF);
@@ -9,7 +9,7 @@
          for (i = 1; i < 15; i++) {
              int64_t error = aspect_ratio.num * (1LL<<32) / aspect_ratio.den;
              if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO || i <= 1)
-@@ -269,12 +269,41 @@
+@@ -271,12 +271,41 @@
                  s->aspect_ratio_info = i;
              }
          }
@@ -56,7 +56,7 @@
              if (v > 0x3ffff && s->codec_id == AV_CODEC_ID_MPEG1VIDEO)
                  v = 0x3ffff;
          } else {
-@@ -324,7 +353,19 @@
+@@ -326,7 +355,19 @@
              put_bits(&s->pb, 3, s->avctx->profile); // profile
              put_bits(&s->pb, 4, s->avctx->level);   // level
  
@@ -77,7 +77,7 @@
              put_bits(&s->pb, 2, s->chroma_format);
              put_bits(&s->pb, 2, s->width  >> 12);
              put_bits(&s->pb, 2, s->height >> 12);
-@@ -421,6 +462,7 @@
+@@ -423,6 +464,7 @@
  
  void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number)
  {
@@ -85,7 +85,7 @@
      AVFrameSideData *side_data;
      mpeg1_encode_sequence_header(s);
  
-@@ -459,6 +501,46 @@
+@@ -461,6 +503,46 @@
  
      s->frame_pred_frame_dct = 1;
      if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
@@ -132,7 +132,7 @@
          put_header(s, EXT_START_CODE);
          put_bits(&s->pb, 4, 8);                 /* pic ext */
          if (s->pict_type == AV_PICTURE_TYPE_P ||
-@@ -478,10 +560,14 @@
+@@ -480,10 +562,14 @@
  
          av_assert0(s->picture_structure == PICT_FRAME);
          put_bits(&s->pb, 2, s->picture_structure);
@@ -147,7 +147,7 @@
          /* XXX: optimize the generation of this flag with entropy measures */
          s->frame_pred_frame_dct = s->progressive_sequence;
  
-@@ -490,7 +576,8 @@
+@@ -492,7 +578,8 @@
          put_bits(&s->pb, 1, s->q_scale_type);
          put_bits(&s->pb, 1, s->intra_vlc_format);
          put_bits(&s->pb, 1, s->alternate_scan);

avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_nvenc.c.patch -> avidemux_2.7.6.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_nvenc.c.patch Changed

avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_nvenc.patch -> avidemux_2.7.6.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_nvenc.patch Changed

@@ -1,6 +1,6 @@
---- libavcodec/nvenc.c.orig	2018-06-04 23:45:49.502010074 +0200
-+++ libavcodec/nvenc.c	2018-06-05 00:00:09.216196437 +0200
-@@ -40,12 +40,12 @@
+--- libavcodec/nvenc.c.orig	2019-09-08 19:21:09.585572028 +0200
++++ libavcodec/nvenc.c	2019-09-08 19:21:09.590571998 +0200
+@@ -43,12 +43,12 @@
      AV_PIX_FMT_YUV420P,
      AV_PIX_FMT_NV12,
      AV_PIX_FMT_P010,
@@ -19,7 +19,7 @@
  #if CONFIG_D3D11VA
      AV_PIX_FMT_D3D11,
  #endif
-@@ -1255,12 +1255,13 @@
+@@ -1243,12 +1243,13 @@
  {
      switch (pix_fmt) {
      case AV_PIX_FMT_YUV420P:
@@ -34,7 +34,7 @@
      case AV_PIX_FMT_YUV444P:
          return NV_ENC_BUFFER_FORMAT_YUV444_PL;
      case AV_PIX_FMT_YUV444P16:
-@@ -1269,6 +1270,7 @@
+@@ -1257,6 +1258,7 @@
          return NV_ENC_BUFFER_FORMAT_ARGB;
      case AV_PIX_FMT_0BGR32:
          return NV_ENC_BUFFER_FORMAT_ABGR;
@@ -42,7 +42,7 @@
      default:
          return NV_ENC_BUFFER_FORMAT_UNDEFINED;
      }
-@@ -1534,10 +1536,33 @@
+@@ -1522,10 +1524,33 @@
      av_fifo_generic_read(ctx->unused_surface_queue, &tmp_surf, sizeof(tmp_surf), NULL);
      return tmp_surf;
  }
@@ -76,7 +76,7 @@
      int dst_linesize[4] = {
          lock_buffer_params->pitch,
          lock_buffer_params->pitch,
-@@ -1563,6 +1588,34 @@
+@@ -1551,6 +1576,34 @@
                    avctx->width, avctx->height);
  
      return 0;

avidemux_2.7.6.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_file.c.patch Added

@@ -0,0 +1,46 @@
+--- libavformat/file.c.orig	2019-08-05 22:52:21.000000000 +0200
++++ libavformat/file.c	2019-11-16 14:26:36.197435906 +0100
+@@ -134,11 +134,13 @@
+     return c->fd;
+ }
+ 
++#define REMOVE_PROTO(x) if(av_strstart(x, "file:", &x)) av_strstart(x, "//", &x); // eum.
++
+ static int file_check(URLContext *h, int mask)
+ {
+     int ret = 0;
+     const char *filename = h->filename;
+-    av_strstart(filename, "file:", &filename);
++    REMOVE_PROTO(filename)
+ 
+     {
+ #if HAVE_ACCESS && defined(R_OK)
+@@ -172,7 +174,7 @@
+ #if HAVE_UNISTD_H
+     int ret;
+     const char *filename = h->filename;
+-    av_strstart(filename, "file:", &filename);
++    REMOVE_PROTO(filename)
+ 
+     ret = rmdir(filename);
+     if (ret < 0 && (errno == ENOTDIR
+@@ -194,8 +196,8 @@
+ {
+     const char *filename_src = h_src->filename;
+     const char *filename_dst = h_dst->filename;
+-    av_strstart(filename_src, "file:", &filename_src);
+-    av_strstart(filename_dst, "file:", &filename_dst);
++    REMOVE_PROTO(filename_src)
++    REMOVE_PROTO(filename_dst)
+ 
+     if (rename(filename_src, filename_dst) < 0)
+         return AVERROR(errno);
+@@ -212,7 +214,7 @@
+     int fd;
+     struct stat st;
+ 
+-    av_strstart(filename, "file:", &filename);
++    REMOVE_PROTO(filename)
+ 
+     if (flags & AVIO_FLAG_WRITE && flags & AVIO_FLAG_READ) {
+         access = O_CREAT | O_RDWR;

avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_isom.c.patch -> avidemux_2.7.6.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_isom.c.patch Changed

@@ -1,18 +1,16 @@
---- libavformat/isom.c.orig	2017-10-15 17:59:38.000000000 +0200
-+++ libavformat/isom.c	2017-10-20 21:57:43.612220521 +0200
-@@ -331,8 +331,13 @@
+--- libavformat/isom.c.orig	2019-09-08 19:21:09.594571974 +0200
++++ libavformat/isom.c	2019-09-08 19:28:06.017050197 +0200
+@@ -336,8 +336,11 @@
      { AV_CODEC_ID_MACE3,           MKTAG('M', 'A', 'C', '3') },
      { AV_CODEC_ID_MACE6,           MKTAG('M', 'A', 'C', '6') },
      { AV_CODEC_ID_MP1,             MKTAG('.', 'm', 'p', '1') },
 -    { AV_CODEC_ID_MP2,             MKTAG('.', 'm', 'p', '2') },
 -    { AV_CODEC_ID_MP3,             MKTAG('.', 'm', 'p', '3') },
-+
-+// MEANX     { AV_CODEC_ID_MP2,             MKTAG('.', 'm', 'p', '2') },
-+// MEANX     { AV_CODEC_ID_MP3,             MKTAG('.', 'm', 'p', '3') },
-+ { AV_CODEC_ID_MP2,             MKTAG( 'm', 'p', '4','a') },
-+ { AV_CODEC_ID_MP3,             MKTAG( 'm', 'p', '4','a') },
-+
++// MEANX    { AV_CODEC_ID_MP2,             MKTAG('.', 'm', 'p', '2') },
++// MEANX    { AV_CODEC_ID_MP3,             MKTAG('.', 'm', 'p', '3') },
++    { AV_CODEC_ID_MP2,             MKTAG('m', 'p', '4', 'a') },
++    { AV_CODEC_ID_MP3,             MKTAG('m', 'p', '4', 'a') },
 +// /MEANX
+     { AV_CODEC_ID_MP3,             MKTAG('m', 'p', '3', ' ') }, /* vlc */
      { AV_CODEC_ID_MP3,             0x6D730055                },
      { AV_CODEC_ID_NELLYMOSER,      MKTAG('n', 'm', 'o', 's') }, /* Flash Media Server */
-     { AV_CODEC_ID_NELLYMOSER,      MKTAG('N', 'E', 'L', 'L') }, /* Perian */

avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc.c.patch -> avidemux_2.7.6.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc.c.patch Changed

@@ -1,6 +1,6 @@
---- libavformat/matroskaenc.c.orig	2019-07-08 19:45:30.000000000 +0200
-+++ libavformat/matroskaenc.c	2019-07-25 00:44:53.173020711 +0200
-@@ -636,6 +636,8 @@
+--- libavformat/matroskaenc.c.orig	2019-08-05 22:52:21.000000000 +0200
++++ libavformat/matroskaenc.c	2019-09-08 19:48:09.874774972 +0200
+@@ -627,6 +627,8 @@
  
  static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par)
  {
@@ -9,7 +9,7 @@
      const uint8_t *header_start[3];
      int header_len[3];
      int first_header_size;
-@@ -660,6 +662,29 @@
+@@ -651,6 +653,29 @@
          avio_write(pb, header_start[j], header_len[j]);
  
      return 0;
@@ -39,7 +39,7 @@
  }
  
  static int put_wv_codecpriv(AVIOContext *pb, AVCodecParameters *par)
-@@ -1222,7 +1247,25 @@
+@@ -1213,7 +1238,25 @@
      put_ebml_uint (pb, MATROSKA_ID_TRACKUID,
                     mkv->is_dash ? mkv->dash_track_number : i + 1);
      put_ebml_uint (pb, MATROSKA_ID_TRACKFLAGLACING , 0);    // no lacing (yet)

avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc_vp9.c.patch -> avidemux_2.7.6.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc_vp9.c.patch Changed

avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_mpegenc.c.patch -> avidemux_2.7.6.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_mpegenc.c.patch Changed

avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_mpegtsenc.c.patch -> avidemux_2.7.6.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_mpegtsenc.c.patch Changed

avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/libavutil_file_open.c.patch -> avidemux_2.7.6.tar.gz/avidemux_core/ffmpeg_package/patches/libavutil_file_open.c.patch Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_audioDevices/Win32/ADM_deviceWin32.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_audioDevices/Win32/ADM_deviceWin32.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_audioEncoders/fdk-aac/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_audioEncoders/fdk-aac/CMakeLists.txt Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp Changed

@@ -240,9 +240,10 @@
     SET_PARAM(AACENC_BITRATE,_config.bitrate*1000)
     SET_PARAM(AACENC_SAMPLERATE,(wavheader.frequency))    
     SET_PARAM(AACENC_AFTERBURNER,_config.afterburner);
-    SET_PARAM(AACENC_CHANNELMODE,mode)            
+    SET_PARAM(AACENC_CHANNELMODE,mode)
+#ifdef LOW_DELAY_EXPLICIT_SBR
     SET_PARAM(AACENC_SBR_MODE,_config.sbr)            
-    
+#endif
     //
     // make a dry run of the encoder so that we have extradata
     //
@@ -270,9 +271,12 @@
      _extraSize=pInfo.confSize;
      _extraData=new uint8_t[1+_extraSize];
      memcpy(_extraData,pInfo.confBuf,_extraSize);
+     _extraData[_extraSize]=0;
 
     // update
     wavheader.byterate=(_config.bitrate*1000)/8;
+    if(_config.profile!=AOT_AAC_LC)
+        wavheader.encoding=WAV_AAC_HE;
 
     // How many samples do we need to output one AAC packet ?
     _chunk=pInfo.frameLength*wavheader.channels;
@@ -425,26 +429,23 @@
 #define PROFILE(x,y) {y,QT_TRANSLATE_NOOP("FDK-AAC",x)}    
      diaMenuEntry profileM[]={
          PROFILE("LC",AOT_AAC_LC),
-         PROFILE("HE-AAC",AOT_AAC_LC),
-         PROFILE("HE-AACv2",AOT_AAC_LC),
+         PROFILE("HE-AAC",AOT_SBR),
+         PROFILE("HE-AACv2",AOT_PS)
      };
-    uint32_t prof=0;
-#if 0
-    diaElemMenu profile(&prof,   QT_TRANSLATE_NOOP("FDK-AAC","_Profile::"), SZT(profileM),profileM);
-    diaElemMenu bitrate(&(config.bitrate),   QT_TRANSLATE_NOOP("FDK-AAC","_Bitrate:"), SZT(bitrateM),bitrateM);
-  
-    diaElemToggle sbr(&(config.sbr),QT_TRANSLATE_NOOP("FDK-AAC","SBR enabled"));
-    diaElemToggle afterburner(&(config.afterburner),QT_TRANSLATE_NOOP("FDK-AAC","After burner"));
 
+    diaElemMenu profile(&(config.profile), QT_TRANSLATE_NOOP("FDK-AAC","_Profile:"), SZT(profileM),profileM);
+    diaElemMenu bitrate(&(config.bitrate), QT_TRANSLATE_NOOP("FDK-AAC","_Bitrate:"), SZT(bitrateM),bitrateM);
+#ifdef LOW_DELAY_EXPLICIT_SBR
+    diaElemToggle sbr(&(config.sbr),QT_TRANSLATE_NOOP("FDK-AAC","SBR enabled"));
+#endif
+    diaElemToggle afterburner(&(config.afterburner),QT_TRANSLATE_NOOP("FDK-AAC","Afterburner"));
+#ifdef LOW_DELAY_EXPLICIT_SBR
     diaElem *elems[]={&profile,&bitrate,&sbr,&afterburner};
-    
-    if ( diaFactoryRun(QT_TRANSLATE_NOOP("FDK-AAC","FDK-AAC Configuration"),4,elems))
+    if(diaFactoryRun(QT_TRANSLATE_NOOP("FDK-AAC","FDK-AAC Configuration"),4,elems))
 #else
-     diaElemMenu bitrate(&(config.bitrate),   QT_TRANSLATE_NOOP("FDK-AAC","_Bitrate:"), SZT(bitrateM),bitrateM);
-     diaElemToggle afterburner(&(config.afterburner),QT_TRANSLATE_NOOP("FDK-AAC","After burner"));
-     diaElem *elems[]={&bitrate,&afterburner};
-     if ( diaFactoryRun(QT_TRANSLATE_NOOP("FDK-AAC","FDK-AAC Configuration"),2,elems))
-#endif        
+    diaElem *elems[]={&profile,&bitrate,&afterburner};
+    if(diaFactoryRun(QT_TRANSLATE_NOOP("FDK-AAC","FDK-AAC Configuration"),3,elems))
+#endif
     {
         if(*setup) delete *setup;
         *setup=NULL;

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp Changed

@@ -107,7 +107,7 @@
     if(_handle)
         opus_encoder_destroy(_handle);
     _handle=NULL;
-    printf("[Opus] Deleting faac\n");
+    printf("[Opus] Deleting encoder\n");
 
 };
 
@@ -172,6 +172,29 @@
     wavheader.blockalign=1;
     wavheader.bitspersample=0;
     wavheader.encoding=WAV_OPUS;
+    // create header
+    int initialPadding=0;
+    if(OPUS_OK != opus_encoder_ctl(_handle,OPUS_GET_LOOKAHEAD(&initialPadding)))
+        ADM_warning("[Opus] Cannot get number of lookahead samples.\n");
+    _extraSize=19; // max 2 channels
+    _extraData=new uint8_t[_extraSize];
+    uint8_t *p=_extraData;
+    memset(p,0,_extraSize);
+    const char *head="OpusHead";
+    memcpy(p,head,8);
+    p+=8;
+#define PUT_BYTE(v) *p=v&0xFF; p++;
+    PUT_BYTE(1) // version
+    PUT_BYTE(channels)
+
+    uint16_t padding=(uint32_t)initialPadding&0xFFFF;
+    PUT_BYTE(padding)
+    PUT_BYTE(padding>>8)
+    PUT_BYTE(wavheader.frequency)
+    PUT_BYTE(wavheader.frequency>>8)
+    PUT_BYTE(wavheader.frequency>>16)
+    PUT_BYTE(wavheader.frequency>>24)
+
     return true;
 }
 #define SIZE_INTERNAL 64*1024

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_autoScrips/720p.py -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_autoScrips/720p.py Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_autoScrips/PSP.py -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_autoScrips/PSP.py Changed

@@ -43,12 +43,12 @@
 dlgWizard.addControl(mnuSourceRatio);
 res=dlgWizard.show()
 if res!=1:
-    exit()
+    return
 source.ar=mnuSourceRatio.index
 dest.ar=1
 resizer=source.compute_resize(source,dest,finalSizeWidth,finalSizeHeight,ADM_imageInfo.aspectRatio)
 if(resizer is None):
-    exit()
+    return
 print("Resize to "+str(resizer.width)+"x"+str(resizer.height))
 source.apply_resize(resizer)
 ############################
@@ -62,22 +62,19 @@
 ##################################
 #  Video
 ##################################
-adm.videoCodec("x264", "general.params=CBR=500", "general.threads=99", "general.fast_first_pass=True", "level=30", "vui.sar_height=1", "vui.sar_width=1",
-"MaxRefFrames=2", "MinIdr=0", "MaxIdr=250", "i_scenecut_threshold=40", "intra_refresh=False", "MaxBFrame=2", "i_bframe_adaptive=0",
-"i_bframe_bias=0", "i_bframe_pyramid=0", "b_deblocking_filter=False", "i_deblocking_filter_alphac0=0", "i_deblocking_filter_beta=0", "cabac=True",
-"interlaced=False", "constrained_intra=False", "tff=True", "fake_interlaced=False", "analyze.b_8x8=False", "analyze.b_i4x4=True", "analyze.b_i8x8=False", "analyze.b_p8x8=True", "analyze.b_p16x16=False",
-"analyze.b_b16x16=False", "analyze.weighted_pred=2", "analyze.weighted_bipred=True", "analyze.direct_mv_pred=3",
-"analyze.chroma_offset=0", "analyze.me_method=0", "analyze.me_range=16", "analyze.mv_range=-1", "analyze.mv_range_thread=-1", "analyze.subpel_refine=7", "analyze.chroma_me=True", "analyze.mixed_references=True",
-"analyze.trellis=1", "analyze.psy_rd=1.000000", "analyze.psy_trellis=0.000000", "analyze.fast_pskip=True", "analyze.dct_decimate=True",
-"analyze.noise_reduction=0", "analyze.psy=True", "analyze.intra_luma=11", "analyze.inter_luma=21", "ratecontrol.rc_method=0",
-"ratecontrol.qp_constant=0", "ratecontrol.qp_min=0", "ratecontrol.qp_max=32", "ratecontrol.qp_step=4", "ratecontrol.bitrate=0", "ratecontrol.rate_tolerance=1.000000", "ratecontrol.vbv_max_bitrate=0",
-"ratecontrol.vbv_buffer_size=0", "ratecontrol.vbv_buffer_init=0", "ratecontrol.ip_factor=1.000000", "ratecontrol.pb_factor=1.000000", "ratecontrol.aq_mode=1",
-"ratecontrol.aq_strength=1.000000", "ratecontrol.mb_tree=True", "ratecontrol.lookahead=40")
+adm.videoCodec("x264", "useAdvancedConfiguration=True", "general.params=CBR=500", "general.threads=99", "general.preset=", "general.tuning=", "general.profile=", "general.fast_decode=False", "general.zero_latency=False"
+, "general.fast_first_pass=True", "general.blueray_compatibility=False", "general.fake_interlaced=False", "level=30", "vui.sar_height=1", "vui.sar_width=1", "MaxRefFrames=2", "MinIdr=0", "MaxIdr=250", "i_scenecut_threshold=40"
+, "intra_refresh=False", "MaxBFrame=2", "i_bframe_adaptive=0", "i_bframe_bias=0", "i_bframe_pyramid=0", "b_deblocking_filter=False", "i_deblocking_filter_alphac0=0", "i_deblocking_filter_beta=0", "cabac=True", "interlaced=False"
+, "constrained_intra=False", "tff=True", "fake_interlaced=False", "analyze.b_8x8=True", "analyze.b_i4x4=True", "analyze.b_i8x8=False", "analyze.b_p8x8=True", "analyze.b_p16x16=False", "analyze.b_b16x16=False"
+, "analyze.weighted_pred=2", "analyze.weighted_bipred=True", "analyze.direct_mv_pred=3", "analyze.chroma_offset=0", "analyze.me_method=0", "analyze.me_range=16", "analyze.mv_range=-1", "analyze.mv_range_thread=-1"
+, "analyze.subpel_refine=7", "analyze.chroma_me=True", "analyze.mixed_references=True", "analyze.trellis=1", "analyze.psy_rd=1.000000", "analyze.psy_trellis=0.000000", "analyze.fast_pskip=True", "analyze.dct_decimate=True"
+, "analyze.noise_reduction=0", "analyze.psy=True", "analyze.intra_luma=11", "analyze.inter_luma=21", "ratecontrol.rc_method=0", "ratecontrol.qp_constant=0", "ratecontrol.qp_min=0", "ratecontrol.qp_max=32"
+, "ratecontrol.qp_step=4", "ratecontrol.bitrate=0", "ratecontrol.rate_tolerance=1.000000", "ratecontrol.vbv_max_bitrate=0", "ratecontrol.vbv_buffer_size=0", "ratecontrol.vbv_buffer_init=0", "ratecontrol.ip_factor=1.000000"
+, "ratecontrol.pb_factor=1.000000", "ratecontrol.aq_mode=1", "ratecontrol.aq_strength=1.000000", "ratecontrol.mb_tree=True", "ratecontrol.lookahead=40")
 
 ###################################
 # Container = MP4
 ###################################
 #
 #
-adm.setContainer("MP4", "muxerType=1", "useAlternateMp3Tag=True", "forceAspectRatio=False", "aspectRatio=1")
-    
+adm.setContainer("MP4", "muxerType=1", "optimize=1", "forceAspectRatio=False", "aspectRatio=1", "rotation=0", "clockfreq=0")

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_autoScrips/check24fps.py -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_autoScrips/check24fps.py Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_autoScrips/dvd.py -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_autoScrips/dvd.py Changed

@@ -53,12 +53,12 @@
 dlgWizard.addControl(mnuDestRatio);
 res=dlgWizard.show()
 if res!=1:
-    exit()
+    return
 source.ar=mnuSourceRatio.index
 dest.ar=mnuDestRatio.index+1
 resizer=source.compute_resize(source,dest,finalSizeWidth,finalSizeHeight,ADM_imageInfo.aspectRatio)
 if(resizer is None):
-    exit()
+    return
 print("Resize to "+str(resizer.width)+"x"+str(resizer.height))
 source.apply_resize(resizer)
 ############################
@@ -68,23 +68,23 @@
 print("We have "+str(tracks)+ " audio tracks.")
 if tracks==0:
      gui.displayError("Audio","No audio tracks!")
-     exit()
+     return
 for i in range(0,tracks):
-  print("Processing track "+str(i))
-  encoding=adm.audioEncoding(i)
-  fq=adm.audioFrequency(i)
-  channels=adm.audioChannels(i)
-  reencode=False
-  # 1 check frequency
-  if(fq != 48000):
-      adm.audioSetResample(i,48000)
-      reencode=True
-  if(not(encoding in supported)):
-      reencode=True
-  if(True==reencode):
-      if(channels!=2):
-          adm.audioSetMixer(i,"STEREO")
-      adm.audioCodec(i,"LavAC3","bitrate=224")
+    print("Processing track "+str(i))
+    encoding=adm.audioEncoding(i)
+    fq=adm.audioFrequency(i)
+    channels=adm.audioChannels(i)
+    reencode=False
+    # 1 check frequency
+    if(fq != 48000):
+        adm.audioSetResample(i,48000)
+        reencode=True
+    if(not(encoding in supported)):
+        reencode=True
+    if(True==reencode):
+        if(channels!=2):
+            adm.audioSetMixer(i,"STEREO")
+        adm.audioCodec(i,"LavAC3","bitrate=224")
 ##################################
 #  Video
 ##################################
@@ -92,9 +92,8 @@
 if(resizer.ar==ADM_image.AR_16_9):
     ff_ar="widescreen=True"
 #
-adm.videoCodec("ffMpeg2","params=CQ=2","lavcSettings=:version=2:MultiThreaded=2:me_method=5:_GMC=False:_4MV=False:_QPEL=False:_TRELLIS_QUANT=True:qmin=2:qmax=31:max_qdiff=3:max_b_frames=2:mpeg_quant=1:is_luma_elim_threshold=1:luma_elim_threshold=4294967294:is_chroma_elim_threshold=1:chroma_elim_threshold=4294967291:lumi_masking=0.050000:is_lumi_masking=1:dark_masking=0.010000:is_dark_masking=1:qcompress=0.500000:qblur=0.500000:"+"minBitrate=0:maxBitrate=9500:user_matrix=1:gop_size=18:interlaced=False:bff=False:"+str(ff_ar)+":"+"mb_eval=2:vratetol=8000:is_temporal_cplx_masking=False:temporal_cplx_masking=0.000000:is_spatial_cplx_masking=False:spatial_cplx_masking=0.000000:_NORMALIZE_AQP=False:use_xvid_ratecontrol=False:bufferSize=224:override_ratecontrol=False:dummy=0","matrix=0")
+adm.videoCodec("ffMpeg2","params=CQ=2","lavcSettings=:version=2:MultiThreaded=2:_4MV=False:_QPEL=False:_TRELLIS_QUANT=True:qmin=2:qmax=31:max_qdiff=3:max_b_frames=2:mpeg_quant=1:is_luma_elim_threshold=1:luma_elim_threshold=4294967294:is_chroma_elim_threshold=1:chroma_elim_threshold=4294967291:lumi_masking=0.050000:is_lumi_masking=1:dark_masking=0.010000:is_dark_masking=1:qcompress=0.500000:qblur=0.500000:"+"minBitrate=0:maxBitrate=9500:user_matrix=1:gop_size=18:interlaced=False:bff=False:"+str(ff_ar)+":"+"mb_eval=2:vratetol=8000:is_temporal_cplx_masking=False:temporal_cplx_masking=0.000000:is_spatial_cplx_masking=False:spatial_cplx_masking=0.000000:_NORMALIZE_AQP=False:use_xvid_ratecontrol=False:bufferSize=224:override_ratecontrol=False:dummy=0","matrix=0")
 ###################################
 # Container = Mpeg PS/DVD
 ###################################
 adm.setContainer("ffPS","muxingType=2","acceptNonCompliant=False","muxRatekBits=11000","videoRatekBits=9800","bufferSizekBytes=224")
-

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_autoScrips/svcd.py -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_autoScrips/svcd.py Changed

@@ -50,12 +50,12 @@
 dlgWizard.addControl(mnuDestRatio);
 res=dlgWizard.show()
 if res!=1:
-    exit()
+    return
 source.ar=mnuSourceRatio.index
 dest.ar=mnuDestRatio.index+1
 resizer=source.compute_resize(source,dest,finalSizeWidth,finalSizeHeight,ADM_imageInfo.aspectRatio)
 if(resizer is None):
-    exit()
+    return
 print("Resize to "+str(resizer.width)+"x"+str(resizer.height))
 # Correct so that result is 2/3 D1 i.e. 480xxxx
 newW=resizer.width
@@ -71,23 +71,23 @@
 print("We have "+str(tracks)+ " audio tracks.")
 if tracks==0:
      gui.displayError("Audio","No audio tracks!")
-     exit()
+     return
 for i in range(0,tracks):
-  encoding=adm.audioEncoding(i)
-  fq=adm.audioFrequency(i)
-  channels=adm.audioChannels(i)
-  reencode=False
-  # 1 check frequency
-  if(fq != 44100):
-      adm.audioSetResample(i,44100)
-      reencode=True
-  if(not(encoding in supported)):
-      reencode=True
-  if(channels!=2):
-      adm.audioSetMixer(i,"STEREO")
-      reencode=True
-  if(True==reencode):
-      adm.audioCodec(i,"TwoLame","bitrate=224")
+    encoding=adm.audioEncoding(i)
+    fq=adm.audioFrequency(i)
+    channels=adm.audioChannels(i)
+    reencode=False
+    # 1 check frequency
+    if(fq != 44100):
+        adm.audioSetResample(i,44100)
+        reencode=True
+    if(not(encoding in supported)):
+        reencode=True
+    if(channels!=2):
+        adm.audioSetMixer(i,"STEREO")
+        reencode=True
+    if(True==reencode):
+        adm.audioCodec(i,"TwoLame","bitrate=224")
 ##################################
 #  Video
 ##################################
@@ -95,7 +95,7 @@
 if(resizer.ar==ADM_image.AR_16_9):
     ff_ar="widescreen=True"
 #
-adm.videoCodec("ffMpeg2","params=CQ=4","lavcSettings=:version=2:MultiThreaded=2:me_method=5:_GMC=False:_4MV=False:_QPEL=False:_TRELLIS_QUANT=True:qmin=2:qmax=31:max_qdiff=3:max_b_frames=2:mpeg_quant=1:is_luma_elim_threshold=1:luma_elim_threshold=4294967294:is_chroma_elim_threshold=1:chroma_elim_threshold=4294967291:lumi_masking=0.050000:is_lumi_masking=1:dark_masking=0.010000:is_dark_masking=1:qcompress=0.500000:qblur=0.500000:minBitrate=0:maxBitrate=2400:user_matrix=1:gop_size=18:interlaced=False:bff=False:"+str(ff_ar)+":mb_eval=2:vratetol=8000:is_temporal_cplx_masking=False:temporal_cplx_masking=0.000000:is_spatial_cplx_masking=False:spatial_cplx_masking=0.000000:_NORMALIZE_AQP=False:use_xvid_ratecontrol=False:bufferSize=112:override_ratecontrol=False:dummy=0","matrix=1")
+adm.videoCodec("ffMpeg2","params=CQ=4","lavcSettings=:version=2:MultiThreaded=2:_4MV=False:_QPEL=False:_TRELLIS_QUANT=True:qmin=2:qmax=31:max_qdiff=3:max_b_frames=2:mpeg_quant=1:is_luma_elim_threshold=1:luma_elim_threshold=4294967294:is_chroma_elim_threshold=1:chroma_elim_threshold=4294967291:lumi_masking=0.050000:is_lumi_masking=1:dark_masking=0.010000:is_dark_masking=1:qcompress=0.500000:qblur=0.500000:minBitrate=0:maxBitrate=2400:user_matrix=1:gop_size=18:interlaced=False:bff=False:"+str(ff_ar)+":mb_eval=2:vratetol=8000:is_temporal_cplx_masking=False:temporal_cplx_masking=0.000000:is_spatial_cplx_masking=False:spatial_cplx_masking=0.000000:_NORMALIZE_AQP=False:use_xvid_ratecontrol=False:bufferSize=112:override_ratecontrol=False:dummy=0","matrix=1")
 
 ###################################
 # Container = Mpeg PS/DVD

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_autoScrips/vcd.py -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_autoScrips/vcd.py Changed

@@ -50,12 +50,12 @@
 dlgWizard.addControl(mnuDestRatio);
 res=dlgWizard.show()
 if res!=1:
-    exit()
+    return
 source.ar=mnuSourceRatio.index
 dest.ar=mnuDestRatio.index+1
 resizer=source.compute_resize(source,dest,finalSizeWidth,finalSizeHeight,ADM_imageInfo.aspectRatio)
 if(resizer is None):
-    exit()
+    return
 print("Resize to "+str(resizer.width)+"x"+str(resizer.height))
 source.apply_resize(resizer)
 ############################
@@ -64,8 +64,8 @@
 tracks=adm.audioTracksCount()
 print("We have "+str(tracks)+ " audio tracks.")
 if(tracks!=1):
-  gui.displayError("Error","Please have only one audio track for VCD!")
-  exit()
+    gui.displayError("Error","Please have only one audio track for VCD!")
+    return
 encoding=adm.audioEncoding(0)
 fq=adm.audioFrequency(0)
 channels=adm.audioChannels(0)
@@ -88,7 +88,7 @@
 if(resizer.ar==ADM_image.AR_16_9):
     ff_ar="widescreen=True"
 #
-adm.videoCodec("ffMpeg2","params=CQ=2","lavcSettings=:version=2:MultiThreaded=2:me_method=5:_GMC=False:_4MV=False:_QPEL=False:_TRELLIS_QUANT=True:qmin=2:qmax=31:max_qdiff=3:max_b_frames=2:mpeg_quant=1:is_luma_elim_threshold=1:luma_elim_threshold=4294967294:is_chroma_elim_threshold=1:chroma_elim_threshold=4294967291:lumi_masking=0.050000:is_lumi_masking=1:dark_masking=0.010000:is_dark_masking=1:qcompress=0.500000:qblur=0.500000:"+"minBitrate=0:maxBitrate=9500:user_matrix=1:gop_size=18:interlaced=False:bff=False:"+str(ff_ar)+":"+"mb_eval=2:vratetol=8000:is_temporal_cplx_masking=False:temporal_cplx_masking=0.000000:is_spatial_cplx_masking=False:spatial_cplx_masking=0.000000:_NORMALIZE_AQP=False:use_xvid_ratecontrol=False:bufferSize=224:override_ratecontrol=False:dummy=False","matrix=0")
+adm.videoCodec("ffMpeg2","params=CQ=2","lavcSettings=:version=2:MultiThreaded=2:_4MV=False:_QPEL=False:_TRELLIS_QUANT=True:qmin=2:qmax=31:max_qdiff=3:max_b_frames=2:mpeg_quant=1:is_luma_elim_threshold=1:luma_elim_threshold=4294967294:is_chroma_elim_threshold=1:chroma_elim_threshold=4294967291:lumi_masking=0.050000:is_lumi_masking=1:dark_masking=0.010000:is_dark_masking=1:qcompress=0.500000:qblur=0.500000:"+"minBitrate=0:maxBitrate=9500:user_matrix=1:gop_size=18:interlaced=False:bff=False:"+str(ff_ar)+":"+"mb_eval=2:vratetol=8000:is_temporal_cplx_masking=False:temporal_cplx_masking=0.000000:is_spatial_cplx_masking=False:spatial_cplx_masking=0.000000:_NORMALIZE_AQP=False:use_xvid_ratecontrol=False:bufferSize=224:override_ratecontrol=False:dummy=False","matrix=0")
 ###################################
 # Container = Mpeg PS/DVD
 ###################################

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp Changed

@@ -20,11 +20,12 @@
 #include "ADM_default.h"
 #include "fourcc.h"
 #include "DIA_coreToolkit.h"
-#include "ADM_videoInfoExtractor.h"
 #include "ADM_aacinfo.h"
 #include "ADM_flv.h"
 
 #include <math.h>
+#include <algorithm>
+#include <vector>
 #if 0
     #define aprintf printf
 #else
@@ -36,7 +37,36 @@
 // Borrowed from lavformt/flv.h
 uint32_t ADM_UsecFromFps1000(uint32_t fps1000);
 
-
+#ifdef USE_BUFFERED_IO
+uint8_t flvHeader::Skip(uint32_t len)
+{
+    return parser->forward(len);
+}
+uint8_t flvHeader::read(uint32_t len, uint8_t *where)
+{
+    if(len==parser->read32(len,where))
+        return 1;
+    return 0;
+}
+uint8_t flvHeader::read8(void)
+{
+    return parser->read8i();
+}
+uint32_t flvHeader::read16(void)
+{
+    uint32_t r=parser->read16i();
+    return r;
+}
+uint32_t flvHeader::read24(void)
+{
+    uint32_t r=parser->read16i();
+    return (r<<8)+(uint32_t)parser->read8i();
+}
+uint32_t flvHeader::read32(void)
+{
+    return parser->read32i();
+}
+#else
 /**
     \fn Skip
     \brief Skip some bytes from the file
@@ -95,6 +125,7 @@
     aprintf("uint32_t =%d ",(r[0]<<24)+(r[1]<<16)+(r[2]<<8)+r[3]);
     return (r[0]<<24)+(r[1]<<16)+(r[2]<<8)+r[3];
 }
+#endif
 /**
     \fn     readFlvString
     \brief  read pascal like string
@@ -122,6 +153,32 @@
     return (char *)stringz;
 }
 
+static bool timeBaseFromFps1000(uint32_t v, uint32_t *num, uint32_t *den)
+{
+    if(!v || !num || !den)
+        return false;
+    switch(v)
+    {
+        case 23976:
+            *num=1001;
+            *den=24000;
+            break;
+        case 29970:
+            *num=1001;
+            *den=30000;
+            break;
+        case 59940:
+            *num=1001;
+            *den=60000;
+            break;
+        default:
+            *num=1000;
+            *den=v;
+            break;
+    }
+    return true;
+}
+
 /**
     \fn setProperties
     \brief get a couple key/value and use it if needed...
@@ -130,7 +187,16 @@
 {
     if(!strcmp(name,"framerate"))
     {
-        _videostream.dwRate=(uint32_t)(value*1000);
+        value*=1000.;
+        value+=0.49;
+        uint32_t v=(uint32_t)value;
+        uint32_t num,den;
+        if(timeBaseFromFps1000(v,&num,&den))
+        {
+            _videostream.dwScale=num;
+            _videostream.dwRate=den;
+            _mainaviheader.dwMicroSecPerFrame=0; // conformance with constant fps will be probed later
+        }
         return;
     }
     if(!strcmp(name,"width"))
@@ -157,12 +223,123 @@
 */
 bool flvHeader::parseOneMeta(const char *stri,uint64_t endPos,bool &end)
 {
-            static int nesting=0;
-            nesting++;
-            int type=read8();
-            Nest();
-            
-            printf("\n>> type :%d ",type);
+    static int nesting=0;
+    nesting++;
+    int type=read8();
+    Nest();
+    printf("\n>> type :%d ",type);
+#ifdef USE_BUFFERED_IO
+    uint64_t pos=0;
+    parser->getpos(&pos);
+    aprintf("nesting = %d, at %d, : ,end=%d",nesting,pos,endPos);
+    switch(type)
+    {
+        case AMF_DATA_TYPE_NULL:
+            parser->setpos(endPos);
+            break;
+        case AMF_DATA_TYPE_OBJECT_END:
+            Nest(); printf("** Object end**.\n");
+            parser->getpos(&pos);
+            if(pos>=endPos-4)
+                parser->setpos(endPos);
+            end=true;
+            nesting--;
+            break;
+        case AMF_DATA_TYPE_OBJECT:
+        {
+            printf("\n");
+            bool myEnd=false;
+            parser->getpos(&pos);
+            while(pos<endPos-4 && myEnd==false)
+            {
+                Nest();
+                parser->getpos(&pos);
+                aprintf("Pos = %d, end=%d (object)\n",pos,endPos-4);
+                char *o=readFlvString();
+                Nest(); printf("\t ** Object**:%s",o);
+                if(false==parseOneMeta(o,endPos,myEnd)) return false;
+/*
+                char objType=read8();
+                printf("-->%d",objType);
+                if(objType!=10)
+                {
+                    ADM_warning("type is not strict array\n");
+                    goto xxer;
+                }
+                int count=read32();
+                printf(", count=%d\n",count);
+                for(int i=0;i<count;i++)
+                {
+                    if(false==parseOneMeta(endPos)) return false;
+                }
+                break;
+*/
+                parser->getpos(&pos);
+            }
+            break;
+        }
+        case AMF_DATA_TYPE_ARRAY:
+        {
+            uint32_t len=read32();
+            Nest();printf("\n**[FLV] Array : %" PRIu32" entries**\n",len);
+            bool theend;
+            parser->getpos(&pos);
+            for(int i=0;i<len && pos<endPos-4;i++)
+                if(false==parseOneMeta("",endPos,theend)) return false;
+            Nest();printf("\n");
+            break;
+        }
+        case AMF_DATA_TYPE_DATE: Skip(8+2);break;
+        case AMF_DATA_TYPE_NUMBER:
+        {
+            float val;
+            uint64_t hi,lo;
+            hi=read32();lo=read32();
+            hi=(hi<<32)+lo;
+            val=(float)av_int2double(hi);
+            printf("->%f",val);
+            setProperties(stri,val);
+            break;
+        }
+        case AMF_DATA_TYPE_STRING:
+        {
+            int r=read16();
+#if 1
+            Nest();printf("<");
+            for(int i=0;i<r;i++)
+            {
+                printf("%c",read8());
+            }
+            printf(">");
+#else
+            Skip(r);
+#endif
+        }
+            break;
+        case AMF_DATA_TYPE_BOOL: read8();break;
+        case AMF_DATA_TYPE_MIXEDARRAY:
+        {
+            read32();
+            parser->getpos(&pos);
+            while(pos<endPos-4)
+            {
+                char *o=readFlvString();
+                bool theend;
+                if(!o) break;
+                Nest();printf("** MixedArray:%s **",o);
+                if(false==parseOneMeta(o,endPos,theend)) return false;
+                parser->getpos(&pos);
+            }
+            if(read8()!=AMF_END_OF_OBJECT) return false;
+         }
+             break;
+        default: printf("Unknown type=%d\n",type);ADM_assert(0);
+    }
+    printf("\n");
+
+    nesting--;
+    return true;
+#else
             aprintf("nesting = %d, at %d, : ,end=%d",nesting,ftello(_fd),endPos);
             switch(type)
             {
@@ -244,7 +421,7 @@
                                                     }
                                                     printf(">");
                                                 #else
-                                                            Skip(r);}
+                                                    Skip(r);
                                                 #endif
                                                 }
                                                 
@@ -272,6 +449,7 @@
 
             nesting--;
             return true;
+#endif
 xxer:
     nesting --;
     return false;
@@ -282,7 +460,15 @@
 */
 uint8_t flvHeader::parseMetaData(uint32_t remaining)
 {
+#ifdef USE_BUFFERED_IO
+    uint64_t pos=0;
+    parser->getpos(&pos);
+    pos+=remaining;
+    ADM_assert(!(pos&0xffffffff00000000));
+    uint32_t endPos=pos;
+#else
     uint32_t endPos=ftello(_fd)+remaining;
+#endif
     // Check the first one is onMetaData...
     uint8_t type=read8();
     char *z;
@@ -292,15 +478,30 @@
     printf("[FlashString] %s\n",z);
     if(z && strncmp(z,"onMetaData",10)) goto endit;
     // Normally the next one is mixed array
-    while(ftello(_fd)<endPos-4)
+#ifdef USE_BUFFERED_IO
+    parser->getpos(&pos);
+    while(pos<endPos-4)
     {
         bool theend;
         printf("\n----------------------- Parse---------------------\n");
         if(false==parseOneMeta("meta",endPos,theend)) goto endit;
+        parser->getpos(&pos);
     }
 
+#else
+    while(ftello(_fd)<endPos-4)
+    {
+        bool theend;
+        printf("\n----------------------- Parse---------------------\n");
+        if(false==parseOneMeta("meta",endPos,theend)) goto endit;
+    }
+#endif
 endit:
+#ifdef USE_BUFFERED_IO
+    parser->setpos(endPos);
+#else
     fseeko(_fd,endPos,SEEK_SET);
+#endif
     updateDimensionWithMeta(videoCodec);
     return 1;
 }
@@ -368,12 +569,26 @@
   uint32_t prevLen, type, size, dts;
   uint64_t pos=0;
   bool firstVideo=true;
+  bool tryProbedAvgFps=false;
+  int32_t firstCts=0;
   _isvideopresent=0;
   _isaudiopresent=0;
   audioTrack=NULL;
   videoTrack=NULL;
   _videostream.dwRate=0;
+  _videostream.dwScale=1000;
   _filename=ADM_strdup(name);
+#ifdef USE_BUFFERED_IO
+  parser=new fileParser(CACHE_SIZE);
+  ADM_assert(parser);
+  int append=0;
+  if(!parser->open(name,&append))
+  {
+    ADM_error("[flv] Cannot open %s\n",name);
+    return 0;
+  }
+  uint64_t fileSize=parser->getSize();
+#else
   _fd=ADM_fopen(name,"rb");
   if(!_fd)
   {
@@ -386,6 +601,7 @@
   fileSize=ftello(_fd);
   fseeko(_fd,0,SEEK_SET);
   printf("[FLV] file size :%" PRIu64 " bytes\n",fileSize);
+#endif
   // It must begin by F L V 01
   uint8_t four[4];
 
@@ -415,9 +631,15 @@
 
   // Skip header
   uint32_t skip=read32();
+#ifdef USE_BUFFERED_IO
+  parser->setpos(skip);
+  printf("[flv] Skipping %u header bytes\n",skip);
+  parser->getpos(&pos);
+#else
   fseeko(_fd,skip,SEEK_SET);
   printf("[FLV] Skipping %u header bytes\n",skip);
-  pos=ftello(_fd);;
+  pos=ftello(_fd);
+#endif
   printf("pos:%" PRIu64 "/%" PRIu64 "\n",pos,fileSize);
   // Create our video index
   videoTrack=new flvTrak(50);
@@ -430,8 +652,11 @@
   {
     int32_t cts=0;
     uint32_t pts=0xffffffff;
-
+#ifdef USE_BUFFERED_IO
+    parser->getpos(&pos);
+#else
     pos=ftello(_fd);
+#endif
     prevLen=read32();
     type=read8();
     size=read24();
@@ -443,7 +668,13 @@
     aprintf("type  =%d\n",(int)type);
     aprintf("size  =%d\n",(int)size);
     aprintf("dts   =%d\n",(int)dts);
-    if(!size) continue;
+    if(!size)
+    {
+#ifdef USE_BUFFERED_IO
+        parser->getpos(&pos);
+#endif
+        continue;
+    }
     uint32_t remaining=size;
     //printf("[FLV] At %08" PRIu64 " found type %x size %u pts%u\n",pos,type,size,dts);
     switch(type)
@@ -471,8 +702,16 @@
             {
                 if(extraHeader(audioTrack,&remaining,false,&cts)) continue;
             }
+#ifdef USE_BUFFERED_IO
+            if(remaining)
+            {
+                parser->getpos(&pos);
+                insertAudio(pos,remaining,dts);
+            }
+#else
             if(remaining)
                 insertAudio(ftello(_fd),remaining,dts);
+#endif
           }
           break;
       case FLV_TAG_TYPE_META:
@@ -504,14 +743,58 @@
             }
             if(videoCodec==FLV_CODECID_H264)
             {
-                if(true==extraHeader(videoTrack,&remaining,true,&cts)) continue;
+                if(true==extraHeader(videoTrack,&remaining,true,&cts))
+                {
+                    ADM_info("Retrieving H.264 info...\n");
+                    nalsize=ADM_getNalSizeH264(videoTrack->extraData,videoTrack->extraDataLen);
+                    spsinfo=new ADM_SPSInfo;
+                    if(false==extractSPSInfo_mp4Header(videoTrack->extraData,videoTrack->extraDataLen,spsinfo))
+                    {
+                        ADM_warning("Cannot decode SPS\n");
+                        delete spsinfo;
+                        spsinfo=NULL;
+                    }
+                    continue;
+                }
+                if(!videoTrack->_nbIndex) firstCts=cts;
+                if(!bFramesPresent && firstCts!=cts)
+                    bFramesPresent=true;
                 int64_t sum=cts+dts;
                 if(sum<0) pts=0xffffffff;
                     else pts=dts+(int32_t)cts;
 
             }
+#ifdef USE_BUFFERED_IO
             if(remaining)
-                insertVideo(ftello(_fd),remaining,frameType,dts,pts);
+            {
+                bool check=bFramesPresent;
+                parser->getpos(&pos);
+                insertVideo(pos,remaining,frameType,dts,pts);
+                if(!ptsInvalid && bFramesPresent!=check)
+                {
+                    ADM_warning("Invalid PTS detected at frame %d\n",(int)videoTrack->_nbIndex-1);
+                    ptsInvalid=true;
+                }
+                pos+=remaining;
+                remaining=0;
+                parser->setpos(pos);
+            }
+#else
+            if(remaining)
+            {
+                bool check=bFramesPresent;
+                pos=ftello(_fd);
+                insertVideo(pos,remaining,frameType,dts,pts);
+                if(!ptsInvalid && bFramesPresent!=check)
+                {
+                    ADM_warning("Invalid PTS detected at frame %d\n",(int)videoTrack->_nbIndex-1);
+                    ptsInvalid=true;
+                }
+                pos+=remaining;
+                remaining=0;
+                fseeko(_fd,pos,SEEK_SET);
+            }
+#endif
           }
            break;
       default: printf("[FLV]At 0x%" PRIx64 ", unhandled type %u\n",pos,type);
@@ -520,42 +803,37 @@
   } // while
 
   // Udpate frame count etc..
-  ADM_info("\n[FLV] Found %u frames\n",videoTrack->_nbIndex);
-  
-  if(!metaWidth && !metaHeight &&  videoCodec==FLV_CODECID_H264)
-  {
-      ADM_info("No width / height, trying to get them..\n");
-      ADM_SPSInfo spsinfo;
-      if(extractSPSInfo_mp4Header(videoTrack->extraData,videoTrack->extraDataLen,&spsinfo))
-      {
-                ADM_info("W %d\n",spsinfo.width);
-                ADM_info("H %d\n",spsinfo.height);
-                if(spsinfo.width && spsinfo.height)
-                {
-                    metaWidth=spsinfo.width;
-                    metaHeight=spsinfo.height;
-                    updateDimensionWithMeta(FLV_CODECID_H264);
-                }else
-                {
-                        ADM_warning("Cannot decode SPS\n");
-                }
-      }else
-      {
-          ADM_warning("Cannot extract pps and sps\n");
-      }
-          
-  }
+  ADM_info("[FLV] Found %u frames\n",videoTrack->_nbIndex);
   
+    if(videoCodec==FLV_CODECID_H264 && spsinfo && spsinfo->width && spsinfo->height)
+    {
+        ADM_info("Setting width and height to values obtained from codec\n");
+        ADM_info("W %d\n",spsinfo->width);
+        ADM_info("H %d\n",spsinfo->height);
+        metaWidth=spsinfo->width;
+        metaHeight=spsinfo->height;
+        updateDimensionWithMeta(FLV_CODECID_H264);
+    }
+
    _videostream.dwLength= _mainaviheader.dwTotalFrames=videoTrack->_nbIndex;
+
+    // Can we force a constant frame rate based on metadata?
+    uint64_t delay=(firstCts>0)? 1000LL*firstCts : 0;
+    if(false==enforceConstantFps(_videostream.dwScale,_videostream.dwRate,delay,bFramesPresent))
+    {
+        ADM_info("Cannot force constant frame rate for timebase %u / %u\n",_videostream.dwScale,_videostream.dwRate);
+        tryProbedAvgFps=true;
+    }
    // Compute average fps
     float f=_videostream.dwLength;
     uint64_t duration=videoTrack->_index[videoTrack->_nbIndex-1].dtsUs;
+    duration+=(uint64_t)((double)duration/(double)f+0.49);
 
     if(duration)
           f=1000.*1000.*1000.*f/duration;
      else  f=25000;
     // If it was available from the metadata, use the one from metadata
-    if(! _videostream.dwRate)
+    if(tryProbedAvgFps)
     {
         float d=searchMinimum();
         printf("[FLV] minimum delta :%d\n",(uint32_t)d);
@@ -566,18 +844,53 @@
         uint32_t max=(uint32_t)floor(d);
         if(max<2) max=2; // 500 fps max
         printf("[FLV] Avg fps :%d, max fps :%d\n",avg,max);
-        _videostream.dwRate=max;
+        // Can we use the probed average fps for timebase?
+        bool skip=false;
+        uint32_t num,den;
+        if(timeBaseFromFps1000(avg,&num,&den))
+        {
+            skip = (num==_videostream.dwScale) && (den==_videostream.dwRate);
+            if(!skip)
+            {
+                _videostream.dwScale=num;
+                _videostream.dwRate=den;
+                _mainaviheader.dwMicroSecPerFrame=0; // assume a perfectly regular stream
+            }
+        }
+        if(skip || false==enforceConstantFps(_videostream.dwScale,_videostream.dwRate,delay,bFramesPresent))
+        {
+            if(skip)
+                ADM_info("Average fps matches metadata, skipping the check.\n");
+            else
+                ADM_info("Cannot force CFR based on avg fps for timebase %u / %u\n",_videostream.dwScale,_videostream.dwRate);
+            // Can we use at least a timebase derived from max fps?
+            if(timeBaseFromFps1000(max,&num,&den))
+            {
+                _videostream.dwScale=num;
+                _videostream.dwRate=den;
+            }
+            _mainaviheader.dwMicroSecPerFrame=ADM_UsecFromFps1000(avg); // should be safe now
+            if(false==checkTimeBase(_videostream.dwScale,_videostream.dwRate))
+            {
+                ADM_info("Cannot use timebase %u / %u from max fps, falling back to 1 / 1000 equivalent.\n",_videostream.dwScale,_videostream.dwRate);
+                {
+                    _videostream.dwRate=16000; // lavf doesn't like low clocks like e.g. 1000 // FIXME
+                    _videostream.dwScale=16;
+                }
+            }
+        }
     }
-    _videostream.dwScale=1000;
-    _mainaviheader.dwMicroSecPerFrame=ADM_UsecFromFps1000(_videostream.dwRate);
-   printf("[FLV] Duration %" PRIu64" ms\n",videoTrack->_index[videoTrack->_nbIndex-1].dtsUs/1000);
+
+    ADM_info("[FLV] Duration: %" PRIu64" ms, time base: %u / %u\n",duration/1000,
+        _videostream.dwScale,_videostream.dwRate);
 
    //
     _videostream.fccType=fourCC::get((uint8_t *)"vids");
     _video_bih.biBitCount=24;
     _videostream.dwInitialFrames= 0;
     _videostream.dwStart= 0;
-    videoTrack->_index[0].flags=AVI_KEY_FRAME;
+    videoTrack->_index[0].flags &= ~AVI_B_FRAME;
+    videoTrack->_index[0].flags |= AVI_KEY_FRAME;
 
     // if it is AAC and we have extradata...
     if(_isaudiopresent && wavHeader.encoding && audioTrack->extraDataLen>=2)
@@ -602,7 +915,10 @@
         _audioStream = NULL;
        _access=NULL;
     }
-
+#ifdef USE_BUFFERED_IO
+    // Too big cache may be detrimental for keyframe-based navigation, reduce cache size
+    parser->setBufferSize(DMX_BUFFER);
+#endif
   printf("[FLV]FLV successfully read\n");
 
   return 1;
@@ -668,12 +984,20 @@
 
     if(codec==FLV_CODECID_H263 && *remaining)
     {
-  
+#ifdef USE_BUFFERED_IO
+      uint64_t pos=0;
+      parser->getpos(&pos);
+#else
       uint32_t pos=ftello(_fd);
+#endif
       uint32_t len=*remaining,width,height;
       uint8_t *buffer=new uint8_t[len];
       read(len,buffer);
+#ifdef USE_BUFFERED_IO
+      parser->setpos(pos);
+#else
       fseeko(_fd,pos,SEEK_SET);
+#endif
        /* Decode header, from h263dec.c / lavcodec*/
       if(extractH263FLVInfo(buffer,len,&width,&height))
       {
@@ -744,6 +1068,25 @@
     if(pts==0xffffffff) x->ptsUs=ADM_NO_PTS;
         else
       x->ptsUs=pts*1000LL;
+    if(videoCodec==FLV_CODECID_H264 && nalsize && spsinfo)
+    {
+        uint8_t *buffer=new uint8_t[size];
+        if(read(size,buffer))
+        { // Keep fingers crossed that we don't encounter inband SPS changing midstream.
+            uint32_t flags=0;
+            if(extractH264FrameType(buffer,size,nalsize,&flags,NULL,spsinfo))
+            {
+                if(!!(flags & AVI_KEY_FRAME) != (frameType==1))
+                    ADM_warning("Container and codec disagree about frame %u: %s says keyframe.\n",
+                        videoTrack->_nbIndex,(flags & AVI_KEY_FRAME)? "codec" : "container");
+                if(flags & AVI_B_FRAME)
+                    bFramesPresent=true;
+                x->flags=flags;
+                videoTrack->_nbIndex++;
+                return 1;
+            }
+        }
+    }
     if(frameType==1)
     {
         x->flags=AVI_KEY_FRAME;
@@ -756,7 +1099,212 @@
     return 1;
 }
 /**
-      \fn insertVideo
+      \fn enforceConstantFps
+      \brief Check whether we can force CFR and update video index if necessary
+*/
+bool flvHeader::enforceConstantFps(uint32_t scale, uint32_t rate, uint64_t delay, bool reorder)
+{
+    if(!_videostream.dwRate)
+        return false;
+
+    double d=_videostream.dwScale;
+    d*=1000.*1000;
+    d/=_videostream.dwRate*2;
+    d+=0.49;
+    const int64_t threshold=(int64_t)d; // half of frame increment, as generous as possible
+    const uint32_t nbFrames=videoTrack->_nbIndex;
+    uint32_t i;
+
+    for(i=0; i<nbFrames; i++)
+    {
+        d=i;
+        d*=_videostream.dwScale;
+        d*=1000.;
+        d/=_videostream.dwRate;
+        d*=1000.;
+        d+=0.49;
+        uint64_t expected=(uint64_t)d;
+        flvIndex *x=&(videoTrack->_index[i]);
+        if(x->dtsUs!=ADM_NO_PTS)
+        {
+            int64_t delta=x->dtsUs-expected;
+            //printf("Frame %u dts delta: %" PRId64" us\n",i,delta);
+            if(delta>threshold || -delta>threshold)
+            {
+                ADM_warning("Delta %" PRId64" for frame %u exceeds threshold.\n",delta,i);
+                return false;
+            }
+        }
+    }
+    ADM_info("Forcing constant frame rate...\n");
+    // Force constant frame rate
+    for(i=0; i<nbFrames; i++)
+    {
+        d=i;
+        d*=_videostream.dwScale;
+        d*=1000.*1000;
+        d/=_videostream.dwRate;
+        d+=0.49;
+        videoTrack->_index[i].dtsUs=(uint64_t)d;
+    }
+    // round up delay to a multiple of timebase
+    if(delay)
+    {
+        uint64_t num=_videostream.dwScale;
+        delay+=num-1;
+        delay/=num;
+        delay*=num;
+    }
+    if(reorder)
+    {
+        uint32_t i;
+        std::vector <uint32_t> DisplayOrder;
+        std::vector <uint64_t> sortedPts;
+        for(i=0; i<nbFrames; i++)
+        {
+            flvIndex *x=&(videoTrack->_index[i]);
+            if(x->ptsUs==ADM_NO_PTS) continue;
+            sortedPts.push_back(x->ptsUs);
+        }
+        std::sort(sortedPts.begin(),sortedPts.end());
+        for(i=0; i<nbFrames; i++)
+        {
+            uint32_t nbInvalid=0;
+            flvIndex *x=&(videoTrack->_index[i]);
+            if(x->ptsUs==ADM_NO_PTS)
+            {
+                DisplayOrder.push_back(i);
+                nbInvalid++;
+                continue;
+            }
+            uint32_t base=0;
+            if(i>32) base=i-32; // max 16 ref * 2 fields
+            for(uint32_t j=base;j<sortedPts.size();j++)
+            {
+                if(x->ptsUs!=sortedPts.at(j))
+                    continue;
+                uint32_t k=nbInvalid+j;
+                ADM_assert(k<nbFrames);
+                DisplayOrder.push_back(k);
+                //printf("%u --> %u\n",i,k);
+                break;
+            }
+        }
+        for(i=0; i<nbFrames; i++)
+        {
+            if(i+1>=DisplayOrder.size())
+                break;
+            uint32_t j=DisplayOrder.at(i);
+            flvIndex *x=&(videoTrack->_index[i]);
+            if(x->ptsUs==ADM_NO_PTS) continue;
+            x->ptsUs=videoTrack->_index[j].dtsUs+delay;
+        }
+    }else
+    {
+        for(i=0; i<nbFrames; i++)
+        {
+            flvIndex *x=&(videoTrack->_index[i]);
+            x->ptsUs=x->dtsUs+delay;
+        }
+    }
+    // verify that the delay is sufficient
+    uint64_t delay2=0;
+    for(i=0; i<nbFrames; i++)
+    {
+        flvIndex *x=&(videoTrack->_index[i]);
+        if(x->ptsUs==ADM_NO_PTS || x->dtsUs==ADM_NO_PTS)
+            continue;
+        if(x->ptsUs+delay2<x->dtsUs)
+            delay2+=x->dtsUs-x->ptsUs;
+    }
+    if(delay2)
+    {
+        ADM_warning("Original PTS delay is insufficient, adding %" PRIu64" us.\n",delay2);
+        for(i=0; i<nbFrames; i++)
+            videoTrack->_index[i].ptsUs+=delay2;
+    }
+    return true;
+}
+
+/**
+      \fn checkTimeBase
+      \brief Check whether all dts and pts can be expressed in the given timebase
+*/
+bool flvHeader::checkTimeBase(uint32_t scale, uint32_t rate)
+{
+    if(!scale || rate<1000)
+        return false;
+
+    uint32_t i;
+    const uint32_t nbFrames=videoTrack->_nbIndex;
+    scale*=1000;
+    // check dts first
+    for(i=0; i<nbFrames; i++)
+    {
+        flvIndex *x=&(videoTrack->_index[i]);
+        if(x->dtsUs==ADM_NO_PTS || x->dtsUs<1000)
+            continue;
+        uint64_t low=x->dtsUs-1000; // -1 ms
+        uint64_t high=x->dtsUs+1000; // +1 ms
+        double f=low;
+        f*=rate;
+        f/=scale;
+        f+=0.49;
+        low=(uint64_t)f; // 1000 * scaled time
+        f=high;
+        f*=rate;
+        f/=scale;
+        f+=0.49;
+        high=(uint64_t)f;
+        if(high%1000>100 || low%1000<900)
+        {
+            ADM_warning("Frame %d dts is not a multiple of timebase.\n",i);
+            return false;
+        }
+    }
+    // now get pts delay
+#define HIGH_POINT 0xFFFFFFF0 // an arbitrary high value
+    uint64_t delay=HIGH_POINT;
+    for(i=0; i<nbFrames; i++)
+    {
+        flvIndex *x=&(videoTrack->_index[i]);
+        if(x->ptsUs==ADM_NO_PTS)
+            continue;
+        if(x->ptsUs<delay) delay=x->ptsUs;
+        if(!delay) break;
+    }
+    if(delay==HIGH_POINT)
+        return true; // no valid pts
+    ADM_info("Probed PTS delay: %" PRIu64" us.\n",delay);
+    // check pts
+    for(i=0; i<nbFrames; i++)
+    {
+        flvIndex *x=&(videoTrack->_index[i]);
+        if(x->ptsUs==ADM_NO_PTS || x->ptsUs-delay<1000)
+            continue;
+        uint64_t low=x->ptsUs-delay-1000; // -1 ms
+        uint64_t high=x->ptsUs-delay+1000; // +1 ms
+        double f=low;
+        f*=rate;
+        f/=scale;
+        f+=0.49;
+        low=(uint64_t)f; // 1000 * scaled time
+        f=high;
+        f*=rate;
+        f/=scale;
+        f+=0.49;
+        high=(uint64_t)f;
+        if(high%1000>100 || low%1000<900)
+        {
+            ADM_warning("Frame %d pts is not a multiple of timebase.\n",i);
+            return false;
+        }
+    }
+    return true;
+}
+
+/**
+      \fn insertAudio
       \brief add a frame to the index, grow the index if needed
 */
 uint8_t flvHeader::insertAudio(uint64_t pos,uint32_t size,uint32_t pts)
@@ -837,17 +1385,26 @@
      if(audioTrack->extraData) delete [] audioTrack->extraData;
     delete audioTrack;
   }
+#ifdef USE_BUFFERED_IO
+  if(parser)
+  {
+      delete parser;
+      parser=NULL;
+  }
+#else
   if(_fd) fclose(_fd);
+  _fd=NULL;
+#endif
   if(_audioStream) delete _audioStream;
   if(_access) delete _access;
-  
-  
-  _fd=NULL;
+  if(spsinfo) delete spsinfo;
+
   _filename=NULL;
   videoTrack=NULL;
   audioTrack=NULL;
   _audioStream=NULL;
   _access=NULL;
+  spsinfo=NULL;
   return 1;
 }
 /**
@@ -858,7 +1415,11 @@
  flvHeader::flvHeader( void ) : vidHeader()
 {
     videoCodec=0xFFFF;
+#ifdef USE_BUFFERED_IO
+    parser=NULL;
+#else
     _fd=NULL;
+#endif
     _filename=NULL;
     videoTrack=NULL;
     audioTrack=NULL;
@@ -870,7 +1431,10 @@
     metaFps1000=0;
     metaFrameWidth=0;
     metaFrameHeight=0;
-
+    ptsInvalid=false;
+    bFramesPresent=false;
+    nalsize=0;
+    spsinfo=NULL;
 }
 /**
     \fn flvHeader
@@ -933,8 +1497,14 @@
 {
      if(frame>=videoTrack->_nbIndex) return 0;
      flvIndex *idx=&(videoTrack->_index[frame]);
+#ifdef USE_BUFFERED_IO
+     parser->setpos(idx->pos);
+     if(!read(idx->size,img->data))
+         return 0;
+#else
      fseeko(_fd,idx->pos,SEEK_SET);
      fread(img->data,idx->size,1,_fd);
+#endif
      img->dataLength=idx->size;
      img->flags=idx->flags;
      //img->demuxerDts=ADM_COMPRESSED_NO_PTS;

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flv.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flv.h Changed

@@ -22,6 +22,14 @@
 
 #include "ADM_Video.h"
 #include "ADM_audioStream.h"
+#include "ADM_videoInfoExtractor.h"
+
+#define USE_BUFFERED_IO
+
+#ifdef USE_BUFFERED_IO
+  #define CACHE_SIZE 1024*1024
+  #include "dmx_io.h"
+#endif
 
 typedef struct 
 {
@@ -55,14 +63,15 @@
 class ADM_flvAccess : public ADM_audioAccess
 {
 protected:
-                      
+#ifdef USE_BUFFERED_IO
+                fileParser       *aparser;
+#else
                 FILE             *_fd;
+#endif
                 flvTrak          *_track;
                 uint32_t         currentBlock;
                 bool             goToBlock(uint32_t block);
-                // Suppress repeated debug messages from getPacket
-                ADMCountdown     *_msg_ratelimit;
-                uint32_t         _msg_counter;
+                bool             _endOfStream;
 
 public:
                                   ADM_flvAccess(const char *name,flvTrak *trak); 
@@ -93,8 +102,9 @@
 class flvHeader         :public vidHeader
 {
   protected:
-                                
+#ifndef USE_BUFFERED_IO
     FILE                    *_fd;
+#endif
     char                    *_filename;
     flvTrak                 *videoTrack;
     flvTrak                 *audioTrack;
@@ -104,7 +114,15 @@
     /* */
     uint32_t            metaWidth,metaHeight,metaFps1000,videoCodec;
     uint32_t            metaFrameWidth,metaFrameHeight;
-
+    // special treatment for H.264
+    bool                ptsInvalid;
+    bool                bFramesPresent;
+    uint32_t            nalsize;
+    ADM_SPSInfo         *spsinfo;
+
+#ifdef USE_BUFFERED_IO
+    fileParser  *parser;
+#endif
     uint8_t     read(uint32_t len, uint8_t *where);
     uint8_t     read8(void);
     uint32_t    read16(void);
@@ -116,7 +134,9 @@
     uint8_t     setAudioHeader(uint32_t format,uint32_t fq,uint32_t bps,uint32_t channels);
     uint8_t     setVideoHeader(uint8_t codec,uint32_t *remaining);
     bool        extraHeader(flvTrak *trk,uint32_t *remain,bool haveCts,int32_t *cts);
-    
+    bool        enforceConstantFps(uint32_t scale, uint32_t rate, uint64_t delay, bool reorder);
+    bool        checkTimeBase(uint32_t scale, uint32_t rate);
+
     uint8_t     getFrameSize (uint32_t frame, uint32_t * size);
     char        *readFlvString(void);
     uint8_t     parseMetaData(uint32_t remaining);
@@ -158,7 +178,7 @@
 
 virtual   bool                    getPtsDts(uint32_t frame,uint64_t *pts,uint64_t *dts);
 virtual   bool                    setPtsDts(uint32_t frame,uint64_t pts,uint64_t dts);
-
+virtual   bool                    providePts(void) { return !ptsInvalid; }
 
 };
 #endif

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flvAudio.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flvAudio.cpp Changed

@@ -44,14 +44,19 @@
 */
 ADM_flvAccess::ADM_flvAccess(const char *name,flvTrak *track) : ADM_audioAccess()
 {
+#ifdef USE_BUFFERED_IO
+    aparser=new fileParser();
+    ADM_assert(aparser);
+    int append=0;
+    ADM_assert(aparser->open(name,&append));
+#else
     _fd=ADM_fopen(name,"rb");
     ADM_assert(_fd);
+#endif
     _track=track;
     goToBlock(0);
     currentBlock=0;
-    _msg_counter = 0;
-    _msg_ratelimit = new ADMCountdown(200);
-    _msg_ratelimit->reset();
+    _endOfStream=false;
 }
 /**
     \fn ADM_audioAccess
@@ -60,11 +65,16 @@
 */
 ADM_flvAccess::~ADM_flvAccess()
 {
+#ifdef USE_BUFFERED_IO
+    if(aparser)
+    {
+        delete aparser;
+        aparser=NULL;
+    }
+#else
     if(_fd) fclose(_fd);
     _fd=NULL;
-    if(_msg_ratelimit)
-        delete _msg_ratelimit;
-    _msg_ratelimit = NULL;
+#endif
 }
 /**
     \fn getDurationInUs
@@ -117,30 +127,23 @@
     flvIndex *x;
     if(false==goToBlock(currentBlock))
     {
-        if(_msg_ratelimit->done())
-        {
-            if(_msg_counter)
-            {
-                printf("[ADM_flvAccess::getPacket] Packet out of bounds (message repeated %" PRIu32" times)\n",_msg_counter);
-                _msg_counter = 0;
-            }else
-            {
-                printf("[ADM_flvAccess::getPacket] Packet out of bounds\n");
-            }
-            _msg_ratelimit->reset();
-        }else
+        if(!_endOfStream)
         {
-            _msg_counter++;
+            printf("[ADM_flvAccess::getPacket] Packet out of bounds.\n");
+            _endOfStream=true;
         }
         return false;
     }
     x=&(_track->_index[currentBlock]);
+#ifdef USE_BUFFERED_IO
+    aparser->read32(x->size,buffer);
+#else
     fread(buffer,x->size,1,_fd);
+#endif
     *osize=x->size;
     *dts=((uint64_t)x->dtsUs);
     
     currentBlock++;
-    _msg_counter = 0;
     return 1;
 }
 /**
@@ -150,17 +153,17 @@
 {
     if(block>=_track->_nbIndex)
     {
-        if(_msg_ratelimit->done())
-        {
-            if(_msg_counter)
-                printf("[ADM_flvAccess::goToBlock] Exceeding max cluster: asked: %u max: %u (message repeated %" PRIu32" times)\n",block,_track->_nbIndex,_msg_counter);
-            else
-                printf("[ADM_flvAccess::goToBlock] Exceeding max cluster: asked: %u max: %u\n",block,_track->_nbIndex);
-        }
+        if(!_endOfStream)
+            printf("[ADM_flvAccess::goToBlock] Exceeding max cluster: asked: %u max: %u\n",block,_track->_nbIndex);
         return false;  // FIXME
     }
+    _endOfStream=false;
     currentBlock=block;
+#ifdef USE_BUFFERED_IO
+    aparser->setpos(_track->_index[currentBlock].pos);
+#else
     fseeko(_fd,_track->_index[currentBlock].pos,SEEK_SET);
+#endif
     return 1;
 }

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Flv/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Flv/CMakeLists.txt Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp Changed

@@ -36,7 +36,7 @@
    {40000,1000,25000}, // 25 fps
    {33367,1001,30000}, // 30 NTSC
    //{20853,2000,24000}, // 24*2
-   {20854,2002,24000}, // 23976*2
+   {20854,1001,48000}, // 23976*2
    {20000,1000,50000}, // 50
    {16683,1001,60000}, // 60 NTSCs
    {16667,1000,60000} // 60 fps
@@ -114,11 +114,23 @@
   _segmentPosition=ebml.tell();
   ADM_info("[MKV] found Segment at 0x%llx\n",(uint64_t)_segmentPosition);
    /* Now find tracks */
+  bool tracksElemFound=false;
+  uint64_t nextHead=0;
   if(ebml.find(ADM_MKV_SECONDARY,MKV_SEGMENT,MKV_SEEK_HEAD,&alen))
   {
        ADM_ebml_file seekHead( &ebml,alen);
-       readSeekHead(&seekHead);
-  }else      
+       tracksElemFound = readSeekHead(&seekHead,&nextHead);
+       if(!tracksElemFound && nextHead)
+       {
+           ebml.seek(nextHead);
+           if(ebml.simplefind(MKV_SEEK_HEAD,&len,false))
+           {
+               ADM_ebml_file secondary(&ebml,len);
+               tracksElemFound = readSeekHead(&secondary);
+           }
+       }
+  }
+  if(!tracksElemFound)
   { // No valid seek_head, try to find MKV_TRACKS
       ADM_info("Searching for MKV_TRACKS\n");
       int headerLen;
@@ -183,6 +195,7 @@
         ADM_info("Track %" PRIu32" has an index size of %d entries\n",i,_tracks[i].index.size());
 
     int last=_tracks[0].index.size();
+#if 0
     if(isVC1Compatible(_videostream.fccHandler))
     {
         mkvTrak *vid=_tracks;
@@ -191,6 +204,7 @@
         for(int i=1;i<last-1;i++)
             vid->index[i].Pts=ADM_NO_PTS;
     }
+#endif
   // Delay frames + recompute frame duration
 // now that we have a good frameduration and max pts dts difference, we can set a proper DTS for all video frame
     uint32_t ptsdtsdelta, mindelta;
@@ -204,56 +218,9 @@
     mkvTrak *vid=_tracks;
     if(hasBframe==true) // Try to compute a sane DTS knowing the PTS and the DTS/PTS delay
     {
-        bool useSortedPtsToSetDts=false;
-        int bumped=0;
-        for(int i=1;i<last;i++)
-        {
-            uint64_t pts;
-            pts=vid->index[i].Pts;
-            lastDts+=increment; // This frame dts with no correction
-            if(pts==ADM_NO_PTS)
-            {
-                vid->index[i].Dts=lastDts;
-                continue;
-            }
-            uint64_t limitDts=0;
-            if(vid->index[i].Pts>ptsdtsdelta)
-                limitDts=vid->index[i].Pts-ptsdtsdelta;
+        setDtsFromListOfSortedPts();
 
-#define DTS_BUMPED_THRESHOLD 10
-
-            if(lastDts<limitDts)
-            {
-                if(i==1)
-                {
-                    lastDts = (vid->index[0].Pts-ptsdtsdelta>0)? vid->index[0].Pts-ptsdtsdelta : 0;
-                    vid->index[0].Dts = lastDts;
-                    lastDts+=increment;
-                }
-                if(limitDts-lastDts>1000) // not just a rounding error
-                {
-                    ADM_warning("Bumping DTS by %" PRIu64" ms to keep PTS/DTS delta within limits for frame %d\n",(limitDts-lastDts)/1000,i);
-                    lastDts=limitDts;
-                    bumped++;
-                    if(bumped>DTS_BUMPED_THRESHOLD)
-                    {
-                        ADM_warning("Default time increment is probably too low, resorting to direct mapping.\n");
-                        useSortedPtsToSetDts=true;
-                        break;
-                    }
-                }
-            }
-            vid->index[i].Dts=lastDts;
-        }
-        if(useSortedPtsToSetDts)
-        {
-            setDtsFromListOfSortedPts();
-        }
-        // Check that we have PTS>=DTS also
-        uint64_t enforcePtsGreaterThanDts;
-        bool secondTry=false;
-_again:
-        enforcePtsGreaterThanDts=0;
+        uint64_t enforcePtsGreaterThanDts=0;
         int frmeMaxDlta=-1;
         for(int i=0;i<last;i++)
         {
@@ -270,17 +237,6 @@
         if(enforcePtsGreaterThanDts)
         {
             ADM_info("Have to delay by %" PRIu64" us detected for frame %d so that PTS>DTS\n",enforcePtsGreaterThanDts,frmeMaxDlta);
-            if(enforcePtsGreaterThanDts>ptsdtsdelta)
-            {
-                ADM_warning("The delay is implausibly high. The calculated frame rate is probably too low.\n");
-                if(!secondTry)
-                {
-                    setDtsFromListOfSortedPts();
-                    ADM_warning("Retrying with direct mapping.\n");
-                    secondTry=true;
-                    goto _again;
-                }
-            }
             for(int i=0;i<_nbAudioTrack+1;i++)
                 delayTrack(i,&(_tracks[i]),enforcePtsGreaterThanDts);
         }
@@ -310,6 +266,8 @@
           for(int i=0;i<_nbAudioTrack;i++)
           {
             rescaleTrack(&(_tracks[1+i]),duration32);
+            if(!_tracks[1+i].duration)
+                _tracks[1+i].duration=_tracks[0].duration; // FIXME
             switch(_tracks[1+i].wavHeader.encoding)
             {
                 case WAV_OGG_VORBIS:            
@@ -337,10 +295,14 @@
         {
             mkvAccess *access=new mkvAccess(_filename,&(_tracks[i+1]));
             _access[i]=new mkvAccessBuffered(access,_tracks[i+1]._needBuffering);
-        }
-        else
+        }else if(_tracks[i+1].wavHeader.encoding==MKV_MUX_LATM)
         {
-               _access[i]=new mkvAccess(_filename,&(_tracks[i+1]));
+            mkvAccess *access=new mkvAccess(_filename,&(_tracks[i+1]));
+            _access[i]=new mkvAccessLatm(access,LATM_MAX_BUFFER_SIZE);
+            _tracks[i+1].wavHeader.encoding=WAV_AAC;
+        }else
+        {
+            _access[i]=new mkvAccess(_filename,&(_tracks[i+1]));
         }
         _audioStreams[i]=ADM_audioCreateStream(&(_tracks[1+i].wavHeader), _access[i]);;
         _audioStreams[i]->setLanguage(_tracks[1+i].language);
@@ -452,11 +414,19 @@
 {
   mkvTrak *track=_tracks;
   int nb=track->index.size();
+  ADM_assert(den);
   double dHalf=(500000.*(double)num)/((double)den);
   int half=dHalf-1; // half interval in us
   int first=0;
   while(  track->index[first].Pts==ADM_NO_PTS && first<nb) first++; // we should have some at least
   uint64_t zero= track->index[first].Pts;
+  {
+    double dmultiple=zero+half;
+    dmultiple*=den;
+    dmultiple/=(1000000.*(double)num);
+    zero=((uint64_t)dmultiple*1000000*num)/den;
+    track->index[first].Pts=zero;
+  }
   ADM_info("Num=%d Den=%d half=%d zero=%d first=%d\n",num,den,half,(int)zero,first);
   for(int i=first+1;i<nb;i++)
   {
@@ -477,6 +447,13 @@
 #endif
     track->index[i].Pts=reconstructed;
   }
+  _videostream.dwScale=num;
+  _videostream.dwRate=den;
+  double f=num;
+  f=f*1000000.;
+  f/=den;
+  f+=0.49;
+  track->_defaultFrameDuration=f;
   return true;
 }
 /**
@@ -545,7 +522,34 @@
     if(nbBFrame) *bFramePresent=true;
 
     ADM_warning(">>> MinDelta=%d MaxDelta=%d\n",minDelta,maxDelta);
-    int stdFrameRate=getStdFrameRate(track->_defaultFrameDuration);
+    // Check whether the default frame duration is valid
+    int stdFrameRate=-1;
+    if(!nbBFrame && minDelta)
+    {
+        bool frameDurationInvalid=false;
+        if((uint64_t)maxDelta < (uint64_t)track->_defaultFrameDuration)
+        {
+            ADM_warning("Default frame duration is invalid, exceeds max delta\n");
+            frameDurationInvalid=true;
+        }
+        if((uint64_t)minDelta > (uint64_t)track->_defaultFrameDuration)
+        {
+            ADM_warning("Default frame duration is invalid, below min delta\n");
+            frameDurationInvalid=true;
+        }
+        if(frameDurationInvalid)
+        {
+            stdFrameRate=getStdFrameRate(minDelta);
+            if(stdFrameRate!=-1 && stdFrameRate==getStdFrameRate(maxDelta)) // full confidence
+            {
+                _videostream.dwScale = candidateFrameRate[stdFrameRate].num;
+                _videostream.dwRate = candidateFrameRate[stdFrameRate].den;
+                track->_defaultFrameDuration = candidateFrameRate[stdFrameRate].durationInUs;
+            }
+        }
+    }
+
+    stdFrameRate=getStdFrameRate(track->_defaultFrameDuration);
 
     int num= _videostream.dwScale;
     int den= _videostream.dwRate;
@@ -633,6 +637,8 @@
                 deviation=deviationMinDelta;
                 skipped=minDeltaSkip;
                 ADM_info("Min delta is better\n");
+                if(stdFrameRate==-1)
+                    stdFrameRate=getStdFrameRate(minDelta);
             }
         }
 
@@ -644,20 +650,31 @@
             ADM_info("Checking deviation for stdFrameRate=%d:%d\n",fr->num,fr->den);
             int deviationStd=devEngine.computeDeviation(fr->num,fr->den,stdSkip);
             ADM_info("Deviation for stdFrameRate(%d) =%d\n",stdFrameRate,deviationStd);
-            if(deviationStd<deviation && stdSkip<skipped*3)
+            if(deviationStd<=deviation && stdSkip<=skipped*3)
             {
               num=fr->num;
               den=fr->den;
               deviation=deviationStd;
-              ADM_info("Std frame rate is better\n");
+              skipped=stdSkip;
+              ADM_info("Std frame rate is equal or better\n");
             }
         }
     }
     ADM_info("Old default duration    %" PRId64" us\n",track->_defaultFrameDuration);
-    if(!deviation)
+#define TOLERANCE 500
+    if(deviation < TOLERANCE)
     {
         ADM_info("We are within margin, recomputing timestamp with exact value (%d vs %d)\n",num,den);
         enforceFixedFrameRate(num,den);
+        if(!skipped)
+        {
+            ADM_info("Enforcing constant frame rate.\n");
+            _mainaviheader.dwMicroSecPerFrame=0; // perfectly regular
+        }else
+        {
+            ADM_info("Variable frame rate with time base %d/%d\n",num,den);
+            _mainaviheader.dwMicroSecPerFrame=track->_defaultFrameDuration;
+        }
         // do it again, the old may not be valid 
         // Search minimum and maximum between 2 frames
         // the minimum will give us the maximum fps
@@ -681,25 +698,20 @@
             //printf("\/=%" PRId64" Min %" PRId64" MAX %" PRId64"\n",delta,minDelta,maxDelta);
         }
 
-    }
-
-    //if( num!= _videostream.dwScale ||  den!= _videostream.dwRate)
+    }else
     {
-        ADM_info("New framerate values : %d:%d\n",num,den);
-        _videostream.dwScale=num;
-        _videostream.dwRate=den;
+        ADM_info("Variable frame rate, using 1/90000 time base.\n");
+        _videostream.dwScale=1;
+        _videostream.dwRate=90000;
         double f=num;
         f=f*1000000.;
         f/=den;
-        track->_defaultFrameDuration=f;
-       
-
+        f+=0.49;
+        track->_defaultFrameDuration=_mainaviheader.dwMicroSecPerFrame=(uint32_t)f;
     }
 
     ADM_info("New default duration    %" PRId64" us\n",track->_defaultFrameDuration);
-
-
-
+#undef TOLERANCE
     ADM_info("First frame pts     %" PRId64" us\n",track->index[0].Pts);
 
     *maxDeltaX=maxDelta;
@@ -936,7 +948,9 @@
     _parser=NULL;
 
 
-#define FREEIF(i) { if(_tracks[i].extraData) delete [] _tracks[i].extraData; _tracks[i].extraData=0;}
+#define FREEIF(i) { if(_tracks[i].extraData) delete [] _tracks[i].extraData; _tracks[i].extraData=0; \
+                    if(_tracks[i].infoCache) delete [] _tracks[i].infoCache; _tracks[i].infoCache=0; \
+                    if(_tracks[i].paramCache) delete [] _tracks[i].paramCache; _tracks[i].paramCache=0; }
   if(_isvideopresent)
   {
       FREEIF(0);
@@ -958,6 +972,8 @@
         delete [] _access;
         _access=NULL;
     }
+    ADM_dealloc(_filename);
+    _filename=NULL;
     return 1;
 }
 /**
@@ -1011,7 +1027,7 @@
 {
   if(frame>=_tracks[0].index.size()) return 0;
   *flags=_tracks[0].index[frame].flags;
-  if(!frame) *flags=AVI_KEY_FRAME;
+  if(!frame) *flags=AVI_KEY_FRAME | (*flags & AVI_STRUCTURE_TYPE_MASK);
   return 1;
 }
 /**
@@ -1191,10 +1207,12 @@
  * \fn readSeekHead
  * \bried used to locate the interesting parts of the file
  */
-bool    mkvHeader::readSeekHead(ADM_ebml_file *body)
+bool    mkvHeader::readSeekHead(ADM_ebml_file *body, uint64_t *nexthead)
 {
     uint64_t vlen,len;
     ADM_info("Parsing SeekHead\n");
+    if(nexthead)
+        *nexthead=0;
     while(!body->finished())
     {
         if(!body->simplefind(MKV_SEEK,&vlen,false))
@@ -1241,6 +1259,14 @@
         uint64_t position=item.readUnsignedInt(len);
         switch(t)
         {
+            case MKV_SEEK_HEAD:
+                {
+                    uint64_t chained=position+_segmentPosition;
+                    ADM_info("Chained MKV_SEEK_HEAD at position %" PRIu64"\n",chained);
+                    if(nexthead)
+                        *nexthead=chained;
+                    break;
+                }
             case MKV_CUES:
                     _cuePosition=position+_segmentPosition;
                     ADM_info("   at position  0x%llx\n",_cuePosition);

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.h Changed

@@ -24,6 +24,7 @@
 
 #include "ADM_Video.h"
 #include "ADM_audioStream.h"
+#include "ADM_aacLatm.h"
 #include "ADM_ebml.h"
 #include <BVector.h>
 #define MKV_MAX_REPEAT_HEADER_SIZE 16
@@ -58,6 +59,10 @@
         length=0;
         extraData=NULL;
         extraDataLen=0;
+        infoCache=NULL;
+        infoCacheSize=0;
+        paramCache=NULL;
+        paramCacheSize=0;
         headerRepeatSize=0;
         _sizeInBytes=0;
         _defaultFrameDuration=0;
@@ -76,6 +81,10 @@
   /* Used for both */
   uint8_t    *extraData;
   uint32_t   extraDataLen;
+  uint8_t    *infoCache; // decoded SPS & friends
+  uint32_t   infoCacheSize;
+  uint8_t    *paramCache; // raw SPS data
+  uint32_t   paramCacheSize;
   /* */
   uint32_t   headerRepeatSize;
   uint8_t    headerRepeat[MKV_MAX_REPEAT_HEADER_SIZE];
@@ -88,6 +97,7 @@
 };
 
 #define MKV_MAX_LACES 101 // ?
+#define MKV_MUX_LATM 0x1602
 /**
  */
 class mkvAccess;
@@ -112,6 +122,26 @@
             int         _offset;
 };
 
+class mkvAccessLatm : public ADM_audioAccess
+{
+public:
+            mkvAccessLatm(mkvAccess *ac,int maxSize);
+            ~mkvAccessLatm();
+                virtual bool      isCBR(void) { return false; }
+                virtual bool      canSeekTime(void) { return true; };
+                virtual bool      canSeekOffset(void) { return false; };
+                virtual bool      canGetDuration(void) { return true; };
+                virtual uint64_t  getDurationInUs(void);
+                virtual bool      goToTime(uint64_t timeUs);
+                virtual bool      getPacket(uint8_t *buffer, uint32_t *size, uint32_t maxSize,uint64_t *dts);
+                virtual bool      getExtraData(uint32_t *l, uint8_t **d);
+protected:
+            ADM_latm2aac latm;
+            mkvAccess   *_son;
+            int         _maxSize;
+            uint8_t     *_buffer;
+};
+
 /**
     \class mkvAccess
     \brief Matroska audio demuxer
@@ -202,7 +232,7 @@
     uint8_t                 walk(void *seed);
     uint64_t                walkAndFind(void *seed,MKV_ELEM_ID searched);
     int                     searchTrackFromTid(uint32_t tid);
-    bool                    readSeekHead(ADM_ebml_file *body);
+    bool                    readSeekHead(ADM_ebml_file *body,uint64_t *nexthead=NULL);
     //
     //                      
     int                     isBufferingNeeded(mkvTrak *trk); // Split audio blocks into smaller pieces if needed

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvAccessLatm.cpp Added

@@ -0,0 +1,91 @@
+/***************************************************************************
+    copyright            : (C) 2006 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "ADM_cpp.h"
+#include "ADM_default.h"
+#include "ADM_mkv.h"
+#if 0
+#define aprintf ADM_info
+#else
+#define aprintf(...) {}
+#endif
+
+/**
+    \fn ctor
+*/
+mkvAccessLatm::mkvAccessLatm(mkvAccess *access, int maxSize)
+{
+    _maxSize=maxSize;
+    _son=access;
+    _buffer=new uint8_t[maxSize];
+}
+/**
+    \fn dtor
+*/
+mkvAccessLatm::~mkvAccessLatm()
+{
+    if(_buffer) delete [] _buffer;
+    if(_son) delete _son;
+    _buffer=NULL;
+    _son=NULL;
+}
+/**
+    \fn getExtraData
+*/
+bool mkvAccessLatm::getExtraData(uint32_t *l, uint8_t **d)
+{
+    return latm.getExtraData(l,d);
+}
+/**
+    \fn getDurationInUs
+*/
+uint64_t  mkvAccessLatm::getDurationInUs(void)
+{
+    return _son->getDurationInUs();
+}
+/**
+    \fn goToTime
+*/
+bool mkvAccessLatm::goToTime(uint64_t timeUs)
+{
+    latm.flush();
+    return _son->goToTime(timeUs);
+}
+/**
+    \fn getPacket
+*/
+bool mkvAccessLatm::getPacket(uint8_t *dest, uint32_t *packLen, uint32_t maxSize, uint64_t *timecode)
+{
+    int retries=10;
+    uint64_t time=ADM_NO_PTS;
+    while(latm.empty()) // fetch next LOAS frame, it will contain several frames
+    {
+        if(!retries)
+        {
+            ADM_error("Cannot get AAC packet from LATM\n");
+            return false;
+        }
+        if(ADM_latm2aac::LATM_MORE_DATA_NEEDED==latm.convert(time))
+        {
+            uint32_t len=0;
+            if(!_son->getPacket(_buffer,&len,_maxSize,&time)) return false;
+            if(false==latm.pushData(len,_buffer))
+                latm.flush();
+        }
+        retries--;
+    }
+    latm.getData(&time,packLen,dest,maxSize);
+    *timecode=time;
+    return true;
+}
+//EOF

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvDeviation.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvDeviation.cpp Changed

@@ -31,7 +31,7 @@
     sorted=NULL;    
 }
 
-int comp64_t (const void * elem1, const void * elem2) 
+static int comp64_t (const void * elem1, const void * elem2)
 {
     uint64_t left=*(uint64_t *)elem1;
     uint64_t right=*(uint64_t *)elem2;
@@ -107,7 +107,7 @@
     {
         //printf("Skipped %d %d\n",i,jump);
         nbSkipped+=jump;
-        sumOfError=sumOfError+(1+jump)*(1+jump)*coeff*coeff;
+        //sumOfError=sumOfError+(1+jump)*(1+jump)*coeff*coeff;
         lastValidFrame=multiple;
         continue;
     }
@@ -115,7 +115,7 @@
     //printf("frame %d multiple = %d, deviation=%d\n",i,(int)multiple,(int)deviation);
     
     // We have an accuracy of 1ms, so if the error is less than 2 ms, we ignore it
-    if(deviation>1000.)
+    if(deviation>2000.)
     {
         int dev=(int)deviation;
         dev=dev-dev%1000;
@@ -124,8 +124,8 @@
     }
   }
 
-  double scale=nbValid;
-  sumOfError/=scale*scale;
+  sumOfError/=(double)nbValid;
+  sumOfError=sqrt(sumOfError);
   ADM_info("Den=%d Num=%d  sum of error=%d, multiple=%d\n",den,num,(int)sumOfError,multipleError);
   ADM_info("MinDelta=%d maxDelta=%d skipped=%d\n",minDelta,maxDelta,nbSkipped);
   return (int)sumOfError  ;

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp Changed

@@ -20,7 +20,8 @@
 #include "ADM_Video.h"
 
 #include "fourcc.h"
-
+#include "ADM_codecType.h"
+#include "ADM_videoInfoExtractor.h"
 #include "ADM_mkv.h"
 
 #include "mkv_tags.h"
@@ -160,19 +161,17 @@
 */
 uint8_t mkvHeader::analyzeOneTrack(void *head,uint32_t headlen)
 {
+    entryDesc entry;
 
-      entryDesc entry;
-      
-      /* Set some defaults value */
-
-      entry.chan=1;
+    /* Set some defaults value */
+    entry.chan=1;
 
-      entryWalk(  (ADM_ebml_file *)head,headlen,&entry);
-      entry.dump();
+    entryWalk(  (ADM_ebml_file *)head,headlen,&entry);
+    entry.dump();
 
-      //***************** First video track *****************
-      if(entry.trackType==1 &&  !_isvideopresent)
-      {
+    //***************** First video track *****************
+    if(entry.trackType==1 &&  !_isvideopresent)
+    {
         _isvideopresent=1;
         if(entry.defaultDuration)
         {
@@ -186,14 +185,13 @@
             _videostream.dwRate=(uint32_t)inv;
         }else
         {
-          printf("[MKV] No duration, assuming 25 fps\n");
-          _videostream.dwScale=1000;
-          _videostream.dwRate=25000;
-          _tracks[0]._defaultFrameDuration=40000;
-
+            printf("[MKV] No duration, assuming 25 fps\n");
+            _videostream.dwScale=1000;
+            _videostream.dwRate=25000;
+            _tracks[0]._defaultFrameDuration=40000;
         }
 
-        _mainaviheader.dwMicroSecPerFrame=(uint32_t)floor(50.0F);;
+        _mainaviheader.dwMicroSecPerFrame=_tracks[0]._defaultFrameDuration;
         _videostream.fccType=fourCC::get((uint8_t *)"vids");
         _video_bih.biBitCount=24;
         _videostream.dwInitialFrames= 0;
@@ -202,36 +200,70 @@
         _video_bih.biHeight=_mainaviheader.dwHeight=entry.h;
         _videostream.fccHandler=_video_bih.biCompression=entry.fcc;
 
+#define AV1_EXTRADATA_OFFSET 4
+
         // if it is vfw...
         if(fourCC::check(entry.fcc,(uint8_t *)"VFWX") && entry.extraData && entry.extraDataLen>=sizeof(ADM_BITMAPINFOHEADER))
         {
-          ADM_info("VFW compatibility header, data=%d bytes\n",(int)entry.extraDataLen);
-          memcpy(& _video_bih,entry.extraData,sizeof(ADM_BITMAPINFOHEADER));
+            ADM_info("VFW compatibility header, data=%d bytes\n",(int)entry.extraDataLen);
+            memcpy(& _video_bih,entry.extraData,sizeof(ADM_BITMAPINFOHEADER));
 
-          _videostream.fccHandler=_video_bih.biCompression;
-          _mainaviheader.dwWidth=  _video_bih.biWidth;
-          _mainaviheader.dwHeight= _video_bih.biHeight;
-          if(entry.extraDataLen>sizeof(ADM_BITMAPINFOHEADER))
-          {
+            _videostream.fccHandler=_video_bih.biCompression;
+            _mainaviheader.dwWidth= _video_bih.biWidth;
+            _mainaviheader.dwHeight=_video_bih.biHeight;
+            if(entry.extraDataLen>sizeof(ADM_BITMAPINFOHEADER))
+            {
                 int l=entry.extraDataLen-sizeof(ADM_BITMAPINFOHEADER);
                 _tracks[0].extraData=new uint8_t[l];
                 _tracks[0].extraDataLen=l;
                 memcpy(_tracks[0].extraData,entry.extraData +sizeof(ADM_BITMAPINFOHEADER),l);
                 ADM_info("VFW Header+%d bytes of extradata\n",l);   
                 mixDump(_tracks[0].extraData,l);
-          }
-          delete [] entry.extraData;
-          entry.extraData=NULL;
-          entry.extraDataLen=0;
-
-        } 
-        else
+            }
+            delete [] entry.extraData;
+            entry.extraData=NULL;
+            entry.extraDataLen=0;
+        }else if(fourCC::check(entry.fcc,(uint8_t *)"av01") && entry.extraData && entry.extraDataLen>AV1_EXTRADATA_OFFSET)
+        {
+            _tracks[0].extraDataLen=entry.extraDataLen-AV1_EXTRADATA_OFFSET;
+            _tracks[0].extraData=new uint8_t[_tracks[0].extraDataLen];
+            memcpy(_tracks[0].extraData, entry.extraData+AV1_EXTRADATA_OFFSET, _tracks[0].extraDataLen);
+            delete [] entry.extraData;
+            entry.extraData=NULL;
+            entry.extraDataLen=0;
+        }else
         {
             _tracks[0].extraData=entry.extraData;
             _tracks[0].extraDataLen=entry.extraDataLen;
         }
+        if(isH264Compatible(entry.fcc) && _tracks[0].extraData
+            && _tracks[0].extraDataLen > 8 // FIXME
+            && (_tracks[0].extraData[5] & 0x1F) == 1) // 1x SPS
+        {
+            ADM_SPSInfo info;
+            if(extractSPSInfo_mp4Header(_tracks[0].extraData, _tracks[0].extraDataLen, &info))
+            {
+                uint32_t sz=sizeof(ADM_SPSInfo);
+                if(_tracks[0].infoCache)
+                    delete [] _tracks[0].infoCache;
+                _tracks[0].infoCache=new uint8_t[sz];
+                memcpy(_tracks[0].infoCache, &info, sz);
+                _tracks[0].infoCacheSize=sz;
+                // now copy SPS to the raw parameter sets cache
+                uint8_t *p=_tracks[0].extraData;
+                sz=(*(p+6)<<8)+*(p+7);
+                if(_tracks[0].extraDataLen > sz+8)
+                {
+                    if(_tracks[0].paramCache)
+                        delete [] _tracks[0].paramCache;
+                    _tracks[0].paramCache=new uint8_t[sz];
+                    memcpy(_tracks[0].paramCache,p+8,sz);
+                    _tracks[0].paramCacheSize=sz;
+                }
+            }
+        }
         _tracks[0].streamIndex=entry.trackNo;
-        
+
         uint32_t hdr=entry.headerRepeatSize;
         if(hdr)
         {
@@ -239,15 +271,15 @@
             memcpy(_tracks[0].headerRepeat,entry.headerRepeat,hdr);
             ADM_info("video has %d bytes of repeated headers\n",hdr);
         }
-        
         return 1;
-      }
-      //***************** Audio tracks *****************
-      if(entry.trackType==2 && _nbAudioTrack<ADM_MKV_MAX_TRACKS)
-      {
+    }
+    //***************** Audio tracks *****************
+    if(entry.trackType==2 && _nbAudioTrack<ADM_MKV_MAX_TRACKS)
+    {
         mkvTrak *t=&(_tracks[1+_nbAudioTrack]);
-        t->extraDataLen=entry.extraDataLen;
-        ADM_info("This track has %d bytes of  extradata\n",t->extraDataLen);
+        t->language=entry.language;
+        t->wavHeader.bitspersample=16;
+        t->wavHeader.byterate=0; // to be set later
         // MS/ACM : ACMX
         if(0x100001==entry.fcc)
         {
@@ -259,15 +291,20 @@
                 mixDump(entry.extraData,l);
                 memcpy(&(t->wavHeader),entry.extraData,wavSize);
                 ADM_info("Encoding : %d\n",t->wavHeader.encoding);
+                wavSize+=2; // size of WAVEFORMATEX
                 int x=l-wavSize;
-                
-                if(x>0) // If we have more than a wavheader, it is extradata
+
+                if(x>0) // If we have more than WAVEFORMATEX, it is extradata
                 {
                     ADM_info("Found %d bytes of extradata\n",x);
                     t->extraData=new uint8_t[x];
                     t->extraDataLen=x;
                     memcpy(t->extraData,entry.extraData+wavSize,x);
+                    if(t->wavHeader.encoding==0xfffe) // WAVE_FORMAT_EXTENSIBLE + extradata: might be AAC LATM
+                        t->wavHeader.encoding=MKV_MUX_LATM;
                 }
+                if(t->wavHeader.encoding==MKV_MUX_LATM)
+                    t->wavHeader.byterate=0; // to be set later
                 delete [] entry.extraData;
                 t->streamIndex=entry.trackNo;
                 if(entry.defaultDuration)
@@ -279,7 +316,6 @@
                 return 1;
             }
         }
-        //**
         if(entry.fcc==WAV_AAC)
         {
             if(!entry.extraDataLen)
@@ -302,39 +338,38 @@
                 }
             }
         }
-        //**
-         t->language=entry.language;
-         t->wavHeader.encoding=entry.fcc;
-         t->wavHeader.channels=entry.chan;
-         t->wavHeader.frequency=entry.fq;
-         t->wavHeader.bitspersample=16;
-         t->wavHeader.byterate=(128000)>>3; //FIXME
-         t->streamIndex=entry.trackNo;
-         t->extraData=entry.extraData;
-         
-         t->extraDataLen=entry.extraDataLen;
-         if(entry.defaultDuration)
-          t->_defaultFrameDuration=entry.defaultDuration;
-         else
-           t->_defaultFrameDuration=0;
+        if(entry.fcc==WAV_PCM || entry.fcc==WAV_LPCM)
+        {
+            t->wavHeader.byterate = t->wavHeader.bitspersample * entry.fq * entry.chan >> 3;
+        }
+        t->wavHeader.encoding=entry.fcc;
+        t->wavHeader.channels=entry.chan;
+        t->wavHeader.frequency=entry.fq;
+        t->streamIndex=entry.trackNo;
+        if(entry.defaultDuration)
+            t->_defaultFrameDuration=entry.defaultDuration;
+        else
+            t->_defaultFrameDuration=0;
         uint32_t hdr=entry.headerRepeatSize;
         if(hdr)
         {
-           t->headerRepeatSize=entry.headerRepeatSize;
+            t->headerRepeatSize=entry.headerRepeatSize;
             memcpy(t->headerRepeat,entry.headerRepeat,hdr);
         }
+        t->extraData=entry.extraData;
+        t->extraDataLen=entry.extraDataLen;
+        ADM_info("This track has %d bytes of extradata\n",t->extraDataLen);
 
         _nbAudioTrack++;
         return 1;
-      }
-      // Other tracks, ignored...
-      
-      if(entry.extraData)
-      {
-          ADM_info("Ignoring extradata\n");
-          delete [] entry.extraData;
-      }
-      return 1;
+    }
+    // Other tracks, ignored...
+    if(entry.extraData)
+    {
+        ADM_info("Ignoring extradata\n");
+        delete [] entry.extraData;
+    }
+    return 1;
 
 }

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp Changed

@@ -32,104 +32,100 @@
 #else
 #define aprintf(...) {}
 #endif
+
 /**
     \fn videoIndexer
     \brief index the video Track
 */
 uint8_t mkvHeader::videoIndexer(ADM_ebml_file *parser)
 {
-  uint64_t len,id;
-  ADM_MKV_TYPE type;
-  const char *ss;
+    uint64_t len,id;
+    ADM_MKV_TYPE type;
+    const char *ss;
 
-   parser->seek(0);
-   DIA_workingBase *work=createWorking(QT_TRANSLATE_NOOP("matroskademuxer","Matroska Images"));
-   uint8_t res=1;
+    parser->seek(0);
+    DIA_workingBase *work=createWorking(QT_TRANSLATE_NOOP("matroskademuxer","Matroska Images"));
+    uint8_t res=1;
 
-   readBufferSize=200*1024;
-   readBuffer=new uint8_t[readBufferSize];
+    readBufferSize=200*1024;
+    readBuffer=new uint8_t[readBufferSize];
     //************
-   work->update(0);
+    work->update(0);
 #if 0
     int nbCluster=_clusters.size();
-   for(int clusters=0;clusters<nbCluster;clusters++)
+    for(int clusters=0;clusters<nbCluster;clusters++)
     {
         printf("[Cluster] %d/%d StartTimecode=%" PRIu64" ms\n",clusters,nbCluster,_clusters[clusters].Dts);
     }
 #endif
     int nbClusters=_clusters.size();
-   for(int clusters=0;clusters<nbClusters;clusters++)
-   {
-   parser->seek(_clusters[clusters].pos);
-   ADM_ebml_file cluster(parser,_clusters[clusters].size);
-   int thiscluster=0;
-   while(!cluster.finished())
-   {
-      if(!work->isAlive())
-      {
-        res=ADM_IGN;
-        break;
-      }
-      work->update(clusters,nbClusters);
-      cluster.readElemId(&id,&len);
-      if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
-      {
-        printf("[MKV] Tag 0x%" PRIx64" not found (len %" PRIu64")\n",id,len);
-        cluster.skip(len);
-        continue;
-      }
-      //printf("\t\tFound %s\n",ss);
-      switch(id)
-      {
+    for(int clusters=0;clusters<nbClusters;clusters++)
+    {
+        parser->seek(_clusters[clusters].pos);
+        ADM_ebml_file cluster(parser,_clusters[clusters].size);
+        int thiscluster=0;
+        while(!cluster.finished())
+        {
+            if(!work->isAlive())
+            {
+                res=ADM_IGN;
+                break;
+            }
+            work->update(clusters,nbClusters);
+            cluster.readElemId(&id,&len);
+            if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
+            {
+                printf("[MKV] Tag 0x%" PRIx64" not found (len %" PRIu64")\n",id,len);
+                cluster.skip(len);
+                continue;
+            }
+            //printf("\t\tFound %s\n",ss);
+            switch(id)
+            {
                 default:
                 case MKV_TIMECODE:
-                  //printf("Skipping %s\n",ss);
-                  cluster.skip(len);
-                  break;
+                    //printf("Skipping %s\n",ss);
+                    cluster.skip(len);
+                    break;
                 case MKV_SIMPLE_BLOCK:
-                    {
-                      indexBlock(parser,len,_clusters[clusters].Dts);
-                    }
+                    indexBlock(parser,len,_clusters[clusters].Dts);
                     break;
                 case MKV_BLOCK_GROUP:
                 {
-                        //printf("Block Group\n");
-                        ADM_ebml_file blockGroup(parser,len);
-                        while(!blockGroup.finished())
+                    //printf("Block Group\n");
+                    ADM_ebml_file blockGroup(parser,len);
+                    while(!blockGroup.finished())
+                    {
+                        blockGroup.readElemId(&id,&len);
+                        if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
                         {
-                                blockGroup.readElemId(&id,&len);
-                                if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
-                                {
-                                  printf("[MKV] Tag 0x%" PRIx64" not found (len %" PRIu64")\n",id,len);
-                                  blockGroup.skip(len);
-                                  continue;
-                                }
-                                //printf("\t\t\t\tFound %s\n",ss);
-                                //printf(">%s\n",ss);
-                                switch(id)
-                                {
-                                  default: blockGroup.skip(len);break;
-                                  case MKV_BLOCK :
-                                  case MKV_SIMPLE_BLOCK:
-                                  {
-                                    indexBlock(&blockGroup,len,_clusters[clusters].Dts);
-                                  }
-                                  break;
-                                }
-                          }
-                          thiscluster++;
+                            printf("[MKV] Tag 0x%" PRIx64" not found (len %" PRIu64")\n",id,len);
+                            blockGroup.skip(len);
+                            continue;
+                        }
+                        //printf("\t\t\t\tFound %s\n",ss);
+                        //printf(">%s\n",ss);
+                        switch(id)
+                        {
+                            default: blockGroup.skip(len);break;
+                            case MKV_BLOCK:
+                            case MKV_SIMPLE_BLOCK:
+                                indexBlock(&blockGroup,len,_clusters[clusters].Dts);
+                                break;
+                        }
+                    }
+                    thiscluster++;
+                }
+                break; // Block Group
             }
-
-            break; // Block Group
-       }
-     }
+        }
    // printf("[MKV] ending cluster at 0x%llx\n",segment.tell());
-  }
-     printf("Found %" PRIu32" images in this cluster\n",(uint32_t)VIDEO.index.size());
-     delete work;
-     delete [] readBuffer;
-     readBuffer=NULL;
-     return (res==ADM_IGN)? res : !!VIDEO.index.size();
+    }
+    printf("Found %" PRIu32" images in this cluster\n",(uint32_t)VIDEO.index.size());
+    delete work;
+    delete [] readBuffer;
+    readBuffer=NULL;
+    return (res==ADM_IGN)? res : !!VIDEO.index.size();
 }
 /**
       \fn indexBlock
@@ -137,30 +133,30 @@
 */
 uint8_t mkvHeader::indexBlock(ADM_ebml_file *parser,uint32_t len,uint32_t clusterTimeCodeMs)
 {
-  int entryFlags=0;
-  //
-  uint64_t tail=parser->tell()+len;
-  // Read Track id
-  uint32_t tid=parser->readEBMCode();
-  int track=searchTrackFromTid(tid);
-
-      //printf("Wanted %u got %u\n",_tracks[0].streamIndex,tid);
-      if(track==-1) //dont care track
-      {
+    int entryFlags=0;
+
+    uint64_t tail=parser->tell()+len;
+    // Read Track id
+    uint32_t tid=parser->readEBMCode();
+    int track=searchTrackFromTid(tid);
+
+    //printf("Wanted %u got %u\n",_tracks[0].streamIndex,tid);
+    if(track==-1) //dont care track
+    {
         parser->seek(tail);
         return 1; // we do only video here...
-      }
-      // Skip timecode
-      uint64_t blockBegin=parser->tell();
-      int16_t timecode=parser->readSignedInt(2);
-      //if(!track) printf("TC: %d\n",timecode);
-      uint8_t flags=parser->readu8();
-
-      //int lacing=((flags>>1)&3);
-
-      addIndexEntry(track,parser,blockBegin,tail-blockBegin,entryFlags,clusterTimeCodeMs+timecode);
-      parser->seek(tail);
-      return 1;
+    }
+    // Skip timecode
+    uint64_t blockBegin=parser->tell();
+    int16_t timecode=parser->readSignedInt(2);
+    //if(!track) printf("TC: %d\n",timecode);
+    uint8_t flags=parser->readu8();
+
+    //int lacing=((flags>>1)&3);
+
+    addIndexEntry(track,parser,blockBegin,tail-blockBegin,entryFlags,clusterTimeCodeMs+timecode);
+    parser->seek(tail);
+    return 1;
 }
 /**
  *
@@ -168,19 +164,19 @@
  */
 static int mkvFindStartCode(uint8_t *& start, uint8_t *end)
 {
-        uint32_t last=0xffffffff;
-        while(start<end)
+    uint32_t last=0xffffffff;
+    while(start<end)
+    {
+        last=(last<<8)+*start;
+        if((last & 0xFFFFFF00)==0x100)
         {
-            last=(last<<8)+*start;
-            if((last & 0xFFFFFF00)==0x100)
-            {
-                int r=start[0];
-                start++;
-                return r;
-            }
+            int r=start[0];
             start++;
+            return r;
         }
-        return -1;
+        start++;
+    }
+    return -1;
 }
 
 static bool canRederiveFrameType(uint32_t fcc)
@@ -199,121 +195,220 @@
 */
 uint8_t mkvHeader::addIndexEntry(uint32_t track,ADM_ebml_file *parser,uint64_t where, uint32_t size,uint32_t flags,uint32_t timecodeMS)
 {
-  //
-  mkvTrak *Track=&(_tracks[track]);
-  mkvIndex ix;
-
-  ix.pos=where;
-  ix.size=size;
-  ix.flags=0;
-  ix.Dts=timecodeMS*_timeBase;
-  ix.Pts=timecodeMS*_timeBase;
-  //printf("Track=%d, timecode=%d timeBase=%d, Pts=%d\n",track,(int)timecodeMS,(int)_timeBase,ix.Pts);
-   uint32_t rpt=_tracks[0].headerRepeatSize;
-
-   // expand buffer if needed
-   if(size>readBufferSize)
-   {
-       delete [] readBuffer;
-       readBufferSize=size*2;
-       readBuffer=new uint8_t[readBufferSize];
-   }
-   if(!track)
-   {
-       aprintf("adding image at 0x%llx , time = %d\n",where,timecodeMS);
-   }
-  // since frame type is unreliable for mkv, we scan each frame
-  // For the 2 most common cases : mp4 & h264.
-  // Hackish, we already read the 3 bytes header
-  // But they are already taken into account in the size part
-  if(!track && canRederiveFrameType(_videostream.fccHandler)) // Track 0 is video
-  {
-    if( isMpeg4Compatible(_videostream.fccHandler))
+    mkvTrak *Track=&(_tracks[track]);
+    mkvIndex ix;
+
+    ix.pos=where;
+    ix.size=size;
+    ix.flags=0;
+    ix.Dts=timecodeMS*_timeBase;
+    ix.Pts=timecodeMS*_timeBase;
+    //printf("Track=%d, timecode=%d timeBase=%d, Pts=%d\n",track,(int)timecodeMS,(int)_timeBase,ix.Pts);
+    uint32_t rpt=_tracks[0].headerRepeatSize;
+
+    // expand buffer if needed
+    if(size>readBufferSize)
     {
-
+        delete [] readBuffer;
+        readBufferSize=size*2;
+        readBuffer=new uint8_t[readBufferSize];
+    }
+    if(!track)
+    {
+        aprintf("adding image at 0x%llx , time = %d\n",where,timecodeMS);
+    }
+    // since frame type is unreliable for mkv, we scan each frame
+    // For the 2 most common cases : mp4 & h264.
+    // Hackish, we already read the 3 bytes header
+    // But they are already taken into account in the size part
+    if(!track && canRederiveFrameType(_videostream.fccHandler)) // Track 0 is video
+    {
+        if( isMpeg4Compatible(_videostream.fccHandler))
+        {
             if(rpt)
                 memcpy(readBuffer,_tracks[0].headerRepeat,rpt);
             parser->readBin(readBuffer+rpt,size-3);
-            // Search the frame type...
 
-             uint32_t nb,timeinc=16;
-             ADM_vopS vops[10];
-             vops[0].type=AVI_KEY_FRAME;
-             ADM_searchVop(readBuffer,readBuffer+rpt+size-3,&nb,vops, &timeinc);
-             ix.flags=vops[0].type;
-
-    }else
-    if(isH264Compatible(_videostream.fccHandler))
-    {
+            // Search the frame type...
+            uint32_t nb,timeinc=16;
+            ADM_vopS vops[10];
+            vops[0].type=AVI_KEY_FRAME;
+            ADM_searchVop(readBuffer,readBuffer+rpt+size-3,&nb,vops, &timeinc);
+            ix.flags=vops[0].type;
 
-                uint32_t flags=AVI_KEY_FRAME;
+        }else if(isH264Compatible(_videostream.fccHandler))
+        {
+            uint32_t flags=AVI_KEY_FRAME;
 
-                if(rpt)
-                        memcpy(readBuffer,_tracks[0].headerRepeat,rpt);
-                parser->readBin(readBuffer+rpt,size-3);
-                extractH264FrameType(readBuffer,rpt+size-3,&flags,NULL,NULL,&_H264Recovery);
-                if(flags & AVI_KEY_FRAME)
+            if(rpt)
+                memcpy(readBuffer,_tracks[0].headerRepeat,rpt);
+            parser->readBin(readBuffer+rpt,size-3);
+            // Deal with Matroska files containing Annex-B type of H.264 stream
+            bool AnnexB=false;
+            if(!_tracks[0].extraDataLen && rpt+size > 3 && !readBuffer[0] && !readBuffer[1])
+            {
+                uint32_t mark=(readBuffer[2] << 8) + readBuffer[3];
+                if(mark == 1 || (mark > 0xFF && mark < 0x200 && rpt+size-3 != mark+4))
+                    AnnexB=true;
+            }
+            uint32_t nalSize=0;
+            if(_tracks[0].extraDataLen)
+                nalSize=ADM_getNalSizeH264(_tracks[0].extraData, _tracks[0].extraDataLen);
+            ADM_SPSInfo *info=(ADM_SPSInfo *)_tracks[0].infoCache;
+            uint8_t *sps=_tracks[0].paramCache;
+            uint32_t spsLen=_tracks[0].paramCacheSize;
+            // do we have inband SPS?
+            uint8_t buf[MAX_H264_SPS_SIZE];
+            uint32_t inBandSpsLen=0;
+            if(!AnnexB)
+                inBandSpsLen=getRawH264SPS(readBuffer, rpt+size-3, nalSize, buf, MAX_H264_SPS_SIZE);
+            else
+                inBandSpsLen=getRawH264SPS_startCode(readBuffer, rpt+size-3, buf, MAX_H264_SPS_SIZE);
+            bool match=true;
+            if(inBandSpsLen > 1) // else likely misdetected Annex-B start code
+            {
+                if(inBandSpsLen!=spsLen)
+                    ADM_warning("SPS length mismatch: %u (old) vs %u (new)\n",spsLen,inBandSpsLen);
+                match=!memcmp(buf, sps, (spsLen>inBandSpsLen)? inBandSpsLen : spsLen);
+            }
+            if(!match)
+            {
+                ADM_warning("SPS mismatch? Checking deeper...\n");
+                ADM_SPSInfo info2;
+                if(extractSPSInfoFromData(buf,inBandSpsLen,&info2))
                 {
-                    printf("[MKV/H264] Frame %" PRIu32" is a keyframe\n",(uint32_t)Track->index.size());
+                    const uint32_t sz=sizeof(ADM_SPSInfo);
+                    if(!info)
+                    {
+                        _tracks[0].infoCache=new uint8_t[sz];
+                        memcpy(_tracks[0].infoCache, &info2, sz);
+                        _tracks[0].infoCacheSize=sz;
+                    }else
+                    {
+#define MATCH(x) if(info->x != info2.x) { ADM_warning("%s value does not match.\n",#x); info->x = info2.x; match=false; }
+                        match=true;
+                        MATCH(width) // FIXME: dimensions mismatch should be fatal
+                        MATCH(height)
+                        MATCH(CpbDpbToSkip)
+                        MATCH(hasPocInfo)
+                        MATCH(log2MaxFrameNum)
+                        MATCH(log2MaxPocLsb)
+                        MATCH(frameMbsOnlyFlag)
+                        MATCH(refFrames)
+                        if(!match)
+                        {
+                            ADM_warning("Codec parameters change on the fly at frame %u, expect problems.\n",Track->index.size());
+                            // Nevertheless, update the cached info
+                            memcpy(_tracks[0].infoCache, &info2, sz);
+                        }
+                    }
+                    // Update cached raw SPS
+                    if(_tracks[0].paramCache)
+                        delete [] _tracks[0].paramCache;
+                    _tracks[0].paramCache=new uint8_t[inBandSpsLen];
+                    memcpy(_tracks[0].paramCache, buf, inBandSpsLen);
+                    _tracks[0].paramCacheSize=inBandSpsLen;
                 }
-                ix.flags=flags;
-                if(Track->index.size()) ix.Dts=ADM_NO_PTS;
+            }
+            if(AnnexB)
+                extractH264FrameType_startCode(readBuffer, rpt+size-3, &flags, NULL, info, &_H264Recovery);
+            else
+                extractH264FrameType(readBuffer, rpt+size-3, nalSize, &flags, NULL, info, &_H264Recovery);
+            if(flags & AVI_KEY_FRAME)
+            {
+                printf("[MKV/H264] Frame %" PRIu32" is a keyframe\n",(uint32_t)Track->index.size());
+            }
+            ix.flags=flags;
+            if(Track->index.size()) ix.Dts=ADM_NO_PTS;
 
-    }/*else if(isH265Compatible(_videostream.fccHandler))
-    {
+        }/*else if(isH265Compatible(_videostream.fccHandler))
+        {
+            uint32_t flags=AVI_KEY_FRAME;
 
-                uint32_t flags=AVI_KEY_FRAME;
+            if(rpt)
+                memcpy(readBuffer,_tracks[0].headerRepeat,rpt);
+            parser->readBin(readBuffer+rpt,size-3);
+            extractH265FrameType(2,readBuffer,rpt+size-3,&flags); // Nal size is not used in that case
+            if(flags & AVI_KEY_FRAME)
+            {
+                printf("[MKV/H265] Frame %" PRIu32" is a keyframe\n",(uint32_t)Track->index.size());
+            }
+            ix.flags=flags;
+            if(Track->index.size()) ix.Dts=ADM_NO_PTS;
 
-                if(rpt)
-                        memcpy(readBuffer,_tracks[0].headerRepeat,rpt);
-                parser->readBin(readBuffer+rpt,size-3);
-                extractH265FrameType(2,readBuffer,rpt+size-3,&flags); // Nal size is not used in that case
-                if(flags & AVI_KEY_FRAME)
+        }*/else if(isMpeg12Compatible(_videostream.fccHandler))
+        {
+            if(rpt)
+                memcpy(readBuffer,_tracks[0].headerRepeat,rpt);
+            parser->readBin(readBuffer+rpt,size-3);
+            uint8_t *begin=readBuffer;
+            uint8_t *end=readBuffer+size-3+rpt;
+            bool following=false;
+            int picFound=0;
+            while(begin<end)
+            {
+                int code=mkvFindStartCode(begin,end);
+                if(!picFound && code==-1)
                 {
-                    printf("[MKV/H265] Frame %" PRIu32" is a keyframe\n",(uint32_t)Track->index.size());
+                    ADM_warning("[Mpg2InMkv]No startcode found\n");
+                    break;
                 }
-                ix.flags=flags;
-                if(Track->index.size()) ix.Dts=ADM_NO_PTS;
-
-    }*/else if(isMpeg12Compatible(_videostream.fccHandler))
-    {
-
-                if(rpt)
-                        memcpy(readBuffer,_tracks[0].headerRepeat,rpt);
-                parser->readBin(readBuffer+rpt,size-3);
-                uint8_t *begin=readBuffer;
-                uint8_t *end=readBuffer+size-3+rpt;
-                while(begin<end)
+                //printf("Startcode found = 0x%x\n",code);
+                if(!code) // picture
                 {
-                    int code=mkvFindStartCode(begin,end);
-                    if(code==-1)
+                    int picType=begin[1]>>3;
+                    begin+=4;
+                    picFound++;
+                    following=true;
+                    if(picFound>1)
+                        continue;
+                    picType&=7;
+                    switch(picType)
                     {
-                        ADM_warning("[Mpg2InMkv]No startcode found\n");
-                        break;
+                        case 1: ix.flags=AVI_KEY_FRAME;break;
+                        case 2: ix.flags=AVI_P_FRAME;break;
+                        case 4: ix.flags=AVI_P_FRAME;break;
+                        case 3: ix.flags=AVI_B_FRAME;break;
+                        default: ADM_warning("[Mpeg2inMkv]Bad pictype : %d\n",picType);
+                    }
+                }
+                if(code==0xB5) // extension
+                {
+                    int id=(begin[0]<<8)+begin[1];
+                    id>>=12;
+                    begin+=2;
+                    if(id!=8)
+                    {
+                        following=false;
+                        continue;
                     }
-                    //printf("Startcode found = 0x%x\n",code);
-                    if(!code) // picture
+                    if(picFound>1)
                     {
-                        int picType=begin[1]>>3;
-                        begin+=4;
-                        picType&=7;
-                        switch(picType)
-                        {
-                            case 1: ix.flags=AVI_KEY_FRAME;break;
-                            case 2: ix.flags=AVI_P_FRAME;break;
-                            case 4: ix.flags=AVI_P_FRAME;break;
-                            case 3: ix.flags=AVI_B_FRAME;break;
-                            default: ADM_warning("[Mpeg2inMkv]Bad pictype : %d\n",picType);
-                        }
+                        //printf("Multiple pics in a single buffer, clearing field structure.\n");
+                        ix.flags &= ~AVI_STRUCTURE_TYPE_MASK;
                         break;
                     }
-
+                    if(!following)
+                    {
+                        ADM_warning("Skipping picture coding extension not following picture.\n");
+                        begin+=3;
+                        continue;
+                    }
+                    following=false;
+                    int picStruct=begin[0]&3;
+                    begin+=3; // skip also parity and progressive flags
+                    switch(picStruct)
+                    {
+                        case 1: ix.flags|=AVI_TOP_FIELD+AVI_FIELD_STRUCTURE; break;
+                        case 2: ix.flags|=AVI_BOTTOM_FIELD+AVI_FIELD_STRUCTURE; break;
+                        default:break;
+                    }
                 }
-
-    }else if(isVC1Compatible(_videostream.fccHandler))
-    {
-        if(rpt)
-                    memcpy(readBuffer,_tracks[0].headerRepeat,rpt);
+            }
+        }else if(isVC1Compatible(_videostream.fccHandler))
+        {
+            if(rpt)
+                memcpy(readBuffer,_tracks[0].headerRepeat,rpt);
             parser->readBin(readBuffer+rpt,size-3);
             uint8_t *begin=readBuffer;
             uint8_t *end=readBuffer+size-3+rpt;
@@ -322,11 +417,13 @@
             {
                 ix.flags=frameType;
             }
+        }
     }
-  }
-  Track->index.append(ix);
+    if(size>3)
+        Track->_sizeInBytes+=size-3;
+    Track->index.append(ix);
 
-  return 1;
+    return 1;
 }
 
 /**
@@ -336,11 +433,11 @@
 */
 int mkvHeader::searchTrackFromTid(uint32_t tid)
 {
-  for(int i=0;i<1+_nbAudioTrack;i++)
-  {
-    if(tid==_tracks[i].streamIndex) return i;
-  }
-  return -1;
+    for(int i=0;i<1+_nbAudioTrack;i++)
+    {
+        if(tid==_tracks[i].streamIndex) return i;
+    }
+    return -1;
 }
 
 /**
@@ -348,151 +445,147 @@
   \brief Update index with cue content
 
 */
-bool     mkvHeader::readCue(ADM_ebml_file *parser)
+bool mkvHeader::readCue(ADM_ebml_file *parser)
 {
-  uint64_t len,vlen;
-  uint64_t id;
-  ADM_MKV_TYPE type;
-  const char *ss;
-  uint64_t time;
-
+    uint64_t len,vlen;
+    uint64_t id;
+    ADM_MKV_TYPE type;
+    const char *ss;
+    uint64_t time;
 
-
-  if(!goBeforeAtomAtPosition(parser, _cuePosition,vlen, MKV_CUES,"MKV_CUES"))
-  {
-      ADM_warning("Cannot go to the CUES atom\n");
-      return false;
-  }
+    if(!goBeforeAtomAtPosition(parser, _cuePosition,vlen, MKV_CUES,"MKV_CUES"))
+    {
+        ADM_warning("Cannot go to the CUES atom\n");
+        return false;
+    }
 
     ADM_ebml_file cues(parser,vlen);
     while(!cues.finished())
     {
-           cues.readElemId(&id,&len);
-           if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
-           {
-             printf("[MKV] Tag 0x%" PRIx64" not found (len %" PRIu64")\n",id,len);
-             cues.skip(len);
-             continue;
-           }
-           if(id!=MKV_CUE_POINT)
-           {
-             printf("Found %s in CUES, ignored \n",ss);
-             cues.skip(len);
-             continue;
-           }
-           ADM_ebml_file cue(&cues,len);
-           // Cue TIME normally
-            cue.readElemId(&id,&len);
-            if(id!=MKV_CUE_TIME)
-            {
-               ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type);
-               printf("Found %s(0x%" PRIx64"), expected CUE_TIME  (0x%x)\n", ss,id,MKV_CUE_TIME);
-               cue.skip(cue.remaining());
-               continue;
-            }
-            time=cue.readUnsignedInt(len);
-
+        cues.readElemId(&id,&len);
+        if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
+        {
+            printf("[MKV] Tag 0x%" PRIx64" not found (len %" PRIu64")\n",id,len);
+            cues.skip(len);
+            continue;
+        }
+        if(id!=MKV_CUE_POINT)
+        {
+            printf("Found %s in CUES, ignored \n",ss);
+            cues.skip(len);
+            continue;
+        }
+        ADM_ebml_file cue(&cues,len);
+        // Cue TIME normally
+        cue.readElemId(&id,&len);
+        if(id!=MKV_CUE_TIME)
+        {
+            ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type);
+            printf("Found %s(0x%" PRIx64"), expected CUE_TIME  (0x%x)\n", ss,id,MKV_CUE_TIME);
+            cue.skip(cue.remaining());
+            continue;
+        }
+        time=cue.readUnsignedInt(len);
 
-            cue.readElemId(&id,&len);
-            if(id!=MKV_CUE_TRACK_POSITION)
-            {
-               ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type);
-               printf("Found %s (0x%" PRIx64"), expected MKV_CUE_TRACK_POSITION (0x%x)\n", ss,id,MKV_CUE_TRACK_POSITION);
-               cue.skip(cues.remaining());
-               continue;
-            }
-            ADM_ebml_file trackPos(&cue,len);
-            uint64_t tid=0;
-            uint64_t cluster_position=0;
-            uint64_t cue_position=0;
-            while(!trackPos.finished())
+        cue.readElemId(&id,&len);
+        if(id!=MKV_CUE_TRACK_POSITION)
+        {
+            ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type);
+            printf("Found %s (0x%" PRIx64"), expected MKV_CUE_TRACK_POSITION (0x%x)\n", ss,id,MKV_CUE_TRACK_POSITION);
+            cue.skip(cues.remaining());
+            continue;
+        }
+        ADM_ebml_file trackPos(&cue,len);
+        uint64_t tid=0;
+        uint64_t cluster_position=0;
+        uint64_t cue_position=0;
+        while(!trackPos.finished())
+        {
+            trackPos.readElemId(&id,&len);
+            switch(id)
             {
-              trackPos.readElemId(&id,&len);
-              switch(id)
-              {
                 case MKV_CUE_TRACK: tid=trackPos.readUnsignedInt(len);break;
                 case MKV_CUE_CLUSTER_POSITION: cluster_position=trackPos.readUnsignedInt(len);break;
                 case MKV_CUE_RELATIVE_POSITION: cue_position=trackPos.readUnsignedInt(len);break;
                 default:
-                      ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type);
-                      printf("[MKV] in cluster position found tag %s (0x%" PRIx64")\n",ss,id);
-                      trackPos.skip(len);
-                      continue;
-              }
+                    ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type);
+                    printf("[MKV] in cluster position found tag %s (0x%" PRIx64")\n",ss,id);
+                    trackPos.skip(len);
+                    continue;
             }
-            aprintf("Track %" PRIx64" segmentPos=%" PRIx64" Cluster Position 0x%" PRIx64" Cue position 0x%" PRIx64" Absolute=%" PRIx64" time %" PRIu64"\n",
-                  tid,_segmentPosition,cluster_position,cue_position,cue_position+cluster_position+_segmentPosition,time);
+        }
+        aprintf("Track %" PRIx64" segmentPos=%" PRIx64" Cluster Position 0x%" PRIx64" Cue position 0x%" PRIx64" Absolute=%" PRIx64" time %" PRIu64"\n",
+            tid,_segmentPosition,cluster_position,cue_position,cue_position+cluster_position+_segmentPosition,time);
 
-            if(!searchTrackFromTid(tid)) //only keep video i.e. track zero
-            {
-                //printf("Adding cue entry\n");
-                 _cueTime.append(time);
-            }
-   }
-   if(_cueTime.size())
-   {
+        if(!searchTrackFromTid(tid)) //only keep video i.e. track zero
+        {
+            //printf("Adding cue entry\n");
+            _cueTime.append(time);
+        }
+    }
+    if(_cueTime.size())
+    {
         ADM_info("[MKV] Cues updated\n");
         return true;
-   }
-   else
-   {
-       ADM_info("[MKV] No Cue found\n");
-       return false;
-   }
+    }else
+    {
+        ADM_info("[MKV] No Cue found\n");
+        return false;
+    }
 
 }
 /**
         \fn indexClusters
         \brief make a list of all clusters with there position & size
 */
-uint8_t   mkvHeader::indexClusters(ADM_ebml_file *parser)
+uint8_t mkvHeader::indexClusters(ADM_ebml_file *parser)
 {
-  uint64_t fileSize,len;
-  uint64_t alen,vlen;
-  uint64_t id;
-  ADM_MKV_TYPE type;
-  const char *ss;
-  uint64_t pos;
-  uint8_t res=1;
+    uint64_t fileSize,len;
+    uint64_t alen,vlen;
+    uint64_t id;
+    ADM_MKV_TYPE type;
+    const char *ss;
+    uint64_t pos;
+    uint8_t res=1;
 
     mkvIndex tmpCluster;
 
-  // Search segment
-   fileSize=parser->getFileSize();
-   if(!parser->simplefind(MKV_SEGMENT,&vlen,1))
-   {
-     ADM_warning("[MKV] cluster indexer, cannot find CLUSTER atom\n");
-     return 0;
-   }
+    // Search segment
+    fileSize=parser->getFileSize();
+    if(!parser->simplefind(MKV_SEGMENT,&vlen,1))
+    {
+        ADM_warning("[MKV] cluster indexer, cannot find CLUSTER atom\n");
+        return 0;
+    }
     // In case the segment is ridiculously small take file size....
-   pos=parser->tell();
-   ADM_info("FileSize = %" PRIu64", pos=%" PRIu64" size=%" PRIu64",pos+size=%" PRIu64"\n",fileSize,pos,vlen,pos+vlen);
-   if(pos+vlen<fileSize)
+    pos=parser->tell();
+    ADM_info("FileSize = %" PRIu64", pos=%" PRIu64" size=%" PRIu64",pos+size=%" PRIu64"\n",fileSize,pos,vlen,pos+vlen);
+    if(pos+vlen<fileSize)
     {
         ADM_warning("Segment is way too small, trying to guess the right value\n");
         vlen=fileSize-pos;
     }
-   ADM_ebml_file segment(parser,vlen);
-
-   DIA_workingBase *work=createWorking(QT_TRANSLATE_NOOP("matroskademuxer","Matroska clusters"));
-   while(segment.simplefind(MKV_CLUSTER,&alen,0))
-   {
-     if(!work->isAlive())
-     {
-        res=ADM_IGN;
-        break;
-     }
-     // UI update
-     work->update(segment.tell()>>10,fileSize>>10);
-     tmpCluster.pos=segment.tell();
-     tmpCluster.size=alen;
-     _clusters.append(tmpCluster);
+    ADM_ebml_file segment(parser,vlen);
+
+    DIA_workingBase *work=createWorking(QT_TRANSLATE_NOOP("matroskademuxer","Matroska clusters"));
+    while(segment.simplefind(MKV_CLUSTER,&alen,0))
+    {
+        if(!work->isAlive())
+        {
+            res=ADM_IGN;
+            break;
+        }
+        // UI update
+        work->update(segment.tell()>>10,fileSize>>10);
+        tmpCluster.pos=segment.tell();
+        tmpCluster.size=alen;
+        _clusters.append(tmpCluster);
 
      // Normally the timecode is the 1st one following
 
 tryAgain:
-       segment.readElemId(&id,&len);
-       switch(id)
+        segment.readElemId(&id,&len);
+        switch(id)
         {
             case MKV_CRC32:
             case MKV_PREV_SIZE:
@@ -501,25 +594,24 @@
                 goto tryAgain;
             default:break;
         }
-       int seekme=_clusters.size()-1; // last element...
-       if(id!=MKV_TIMECODE)
-       {
-          ss=NULL;
-          ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type);
-          ADM_warning("[MKV] Cluster : no time code Found %s(0x%" PRIx64"), expected MKV_TIMECODE  (0x%x)\n",
-                  ss,id,MKV_TIMECODE);
-       }
-       else // timecode
-       {
-           uint64_t timecode=segment.readUnsignedInt(len);
-           _clusters[seekme].Dts=timecode;
-       }
-       segment.seek( _clusters[seekme].pos+ _clusters[seekme].size);
-       //printf("Position :%u %u MB\n", _clusters[seekme].pos+ _clusters[seekme].size,( _clusters[seekme].pos+ _clusters[seekme].size)>>20);
-   }
-   delete work;
-   ADM_info("[MKV] Found %u clusters\n",(int)_clusters.size());
-   return res;
+        int seekme=_clusters.size()-1; // last element...
+        if(id!=MKV_TIMECODE)
+        {
+            ss=NULL;
+            ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type);
+            ADM_warning("[MKV] Cluster : no time code Found %s(0x%" PRIx64"), expected MKV_TIMECODE  (0x%x)\n",
+                ss,id,MKV_TIMECODE);
+        }else // timecode
+        {
+            uint64_t timecode=segment.readUnsignedInt(len);
+            _clusters[seekme].Dts=timecode;
+        }
+        segment.seek( _clusters[seekme].pos+ _clusters[seekme].size);
+        //printf("Position :%u %u MB\n", _clusters[seekme].pos+ _clusters[seekme].size,( _clusters[seekme].pos+ _clusters[seekme].size)>>20);
+    }
+    delete work;
+    ADM_info("[MKV] Found %u clusters\n",(int)_clusters.size());
+    return res;
 }
 /**
  * \fn updateFlagsWithCue
@@ -565,13 +657,13 @@
  */
 bool mkvHeader::dumpVideoIndex(int mx)
 {
-  int n=_tracks[0].index.size();
-  if(n>mx) n=mx;
-  for(int i=0;i<n;i++)
-  {
-      ADM_info("[%d] Position 0x%llx, size=%d, time=%s, Flags=%x\n",i,
+    int n=_tracks[0].index.size();
+    if(n>mx) n=mx;
+    for(int i=0;i<n;i++)
+    {
+        ADM_info("[%d] Position 0x%llx, size=%d, time=%s, Flags=%x\n",i,
                _tracks[0].index[i].pos,_tracks[0].index[i].size,ADM_us2plain(_tracks[0].index[i].Pts),_tracks[0].index[i].flags);
-  }
-  return true;
+    }
+    return true;
 }
 //EOF

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvTrackType.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvTrackType.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv_audio.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv_audio.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/CMakeLists.txt Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/mkv_tagenum.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/mkv_tagenum.h Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp Changed

@@ -64,10 +64,13 @@
 #include "ADM_mp4.h"
 
 #include "ADM_vidMisc.h"
+#include "DIA_processing.h"
 
 #include "ADM_videoInfoExtractor.h"
 #include "ADM_codecType.h"
 #include "ADM_a52info.h"
+#include "ADM_mp3info.h"
+#include "ADM_audioXiphUtils.h"
 
 #if 1
 #define aprintf(...) {}
@@ -135,6 +138,8 @@
     return _movieDuration*1000LL; //VDEO.index[VDEO.nbIndex-1].time;
 
 }
+
+#ifdef DERIVE_TB_FROM_MINIMUM_DELTA
 /**
  * \fn compute the minimum us delta = maximum fps
  * \brief average fps is not good enough, it might be too high
@@ -194,6 +199,8 @@
     return true;
     
 }
+#endif
+
 uint8_t  MP4Header::getFrame(uint32_t framenum,ADMCompressedImage *img)
 {
     aprintf("[MP4] frame %d requested (nbFrame=%d)\n",framenum,VDEO.nbIndex);
@@ -234,11 +241,16 @@
 {
     close();
 
-	for (int audio = 0; audio < nbAudioTrack; audio++)
-	{
-		delete audioStream[audio];
-		delete audioAccess[audio];
-	}
+    for(int audio = 0; audio < nbAudioTrack; audio++)
+    {
+        delete audioStream[audio];
+        delete audioAccess[audio];
+    }
+    for(int i = 0; i < nbTrex; i++)
+    {
+        delete _trexData[i];
+        _trexData[i] = NULL;
+    }
 }
 uint8_t    MP4Header::close( void )
 {
@@ -263,6 +275,9 @@
         _videoFound=0;
         delayRelativeToVideo=0;
         _flavor=Mp4Regular;
+        nbTrex=0;
+        for(int i=0;i<_3GP_MAX_TRACKS;i++)
+            _trexData[i]=NULL;
 }
 /**
     \fn getAudioInfo
@@ -328,7 +343,7 @@
 //______________________________________
 uint8_t    MP4Header::open(const char *name)
 {
-        printf("** opening 3gpp files **");
+        printf("** opening 3gpp files **\n");
         _fd=ADM_fopen(name,"rb");
         if(!_fd)
         {
@@ -434,39 +449,134 @@
                 }
             }else { printf("No extradata to probe\n");}
 
-        }
-        else
-        {
-
-        /*
-            Same story for H263 : Analyze 1st frame to get the real width/height
-        */
-            if(fourCC::check(_videostream.fccHandler,(uint8_t *)"H263"))
+        }else if(fourCC::check(_videostream.fccHandler,(uint8_t *)"H263"))
+        { // Same story for H263 : Analyze 1st frame to get the real width/height
+            uint32_t w,h,sz;
+            uint8_t *bfer=NULL;
+            sz=VDEO.index[0].size;
+            if(sz)
             {
-                uint32_t w,h,sz;
-                uint8_t *bfer=NULL;
-                sz=VDEO.index[0].size;
-                if(sz)
+                bfer=new uint8_t[sz];
+                ADMCompressedImage img;
+                img.data=bfer;
+                if(getFrame(0,&img))
                 {
-                        bfer=new uint8_t[sz];
-                        ADMCompressedImage img;
-                        img.data=bfer;
-                        if(getFrame(0,&img))
-                        {
-                        if(extractH263Info(bfer,sz,&w,&h))
+                    if(extractH263Info(bfer,sz,&w,&h))
+                    {
+                        printf("H263 Corrected size : %" PRIu32" x %" PRIu32"\n",w,h);
+                        _video_bih.biWidth=_mainaviheader.dwWidth=w ;
+                        _video_bih.biHeight=_mainaviheader.dwHeight=h;
+                    }else
+                    {
+                        printf("H263 COULD NOT EXTRACT SIZE, using : %" PRIu32" x %" PRIu32"\n",
+                        _video_bih.biWidth,  _video_bih.biHeight);
+                    }
+                }
+                delete [] bfer;
+            }
+        }else if(isH264Compatible(_videostream.fccHandler) && VDEO.extraDataSize)
+        { // Get frame type from H.264 slice headers, this is essential for handling of field encoded streams
+            ADM_SPSInfo info;
+            if(extractSPSInfo_mp4Header(VDEO.extraData,VDEO.extraDataSize,&info))
+            {
+                uint32_t nalSize = ADM_getNalSizeH264(VDEO.extraData,VDEO.extraDataSize);
+                uint32_t prevSpsLen=0;
+                uint8_t *prevSps=NULL, *curSps=NULL;
+#define MAX_SPS_SIZE 1024
+#define MAX_FRAME_LENGTH (1920*1080*3) // ~7 MiB, should be enough even for 4K
+                uint8_t *bfer=new uint8_t[MAX_FRAME_LENGTH];
+                ADMCompressedImage img;
+                img.data=bfer;
+                uint32_t i,fields=0,nb=VDEO.nbIndex;
+                uint64_t processed=0;
+                DIA_processingBase *work=createProcessing(QT_TRANSLATE_NOOP("mp4demuxer","Decoding frame type"),nb);
+                for(i=0;i<nb;i++)
+                {
+                    if(work && work->update(1,processed++))
+                        break; // cancelling frame type decoding is non-fatal
+                    if(!getFrame(i,&img))
+                    {
+                        ADM_warning("Could not get frame %u while decoding H.264 frame type.\n",i);
+                        continue;
+                    }
+                    if(img.flags & AVI_KEY_FRAME)
+                    {
+                        // Check for presence of SPS in the stream. If it changes on-the-fly, we are in trouble.
+                        if(!curSps)
+                            curSps=new uint8_t[MAX_SPS_SIZE];
+                        memset(curSps,0,MAX_SPS_SIZE);
+                        uint32_t curSpsLen = getRawH264SPS(img.data, img.dataLength, nalSize, curSps, MAX_SPS_SIZE);
+                        bool match=true;
+                        if(curSpsLen)
                         {
-                            printf("H263 Corrected size : %" PRIu32" x %" PRIu32"\n",w,h);
-                            _video_bih.biWidth=_mainaviheader.dwWidth=w ;
-                            _video_bih.biHeight=_mainaviheader.dwHeight=h;
+                            if(prevSps)
+                            {
+                                if(prevSpsLen)
+                                    match=!memcmp(prevSps,curSps,(prevSpsLen>curSpsLen)? curSpsLen : prevSpsLen);
+                            }else
+                            {
+                                prevSps=new uint8_t[MAX_SPS_SIZE];
+                            }
+                            if(!match)
+                            {
+                                ADM_warning("Codec parameters change at frame %u.\n",i);
+                                printf("\nOld SPS:\n");
+                                mixDump(prevSps,prevSpsLen);
+                                printf("\nNew SPS:\n");
+                                mixDump(curSps,curSpsLen);
+                            }
+                            prevSpsLen=curSpsLen;
+                            memset(prevSps,0,MAX_SPS_SIZE);
+                            memcpy(prevSps,curSps,prevSpsLen);
                         }
-                        else
+                        if(!match && curSps)
                         {
-                                  printf("H263 COULD NOT EXTRACT SIZE, using : %" PRIu32" x %" PRIu32"\n",
-                                      _video_bih.biWidth,  _video_bih.biHeight);
+                            ADM_info("SPS mismatch? Checking deeper...\n");
+                            ADM_SPSInfo info2;
+                            if(extractSPSInfoFromData(curSps,curSpsLen,&info2))
+                            { // check only fields we actually use
+#define MATCH(x) if(info.x != info2.x) { ADM_warning("%s value does not match.\n",#x); info.x = info2.x; match=false; }
+                                match=true;
+                                // FIXME: dimensions mismatch should be fatal
+                                MATCH(CpbDpbToSkip)
+                                MATCH(hasPocInfo)
+                                MATCH(log2MaxFrameNum)
+                                MATCH(log2MaxPocLsb)
+                                MATCH(frameMbsOnlyFlag)
+                                MATCH(refFrames)
+                                if(!match)
+                                    ADM_warning("Codec parameters change on the fly, expect problems.\n");
+                            }
                         }
+                    }
+                    uint32_t flags;
+                    if(extractH264FrameType(img.data,img.dataLength,nalSize,&flags,NULL,&info))
+                    {
+                        if(flags & AVI_FIELD_STRUCTURE)
+                        {
+                            if(!fields)
+                                printf("First field at frame %u\n",i);
+                            fields++;
+                        }else if(fields==1)
+                        { // discard a single field immediately followed by a frame, probably damaged stream
+                            printf("Resetting fields counter at frame %u\n",i);
+                            fields=0;
                         }
-                        delete [] bfer;
+                        setFlag(i,flags);
+                    }
                 }
+                if(work) delete work;
+                work=NULL;
+                delete [] bfer;
+                bfer=NULL;
+                if(curSps) delete [] curSps;
+                curSps=NULL;
+                if(prevSps) delete [] prevSps;
+                prevSps=NULL;
+                if(fields)
+                    ADM_info("Field encoded H.264 stream detected, # fields: %u\n",fields);
+                else
+                    ADM_info("Probably a frame encoded H.264 stream.\n");
             }
         }
         /*
@@ -536,6 +646,51 @@
                       }
                   }
                   delete [] buffer;
+                  break;
+            }
+            case WAV_MP3: // same for mp3
+            {
+                MP4Index *dex=_tracks[1+audio].index;
+                int size=dex[0].size;
+                uint8_t *buffer=new uint8_t[size];
+                fseeko(_fd,dex[0].offset,SEEK_SET);
+                if(fread(buffer,1,size,_fd))
+                {
+                    uint32_t off;
+                    MpegAudioInfo mpeg;
+                    if(getMpegFrameInfo(buffer, size, &mpeg, NULL, &off) && size >= off+mpeg.size)
+                    {
+                        if(mpeg.mode == 3 && _tracks[1+audio]._rdWav.channels!=1)
+                        {
+                            uint32_t fq=mpeg.samplerate;
+                            uint32_t br=(mpeg.bitrate*1000)>>3; //
+                            ADM_info("Updating MP3 info : Fq=%u, br=%u, chan=%u\n",fq,br,1);
+                            _tracks[1+audio]._rdWav.channels=1;
+                            _tracks[1+audio]._rdWav.frequency=fq;
+                            _tracks[1+audio]._rdWav.byterate=br;
+                        }
+                    }else
+                    {
+                        ADM_warning("Cannot get MP3 info from the first sample.\n");
+                    }
+                }
+                delete [] buffer;
+                break;
+            }
+            case WAV_OGG_VORBIS:
+            {
+                ADM_info("[MP4] Reformatting vorbis header for track %u\n",1+audio);
+                uint8_t *newExtra=NULL;
+                int newExtraSize=0;
+                if(false==ADMXiph::xiphExtraData2Adm(_tracks[1+audio].extraData, _tracks[1+audio].extraDataSize, &newExtra, &newExtraSize))
+                {
+                    ADM_warning("Cannot reformat vorbis extra data, faking audio format to avoid crash.\n");
+                    _tracks[1+audio]._rdWav.encoding=WAV_UNKNOWN;
+                }
+                // Destroy old extradata
+                delete [] _tracks[1+audio].extraData;
+                _tracks[1+audio].extraData=newExtra;
+                _tracks[1+audio].extraDataSize=newExtraSize;
             }
                 break;
             default:
@@ -558,11 +713,23 @@
                 lastFrame=i;
             }
         }
+        int64_t increment=_mainaviheader.dwMicroSecPerFrame;
+        if(!increment) // perfectly regular stream
+        {
+            ADM_assert(_videostream.dwRate);
+            double f=_videostream.dwScale;
+            f*=1000.*1000.;
+            f/=_videostream.dwRate;
+            f+=0.49;
+            increment=(int64_t)f;
+        }
+        duration2+=increment;
         ADM_info("3gp/mov file successfully read..\n");
         if(duration2!=ADM_NO_PTS && duration2>=duration1)
         { // video duration must be > max PTS, otherwise we drop the last frame
             ADM_warning("Last PTS is at or after movie duration, increasing movie duration\n");
-            _movieDuration=(duration2/1000)+1;
+            _movieDuration=(duration2+499)/1000;
+#ifdef DERIVE_TB_FROM_MINIMUM_DELTA
             // adjust calculated average FPS and time increment
             double f=_movieDuration;
             f=1000.*_tracks[0].nbIndex/f;
@@ -570,8 +737,11 @@
             _videostream.dwRate=(uint32_t)floor(f+0.49);
             _mainaviheader.dwMicroSecPerFrame=ADM_UsecFromFps1000(_videostream.dwRate);
             ADM_info("Adjusted fps1000: %d = %" PRIu64" us per frame.\n",_videostream.dwRate,_mainaviheader.dwMicroSecPerFrame);
+#endif
         }
+#ifdef DERIVE_TB_FROM_MINIMUM_DELTA
         refineFps();
+#endif
         if(nb>1 && !lastFrame)
             lastFrame=nb-1;
         ADM_info("Nb images       : %d\n",nb);

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.h Changed

@@ -92,9 +92,7 @@
                 uint32_t        _current_index;
                 MP4Index        *_index;
                 FILE            *_fd;
-                // Suppress repeated debug messages from getPacket
-                ADMCountdown    *_msg_ratelimit;
-                uint32_t        _msg_counter;
+                bool            _endOfStream;
 public:
                                   ADM_mp4AudioAccess(const char *name,MP4Track *trak) ;
                 virtual           ~ADM_mp4AudioAccess();
@@ -151,6 +149,24 @@
 /**
  * 
  */
+class mp4TrexInfo
+{
+public:
+    uint32_t trackID;
+    uint32_t sampleDesc;
+    uint32_t defaultDuration;
+    uint32_t defaultSize;
+    uint32_t defaultFlags;
+
+    mp4TrexInfo()
+    {
+        trackID=sampleDesc=0;
+        defaultDuration=defaultSize=defaultFlags=0;
+    }
+};
+/**
+ * 
+ */
 class mp4Fragment
 {
 public:
@@ -188,6 +204,7 @@
           uint64_t                      delayRelativeToVideo;
           uint8_t                       lookupMainAtoms(void *tom);
           void                          parseMvhd(void *tom);
+          uint8_t                       parseTrex(void *ztom);
           uint8_t                       parseTrack(void *ztom);
           uint8_t                       parseElst(void *tom,int64_t *delay,int64_t *skip);
           bool                          parseMoof(adm_atom &son);
@@ -200,7 +217,9 @@
           uint8_t                       parseStbl(void *ztom,uint32_t trackType,uint32_t trackScale);
           uint8_t                       decodeEsds(void *ztom,uint32_t trackType);
           uint8_t                       updateCtts(MPsampleinfo *info );
+#ifdef DERIVE_TB_FROM_MINIMUM_DELTA
           bool                          refineFps(void);
+#endif
           bool                          adjustElstDelay(void);
           uint32_t                      _videoScale;
           uint32_t                      _movieScale;
@@ -225,6 +244,8 @@
         int64_t                       _currentDelay;
         int64_t                       _currentStartOffset;
         Mp4Flavor                     _flavor;
+        mp4TrexInfo                   *_trexData[_3GP_MAX_TRACKS];
+        uint32_t                      nbTrex;
         uint8_t                       parseAtomTree(adm_atom *atom);
         ADM_mp4AudioAccess            *audioAccess[_3GP_MAX_TRACKS-1];
         ADM_audioStream               *audioStream[_3GP_MAX_TRACKS-1];

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp Changed

@@ -24,6 +24,7 @@
 #include "ADM_mp4.h"
 #include "DIA_coreToolkit.h"
 #include "ADM_coreUtils.h"
+#include "ADM_videoInfoExtractor.h"
 #include "ADM_mp4Tree.h"
 #include "ADM_vidMisc.h"
 #include "ADM_aacinfo.h"
@@ -117,6 +118,12 @@
             switch(id)
             {
                 case ADM_MP4_MVHD: parseMvhd(&son);break;
+                case ADM_MP4_MVEX:
+                    {
+                        ADM_info("Found mvex at position %u of size %u\n",son.getStartPos(),son.getRemainingSize());
+                        parseTrex(&son);
+                    }
+                    break;
                 case ADM_MP4_TRACK:
                     if(!parseTrack(&son))
                     {
@@ -198,8 +205,55 @@
 }
 
 /**
-      \fn parseMvhd
-      \brief Parse mvhd header
+    \fn parseTrex
+    \brief Some iso5 files specify dts increment via trex box only.
+*/
+uint8_t MP4Header::parseTrex(void *ztom)
+{
+    adm_atom *tom=(adm_atom *)ztom;
+    ADMAtoms id;
+    uint32_t container;
+    uint32_t trackId=0;
+    while(!tom->isDone())
+    {
+        adm_atom son(tom);
+        if(!ADM_mp4SearchAtomName(son.getFCC(),&id,&container))
+        {
+            aprintf("[parseTrex] Unknown atom %s\n",fourCC::tostringBE(son.getFCC()));
+            son.skipAtom();
+            continue;
+        }
+        if(id!=ADM_MP4_TREX) continue;
+        if(nbTrex>=_3GP_MAX_TRACKS)
+        {
+            ADM_warning("Number of trex boxes exceeds max supported.\n");
+            nbTrex=_3GP_MAX_TRACKS;
+            break;
+        }
+        mp4TrexInfo *trx=new mp4TrexInfo;
+        ADM_info("Found trex, reading it.\n");
+        son.skipBytes(4); // version and flags
+        trx->trackID=son.read32();
+        trx->sampleDesc=son.read32(); // stsd id
+        trx->defaultDuration=son.read32();
+        trx->defaultSize=son.read32();
+        trx->defaultFlags=son.read32();
+#define DUMPX(a) printf("trex %u: "#a" = %u\n",nbTrex,trx->a);
+        DUMPX(trackID)
+        DUMPX(sampleDesc)
+        DUMPX(defaultDuration)
+        DUMPX(defaultSize)
+        DUMPX(defaultFlags)
+        _trexData[nbTrex++]=trx;
+        son.skipAtom();
+        return 1;
+    }
+    ADM_info("trex box not found.\n");
+    return 0;
+}
+/**
+      \fn parseTrack
+      \brief Parse track header
 */
 uint8_t MP4Header::parseTrack(void *ztom)
 {
@@ -255,8 +309,15 @@
             }
             case ADM_MP4_MDIA:
             {
+                bool skipTrack=!!_videoFound;
                 if(!parseMdia(&son,&trackType,&trackId))
                     return false;
+                if(trackType==TRACK_VIDEO && skipTrack)
+                {
+                    ADM_warning("Skipping video track %u\n",trackId);
+                    tom->skipAtom();
+                    return 1;
+                }
                 break;
             }
             case ADM_MP4_EDTS:
@@ -343,6 +404,12 @@
                         break;
                     case MKFCCR('v','i','d','e'): // 'vide'
                         *trackType=TRACK_VIDEO;
+                        if(_videoFound)
+                        { // Ignore all subsequent video tracks, but keep track type set so that the caller can do the same.
+                            ADM_warning("Multiple video tracks are not supported, skipping.\n");
+                            tom->skipAtom();
+                            return 1;
+                        }
                         _tracks[0].delay=_currentDelay;
                         _tracks[0].startOffset=_currentStartOffset;
                         ADM_info("hdlr video found \n ");
@@ -849,6 +916,7 @@
                                 case MKFCCR('A','V','d','n'): // DNxHD
                                     commonPart(AVdn);
                                     break;
+
 //
                                 case MKFCCR('h','e','v','1'): // hev1 / hevc
                                 case MKFCCR('h','v','c','1'): // hev1 / hevc
@@ -918,6 +986,40 @@
                                         offset++;
                                         printf("avcC Pic len              :%x\n",len);
                                         mixDump(VDEO.extraData+offset,len);
+                                        // Verify width and height, the values from the container may be wrong.
+                                        ADM_SPSInfo sps;
+                                        if(false==extractSPSInfo(VDEO.extraData,VDEO.extraDataSize,&sps))
+                                        {
+                                            ADM_warning("Could not decode H.264 extradata.\n");
+                                            break;
+                                        }
+                                        if(sps.width && sps.height)
+                                        {
+                                            if(lw && lw!=sps.width)
+                                                ADM_warning("Width mismatch, container says %u, codec %u, trusting codec\n",lw,sps.width);
+                                            _video_bih.biWidth=_mainaviheader.dwWidth=sps.width;
+                                            if(lh && lh!=sps.height)
+                                                ADM_warning("Height mismatch, container says %u, codec %u, trusting codec\n",lh,sps.height);
+                                            _video_bih.biHeight=_mainaviheader.dwHeight=sps.height;
+                                        }else
+                                            ADM_warning("Got invalid dimensions from SPS, cannot verify video width and height.\n");
+                                        // Prefill time base from fps1000 value we got from SPS, we handle only standard cases here.
+                                        switch(sps.fps1000)
+                                        {
+                                            case 23976:
+                                                _videostream.dwScale=1001;
+                                                _videostream.dwRate=24000;
+                                                break;
+                                            case 29970:
+                                                _videostream.dwScale=1001;
+                                                _videostream.dwRate=30000;
+                                                break;
+                                            case 24000: case 25000: case 30000: case 50000: case 60000:
+                                                _videostream.dwScale=1000;
+                                                _videostream.dwRate=sps.fps1000;
+                                                break;
+                                            default:break;
+                                        }
                                         break;
                                     } // while
                                     son.skipAtom();
@@ -925,6 +1027,35 @@
 
                                     break;
                                 } // avc1
+
+                                case MKFCCR('a','v','0','1'): // AV1
+                                    commonPart(av01);
+                                    while(!son.isDone())
+                                    {
+                                        adm_atom av1c(&son);
+                                        if(av1c.getFCC()== MKFCCR('a','v','1','C'))
+                                        {
+                                            uint32_t len=av1c.getRemainingSize();
+#define AV1_EXTRADATA_OFFSET 4
+                                            if(len>AV1_EXTRADATA_OFFSET)
+                                            {
+                                                VDEO.extraDataSize=len-AV1_EXTRADATA_OFFSET;
+                                                ADM_info("Found %d bytes of AV1 extradata\n",VDEO.extraDataSize);
+                                                uint8_t *tmp=new uint8_t[len];
+                                                av1c.readPayload(tmp,len);
+                                                VDEO.extraData=new uint8_t[VDEO.extraDataSize];
+                                                memcpy(VDEO.extraData, tmp+AV1_EXTRADATA_OFFSET, VDEO.extraDataSize);
+                                                delete [] tmp;
+                                                tmp=NULL;
+                                                mixDump(VDEO.extraData,VDEO.extraDataSize);
+                                            }
+                                            av1c.skipAtom();
+                                        }
+                                    }
+                                    son.skipAtom();
+                                    left=0;
+                                    break;
+
                                 default:
                                     if(left>10)
                                     {
@@ -943,7 +1074,7 @@
                             uint32_t channels,bpp,encoding,fq,packSize;
 
                             // Put some defaults
-                            ADIO.encoding=1234;
+                            ADIO.encoding=WAV_UNKNOWN;
                             ADIO.frequency=44100;
                             ADIO.byterate=AUDIO_BYTERATE_UNSET;
                             ADIO.channels=2;
@@ -1226,10 +1357,11 @@
             }
             r=indexify(&(_tracks[0]),trackScale,&info,0,&nbo);
 
+            if(!r) return false;
+
             _videostream.dwLength= _mainaviheader.dwTotalFrames=_tracks[0].nbIndex;
             // update fps
             double f=_videostream.dwLength;
-            if(!r) return false;
             ADM_info("Movie duration = %d\n",(int)_movieDuration);
             ADM_info("# images = %d\n",(int)_mainaviheader.dwTotalFrames);
 
@@ -1238,8 +1370,7 @@
 
             ADM_info("Avg fps %f\n",(float)f);
 
-            _videostream.dwRate=(uint32_t)floor(f+0.49);
-            _mainaviheader.dwMicroSecPerFrame=ADM_UsecFromFps1000(_videostream.dwRate);
+            _videostream.dwRate=trackScale;
 
             // if we have a sync atom ???
             if(info.nbSync)
@@ -1359,6 +1490,9 @@
                         case 0x6d:
                             ADIO.encoding=WAV_MP3;
                             break;
+                        case 0xdd:
+                            ADIO.encoding=WAV_OGG_VORBIS;
+                            break;
                         case 226:
                             ADIO.encoding=WAV_AC3;
                             break;

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Fragments.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Fragments.cpp Changed

@@ -111,6 +111,12 @@
                     trafFlags=son.read32()&0xfffff;
                     
                     info.trackID=son.read32();
+                    mp4TrexInfo *trx=NULL;
+                    for(int i=0;i<nbTrex;i++)
+                    {
+                        if(_trexData[i]->trackID==info.trackID)
+                            trx=_trexData[i];
+                    }
                     aprintf("[TFHD] Track=%d flags =0x%x\n",info.trackID,trafFlags);
 #define TRAF_INFO(a,b,s)   if(trafFlags&a)  {info.b=son.read##s();aprintf("TFHD:"#b"=%d\n",(int)info.b);}
                     
@@ -121,6 +127,14 @@
                     TRAF_INFO(0x20,defaultFlags,32);                    
                    
                     if(trafFlags&0x10000) {aprintf("Empty duration\n");info.emptyDuration=true;}
+                    if(trx)
+                    {
+#define CPY_TREX(a) if(!info.a) { info.a=trx->a; aprintf("[TFHD] Using "#a" from trex = %u\n",trx->a); }
+                        CPY_TREX(sampleDesc)
+                        CPY_TREX(defaultDuration)
+                        CPY_TREX(defaultSize)
+                        CPY_TREX(defaultFlags)
+                    }
                     if(trafFlags&0x20000) 
                     {
                             
@@ -212,20 +226,46 @@
     trk->index=new MP4Index[trk->nbIndex];
     uint64_t sum=0;
     int intra=0;
+    bool constantFps=true;
+    uint32_t thisone,step=1;
+    uint32_t previous=0;
     for(uint32_t i=0;i<trk->nbIndex;i++)
     {
         MP4Index *dex=trk->index+i;
         dex->offset=fragList[i].offset;
         dex->size=fragList[i].size;
         trk->totalDataSize+=fragList[i].size;
+        thisone=fragList[i].duration;
+        if(i+1<trk->nbIndex)
+        {
+            if(!i) step=thisone;
+            if(i && step>1 && thisone!=previous && thisone && previous)
+            {
+                constantFps=false;
+                if(thisone>previous)
+                {
+                    if(thisone%previous)
+                        step=1;
+                }else
+                {
+                    if(previous%thisone)
+                        step=1;
+                    else if(step>thisone)
+                        step=thisone;
+                }
+            }
+            previous=thisone;
+        }
 
         double dts=sum;
         double ctts=fragList[i].composition;
 
         dts=dts/_videoScale;
         dts*=1000000.;
+        dts+=0.49;
         ctts=ctts/_videoScale;
         ctts*=1000000.;
+        ctts+=0.49;
         dex->dts=dts;
         dex->pts=dex->dts+ctts;
         if(!(fragList[i].flags &(0x00010000|0x01000000)))
@@ -235,7 +275,7 @@
         }
         else
             dex->intra=0;    
-        sum+=fragList[i].duration;
+        sum+=thisone;
         aprintf("[FRAG] Video entry %u offset=0x%llx size=%d dts=%s ",i,dex->offset,(int)dex->size,ADM_us2plain(dex->dts));
         aprintf("pts=%s\n",ADM_us2plain(dex->pts));
     }
@@ -243,7 +283,22 @@
     MP4Index *ff=trk->index;
     ff->intra=AVI_KEY_FRAME;   
     _videostream.dwLength= _mainaviheader.dwTotalFrames=_tracks[0].nbIndex;
+    _videostream.dwScale=step;
+    _videostream.dwRate=_videoScale;
+    ADM_info("Setting video timebase to %u / %u\n",step,_videoScale);
     fragList.clear();
+    if(constantFps)
+    {
+        _mainaviheader.dwMicroSecPerFrame=0; // force usage of fraction for fps
+        return true;
+    }
+    double total=sum;
+    total/=_videostream.dwLength;
+    total*=1000.*1000.;
+    total/=_videoScale;
+    total+=0.49;
+    _mainaviheader.dwMicroSecPerFrame=(int32_t)total;
+
     return true;
 }

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp Changed

@@ -16,6 +16,7 @@
 
 #include <string.h>
 #include <math.h>
+#include <map>
 
 #include "ADM_default.h"
 #include "ADM_Video.h"
@@ -265,7 +266,7 @@
 
 uint32_t i,j,cur;
 
-        ADM_info("Build Track index\n");
+        ADM_info("Build Track index, track timescale: %u\n",trackScale);
 	*outNbChunk=0;
 	aprintf("+_+_+_+_+_+\n");
 	aprintf("co : %lu sz: %lu sc: %lu co[0] %" PRIu64"\n",info->nbCo,info->nbSz,info->nbSc,info->Co[0]);
@@ -416,11 +417,73 @@
         // now collapse
         uint64_t total=0;
         double   ftot;
-        uint32_t thisone;
+        uint32_t thisone,previous=0;
+        uint32_t step=0xFFFFFFFF;
+        bool constantFps=true;
+
+        // try to correct jitter from rounding errors first
+        if(!isAudio)
+        {
+            std::map <uint32_t, uint32_t> hist;
+            for(uint32_t i=0;i<nbChunk;i++)
+            {
+                thisone=track->index[i].dts;
+                if(!thisone) continue;
+                if(thisone<step) step=thisone;
+                if(thisone<100) continue; // ignore too low durations
+                if(hist.find(thisone)==hist.end())
+                    hist.insert({thisone,1});
+                else
+                    hist[thisone]++;
+            }
+            ADM_info("Histogram map has %u elements.\n",hist.size());
+            std::map <uint32_t, uint32_t>::iterator it;
+            for(it=hist.begin(); it!=hist.end(); it++)
+            {
+                printf("Frame duration %u count: %u\n",it->first,it->second);
+            }
+            if(hist.size()==3) // we look for pattern x-1, x, x+1
+            {
+                ADM_info("Checking whether we need to fix jitter from rounding errors...\n");
+                uint32_t a,b,c;
+                uint32_t acount,ccount;
+                it=hist.begin();
+                a=it->first;
+                acount=it->second;
+                it++;
+                b=it->first;
+                bool restored=false;
+                if(b==a+1)
+                {
+                    it++;
+                    c=it->first;
+                    ccount=it->second;
+                    if(c==b+1 && ccount+2>acount && acount+2>ccount)
+                    {
+                        for(uint32_t i=0;i<nbChunk;i++)
+                            track->index[i].dts=b;
+                        ADM_info("Yes, enforcing CFR, frame duration %u ticks.\n",b);
+                        step=b;
+                        restored=true;
+                    }
+                }
+                if(!restored)
+                    ADM_info("No, nothing we can do.\n");
+            }
+        }
+        if(step==0xFFFFFFFF) step=1;
 
         for(uint32_t i=0;i<nbChunk;i++)
         {
             thisone=track->index[i].dts;
+            if(!isAudio && i+1<nbChunk)
+            {
+                while(thisone%step)
+                    step=thisone%step;
+                if(constantFps && i && thisone!=previous && thisone && previous)
+                    constantFps=false;
+                previous=thisone;
+            }
             ftot=total;
             ftot*=1000.*1000.;
             ftot/=trackScale;
@@ -429,8 +492,50 @@
             total+=thisone;
             aprintf("Audio chunk : %lu time :%lu\n",i,track->index[i].dts);
         }
+        if(isAudio)
+        {
+            ADM_info("Audio index done.\n");
+            return true;
+        }
+        if(!nbChunk)
+        {
+            ADM_warning("Empty index!\n");
+            return false;
+        }
         // Time is now built, it is in us
-        ADM_info("Index done\n");
+        ADM_info("Video index done.\n");
+        _videoFound++;
+        ADM_info("Setting video timebase to %u / %u\n",step,_videoScale);
+        _videostream.dwScale=step;
+        if(constantFps)
+        {
+            _mainaviheader.dwMicroSecPerFrame=0; // force usage of fraction for fps
+            return true;
+        }
+        ftot=total;
+        ftot/=nbChunk;
+        ftot*=1000.*1000.;
+        ftot/=trackScale;
+        ftot+=0.49;
+        /* If the frame increment calculated from the time base is close to the average,
+        the stream may be a constant fps stream with a mixture of frames and fields or
+        simply have holes. The average is meaningless then. */
+        if(step && _videoScale)
+        {
+            double ti=1000.*1000.;
+            ti/=_videoScale;
+            ti*=step;
+            ti+=0.49;
+            if(ftot<ti*2)
+            {
+                _mainaviheader.dwMicroSecPerFrame=(int32_t)ti;
+                ADM_info("Using time base for frame increment %d us instead of average %d\n",(int32_t)ti,(int32_t)ftot);
+                return true;
+            }
+        }
+        _mainaviheader.dwMicroSecPerFrame=(int32_t)ftot;
+        ADM_info("Variable frame rate, %d us per frame on average.\n",_mainaviheader.dwMicroSecPerFrame);
+
 	return true;
 }
 /**

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Leaf.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Leaf.h Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4audio.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4audio.cpp Changed

@@ -49,9 +49,7 @@
     ADM_assert(_fd);
     _current_index=0;
     _index=track->index;
-    _msg_counter = 0;
-    _msg_ratelimit = new ADMCountdown(200);
-    _msg_ratelimit->reset();
+    _endOfStream=false;
 
     extraDataLen=track->extraDataSize;
     extraData=track->extraData;
@@ -71,9 +69,9 @@
             track->_rdWav.encoding = WAV_MP2;
     }
 
-    if(track->_rdWav.byterate == AUDIO_BYTERATE_UNSET)
+    if(track->_rdWav.byterate == AUDIO_BYTERATE_UNSET || track->_rdWav.encoding == WAV_MP3)
     {
-        track->_rdWav.byterate = 128000 >> 3; // dummy value
+        int average = AUDIO_BYTERATE_UNSET;
         ADM_info("Estimating audio byterate...\n");
         uint64_t duration = _index[_nb_chunks-1].dts;
         if(duration != ADM_NO_PTS && duration > 100000) // at least 0.1 s
@@ -83,8 +81,25 @@
             d = track->totalDataSize / d;
             d *= 1000;
             if(d > 0 && d < (192000 * 32)) // anything beyond 7.1 at 192 kHz float must be clearly bogus
-                track->_rdWav.byterate = (uint32_t)d;
+                average = (uint32_t)d;
         }
+        if(average != AUDIO_BYTERATE_UNSET)
+        {
+            if(track->_rdWav.byterate == AUDIO_BYTERATE_UNSET)
+            {
+                track->_rdWav.byterate = average;
+            }else // mp3
+            {
+                int probed = track->_rdWav.byterate;
+#define MAX_AUDIO_BYTERATE_DEVIATION_FROM_AVG 100
+                if(abs(average-probed) > MAX_AUDIO_BYTERATE_DEVIATION_FROM_AVG) // VBR mode mp3
+                {
+                    ADM_warning("Probed byterate %d doesn't match average %d, VBR?\n",probed,average);
+                    track->_rdWav.byterate = average;
+                }
+            }
+        }else if(track->_rdWav.byterate == AUDIO_BYTERATE_UNSET)
+            track->_rdWav.byterate = 128000 >> 3; // use a dummy value as the last resort
     }
 }
 /**
@@ -99,9 +114,6 @@
         fclose(_fd);
         _fd=NULL;
     }
-    if(_msg_ratelimit)
-        delete _msg_ratelimit;
-    _msg_ratelimit = NULL;
 }
 /**
     \fn ADM_mp4AudioAccess
@@ -139,35 +151,25 @@
     uint32_t r=0;
     if(_current_index>=_nb_chunks)
     {
-        if(_msg_ratelimit->done())
-        {
-            if(_msg_counter)
-            {
-                printf("[MP4Audio] : index max :%u/%u (message repeated %u times)\n",_current_index,_nb_chunks,_msg_counter);
-                _msg_counter = 0;
-            }else
-            {
-                printf("[MP4Audio] : index max :%u/%u\n",_current_index,_nb_chunks);
-            }
-            _msg_ratelimit->reset();
-        }else
+        if(!_endOfStream)
         {
-            _msg_counter++;
+            printf("[ADM_mp4AudioAccess::getPacket] Requested index %u out of bounds, max: %u\n",_current_index,(_nb_chunks)?(_nb_chunks-1):0);
+            _endOfStream=true;
         }
         return 0;
     }
-	  fseeko(_fd,_index[_current_index].offset,SEEK_SET);
-	  r=fread(buffer,1,_index[_current_index].size,_fd);
-      if(!r)
-      {
+    fseeko(_fd,_index[_current_index].offset,SEEK_SET);
+    r=fread(buffer,1,_index[_current_index].size,_fd);
+    if(!r)
+    {
         printf("[MP4 Audio] Cannot read \n");
         return false;
-      }
-      *dts=_index[_current_index].dts;
-      *size=r;
-	  _current_index++;
-	  _msg_counter = 0;
-	  return true;
+    }
+    *dts=_index[_current_index].dts;
+    *size=r;
+    _current_index++;
+    _endOfStream=false;
+    return true;
 }
 /**
     \fn getDurationInUs

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/CMakeLists.txt Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp Changed

@@ -40,27 +40,23 @@
     sprintf(idxName,"%s.idx2",name);
     if(!ADM_fileExist(idxName))
         r=psIndexer(name);
-    if(r==ADM_IGN)
+    if(r!=ADM_OK)
     {
-        ADM_warning("Indexing cancelled by the user, deleting the index file. Bye.\n");
-        if(!ADM_eraseFile(idxName))
+        if(r==ADM_IGN)
+            ADM_warning("Indexing cancelled by the user, deleting the index file. Bye.\n");
+        if(!r)
+            ADM_error("Indexing of %s failed, aborting\n",name);
+        if(ADM_fileExist(idxName) && !ADM_eraseFile(idxName))
             ADM_warning("Could not delete %s\n",idxName);
         free(idxName);
         return r;
     }
-    if(!r)
-    {
-        ADM_error("Indexing of %s failed, aborting\n",name);
-        // Currently, indexer returns 0 only if it can't create the .idx2 file, nothing to remove.
-        free(idxName);
-        return r;
-    }
 
-    FP_TYPE appendType=FP_DONT_APPEND;
     char *type;
     uint64_t startDts;
     uint32_t version=0;
     bool reindex=false;
+    int append=PS_DEFAULT_FRAGMENT_SIZE;
     indexFile index;
     r=0;
 
@@ -89,10 +85,10 @@
         printf("[psDemux] Incorrect or not found type\n");
         goto abt;
     }
-    append=(bool)index.getAsUint32("Append");
+    if(!index.getAsUint32("Append"))
+        append=0;
     printf("[psDemux] Append=%" PRIu32"\n",append);
-    if(append) appendType=FP_APPEND;
-    if(!parser.open(name,&appendType))
+    if(!parser.open(name,&append))
     {
         printf("[psDemux] Cannot open root file %s\n",name);
         goto abt;
@@ -139,13 +135,53 @@
                   listOfAudioTracks[i]->access->setScrGapList(&listOfScrGap) ;
     }
     updatePtsDts();
+    {
+    uint32_t fps=_videostream.dwRate;
+    switch(fps)
+    {
+        case 23976:
+            _videostream.dwScale=1001;
+            _videostream.dwRate=24000;
+            break;
+        case 29970:
+            _videostream.dwScale=1001;
+            _videostream.dwRate=30000;
+            break;
+        case 24000:
+        case 25000:
+        case 30000:
+        case 50000:
+        case 60000:
+            _videostream.dwScale=1000;
+            _videostream.dwRate=fps;
+            break;
+        default:
+            _videostream.dwScale=1;
+            _videostream.dwRate=90000;
+            _mainaviheader.dwMicroSecPerFrame=ADM_UsecFromFps1000(fps);
+            break;
+    }
+    if(fieldEncoded)
+    {
+        printf("[psDemux] Doubling fps for field-encoded video");
+        if(_videostream.dwRate<=45000)
+            _videostream.dwRate*=2;
+        else if(!(_videostream.dwScale%2))
+            _videostream.dwScale/=2;
+        if(_mainaviheader.dwMicroSecPerFrame)
+            _mainaviheader.dwMicroSecPerFrame=ADM_UsecFromFps1000(fps*2);
+        else
+            printf(", new time base: %d / %d",_videostream.dwScale,_videostream.dwRate);
+        printf("\n");
+    }
+    }
     _videostream.dwLength= _mainaviheader.dwTotalFrames=ListOfFrames.size();
     printf("[psDemux] Found %d video frames\n",_videostream.dwLength);
     if(_videostream.dwLength)_isvideopresent=1;
 //***********
     
     psPacket=new psPacketLinear(0xE0);
-    if(psPacket->open(name,appendType)==false) 
+    if(psPacket->open(name,append)==false)
     {
         printf("psDemux] Cannot psPacket open the file\n");
         goto abt;
@@ -230,7 +266,7 @@
 
  psHeader::psHeader( void ) : vidHeader()
 { 
-    interlaced=false;
+    fieldEncoded=false;
     lastFrame=0xffffffff;
     
 }
@@ -251,6 +287,7 @@
 uint8_t  psHeader::getFrame(uint32_t frame,ADMCompressedImage *img)
 {
     if(frame>=ListOfFrames.size()) return 0;
+    getFlags(frame,&(img->flags));
     dmxFrame *pk=ListOfFrames[frame];
     if(frame==(lastFrame+1) && pk->type!=1) // the next frame, not an intra
     {
@@ -261,7 +298,6 @@
              img->demuxerDts=pk->dts;
              img->demuxerPts=pk->pts;
              //printf("[>>>] %d:%02x %02x %02x %02x\n",frame,img->data[0],img->data[1],img->data[2],img->data[3]);
-             getFlags(frame,&(img->flags));
              return r;
     }
     if(pk->type==1) // an intra
@@ -272,7 +308,6 @@
              img->demuxerFrameNo=frame;
              img->demuxerDts=pk->dts;
              img->demuxerPts=pk->pts;
-             getFlags(frame,&(img->flags));
              //printf("[>>>] %d:%02x %02x %02x %02x\n",frame,img->data[0],img->data[1],img->data[2],img->data[3]);
              lastFrame=frame;
              return r;
@@ -313,7 +348,6 @@
     img->demuxerDts=pk->dts;
     img->demuxerPts=pk->pts;
     //printf("[>>>] %d:%02x %02x %02x %02x\n",frame,img->data[0],img->data[1],img->data[2],img->data[3]);
-    getFlags(frame,&(img->flags));
     return r;
 }

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.h Changed

@@ -28,6 +28,7 @@
 #include <BVector.h>
 #include "ADM_coreDemuxerMpeg.h"
 
+#define PS_DEFAULT_FRAGMENT_SIZE -1 // no size check
 
 /**
     \struct scrGap
@@ -55,7 +56,7 @@
 public:
                 bool            setTimeOffset(uint64_t of) {dtsOffset=of;return true;}
                 BVector        <ADM_mpgAudioSeekPoint >seekPoints;
-                                  ADM_psAccess(const char *name,uint8_t pid,bool append); 
+                                  ADM_psAccess(const char *name, uint8_t pid, int append);
                 virtual           ~ADM_psAccess();
                                     /// Hint, the stream is pure CBR (AC3,MP2,MP3)
                 virtual bool      isCBR(void) { return true;}
@@ -115,8 +116,7 @@
 class psHeader         :public vidHeader
 {
   protected:
-    bool    append;
-    bool    interlaced;
+    bool    fieldEncoded;
     bool    readVideo(indexFile *index);
     bool    readAudio(indexFile *index,const char *name);
     bool    readIndex(indexFile *index);

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudio.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudio.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudioProbe.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudioProbe.cpp Changed

@@ -42,7 +42,7 @@
     \brief returns a list of audio track found, null if none found
 
 */
-listOfPsAudioTracks *psProbeAudio(const char *fileName, FP_TYPE appendType)
+listOfPsAudioTracks *psProbeAudio(const char *fileName, int append)
 {
     uint32_t size;
     uint64_t dts,pts,startAt;
@@ -54,7 +54,7 @@
 
     printf("[MpegPS] Probing audio for %s\n",fileName);
 
-    if(!packet->open(fileName,appendType)) goto end;
+    if(!packet->open(fileName,append)) goto end;
     fileSize=packet->getSize();
 
     packet->setPos(fileSize/2); // Jump in the middle of the stream
@@ -121,10 +121,11 @@
         //Realign
         p->seek(startAt,0);
         int rd=packetSize*2;
+        if(rd<PROBE_MIN_SIZE) rd=PROBE_MIN_SIZE;
         if(rd>PROBE_ANALYZE_SIZE) rd=PROBE_ANALYZE_SIZE;
         if(!p->read(rd,audioBuffer))
         {
-            ADM_info("Cannot read %d bytes of type %x\n",packetSize*2,pid);
+            ADM_info("Cannot read %d bytes of type %x\n",rd,pid);
             return false;
         }
         psAudioTrackInfo *info=new psAudioTrackInfo;

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudioProbe.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudioProbe.h Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp Changed

@@ -19,17 +19,16 @@
 #include "ADM_default.h"
 #include "ADM_demuxerInternal.h"
 #include "fourcc.h"
-#include "dmxPSPacket.h"
 #include "ADM_quota.h"
+#include "ADM_ps.h"
 #include "ADM_psAudioProbe.h"
 #include "DIA_working.h"
-#include "ADM_indexFile.h"
 #include "ADM_vidMisc.h"
 #include "DIA_coreToolkit.h"
 #include "ADM_coreUtils.h"
 
 static const char Type[5]={'X','I','P','B','P'};  // Frame type
-static const char Structure[4]={'X','T','B','F'}; // X Top Bottom Frame
+static const char Structure[6]={'X','T','B','F','C','S'}; // Invalid, Top, Bottom, Frame, Frame+TFF, Frame+BFF
 
 static const uint32_t FPS[16]={
                 0,                      // 0
@@ -70,8 +69,10 @@
 typedef enum
 {
     pictureFrame=3,
-    pictureTopField=1, 
-    pictureBottomField=2
+    pictureFieldTop=1,
+    pictureFieldBottom=2,
+    pictureTopFirst=4,
+    pictureBottomFirst=5
 }pictureStructure;
 
 typedef struct
@@ -83,7 +84,6 @@
     uint32_t        nbPics;
     indexerState    state;
     psPacketLinear *pkt;
-    int32_t         nextOffset;
     uint64_t        gopStartDts;
 }indexerData;
 
@@ -93,15 +93,6 @@
     markEnd,
     markNow
 }markType;
-/**
-    \struct scrGap
-    \brief Map gap/reset in the scr flow to put everything back to linear / monotonic
-*/
-typedef struct
-{
-    uint64_t position;
-    uint64_t timeOffset;
-}scrGap;
 
 /**
     \class PsIndexer
@@ -126,14 +117,16 @@
         bool    writeVideo(PSVideo *video);
         bool    writeAudio(void);
         bool    writeSystem(const char *filename,bool append);
-        bool    Mark(indexerData *data,dmxPacketInfo *s,markType update);
+        bool    Mark(indexerData *data,dmxPacketInfo *s,bool noptsdts,uint32_t size,markType update);
         uint64_t timeConvert(uint64_t x) // 90 kHz tick -> us
-                    {
-                         if(x==ADM_NO_PTS) return ADM_NO_PTS;
-                            x=x*1000;
-                            x/=90;
-                            return x;
-                    }
+                {
+                    if(x==ADM_NO_PTS) return ADM_NO_PTS;
+                    double f=x;
+                    f*=100.;
+                    f/=9.;
+                    f+=0.49;
+                    return (uint64_t)f;
+                }
 };
 /**
       \fn psIndexer 
@@ -156,7 +149,6 @@
     index=NULL;
     pkt=NULL;
     audioTracks=NULL;
-    ui=createWorking (QT_TRANSLATE_NOOP("psdemuxer","Indexing"));
     headerDumped=false;
     lastValidVideoDts=ADM_NO_PTS;
     timeOffset=0;
@@ -178,32 +170,24 @@
 */  
 uint8_t PsIndexer::run(const char *file)
 {
-uint32_t temporal_ref,val;
-uint64_t fullSize;
-uint8_t buffer[50*1024];
-uint8_t res=1;
-bool seq_found=false;
-
-PSVideo video;
-indexerData  data;    
-dmxPacketInfo info;
-bool bAppend=false;
-    
+    uint32_t temporal_ref,val;
+    uint64_t fullSize;
+    uint8_t buffer[50*1024];
+    uint8_t res=0;
+    bool seq_found=false;
+
+    PSVideo video;
+    indexerData  data;
+    dmxPacketInfo info,lastInfo;
+
     memset(&video,0,sizeof(video));
     memset(&data,0,sizeof(data));
+    memset(&info,0,sizeof(info));
+    memset(&lastInfo,0,sizeof(lastInfo));
     data.picStructure=pictureFrame;
     char *indexName=(char *)malloc(strlen(file)+6);
     sprintf(indexName,"%s.idx2",file);
 
-    FP_TYPE append=FP_DONT_APPEND;
-    if(true==ADM_probeSequencedFile(file))
-    {
-        if(true==GUI_Question(QT_TRANSLATE_NOOP("psdemuxer","There are several files with sequential file names. Should they be all loaded ?")))
-               bAppend=true;
-    }
-    if(true==bAppend)
-        append=FP_APPEND;
-
     index=qfopen(indexName,"wt");
     if(!index)
     {
@@ -211,7 +195,23 @@
         free(indexName);        
         return false;
     }
-    writeSystem(file,bAppend);
+
+    int append=PS_DEFAULT_FRAGMENT_SIZE;
+    {
+    int nbFollowUps=ADM_probeSequencedFile(file,&append);
+    if(nbFollowUps<0)
+    {
+        printf("[PsIndex] Cannot open %s\n",file);
+        qfclose(index);
+        index=NULL;
+        free(indexName);
+        indexName=NULL;
+        return 0;
+    }
+    if(!nbFollowUps || false==GUI_Question(QT_TRANSLATE_NOOP("psdemuxer","There are several files with sequential file names. Should they be all loaded ?")))
+        append=0;
+    }
+    writeSystem(file,append);
     pkt=new psPacketLinearTracker(0xE0);
 
     audioTracks=psProbeAudio(file,append);
@@ -230,9 +230,18 @@
 
     }
 
-    pkt->open(file,append);
+    uint32_t lastConsumed=0;
+    bool picEntryPending=false;
+    bool timingIsInvalid=false;
+    markType update=markStart;
+
+    if(!pkt->open(file,append))
+        goto cleanup;
     data.pkt=pkt;
     fullSize=pkt->getSize();
+
+    ui=createWorking(QT_TRANSLATE_NOOP("psdemuxer","Indexing"));
+
       while(1)
       {
         if(!ui->isAlive())
@@ -241,17 +250,29 @@
             break;
         }
         uint8_t startCode=pkt->findStartCode();
+        if(picEntryPending && startCode!=0xB5) // picture not followed by extension
+        {
+            /*printf("Writing pic %u type: %d size: 0x%x startAt: 0x%x offset: 0x%x\n",
+                data.nbPics,data.frameType,lastConsumed,lastInfo.startAt,lastInfo.offset);*/
+            picEntryPending=false;
+            Mark(&data,&lastInfo,timingIsInvalid,lastConsumed,update);
+            lastConsumed=0;
+            data.state=idx_startAtImage;
+            data.nbPics++;
+        }
+
         if(!pkt->stillOk()) break;
         pkt->getInfo(&info);
         info.offset-=4;
+        //printf("start code: 0x%x pos: 0x%" PRIx64" offset: 0x%x pts: %s\n",startCode,pkt->getPos(),info.offset,ADM_us2plain(timeConvert(info.pts)));
 
           switch(startCode)
                   {
-                  
-
-                            ;
                   case 0xB3: // sequence start
-                          Mark(&data,&info,markStart);
+                          //printf("Writing sequence start.\n");
+                          lastConsumed+=pkt->getConsumed();
+                          Mark(&data,&info,false,lastConsumed,markStart);
+                          lastConsumed=0;
                           data.state=idx_startAtGopOrSeq;
                           if(seq_found)
                           {
@@ -261,7 +282,7 @@
                           //
                           seq_found=1;
                           val=pkt->readi32();
-                          video.interlaced=0; // how to detect ?
+                          video.interlaced=0; // the correct value will be set later
                           video.w=val>>20;
                           video.w=((video.w+15)&~15);
                           video.h=((val>>8) & 0xfff);
@@ -272,12 +293,17 @@
                           video.fps= FPS[val & 0xf];
                           pkt->forward(4);
                           pkt->resetStats();
+                          if(audioTracks)
+                          {
+                              uint32_t i,n=audioTracks->size();
+                              for(i=0;i<n;i++)
+                                  pkt->collectStats((*audioTracks)[i]->esID);
+                          }
                           break;
                   case 0xB5: //  extension
                                 { 
                                     uint8_t firstByte=pkt->readi8();
                                     uint8_t id=firstByte>>4;
-                                    uint8_t two;
                                     switch(id)
                                     {
                                         case 1: // Sequence extension
@@ -291,31 +317,53 @@
                                                 uint32_t extSize=pkt->readi32();
                                                 uint32_t eh=(extSize<<15)>>18;
                                                 uint32_t ew=(extSize)>>18;
-                                                printf("**** %x ->%d x %d\n",extSize,ew,eh);
+                                                //printf("**** %x ->%d x %d\n",extSize,ew,eh);
                                             }
                                             break;
                                         case 8: // picture coding extension (mpeg2)
                                         {
                                             // skip motion vector
-                                            uint8_t picture_structure;
                                             pkt->forward(1); // 4*4 bits
-                                            two=pkt->readi8();
-                                            picture_structure=(two)&3;
-                                            
-                                            //printf("Picture type %02x struct:%x\n",two,picture_structure);
+                                            uint8_t picture_structure=pkt->readi8();
+                                            picture_structure&=3;
+                                            uint8_t two=pkt->readi8();
+                                            uint8_t three=pkt->readi8();
+                                            bool tff=!!(two&0x80);
+                                            bool progressive_frame=!!(three&0x80);
+                                            if(!progressive_frame && picture_structure==3)
+                                                picture_structure+=tff? 1 : 2;
+                                            //printf("Pic struct: %d %s\n",picture_structure,progressive_frame? "progressive" : tff? "top field first" : "bottom field first");
                                             switch(picture_structure)
                                             {
                                             case 3: video.frameCount++;
                                                     data.picStructure=pictureFrame;
                                                     break;
-                                            case 1:  data.picStructure=pictureTopField;
-                                                     video.fieldCount++;
-                                                     break;
-                                            case 2:  data.picStructure=pictureBottomField;
-                                                     video.fieldCount++;
-                                                     break;
-                                            default: ADM_warning("frame type 0 met, this is illegal\n");
+                                            case 1: data.picStructure=pictureFieldTop;
+                                                    video.fieldCount++;
+                                                    break;
+                                            case 2: data.picStructure=pictureFieldBottom;
+                                                    video.fieldCount++;
+                                                    break;
+                                            case 4: video.frameCount++;
+                                                    data.picStructure=pictureTopFirst;
+                                                    break;
+                                            case 5: video.frameCount++;
+                                                    data.picStructure=pictureBottomFirst;
+                                                    break;
+                                            default: ADM_warning("picture structure %d met, this is illegal\n",picture_structure);
+                                            }
+                                            if(picEntryPending)
+                                            {
+                                                /*printf("Writing pic %u type: %d size: 0x%x startAt: 0x%x offset: 0x%x\n",
+                                                    data.nbPics,data.frameType,lastConsumed,lastInfo.startAt,lastInfo.offset);*/
+                                                picEntryPending=false;
+                                                Mark(&data,&lastInfo,timingIsInvalid,lastConsumed,update);
+                                                lastConsumed=0;
+                                                data.state=idx_startAtImage;
+                                                data.nbPics++;
                                             }
+                                            if(!video.interlaced && picture_structure && picture_structure!=3)
+                                                video.interlaced=1;
                                         }
                                         default:break;
                                     }
@@ -340,38 +388,40 @@
 
                             }
 
-#define PREAMBLE qfprintf(index,"[Data]\n"); \
-                 qfprintf(index,"# Warning, picture structure markers F/T/B are shifted one image to the right.\n"); \
-                 qfprintf(index,"# To compensate for that, they are shifted one image to the left in readIndex.");
-
+#define PREAMBLE qfprintf(index,"[Data]");
                           if(!seq_found) continue;
                           if(headerDumped==false)
                           {
                                 PREAMBLE
                                 headerDumped=true;
                           }
-                          if(data.state==idx_startAtGopOrSeq) 
-                          {         
-                                  continue;;
-                          }
-                          
-                          Mark(&data,&info,markStart);
+                          //printf("GOP, pics: %u\n",data.nbPics);
+                          if(data.state==idx_startAtGopOrSeq) continue;
+                          //printf("GOP, writing.\n");
+                          lastConsumed+=pkt->getConsumed();
+                          Mark(&data,&info,false,lastConsumed,markStart);
+                          lastConsumed=0;
                           data.state=idx_startAtGopOrSeq;
                           break;
                   case 0x00 : // picture
                         {
                           int type;
-                          markType update=markNow;
+                          update=markNow;
                           if(!seq_found)
-                          { 
-                                  continue;
-                                  printf("[psIndexer]No sequence start yet, skipping..\n");
+                          {
+                              printf("[psIndexer] No sequence start yet, skipping...\n");
+                              continue;
                           }
                           if(headerDumped==false)
                           {
                                 PREAMBLE
                                 headerDumped=true;
                           }
+                          // Get the size of the previous pic prior to reading the type of the current
+                          // so that we don't need to account for 2 bytes offset in Mark().
+                          // Add size of skipped pics with invalid type to the last valid one.
+                          if(data.state==idx_startAtImage)
+                              lastConsumed+=pkt->getConsumed();
                           val=pkt->readi16();
                           temporal_ref=val>>6;
                           type=7 & (val>>3);
@@ -395,16 +445,22 @@
                             {
                                     lastValidVideoDts=info.dts;
                             }
-                           
-                          
                           if(data.state==idx_startAtGopOrSeq) 
+                              update=markEnd;
+                          data.frameType=type;
+                          if((info.pts!=ADM_NO_PTS || info.dts!=ADM_NO_PTS) &&
+                              lastInfo.pts==info.pts && lastInfo.dts==info.dts &&
+                              lastInfo.startAt==info.startAt) // both pics belong to the same packet
                           {
-                                update=markEnd;
+                              ADM_warning("Invalidating timing for frame %u\n",data.nbPics);
+                              timingIsInvalid=true;
+                          }else
+                          {
+                              timingIsInvalid=false;
                           }
-                          data.frameType=type;
-                          Mark(&data,&info,update);
-                          data.state=idx_startAtImage;
-                          data.nbPics++;
+                          lastInfo=info;
+                          //printf("preparing pic entry, lastInfo.pts: %s\n",ADM_us2plain(timeConvert(lastInfo.pts)));
+                          picEntryPending=true;
                         }
                           break;
                   default:
@@ -415,8 +471,11 @@
 theEnd:    
         printf("\n");
         // Dump progressive/frame gop
-        Mark(&data,&info,markStart);
-        
+        if(picEntryPending)
+            Mark(&data,&lastInfo,timingIsInvalid,lastConsumed,markStart);
+        else
+            Mark(&data,&info,timingIsInvalid,pkt->getConsumed(),markStart);
+
         qfprintf(index,"\n# Found %" PRIu32" images \n",data.nbPics); // Size
         qfprintf(index,"# Found %" PRIu32" frame pictures\n",video.frameCount); // Size
         qfprintf(index,"# Found %" PRIu32" field pictures\n",video.fieldCount); // Size
@@ -427,6 +486,7 @@
         writeAudio();
         writeScrReset();
         qfprintf(index,"\n[End]\n");
+        res=ADM_OK;
 cleanup:
         qfclose(index);
         index=NULL;
@@ -440,34 +500,37 @@
 /**
     \fn   Mark
     \brief update the file
-
-    The offset part is due to the fact that we read 2 bytes from the pic header to know the pic type.
-    So when going from a pic to a pic, it is self cancelling.
-    If the beginning is not a pic, but a gop start for example, we had to add/remove those.
-
 */
-bool  PsIndexer::Mark(indexerData *data,dmxPacketInfo *info,markType update)
+bool  PsIndexer::Mark(indexerData *data,dmxPacketInfo *info,bool invalidateTiming,uint32_t size,markType update)
 {
-    int offset=data->nextOffset;
-    data->nextOffset=0;
-    
-     if( update==markStart)
-     {
-                offset=2;
-     }
+    uint64_t pts,dts;
+    if(invalidateTiming)
+    {
+        pts=dts=ADM_NO_PTS;
+    }else
+    {
+        pts=info->pts;
+        dts=info->dts;
+    }
     if(update==markStart || update==markNow)
     {
         if(data->nbPics)
         {
             // Write previous image data (size) : TODO
-            qfprintf(index,":%06" PRIx32" ",data->pkt->getConsumed()+offset); // Size
+            qfprintf(index,":%06" PRIx32" ",size); // Size
         }
-        else data->pkt->getConsumed();
     }
     if(update==markEnd || update==markNow)
     {
         if(data->frameType==1)
         {
+            // In field encoded streams both fields of the keyframe can be intra,
+            // update data from info then.
+            if(data->state==idx_startAtImage)
+            {
+                data->startAt=info->startAt;
+                data->offset=info->offset;
+            }
             // If audio, also dump audio
             if(audioTracks)
             {
@@ -482,25 +545,24 @@
                 
             }
             // start a new line
-            qfprintf(index,"\nVideo at:%08" PRIx64":%04" PRIx32" Pts:%08" PRId64":%08" PRId64" ",data->startAt,data->offset,info->pts,info->dts);
-            data->gopStartDts=info->dts;
-            data->nextOffset=-2;
+            qfprintf(index,"\nVideo at:%08" PRIx64":%04" PRIx32" Pts:%08" PRId64":%08" PRId64" ",data->startAt,data->offset,pts,dts);
+            data->gopStartDts=dts;
         }
         int64_t deltaDts,deltaPts;
 #if 0
-        printf("Dts%" PRId64",PTS:%" PRId64"\n",info->dts, info->pts);
+        printf("Dts: %" PRId64",PTS :%" PRId64"\n",dts,pts);
 #endif
-        if(info->dts==-1 || data->gopStartDts==-1) deltaDts=-1;
-                else deltaDts=(int64_t)info->dts-(int64_t)data->gopStartDts;
-        if(info->pts==-1 || data->gopStartDts==-1) deltaPts=-1;
-                else deltaPts=(int64_t)info->pts-(int64_t)data->gopStartDts;
-        qfprintf(index,"%c%c:%" PRId64":%" PRId64,Type[data->frameType],Structure[data->picStructure&3],
+        if(dts==ADM_NO_PTS || data->gopStartDts==ADM_NO_PTS) deltaDts=-1;
+                else deltaDts=(int64_t)dts-(int64_t)data->gopStartDts;
+        if(pts==ADM_NO_PTS || data->gopStartDts==ADM_NO_PTS) deltaPts=-1;
+                else deltaPts=(int64_t)pts-(int64_t)data->gopStartDts;
+        qfprintf(index,"%c%c:%" PRId64":%" PRId64,Type[data->frameType],Structure[data->picStructure%sizeof(Structure)],
                     deltaPts,deltaDts);
     }
     if(update==markEnd || update==markNow)
     {
-        data->pts=info->pts;
-        data->dts=info->dts;
+        data->pts=pts;
+        data->dts=dts;
     }
     if(update==markStart || update==markNow)
     {
@@ -519,10 +581,7 @@
     qfprintf(index,"[Video]\n");
     qfprintf(index,"Width=%d\n",video->w);
     qfprintf(index,"Height=%d\n",video->h);
-    if(video->interlaced)
-        qfprintf(index,"Fps=%d\n",video->fps*2);
-    else
-        qfprintf(index,"Fps=%d\n",video->fps);
+    qfprintf(index,"Fps=%d\n",video->fps);
     qfprintf(index,"Interlaced=%d\n",video->interlaced);
     qfprintf(index,"AR=%d\n",video->ar);
     return true;

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psReadIndex.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psReadIndex.cpp Changed

@@ -17,7 +17,7 @@
 #include "ADM_default.h"
 #include "fourcc.h"
 #include "DIA_coreToolkit.h"
-#include "ADM_indexFile.h"
+#include "ADM_coreUtils.h"
 #include "ADM_ps.h"
 #include "ADM_string.h"
 #include <math.h>
@@ -28,14 +28,15 @@
 */
 bool    psHeader::readIndex(indexFile *index)
 {
-char buffer[2000];
+#define PS_MAX_LINE 4000
+char buffer[PS_MAX_LINE];
 bool firstAudio=true;
         printf("[psDemuxer] Reading index\n");
         if(!index->goToSection("Data")) return false;
       
         while(1)
         {
-            if(!index->readString(2000,(uint8_t *)buffer)) break;
+            if(!index->readString(PS_MAX_LINE,(uint8_t *)buffer)) break;
             if(buffer[0]=='[') break;
             if(buffer[0]==0xa || buffer[0]==0xd) continue; // blank line
             // Now split the line
@@ -51,29 +52,6 @@
                     processAudioIndex(buffer+6);
             }
         }
-
-    // Work around picture structure off-by-one
-    uint32_t nbImage=ListOfFrames.size();
-    if(nbImage>2)
-    {
-        ADM_info("Applying workaround for picture structure entries off-by-one.\n");
-        uint32_t next=0;
-        for(int i=0;i<nbImage-1;i++)
-        {
-            next=ListOfFrames[i+1]->pictureType;
-            ListOfFrames[i]->pictureType=next;
-        }
-        // We don't know the picture structure for the last image, but if it is a field,
-        // swapping top and bottom is a reasonable guess.
-        switch(next & AVI_FIELD_STRUCTURE)
-        {
-            case AVI_TOP_FIELD:
-                ListOfFrames[nbImage-1]->pictureType=AVI_FIELD_STRUCTURE+AVI_BOTTOM_FIELD; break;
-            case AVI_BOTTOM_FIELD:
-                ListOfFrames[nbImage-1]->pictureType=AVI_FIELD_STRUCTURE+AVI_TOP_FIELD; break;
-            default:break;
-        }
-    }
     return true;
 }
 /**
@@ -150,17 +128,12 @@
                 }
                 cur++;
                 next=strstr(start," ");
-                *next=0;
+                if(3!=sscanf(cur,"%" PRId64":%" PRId64":%" PRIx32,&framePts,&frameDts,&len))
                 {
-                    string me=string(cur); // pts:dts:length (dec/dec/hex)
-                    vector <string> result;
-                    ADM_splitString(":",me,result);
-                    
-                    ADM_assert(1==sscanf(result[2].c_str(),"%" PRIx32,&len));
-                    ADM_assert(1==sscanf(result[0].c_str(),"%" PRId64,&framePts));
-                    ADM_assert(1==sscanf(result[1].c_str(),"%" PRId64,&frameDts));
+                    ADM_warning("Malformed line:\n");
+                    printf("%s\n",buffer);
+                    return false;
                 }
-                
                 dmxFrame *frame=new dmxFrame;
                 if(!count) // First item.. PTS & DTS are provided as header
                 {
@@ -189,10 +162,14 @@
                 switch(picStruct)
                 {
                         default:  frame->pictureType=0;ADM_warning("Unknown picture structure %c\n",picStruct);break;
-                        case 'F': frame->pictureType=AVI_FRAME_STRUCTURE;break;
+                        case 'F':
+                        case 'C':
+                        case 'S': frame->pictureType=AVI_FRAME_STRUCTURE;break;
                         case 'T': frame->pictureType=AVI_FIELD_STRUCTURE+AVI_TOP_FIELD;break;
                         case 'B': frame->pictureType=AVI_FIELD_STRUCTURE+AVI_BOTTOM_FIELD;break;
                 }
+                if(!fieldEncoded && (frame->pictureType & AVI_FIELD_STRUCTURE))
+                    fieldEncoded=true;
                 frame->len=len;
                 ListOfFrames.append(frame);
                 count++;
@@ -223,13 +200,16 @@
 
     if(!w || !h || !fps) return false;
 
-    interlaced=index->getAsUint32("Interlaced");
-    
+    if(index->getAsUint32("Interlaced"))
+        printf("[psDemuxer] This video is interlaced.\n");
+
     _video_bih.biWidth=_mainaviheader.dwWidth=w ;
     _video_bih.biHeight=_mainaviheader.dwHeight=h;             
+
+    // time base and time increment will be adjusted later in open()
+    _mainaviheader.dwMicroSecPerFrame=0;
     _videostream.dwScale=1000;
     _videostream.dwRate=fps;
-
     _videostream.fccHandler=_video_bih.biCompression=fourCC::get((uint8_t *)"MPEG");
 
     return true;
@@ -244,8 +224,12 @@
     printf("[psDemuxer] Reading Audio\n");
     if(!index->readSection("Audio")) return false;
     uint32_t nbTracks;
-    
+    int append=PS_DEFAULT_FRAGMENT_SIZE;
+
     nbTracks=index->getAsUint32("Tracks");
+    if(!index->getAsUint32("Append"))
+        append=0;
+
     if(!nbTracks)
     {
         printf("[PsDemux] No audio\n");

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp Changed

@@ -40,28 +40,23 @@
     sprintf(idxName,"%s.idx2",name);
     if(!ADM_fileExist(idxName))
         r=tsIndexer(name);
-    if(r==ADM_IGN)
+    if(r!=ADM_OK)
     {
-        ADM_warning("Indexing cancelled by the user, deleting the index file. Bye.\n");
-        if(!ADM_eraseFile(idxName))
+        if(r==ADM_IGN)
+            ADM_warning("Indexing cancelled by the user, deleting the index file. Bye.\n");
+        if(!r)
+            ADM_error("Indexing of %s failed, aborting\n",name);
+        if(ADM_fileExist(idxName) && !ADM_eraseFile(idxName))
             ADM_warning("Could not delete %s\n",idxName);
         free(idxName);
         return r;
     }
-    if(!r)
-    {
-        ADM_error("Indexing of %s failed, aborting\n",name);
-        // Currently, indexer returns 0 only if it can't create the .idx2 file, nothing to remove.
-        free(idxName);
-        return r;
-    }
 
-    FP_TYPE appendType=FP_DONT_APPEND;
     char *type;
     uint64_t startDts;
     uint32_t version=0;
     bool reindex=false;
-    uint32_t append;
+    int append;
     r=0;
 
     indexFile index;
@@ -91,9 +86,9 @@
         goto abt;
     }
     append=index.getAsUint32("Append");
-    printf("[tsDemux] Append=%" PRIu32"\n",append);
-    if(append) appendType=FP_APPEND;
-    if(!parser.open(name,&appendType))
+    ADM_assert(append>=0);
+    printf("[tsDemux] Append=%d\n",append);
+    if(!parser.open(name,&append))
     {
         printf("[tsDemux] Cannot open root file (%s)\n",name);
         goto abt;
@@ -127,7 +122,7 @@
 //***********
     
     tsPacket=new tsPacketLinear(videoPid);
-    if(tsPacket->open(name,appendType)==false) 
+    if(tsPacket->open(name,append)==false)
     {
         printf("tsDemux] Cannot tsPacket open the file\n");
         goto abt;
@@ -260,7 +255,7 @@
 
  tsHeader::tsHeader( void ) : vidHeader()
 { 
-    interlaced=false;
+    fieldEncoded=false;
     lastFrame=0xffffffff;
     videoPid=0;
     videoNeedEscaping=false;

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.h Changed

@@ -41,6 +41,8 @@
                 tsPacket        demuxer;
                 uint32_t         pid;
                 uint64_t        dtsOffset;
+                uint64_t        lastDts; // in ticks, rescaled by dts offset
+                uint32_t        wrapCount; // dts wraps around after 1<<32 ticks
                 uint32_t        videoCodec;
                 ADM_TS_MUX_TYPE muxing;
                 ADM_adts2aac    adts;
@@ -50,7 +52,7 @@
 public:
                 bool            setTimeOffset(uint64_t of) {dtsOffset=of;return true;}
                 
-                                  ADM_tsAccess(const char *name,uint32_t pid,bool append,ADM_TS_MUX_TYPE muxing,int extraLen,uint8_t *extraData); 
+                                  ADM_tsAccess(const char *name,uint32_t pid,int append,ADM_TS_MUX_TYPE muxing,int extraLen,uint8_t *extraData);
                 virtual           ~ADM_tsAccess();
                                     /// Hint, the stream is pure CBR (AC3,MP2,MP3)
                 virtual bool      isCBR(void) { return true;}
@@ -110,7 +112,7 @@
 {
   protected:
     
-    bool    interlaced;
+    bool    fieldEncoded;
     bool    readVideo(indexFile *index);
     bool    readAudio(indexFile *index,const char *name);
     bool    readIndex(indexFile *index);

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudio.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudio.cpp Changed

@@ -33,25 +33,27 @@
     \fn ADM_tsAccess
     \param name   [in] Name of the file to take audio from
     \param pid    [in] Pid of the audio track
-    \param append [in] Flag to auto append files (ignored for now)
+    \param append [in] Flag to auto append files
     \param aacAdts[in] Set to true if the file is aac/adts
     \param myLen/myExtra[in] ExtraData if any
 */
-ADM_tsAccess::ADM_tsAccess(const char *name,uint32_t pid,bool append,ADM_TS_MUX_TYPE muxing,int myLen,uint8_t  *myExtra)
+ADM_tsAccess::ADM_tsAccess(const char *name,uint32_t pid,int append,ADM_TS_MUX_TYPE muxing,int myLen,uint8_t  *myExtra)
 {
-FP_TYPE fp=FP_DONT_APPEND;
-        if(append) fp=FP_APPEND;
         this->pid=pid;
-        if(!demuxer.open(name,fp)) ADM_assert(0);
+        if(!demuxer.open(name,append)) ADM_assert(0);
         packet=new TS_PESpacket(pid);
         this->muxing=muxing;
         ADM_info("Creating audio track, pid=%x, muxing =%d\n",pid,muxing);
+        lastDts=ADM_NO_PTS;
+        wrapCount=0;
         if(myLen && myExtra)
-        {   
-            extraData=new uint8_t [myLen+16]; // guards again lavcodec overread
+        {
             extraDataLen=myLen;
+            myLen+=64; // AV_INPUT_BUFFER_PADDING_SIZE, guards against lavcodec overread
+            extraData=new uint8_t [myLen];
+            memset(extraData,0,myLen);
             memcpy(extraData,myExtra,extraDataLen);
-            ADM_info("Creating ts audio access with %d bytes of extradata.",myLen);
+            ADM_info("Creating ts audio access with %u bytes of extradata.",extraDataLen);
             mixDump(extraData,extraDataLen);
         }
 }
@@ -124,6 +126,8 @@
     {
             aprintf("[PsAudio] Requested %" PRIu32" tick before 1st seek point at :%" PRIu32"\n",(uint32_t)timeUs/1000,(uint32_t)seekPoints[0].dts/1000);
             demuxer.setPos(seekPoints[0].position);
+            wrapCount=0;
+            lastDts=ADM_NO_PTS;
             return true;
     }
 
@@ -135,6 +139,15 @@
                     (uint32_t)seekPoints[i-1].dts/1000,
                     (uint32_t)seekPoints[i].dts/1000);
             demuxer.setPos(seekPoints[i-1].position);
+            uint64_t st=seekPoints[i-1].dts;
+            if(st!=ADM_NO_PTS)
+            {
+                st /= 100;
+                st *= 9; // now in ticks
+                st >>= 32;
+                wrapCount=(uint32_t)st;
+            }
+            lastDts=ADM_NO_PTS;
             return true;
         }
     }
@@ -147,14 +160,23 @@
 uint64_t ADM_tsAccess::timeConvert(uint64_t x)
 {
     if(x==ADM_NO_PTS) return ADM_NO_PTS;
+    const uint64_t wrapLen=1LL<<32;
     if(x<dtsOffset)
+        x+=wrapLen;
+    x-=dtsOffset;
+    if(lastDts!=ADM_NO_PTS)
     {
-        x+=1LL<<32;
+        if(lastDts>x && lastDts-x >= wrapLen/2)
+            wrapCount++;
+        if(wrapCount && x>lastDts && x-lastDts > wrapLen/2)
+            wrapCount--;
     }
-    x=x-dtsOffset;
-    x=x*1000;
-    x/=90;
-    return x;
+    lastDts=x;
+    x+=wrapLen*wrapCount;
+    double f=x*100.;
+    f/=9.;
+    f+=0.49;
+    return (uint64_t)f;
 
 }
 /**
@@ -162,13 +184,11 @@
 */
 bool      ADM_tsAccess::getPacket(uint8_t *buffer, uint32_t *size, uint32_t maxSize,uint64_t *dts)
 {
-uint64_t p,d,start;
     // If it is adts, ask ffmpeg to unwrap it...
     switch(muxing)
     {
         case ADM_TS_MUX_ADTS:
             {
-                    bool r=false;
                     int outsize=0;
                     *size=0;
                     bool gotPacket=false;
@@ -208,21 +228,27 @@
         case ADM_TS_MUX_LATM:
             {
                 // Try to get one...
-                int retries=10;
-                again:
-                if(latm.empty()==true) // fetch next LOAS frame, it will contain several frames
+                int retries=20;
+                bool gotPacket=false;
+                uint64_t time=ADM_NO_PTS;
+                while(latm.empty()) // fetch next LOAS frame, it will contain several frames
                 {
                     if(!retries)
                     {
                         ADM_error("Cannot get AAC packet from LATM\n");
                         return false;
                     }
-                    if(false==demuxer.getNextPES(packet)) return false;
-                    int avail=packet->payloadSize-packet->offset;
-                    if(avail>maxSize) ADM_assert(0);
-                    latm.pushData(avail,packet->payload+packet->offset,packet->pts);
+                    if(gotPacket) time=packet->pts;
+                    if(ADM_latm2aac::LATM_MORE_DATA_NEEDED==latm.convert(time))
+                    {
+                        if(false==demuxer.getNextPES(packet)) return false;
+                        int avail=packet->payloadSize-packet->offset;
+                        if(avail>maxSize) ADM_assert(0);
+                        gotPacket=true;
+                        if(false==latm.pushData(avail,packet->payload+packet->offset))
+                            latm.flush();
+                    }
                     retries--;
-                    goto again;
                  }
                  uint64_t myPts;
                  latm.getData(&myPts,size,buffer,maxSize);

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudioProbe.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudioProbe.cpp Changed

@@ -51,7 +51,6 @@
 {
 #define PROBE_ANALYZE_SIZE 6000 // Should be enough in all cases (need ~ 2 blocks)
 uint8_t audioBuffer[PROBE_ANALYZE_SIZE];
-uint64_t pts,dts,startAt;
         
         trackInfo->extraDataLen=0;
         // dont even try if it is not audio
@@ -84,19 +83,11 @@
             // Step 1, try to get a packet...
             TS_PESpacket pes(trackInfo->esId);
             int retries=5;
-            int offset;
-            uint32_t eLen=0;     
+            uint32_t i,eLen=0;
             uint8_t *eData=NULL;
 
             trackInfo->wav.encoding=WAV_AAC;  
-            
-         
-again:
-            if(!retries)
-            {
-                ADM_error("Cannot get info from audio\n");
-                return false;
-            }
+
             if(false==p->getNextPES(&pes))
                 {
                     ADM_warning("Cannot get pes packet for AAC track\n");
@@ -120,21 +111,30 @@
                         ptr=pes.payload+pes.offset;
                         size=pes.payloadSize-pes.offset;
                         latm.flush();
-                        latm.pushData(size,ptr,0);
-                        if(latm.getFrequency())
+                        latm.pushData(size,ptr);
+                        int errors=8; // arbitrary
+                        while(true)
                         {
-                            ADM_assert(latm.getExtraData(&eLen,&eData));
-                            uint32_t fq=latm.getFrequency();
-                            if(fq<=24000) fq*=2; // implicit SBR?
-                            trackInfo->wav.frequency=fq;
-                            trackInfo->wav.channels=latm.getChannels();
-                            trackInfo->wav.byterate=128000>>3;
-                            trackInfo->extraDataLen=eLen;
-                            for(int i=0;i<eLen;i++)
-                                trackInfo->extraData[i]=eData[i];
-                            trackInfo->mux=ADM_TS_MUX_LATM;
-                            ADM_info("AAC extra data (%d): %02x %02x\n",eLen,eData[0],eData[1]);
-                            return true;
+                            ADM_latm2aac::LATM_STATE outcome=latm.convert(0);
+                            if(outcome==ADM_latm2aac::LATM_ERROR && errors-- > 0)
+                                continue;
+                            if(outcome==ADM_latm2aac::LATM_MORE_DATA_NEEDED)
+                                break;
+                            if(latm.getFrequency())
+                            {
+                                ADM_assert(latm.getExtraData(&eLen,&eData));
+                                uint32_t fq=latm.getFrequency();
+                                if(fq<=24000) fq*=2; // implicit SBR?
+                                trackInfo->wav.frequency=fq;
+                                trackInfo->wav.channels=latm.getChannels();
+                                trackInfo->wav.byterate=128000>>3;
+                                trackInfo->extraDataLen=eLen;
+                                for(i=0;i<eLen;i++)
+                                    trackInfo->extraData[i]=eData[i];
+                                trackInfo->mux=ADM_TS_MUX_LATM;
+                                ADM_info("AAC extra data (%d): %02x %02x\n",eLen,eData[0],eData[1]);
+                                return true;
+                            }
                         }
                         // next packet
                         retries--;
@@ -154,10 +154,17 @@
                     ADM_adts2aac  adts;
                     trackInfo->mux=ADM_TS_MUX_ADTS;
                     int dummySize=0;
-                    if(ADM_adts2aac::ADTS_OK!=adts.convert2(size,ptr,&dummySize,NULL)) // We dont need the output hence the null
+                    while(ADM_adts2aac::ADTS_OK!=adts.convert2(size,ptr,&dummySize,NULL)) // We dont need the output hence the null
                     {
                         ADM_info("ADTS no sync\n");
-                        goto again;
+                        if(!retries || false==p->getNextPES(&pes))
+                        {
+                            ADM_warning("Cannot get pes packet for AAC track\n");
+                            return false;
+                        }
+                        ptr=pes.payload+pes.offset;
+                        size=pes.payloadSize-pes.offset;
+                        retries--;
                     }
                     adts.getExtraData(&eLen,&eData);
                     if( eLen!=2) 
@@ -166,7 +173,7 @@
                         return false;
                     }
                     trackInfo->extraDataLen=eLen;
-                    for(int i=0;i<eLen;i++)
+                    for(i=0;i<eLen;i++)
                         trackInfo->extraData[i]=eData[i];
                     ADM_info("AAC extra data %d: %02x %02x\n",eLen,eData[0],eData[1]);
                     trackInfo->wav.frequency=adts.getFrequency();

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsBruteForce.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsBruteForce.cpp Changed

@@ -45,19 +45,15 @@
     ADM_TS_TRACK *tracks=NULL;
     *outTracks=NULL;
     *nbTracks=0;
-    uint32_t nb=0;
-
 
     tsPacket *ts=new tsPacket();
-    ts->open(file,FP_PROBE);
+    ts->open(file,1);
 
     int packetRead=0;
     int *map=new int[MAX_PID];
     memset(map,0,MAX_PID*sizeof(int));
     uint8_t *buffer=new uint8_t[MAX_BUFFER_SIZE];
     int pid;
-    uint32_t packetSize;
-    uint64_t pts,dts,at;
     while(packetRead++<TS_MAX_PACKET_SCAN)
     {
             if(false==ts->getNextPid(&pid))
@@ -406,26 +402,36 @@
 {
 #define LATM_NB_PACKET 10
 #define LATM_MIN_MATCH 7
-        int match=0;
-        TS_PESpacket pes(pid);
-        for(int i=0;i<LATM_NB_PACKET;i++)
+    int total=0;
+    uint32_t offset;
+    TS_PESpacket pes(pid);
+    for(int i=0;i<LATM_NB_PACKET;i++)
+    {
+        if(!ts->getNextPES(&pes))
         {
-            if(!ts->getNextPES(&pes))
-            {
-                ADM_warning("ADTS:Cannot get PES for pid=%d\n",pid);
-                return false;
-            }
-            uint8_t *p=pes.payload+pes.offset;
-            int key=(p[0]<<8)+p[1];
-            if((key & 0xffe0)==0x56e0)  // 0x2b7 shifted by one bit            
-                match++;
+            ADM_warning("ADTS:Cannot get PES for pid=%d\n",pid);
+            return false;
         }
-        ADM_info("\t LATM match : %d/%d\n",match,LATM_MIN_MATCH);
-        if(match>=LATM_MIN_MATCH) 
+        int match=0;
+        for(offset=pes.offset; offset<pes.payloadSize; offset++)
         {
-            return true;
+            uint8_t *p=pes.payload+offset;
+            int key=(p[0]<<8)+p[1];
+            if((key & 0xffe0)!=0x56e0) // 0x2b7 shifted by one bit
+                continue;
+            ADM_info("LATM match in packet %d at offset %u (PES offset: %u, size: %u)\n",i,offset,pes.offset,pes.payloadSize);
+            match++;
+            if(match>=LATM_MIN_MATCH)
+                break;
         }
-        return false;
+        total+=match;
+        if(total>=LATM_MIN_MATCH*2)
+            break;
+    }
+    ADM_info("\t LATM match : %d/%d\n",total,LATM_MIN_MATCH);
+    if(total>=LATM_MIN_MATCH)
+        return true;
+    return false;
 }
 /**
     \fn idAAC_ADTS

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsComputeTimeStamp.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsComputeTimeStamp.cpp Changed

@@ -7,6 +7,7 @@
 #include "ADM_default.h"
 #include "fourcc.h"
 #include "DIA_coreToolkit.h"
+#include "ADM_coreUtils.h"
 #include "ADM_indexFile.h"
 #include "ADM_ts.h"
 
@@ -23,29 +24,36 @@
         \fn updatePtsDts
         \brief Update the PTS/DTS
 
-TODO / FIXME : Handle wrap
 TODO / FIXME : Handle PTS reordering 
 */
-static uint64_t wrapIt(uint64_t val, uint64_t start)
+static uint64_t wrapIt(uint64_t val, uint64_t start, uint64_t &last, uint32_t &laps)
 {
     if(val==ADM_NO_PTS) return val;
-    if(val>=start) return val-start;
-    uint64_t r;
-        r=val+(1LL<<32);
-        r-=start;
-        return r;
+
+    const uint64_t wraplen=1LL<<32;
+    if(val<start)
+        val+=wraplen;
+    val-=start;
+    if(last>val && last-val >= wraplen/2)
+        laps++;
+    if(laps && val>last && val-last > wraplen/2)
+        laps--;
+    last=val;
+    val+=laps*wraplen;
+    return val;
 }
 bool tsHeader::updatePtsDts(void)
 {
+        uint32_t i;
         uint64_t lastDts=0,lastPts=0,dtsIncrement=0;
 
-
+#if 0
         // For audio, The first packet in the seekpoints happens a bit after the action
         // It means some audio may have been seen since we locked on video.
         // So we compute the DTS of the first real packet
         // by using the size field and byterate and arbitrarily make it begins
         // at video
-        for(int i=0;i<listOfAudioTracks.size();i++)
+        for(i=0;i<listOfAudioTracks.size();i++)
         {
             vector          <ADM_mpgAudioSeekPoint > *seekPoints=&(listOfAudioTracks[i]->access->seekPoints);
             if(!((*seekPoints).size())) continue;
@@ -70,20 +78,34 @@
 
             }
         }
-
+#endif
 
         // Make sure everyone starts at 0
         // Search first timestamp (audio/video)
-
-        switch( _videostream.dwRate)
+        if(fieldEncoded) // Set fps to field rate, necessary for copy mode
         {
-            case 50000:   dtsIncrement=20000;break;
-            case 25000:   dtsIncrement=40000;break;
-            case 23976:   dtsIncrement=41708;break;
-            case 29970:   dtsIncrement=33367;break;
-            default : dtsIncrement=1;
-                    printf("[psDemux] Fps not handled for DTS increment\n");
-
+            if(_videostream.dwRate<=45000)
+                _videostream.dwRate*=2;
+            else if(!(_videostream.dwScale%2))
+                _videostream.dwScale/=2;
+            _mainaviheader.dwMicroSecPerFrame/=2;
+            printf("[processVideoIndex] Doubling fps for field-encoded video, new time base: %d / %d\n",_videostream.dwScale,_videostream.dwRate);
+        }
+        if(_mainaviheader.dwMicroSecPerFrame)
+        {
+            dtsIncrement=_mainaviheader.dwMicroSecPerFrame;
+        }else
+        {
+            if(_videostream.dwScale==1000)
+                dtsIncrement=ADM_UsecFromFps1000(_videostream.dwRate);
+            else if(_videostream.dwScale && _videostream.dwRate)
+            {
+                double f=_videostream.dwScale;
+                f*=1000.*1000.;
+                f/=_videostream.dwRate;
+                f+=0.49;
+                dtsIncrement=(uint64_t)f;
+            }
         }
         uint64_t startDts=ListOfFrames[0]->dts;
         uint64_t startPts=ListOfFrames[0]->pts;
@@ -99,7 +121,7 @@
                 ListOfFrames[0]->dts=startDts;
             }
         }
-        for(int i=0;i<listOfAudioTracks.size();i++)
+        for(i=0;i<listOfAudioTracks.size();i++)
         {
             if(!listOfAudioTracks[i]->access->seekPoints.size()) continue;
             uint64_t a=listOfAudioTracks[i]->access->seekPoints[0].dts;
@@ -107,14 +129,17 @@
         }
         // Rescale all so that it starts ~ 0
         // Video..
-        for(int i=0;i<ListOfFrames.size();i++)
+        uint32_t ptsWrapCount=0;
+        uint32_t dtsWrapCount=0;
+        for(i=0;i<ListOfFrames.size();i++)
         {
             dmxFrame *f=ListOfFrames[i];
-            f->pts=wrapIt(f->pts,startDts);
-            f->dts=wrapIt(f->dts,startDts);
+            f->pts=wrapIt(f->pts,startDts,lastPts,ptsWrapCount);
+            f->dts=wrapIt(f->dts,startDts,lastDts,dtsWrapCount);
         }
+        lastPts=lastDts=0;
         // Audio start at 0 too
-        for(int i=0;i<listOfAudioTracks.size();i++)
+        for(i=0;i<listOfAudioTracks.size();i++)
         {
             ADM_tsTrackDescriptor *track=listOfAudioTracks[i];
             ADM_tsAccess    *access=track->access;
@@ -125,10 +150,10 @@
         // for video
         // We are sure to have both PTS & DTS for 1st image
         // Guess missing DTS/PTS for video
-        int noUpdate=0;
+        /*int noUpdate=0;*/
         startDts=ListOfFrames[0]->dts;
         ListOfFrames[0]->dts=0;
-        for(int i=0;i<ListOfFrames.size();i++)
+        for(i=0;i<ListOfFrames.size();i++)
         {
             dmxFrame *frame=ListOfFrames[i];
             aprintf("[psUpdate] frame:%d raw DTS: %" PRId64" PTS:%" PRId64"\n",i,frame->dts,frame->pts);
@@ -170,12 +195,12 @@
         // Now take care of the first frame dts.
         ListOfFrames[0]->dts=timeConvert(startDts);
         // convert to us for Audio tracks (seek points)
-        for(int i=0;i<listOfAudioTracks.size();i++)
+        for(i=0;i<listOfAudioTracks.size();i++)
         {
             ADM_tsTrackDescriptor *track=listOfAudioTracks[i];
             ADM_tsAccess    *access=track->access;
-            
-            for(int j=0;j<access->seekPoints.size();j++)
+            uint32_t j;
+            for(j=0;j<access->seekPoints.size();j++)
             {
                 if( access->seekPoints[j].dts!=ADM_NO_PTS) 
                     access->seekPoints[j].dts=access->timeConvert( access->seekPoints[j].dts);

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsCrc.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsCrc.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.cpp Changed

@@ -62,7 +62,7 @@
     //
     // Now extract the datas from audio tracks & verify they are here
     tsPacketLinear *p=new tsPacketLinear(0);
-    p->open(file,FP_DONT_APPEND);
+    p->open(file,0);
     for(int i=1;i<nbTracks;i++)
     {
         tsAudioTrackInfo trk;
@@ -183,14 +183,14 @@
     \fn writeSystem
     \brief Write system part of index file
 */
-bool TsIndexerBase::writeSystem(const char *filename,bool append)
+bool TsIndexerBase::writeSystem(const char *filename,int append)
 {
     qfprintf(index,"PSD1\n");
     qfprintf(index,"[System]\n");
     qfprintf(index,"Version=%d\n",ADM_INDEX_FILE_VERSION);
     qfprintf(index,"Type=T\n");
     qfprintf(index,"File=%s\n",filename);
-    qfprintf(index,"Append=%d\n",append);
+    qfprintf(index,"Append=%u\n",(uint32_t)append);
     return true;
 }
 /**
@@ -234,6 +234,7 @@
 {
         // if it contain a SPS or a intra/idr, we start a new line
         bool mustFlush=false;
+        bool picStructFromSei=false;
         int n=listOfUnits.size();
         int picIndex=0;
         H264Unit *unit=&(listOfUnits[0]);
@@ -244,15 +245,18 @@
         {
             switch(listOfUnits[i].unitType)
             {
-                case unitTypeSps: mustFlush=true;;break;
+                case unitTypeSps: mustFlush=true; break;
                 case unitTypePic: 
                             picIndex=i;
-                            pictStruct=listOfUnits[i].imageStructure;
+                            if(!picStructFromSei)
+                                pictStruct=listOfUnits[i].imageStructure;
+                            picStructFromSei=false;
                             if(listOfUnits[i].imageType==1 || listOfUnits[i].imageType==4)
                                 mustFlush=true;
                             break;
                 case unitTypeSei:
                             pictStruct=listOfUnits[i].imageStructure;
+                            picStructFromSei=true;
                             break;
                 default:
                         ADM_assert(0);
@@ -295,7 +299,7 @@
                 else deltaDts=pic->dts-data.beginDts;            
 
 
-        qfprintf(index," %c%c",Type[picUnit->imageType],Structure[pictStruct&3]);
+        qfprintf(index," %c%c",Type[picUnit->imageType],Structure[pictStruct%6]);
         int32_t delta=(int32_t)(nextConsumed-beginConsuming);
         
     //    printf("%d -- %d = %d\n",nextConsumed, beginConsuming,delta);
@@ -347,14 +351,12 @@
     H264Unit &lastUnit=listOfUnits[n-1];
     switch(t)
     {
-        case 3: 
-                lastUnit.imageStructure=pictureFrame;
-                break;
-        case 1:  lastUnit.imageStructure=pictureTopField;
-                 break;
-        case 2:  lastUnit.imageStructure=pictureBottomField;
-                 break;
-        default: ADM_warning("frame type 0 met, this is illegal\n");
+        case 3 : lastUnit.imageStructure=pictureFrame;break;
+        case 1 : lastUnit.imageStructure=pictureFieldTop;break;
+        case 2 : lastUnit.imageStructure=pictureFieldBottom;break;
+        case 4 : lastUnit.imageStructure=pictureTopFirst;break;
+        case 5 : lastUnit.imageStructure=pictureBottomFirst;break;
+        default: ADM_warning("frame type %d met, this is illegal\n",t);break;
     }
     return true;
 }

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.h Changed

@@ -41,7 +41,7 @@
 #else
 #define aprintf printf
 #endif
-static const char Structure[4]={'X','T','B','F'}; // X Top Bottom Frame
+static const char Structure[6]={'X','T','B','F','C','S'}; // Invalid, Top, Bottom, Frame, Frame+TFF, Frame+BFF
 static const char Type[5]={'X','I','P','B','D'};
 #define VC1_MAX_SEQ_SIZE 64
 #if 1
@@ -67,8 +67,10 @@
 typedef enum
 {
     pictureFrame=3,
-    pictureTopField=1, 
-    pictureBottomField=2
+    pictureFieldTop=1,
+    pictureFieldBottom=2,
+    pictureTopFirst=4,
+    pictureBottomFirst=5
 }pictureStructure;
 
 typedef struct
@@ -147,25 +149,31 @@
 virtual uint8_t run(const char *file,ADM_TS_TRACK *videoTrac)=0;
         bool    writeVideo(TSVideo *video,ADM_TS_TRACK_TYPE trkType);
         bool    writeAudio(void);
-        bool    writeSystem(const char *filename,bool append=false);
+        bool    writeSystem(const char *filename,int append=0);
         bool    updateLastUnitStructure(int structure);
         bool    updatePicStructure(TSVideo &video,const uint32_t t)
-                        {
-                                            switch(t)
-                                            {
-                                                case 3: video.frameCount++;
-                                                        thisUnit.imageStructure=pictureFrame;
-                                                        break;
-                                                case 1:  thisUnit.imageStructure=pictureTopField;
-                                                         video.fieldCount++;
-                                                         break;
-                                                case 2:  thisUnit.imageStructure=pictureBottomField;
-                                                         video.fieldCount++;
-                                                         break;
-                                                default: ADM_warning("frame type 0 met, this is illegal\n");
-                                            }
-                                            return true;
-                        }
+                {
+                    switch(t)
+                    {
+                        case 3: video.frameCount++;
+                                thisUnit.imageStructure=pictureFrame;
+                                break;
+                        case 1: thisUnit.imageStructure=pictureFieldTop;
+                                video.fieldCount++;
+                                break;
+                        case 2: thisUnit.imageStructure=pictureFieldBottom;
+                                video.fieldCount++;
+                                break;
+                        case 4: video.frameCount++;
+                                thisUnit.imageStructure=pictureTopFirst;
+                                break;
+                        case 5: video.frameCount++;
+                                thisUnit.imageStructure=pictureBottomFirst;
+                                break;
+                        default: ADM_warning("frame type 0 met, this is illegal\n");
+                    }
+                    return true;
+                }
 };
 
 /**
@@ -178,36 +186,22 @@
         
 protected:
         ADM_SPSInfo             spsInfo;
-        bool                    decodeSEI(uint32_t nalSize, uint8_t *org,uint32_t *recoveryLength,pictureStructure *nextpicstruct);
+        uint8_t                 decodeSEI(uint32_t nalSize, uint8_t *org,uint32_t *recoveryLength,pictureStructure *nextpicstruct);
         #define                 ADM_NAL_BUFFER_SIZE (2*1024) // only used to decode SEI, should plenty enough
         uint8_t                 payloadBuffer[ADM_NAL_BUFFER_SIZE];
+        uint8_t                 spsCache[ADM_NAL_BUFFER_SIZE];
+        uint32_t                spsLen;
 public:
                 TsIndexerH264(listOfTsAudioTracks *tr) : TsIndexerBase(tr)
                 {
-                      memset(&spsInfo,0,sizeof(spsInfo));
+                    memset(&spsInfo,0,sizeof(spsInfo));
+                    spsLen=0;
                 }
                 ~TsIndexerH264()
                 {
                   
                 } 
         uint8_t run(const char *file,ADM_TS_TRACK *videoTrac);
-        bool    updatePicStructure(TSVideo &video,const uint32_t t)
-                        {
-                                            switch(t)
-                                            {
-                                                case 3: video.frameCount++;
-                                                        thisUnit.imageStructure=pictureFrame;
-                                                        break;
-                                                case 1:  thisUnit.imageStructure=pictureTopField;
-                                                         video.fieldCount++;
-                                                         break;
-                                                case 2:  thisUnit.imageStructure=pictureBottomField;
-                                                         video.fieldCount++;
-                                                         break;
-                                                default: ADM_warning("frame type 0 met, this is illegal\n");
-                                            }
-                                            return true;
-                        }
 };
 
 class TsIndexerVC1: public TsIndexerBase
@@ -334,10 +328,10 @@
                                                 case 3: video.frameCount++;
                                                         thisUnit.imageStructure=pictureFrame;
                                                         break;
-                                                case 1:  thisUnit.imageStructure=pictureTopField;
+                                                case 1:  thisUnit.imageStructure=pictureFieldTop;
                                                          video.fieldCount++;
                                                          break;
-                                                case 2:  thisUnit.imageStructure=pictureBottomField;
+                                                case 2:  thisUnit.imageStructure=pictureFieldBottom;
                                                          video.fieldCount++;
                                                          break;
                                                 default: ADM_warning("frame type 0 met, this is illegal\n");

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp Changed

@@ -13,17 +13,16 @@
  ***************************************************************************/
 #include "ADM_tsIndex.h"
 #include "DIA_coreToolkit.h"
-#include "ADM_tsIndex.h"
 
-static bool decoderSei1(const ADM_SPSInfo &spsInfo,int size, uint8_t *bfer,pictureStructure *pic);
-static bool decoderSei6(int size, uint8_t *bfer,uint32_t *recovery);
+static bool decoderSei1(const ADM_SPSInfo &spsInfo, uint32_t size, uint8_t *bfer, pictureStructure *pic);
+static bool decoderSei6(uint32_t size, uint8_t *bfer, uint32_t *recovery);
 /**
-        \fn decodeSEI
-        \brief decode SEI to get short ref I
-        @param recoveryLength # of recovery frame
-        \return true if recovery found
-*/
-bool TsIndexerH264::decodeSEI(uint32_t nalSize, uint8_t *org,uint32_t *recoveryLength,
+ *  \fn decodeSEI
+ *  \brief decode SEI to get short ref I
+ *  @param recoveryLength # of recovery frame, may be NULL
+ *  \return 1 if picture structure found, 6 if recovery found, 7 if both, 0 if none.
+ */
+uint8_t TsIndexerH264::decodeSEI(uint32_t nalSize, uint8_t *org,uint32_t *recoveryLength,
                 pictureStructure *picStruct)
 {
     if(nalSize+16>=ADM_NAL_BUFFER_SIZE)
@@ -32,46 +31,43 @@
         return false;
     }
     uint8_t *payload=payloadBuffer;
-    bool r=false;
+    uint8_t ret=0;
     nalSize=ADM_unescapeH264(nalSize,org,payload);
     uint8_t *tail=payload+nalSize;
     *picStruct=pictureFrame; // frame
     while( payload<tail-2)
     {
-                uint32_t sei_type=0,sei_size=0;
-                while(payload[0]==0xff) {sei_type+=0xff;payload++;};
-                sei_type+=payload[0];payload++;
-                while(payload[0]==0xff) {sei_size+=0xff;payload++;};
-                sei_size+=payload[0];payload++;
-                aprintf("  [SEI] Type: 0x%x, size: %u\n",sei_type,sei_size);
-                if(payload+sei_size>=tail)
-                {
-                        return false;
-                }
-                switch(sei_type) // Recovery point
-                {
-
-                       case 1:
-                        {
-                            decoderSei1(spsInfo,sei_size,payload,picStruct);
-                            payload+=sei_size;
-                            break;
-                        }
-                       case 6:
-                        {
-                            decoderSei6(sei_size,payload,recoveryLength);
-                            payload+=sei_size;
-                            aprintf("[SEI] Recovery :%" PRIu32"\n",*recoveryLength);
-                            r=true;
-                            break;
-                        }
-                        default:
-                            payload+=sei_size;
-                            break;
-                }
+        uint32_t sei_type=0,sei_size=0;
+        while(payload[0]==0xff) {sei_type+=0xff;payload++;};
+        sei_type+=payload[0];payload++;
+        while(payload[0]==0xff) {sei_size+=0xff;payload++;};
+        sei_size+=payload[0];payload++;
+        aprintf("  [SEI] Type: 0x%x, size: %u\n",sei_type,sei_size);
+        if(payload+sei_size>tail)
+            return ret;
+
+        switch(sei_type)
+        {
+            case 1:
+            {
+                decoderSei1(spsInfo,sei_size,payload,picStruct);
+                ret+=1;
+                break;
+            }
+            case 6: // Recovery point
+            {
+                if(!recoveryLength) break;
+                decoderSei6(sei_size,payload,recoveryLength);
+                aprintf("[SEI] Recovery :%" PRIu32"\n",*recoveryLength);
+                ret+=6;
+                break;
+            }
+            default:break;
+        }
+        payload+=sei_size;
     }
     //if(payload+1<tail) ADM_warning("Bytes left in SEI %d\n",(int)(tail-payload));
-    return r;
+    return ret;
 }
 /**
  * \fn findH264SPS
@@ -80,24 +76,28 @@
 bool TsIndexerH264::findH264SPS(tsPacketLinearTracker *pkt,TSVideo &video)
 {
     dmxPacketInfo tmpInfo;
-    bool keepRunning=true;
-    bool seq_found=false;
+    uint64_t rewindStart=0;
+    uint32_t rewindOffset=0;
+    bool sps_found=false;
     TS_PESpacket SEI_nal(0);
-    while(keepRunning)
+    while(true)
     {
-        int startCode=pkt->findStartCode();
+        uint32_t startCode=pkt->findStartCode();
 
-        if(!pkt->stillOk())
-        {
-            keepRunning=false;
-            continue;
-        }
+        if(!pkt->stillOk()) break;
         if(startCode&0x80) continue; // Marker missing
         startCode&=0x1f;
-        if(startCode!=NAL_SPS)
+        if(!sps_found && startCode!=NAL_SPS)
+            continue;
+        if(startCode!=NAL_SPS && startCode!=NAL_SEI)
             continue;
 
         // Got SPS!
+        if(startCode==NAL_SPS && sps_found) // most likely the next keyframe
+        {
+            ADM_warning("No picture timing SEI found within the first GOP, can't check interlacing.\n");
+            break;
+        }
         // Get info
         pkt->getInfo(&tmpInfo);
         // Read just enough...
@@ -110,25 +110,43 @@
             SEI_nal.pushByte(r);
         }
         if(!pkt->stillOk()) break;
-        pkt->seek(tmpInfo.startAt,tmpInfo.offset-5);
-        if (extractSPSInfo(SEI_nal.payload, SEI_nal.payloadSize-3,&spsInfo))
+        if(startCode==NAL_SPS &&!sps_found && extractSPSInfo(SEI_nal.payload, SEI_nal.payloadSize-3, &spsInfo))
         {
             ADM_info("[TsIndexer] Found video %" PRIu32"x%" PRIu32", fps=%" PRIu32"\n",video.w,video.h,video.fps);
             ADM_info("[TsIndexer] SPS says %" PRIu32"x%" PRIu32"\n",spsInfo.width,spsInfo.height);
-            seq_found=1;
+            sps_found=true;
+            rewindStart=tmpInfo.startAt;
+            rewindOffset=tmpInfo.offset-5;
             video.w=spsInfo.width;
             video.h=spsInfo.height;
             video.fps=spsInfo.fps1000;
-            writeVideo(&video,ADM_TS_H264);
-            writeAudio();
-            qfprintf(index,"[Data]");
-            // Rewind
-
-            break;
+            spsLen=SEI_nal.payloadSize-3;
+            if(spsLen>ADM_NAL_BUFFER_SIZE)
+                spsLen=ADM_NAL_BUFFER_SIZE;
+            memcpy(spsCache,SEI_nal.payload,spsLen);
+            continue; // we miss the next NALU, should be harmless
+        }
+        if(startCode==NAL_SEI && sps_found && SEI_nal.payloadSize>=7)
+        {
+            pictureStructure p=pictureFrame;
+            if(decodeSEI(SEI_nal.payloadSize-4, SEI_nal.payload, NULL, &p) & 1)
+            {
+                video.interlaced=(p!=pictureFrame);
+                break; // we've got both, SPS and SEI
+            }
+            startCode=pkt->readi8(); // peek now, findStartCode will miss it
+            if((startCode&0x1f)==NAL_SPS) break;
         }
-        pkt->seek(tmpInfo.startAt,tmpInfo.offset);
     }
-    return seq_found;
+    if(sps_found)
+    {
+        pkt->seek(rewindStart,rewindOffset);
+        pkt->collectStats();
+        writeVideo(&video,ADM_TS_H264);
+        writeAudio();
+        qfprintf(index,"[Data]");
+    }
+    return sps_found;
 }
 /**
     \fn run
@@ -143,7 +161,6 @@
     indexerData data;
 
     uint8_t result=0;
-    bool bAppend=false;
 
     beginConsuming=0;
     listOfUnits.clear();
@@ -172,27 +189,35 @@
     uint64_t lastAudOffset=0;
     int audCount=0;
     int audStartCodeLen=5;
+    int lastRefIdc=0;
+    bool keepRunning=true;
     dmxPacketInfo packetInfo;
 
-    pkt=new tsPacketLinearTracker(videoTrac->trackPid, audioTracks);
-
-    FP_TYPE append=FP_DONT_APPEND;
+    int append=0;
 #ifdef ASK_APPEND_SEQUENCED
-    if(true==ADM_probeSequencedFile(file))
+    append=1;
     {
-        if(true==GUI_Question(QT_TRANSLATE_NOOP("tsdemuxer","There are several files with sequential file names. Should they be all loaded ?")))
-            bAppend=true;
+    int nbFollowUps=ADM_probeSequencedFile(file,&append);
+    if(nbFollowUps<0)
+    {
+        qfclose(index);
+        index=NULL;
+        return 0;
+    }
+    if(!nbFollowUps || false==GUI_Question(QT_TRANSLATE_NOOP("tsdemuxer","There are several files with sequential file names. Should they be all loaded ?")))
+        append=0;
     }
-    if(bAppend==true)
-        append=FP_APPEND;
 #endif
-    writeSystem(file,bAppend);
-    pkt->open(file,append);
+    writeSystem(file,append);
+
+    pkt=new tsPacketLinearTracker(videoTrac->trackPid, audioTracks);
+
+    if(!pkt->open(file,append))
+        goto the_end;
     data.pkt=pkt;
     fullSize=pkt->getSize();
-    gui=createProcessing(QT_TRANSLATE_NOOP("tsdemuxer","Indexing"),pkt->getSize());
-    int lastRefIdc=0;
-    bool keepRunning=true;
+    gui=createProcessing(QT_TRANSLATE_NOOP("tsdemuxer","Indexing"),fullSize);
+
     //******************
     // 1 search SPS
     //******************
@@ -276,17 +301,20 @@
                 }
                 if(!pkt->stillOk()) goto resume;
                 aprintf("[SEI] Nal size :%d\n",SEI_nal.payloadSize);
+                bool gotPictStructInfo=false;
                 if(SEI_nal.payloadSize>=7)
-                    decodeSEI(SEI_nal.payloadSize-4,
+                {
+                    if(decodeSEI(SEI_nal.payloadSize-4,
                               SEI_nal.payload,
                               &(thisUnit.recoveryCount),
-                              &(thisUnit.imageStructure));
-                else
+                              &(thisUnit.imageStructure)) & 1)
+                        gotPictStructInfo=true;
+                }else
                     printf("[SEI] Too short size+4=%d\n",*(SEI_nal.payload));
                 startCode=pkt->readi8();
 
                 decodingImage=false;
-                if(!addUnit(data,unitTypeSei,thisUnit,startCodeLength))
+                if(gotPictStructInfo && !addUnit(data,unitTypeSei,thisUnit,startCodeLength))
                 {
                     result=ADM_IGN;
                     goto the_end;
@@ -325,6 +353,56 @@
                     {
                         thisUnit.consumedSoFar=pkt->getConsumed();
                     }
+                    SEI_nal.empty();
+                    uint32_t code=0xffff+0xffff0000;
+                    while(((0xffffff&code)!=1) && pkt->stillOk())
+                    {
+                        uint8_t r=pkt->readi8();
+                        code=(code<<8)+r;
+                        SEI_nal.pushByte(r);
+                    }
+                    if(!pkt->stillOk()) goto resume;
+                    uint32_t tmpLen=SEI_nal.payloadSize;
+                    aprintf("[SPS] Nal size :%d\n",tmpLen);
+                    if(tmpLen>=7 && tmpLen<=ADM_NAL_BUFFER_SIZE+3)
+                    {
+                        tmpLen-=3;
+                        bool match=!memcmp(spsCache, SEI_nal.payload, (spsLen > tmpLen)? tmpLen : spsLen);
+                        if(!match)
+                        {
+                            ADM_warning("SPS changing midstream? Checking deeper...\n");
+                            ADM_SPSInfo tmpInfo;
+                            if(extractSPSInfo(SEI_nal.payload, tmpLen, &tmpInfo))
+                            {
+                                if(spsInfo.width!=tmpInfo.width || spsInfo.height!=tmpInfo.height)
+                                {
+                                    GUI_Info_HIG(ADM_LOG_IMPORTANT, QT_TRANSLATE_NOOP("tsdemuxer","Size Change"),
+                                                 QT_TRANSLATE_NOOP("tsdemuxer","The size of the video changes at frame %u from %ux%u to %ux%u. "
+                                                                   "This is unsupported, stopping here."),
+                                                 data.nbPics, spsInfo.width, spsInfo.height, tmpInfo.width, tmpInfo.height);
+                                    result=1;
+                                    goto the_end;
+                                }
+                                match=true;
+#define MATCH(x) if(spsInfo.x != tmpInfo.x) { ADM_warning("%s value does not match.\n",#x); spsInfo.x = tmpInfo.x; match=false; }
+
+                                MATCH(CpbDpbToSkip)
+                                MATCH(hasPocInfo)
+                                MATCH(log2MaxFrameNum)
+                                MATCH(log2MaxPocLsb)
+                                MATCH(frameMbsOnlyFlag)
+                                MATCH(refFrames)
+
+                                if(!match)
+                                {
+                                    ADM_warning("Codec parameters change on the fly at frame %u, expect problems.\n",data.nbPics);
+                                    // Nevertheless, update the cached SPS
+                                    memcpy(spsCache, SEI_nal.payload, tmpLen);
+                                    spsLen=tmpLen;
+                                }
+                            }
+                        }
+                    }
                 }
                 if(!addUnit(data,unitTypeSps,thisUnit,startCodeLength))
                 {
@@ -420,25 +498,36 @@
 
 // Workaround win64 bug
 // Put that in a separate function
-bool decoderSei1(const ADM_SPSInfo &spsInfo,int size, uint8_t *bfer,pictureStructure *pic)
+bool decoderSei1(const ADM_SPSInfo &spsInfo, uint32_t size, uint8_t *bfer, pictureStructure *pic)
 {
     if(spsInfo.hasStructInfo)
     {
-      getBits bits(size,bfer);
+      uint32_t paddedSize=size+64; // AV_INPUT_BUFFER_PADDING_SIZE, guards against lavcodec overread
+      uint8_t *padded=(uint8_t *)ADM_alloc(paddedSize);
+      if(!padded) return false;
+
+      memcpy(padded,bfer,size);
+      memset(padded+size,0,64);
+
+      getBits bits(size,padded);
       if(spsInfo.CpbDpbToSkip)
       {
               bits.get(spsInfo.CpbDpbToSkip);
       }
       //printf("Consumed: %d,\n",bits.getConsumedBits());
       int pic4=bits.get(4);
+
+      ADM_dealloc(padded);
+      padded=NULL;
+
       aprintf("Pic struct: %d,\n",pic4);
       switch(pic4)
       {
           case 0: *pic=pictureFrame; break;
-          case 3:
-          case 4: *pic=pictureFrame;
-          case 1: *pic=pictureTopField;break;
-          case 2: *pic=pictureBottomField;break;
+          case 1: *pic=pictureFieldTop;break; // field-encoded, top field
+          case 3: *pic=pictureTopFirst;break; // frame-encoded, displayed as fields, top first
+          case 2: *pic=pictureFieldBottom;break; // field-encoded, bottom field
+          case 4: *pic=pictureBottomFirst;break; // frame-encoded, displayed as fields, bottom first
           default:*pic=pictureFrame;break;
       }
     }
@@ -446,11 +535,21 @@
 }
 //
 // 2nd one
-bool decoderSei6(int size, uint8_t *bfer,uint32_t *recovery)
+bool decoderSei6(uint32_t size, uint8_t *bfer, uint32_t *recovery)
 {
-     getBits bits(size,bfer);
-     *recovery=bits.getUEG();
-     return true;
+    uint32_t paddedSize=size+64; // AV_INPUT_BUFFER_PADDING_SIZE, guards against lavcodec overread
+    uint8_t *padded=(uint8_t *)ADM_alloc(paddedSize);
+    if(!padded) return false;
+
+    memcpy(padded,bfer,size);
+    memset(padded+size,0,64);
+
+    getBits bits(size,padded);
+    *recovery=bits.getUEG();
+
+    ADM_dealloc(padded);
+    padded=NULL;
+    return true;
 }

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp Changed

@@ -169,13 +169,18 @@
     pkt->getInfo( &packetInfo);
     thisUnit.consumedSoFar=0; // Head
     
-    uint64_t startExtraData=packetInfo.startAt-193; // /!\ It may be in the previous packet, very unlikely though    
+    //uint64_t startExtraData=packetInfo.startAt-193; // /!\ It may be in the previous packet, very unlikely though
     pkt->read(512,headerBuffer+5);
     uint8_t *pointer=headerBuffer+5;
     uint8_t *end=headerBuffer+512;
     // Rewind
-    pkt->setPos(packetInfo.startAt);
-    
+    if(packetInfo.offset>12) // 2 x 5 bytes long start code + 2 bytes AUD
+        packetInfo.offset-=12;
+    else
+        packetInfo.offset=0;
+    pkt->seek(packetInfo.startAt,packetInfo.offset);
+    pkt->collectStats();
+
     pointer=findGivenStartCodeInBuffer(pointer,end,NAL_H265_SPS,"SPS");
     if(!pointer)
     {
@@ -309,31 +314,38 @@
     }
 
     uint8_t result=0;
-    bool bAppend=false;
     bool seq_found=false;
     bool firstSps=true;
     uint64_t lastAudOffset=0;
     int audCount=0;
+    int lastRefIdc=0;
     dmxPacketInfo packetInfo;
 
-    pkt=new tsPacketLinearTracker(videoTrac->trackPid, audioTracks);
-
-    FP_TYPE append=FP_DONT_APPEND;
+    int append=0;
 #ifdef ASK_APPEND_SEQUENCED
-    if(true==ADM_probeSequencedFile(file))
+    append=1;
+    {
+    int nbFollowUps=ADM_probeSequencedFile(file,&append);
+    if(nbFollowUps<0)
     {
-        if(true==GUI_Question(QT_TRANSLATE_NOOP("tsdemuxer","There are several files with sequential file names. Should they be all loaded ?")))
-                bAppend=true;
+        qfclose(index);
+        index=NULL;
+        return 0;
+    }
+    if(!nbFollowUps || false==GUI_Question(QT_TRANSLATE_NOOP("tsdemuxer","There are several files with sequential file names. Should they be all loaded ?")))
+        append=0;
     }
-    if(bAppend==true)
-        append=FP_APPEND;
 #endif
-    writeSystem(file,bAppend);
-    pkt->open(file,append);
+    writeSystem(file,append);
+
+    pkt=new tsPacketLinearTracker(videoTrac->trackPid, audioTracks);
+
+    if(!pkt->open(file,append))
+        goto the_end;
     data.pkt=pkt;
     fullSize=pkt->getSize();
-    gui=createProcessing(QT_TRANSLATE_NOOP("tsdemuxer","Indexing"),pkt->getSize());
-    int lastRefIdc=0;
+    gui=createProcessing(QT_TRANSLATE_NOOP("tsdemuxer","Indexing"),fullSize);
+
     //******************
     // 1 search SPS
     //******************

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp Changed

@@ -40,18 +40,15 @@
 uint8_t TsIndexerMpeg2::run(const char *file,ADM_TS_TRACK *videoTrac)
 {
 uint32_t temporal_ref,val;
-uint8_t buffer[50*1024];
 bool seq_found=false;
-H264Unit thisUnit;
+H264Unit spsUnit;
 
 beginConsuming=0;
 
 TSVideo video;
 indexerData  data;    
-dmxPacketInfo tmpInfo;
 
 uint8_t result=1;
-bool bAppend=false;
 
     listOfUnits.clear();
 
@@ -75,35 +72,67 @@
         return 0;
     }
     
-    pkt=new tsPacketLinearTracker(videoTrac->trackPid, audioTracks);
-    
-    FP_TYPE append=FP_DONT_APPEND;
+    int append=0;
 #ifdef ASK_APPEND_SEQUENCED
-    if(true==ADM_probeSequencedFile(file))
+    append=1;
+    {
+    int nbFollowUps=ADM_probeSequencedFile(file,&append);
+    if(nbFollowUps<0)
     {
-        if(true==GUI_Question(QT_TRANSLATE_NOOP("tsdemuxer","There are several files with sequential file names. Should they be all loaded ?")))
-               bAppend=true;
+        qfclose(index);
+        index=NULL;
+        return 0;
+    }
+    if(!nbFollowUps || false==GUI_Question(QT_TRANSLATE_NOOP("tsdemuxer","There are several files with sequential file names. Should they be all loaded ?")))
+        append=0;
     }
-    if(true==bAppend)
-        append=FP_APPEND;
 #endif
-    writeSystem(file,bAppend);
-    pkt->open(file,append);
-    gui= createProcessing(QT_TRANSLATE_NOOP("tsdemuxer","Indexing"),pkt->getSize());
+    writeSystem(file,append);
+
+    pkt=new tsPacketLinearTracker(videoTrac->trackPid, audioTracks);
+
+    if(!pkt->open(file,append))
+    {
+        delete pkt;
+        pkt=NULL;
+        audioTracks=NULL;
+        qfclose(index);
+        index=NULL;
+        return 0;
+    }
     data.pkt=pkt;
     fullSize=pkt->getSize();
+    gui=createProcessing(QT_TRANSLATE_NOOP("tsdemuxer","Indexing"),fullSize);
     int startCode;
     decodingImage=false;
 #define likely(x) x
 #define unlikely(x) x
     int lastStartCode=0xb3;
+    bool seqEntryPending=false;
+    bool picEntryPending=false;
 
-#define REMEMBER() { lastStartCode=startCode;}   
+#define REMEMBER() { lastStartCode=startCode;}
+#define CHECK(x) if(false==x) { result=ADM_IGN; goto the_end; }
       while(true)
       {
         startCode=pkt->findStartCode();
         if(!pkt->stillOk()) break;
 
+        if(picEntryPending && startCode!=0xB5) // picture not followed by extension
+        {
+            if(seqEntryPending)
+            {
+                writeVideo(&video,ADM_TS_MPEG2);
+                writeAudio();
+                qfprintf(index,"[Data]");
+                seqEntryPending=false;
+                pkt->collectStats();
+                CHECK(addUnit(data,unitTypeSps,spsUnit,4+4+4))
+            }
+            CHECK(addUnit(data,unitTypePic,thisUnit,4+2))
+            picEntryPending=false;
+        }
+
           switch(startCode)
                   {
 // B2: User Data
@@ -112,13 +141,9 @@
                           if(seq_found)
                           {
                                 decodingImage=false;
-                                pkt->getInfo(&thisUnit.packetInfo);
-                                thisUnit.consumedSoFar=pkt->getConsumed();
-                                if(!addUnit(data,unitTypeSps,thisUnit,4))
-                                {
-                                    result=ADM_IGN;
-                                    goto the_end;
-                                }
+                                pkt->getInfo(&spsUnit.packetInfo);
+                                spsUnit.consumedSoFar=pkt->getConsumed();
+                                CHECK(addUnit(data,unitTypeSps,spsUnit,4))
                                 pkt->forward(8);  // Ignore
                                 continue;
                           }
@@ -134,19 +159,11 @@
                           video.ar = (val >> 4) & 0xf;
                           video.fps= FPS[val & 0xf];
                           pkt->forward(4);                      //+4
-                          writeVideo(&video,ADM_TS_MPEG2);
-                          writeAudio();
-                          qfprintf(index,"[Data]");
 
                           decodingImage=false;
-                          pkt->getInfo(&thisUnit.packetInfo);
-                          thisUnit.consumedSoFar=pkt->getConsumed();
-                          if(!addUnit(data,unitTypeSps,thisUnit,4+4+4))
-                          {
-                              result=ADM_IGN;
-                              goto the_end;
-                          }
-                          continue;
+                          pkt->getInfo(&spsUnit.packetInfo);
+                          spsUnit.consumedSoFar=pkt->getConsumed();
+                          seqEntryPending=true;
                           break;
 //#warning FIXME, update pic field info.... It triggers a end-of-pic message as it is
 
@@ -173,9 +190,27 @@
                                     three=pkt->readi8();
                                     
                                     int picture_structure=one&3;// 1=TOP, 2=BOTTOM, 3=FRAME
-                                    bool tff=!!(two&0x80);;
-                                    bool progressive_frame=!!(three&0x80);;
-                                    updateLastUnitStructure(picture_structure);
+                                    bool tff=!!(two&0x80);
+                                    bool progressive_frame=!!(three&0x80);
+                                    if(!progressive_frame && picture_structure==3)
+                                        picture_structure+=tff? 1 : 2;
+                                    //updateLastUnitStructure(picture_structure);
+                                    if(picEntryPending)
+                                    {
+                                        if(seqEntryPending)
+                                        {
+                                            video.interlaced=(picture_structure!=3);
+                                            writeVideo(&video,ADM_TS_MPEG2);
+                                            writeAudio();
+                                            qfprintf(index,"[Data]");
+                                            seqEntryPending=false;
+                                            pkt->collectStats();
+                                            CHECK(addUnit(data,unitTypeSps,spsUnit,4+4+4))
+                                        }
+                                        updatePicStructure(video,picture_structure);
+                                        CHECK(addUnit(data,unitTypePic,thisUnit,4+2))
+                                    }
+                                    picEntryPending=false;
 #if 0                                                                                
                                     printf("structure %d progressive=%d tff=%d (%x:%x:%x)\n",picture_structure,progressive_frame,tff,one,two,three);
 
@@ -193,15 +228,11 @@
                   case 0xb8: // GOP
                         REMEMBER()
                           // Update ui                        
-                          if(!seq_found) continue;
+                          if(!seq_found || seqEntryPending) continue;
 
-                          pkt->getInfo(&thisUnit.packetInfo);
-                          thisUnit.consumedSoFar=pkt->getConsumed();
-                          if(!addUnit(data,unitTypeSps,thisUnit,4))
-                          {
-                              result=ADM_IGN;
-                              goto the_end;
-                          }
+                          pkt->getInfo(&spsUnit.packetInfo);
+                          spsUnit.consumedSoFar=pkt->getConsumed();
+                          CHECK(addUnit(data,unitTypeSps,spsUnit,4))
                           break;                                            
                   case 0x00 : // picture
                         {
@@ -227,11 +258,7 @@
                           pkt->getInfo(&thisUnit.packetInfo);
                           thisUnit.consumedSoFar=pkt->getConsumed();
                           thisUnit.imageType=type;
-                          if(!addUnit(data,unitTypePic,thisUnit,4+2))
-                          {
-                              result=ADM_IGN;
-                              goto the_end;
-                          }
+                          picEntryPending=true;
                           pkt->invalidatePtsDts();
                           data.nbPics++;
                         }

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp Changed

@@ -59,11 +59,19 @@
     writeSystem(file,false);
     pkt=new tsPacketLinearTracker(videoTrac->trackPid, audioTracks);
     
-    FP_TYPE append=FP_APPEND;
-    pkt->open(file,append);
+    int append=1; // FIXME
+    if(!pkt->open(file,append))
+    {
+        delete pkt;
+        pkt=NULL;
+        qfclose(index);
+        index=NULL;
+        audioTracks=NULL;
+        return 0;
+    }
     data.pkt=pkt;
     fullSize=pkt->getSize();
-    gui= createProcessing(QT_TRANSLATE_NOOP("tsdemuxer","Indexing"),pkt->getSize());
+    gui= createProcessing(QT_TRANSLATE_NOOP("tsdemuxer","Indexing"),fullSize);
     uint8_t result=1;
     int startCode;
     decodingImage=false;
@@ -115,7 +123,7 @@
                           writeVideo(&video,ADM_TS_VC1);
                           writeAudio();
                           qfprintf(index,"[Data]");
-                          
+                          pkt->collectStats();
                           pkt->getInfo(&thisUnit.packetInfo);
                           thisUnit.consumedSoFar=pkt->getConsumed();
                           if(!addUnit(data,unitTypeSps,thisUnit,seqSize+4))

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.cpp Changed

@@ -88,7 +88,7 @@
     nb=counter=failed=start=match=0;
 
     tsPacket *t=new tsPacket();
-    t->open(file,FP_PROBE);
+    t->open(file,1);
     int videoIndex=-1;
     int vidPidToMatch=-1;
     ADM_TS_TRACK_TYPE vidTypeToMatch=ADM_TS_UNKNOWN;
@@ -366,9 +366,10 @@
                 case 0x1B:     *str= "H264 Video";return ADM_TS_H264;break;
                 case 0x24:     *str= "H265 Video(not sure)";return ADM_TS_H265;break;
                 case 0x81:     *str= "AC3 (Not sure)";return ADM_TS_AC3;break;
-                case 0x82:     *str= "DTS (Not sure)";return ADM_TS_DTS;break;
+                case 0x82:     *str= "DTS (BluRay)";return ADM_TS_DTS;break;
                 case 0x83:     *str= "TrueHD AC3  (BluRay)";return ADM_TS_AC3;break;
                 case 0x84:     *str= "E-AC3 (Not sure)";return ADM_TS_EAC3;break;
+                case 0x86:     *str= "DTS XLL (BluRay)";return ADM_TS_DTS;break;
                 case 0x87:     *str= "E-AC3 (Not sure)";return ADM_TS_EAC3;break;
                 case 0xea:     *str= "VC1 (Not sure)";return ADM_TS_VC1;break;
                 case 0x90:     *str= "Presentation graphics (BluRay)";return ADM_TS_UNKNOWN;break;

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsReadIndex.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsReadIndex.cpp Changed

@@ -22,13 +22,13 @@
 #include "ADM_default.h"
 #include "fourcc.h"
 #include "DIA_coreToolkit.h"
+#include "ADM_coreUtils.h"
 #include "ADM_indexFile.h"
 #include "ADM_ts.h"
 #include "ADM_string.h"
 
 #include <math.h>
 #define TS_MAX_LINE 10000
-extern uint8_t  mk_hex(uint8_t a, uint8_t b);;
 /**
         \fn readIndex
         \brief Read the [video] section of the index file
@@ -174,24 +174,16 @@
                 }
                 switch(picStruct)
                 {
-                        default: ADM_warning("Unknown picture structure %c\n",picStruct);
-                        case 'F': frame->pictureType=AVI_FRAME_STRUCTURE;break;
+                        case 'F':
+                        case 'C':
+                        case 'S': frame->pictureType=AVI_FRAME_STRUCTURE;break;
                         case 'T': frame->pictureType=AVI_FIELD_STRUCTURE+AVI_TOP_FIELD;break;
                         case 'B': frame->pictureType=AVI_FIELD_STRUCTURE+AVI_BOTTOM_FIELD;break;
-
+                        default: ADM_warning("Unknown picture structure %c\n",picStruct);break;
                 }
                 frame->len=len;
-                if(!interlaced && (frame->pictureType & AVI_FIELD_STRUCTURE))
-                {
-                    printf("[processVideoIndex] Setting interlaced flag.\n");
-                    interlaced=true;
-                    // Set fps to field rate for interlaced H.264 streams, necessary for copy mode
-                    if(_videostream.fccHandler==fourCC::get((uint8_t *)"H264"))
-                    {
-                        _videostream.dwRate*=2;
-                        printf("[processVideoIndex] Doubling fps1000 for interlaced H.264, new value = %d\n",_videostream.dwRate);
-                    }
-                }
+                if(frame->pictureType & AVI_FIELD_STRUCTURE)
+                    fieldEncoded=true;
                 ListOfFrames.push_back(frame);
                 count++;
                 if(!next) 
@@ -277,12 +269,36 @@
         return false;
     }
 
-    interlaced=index->getAsUint32("Interlaced");
+    if(index->getAsUint32("Interlaced"))
+        printf("[tsDemux] Video is interlaced.\n");
     
     _video_bih.biWidth=_mainaviheader.dwWidth=w ;
-    _video_bih.biHeight=_mainaviheader.dwHeight=h;             
-    _videostream.dwScale=1000;
-    _videostream.dwRate=fps;
+    _video_bih.biHeight=_mainaviheader.dwHeight=h;
+    _mainaviheader.dwMicroSecPerFrame=0;
+    switch(fps)
+    {
+        case 23976:
+            _videostream.dwScale=1001;
+            _videostream.dwRate=24000;
+            break;
+        case 29970:
+            _videostream.dwScale=1001;
+            _videostream.dwRate=30000;
+            break;
+        case 24000:
+        case 25000:
+        case 30000:
+        case 50000:
+        case 60000:
+            _videostream.dwScale=1000;
+            _videostream.dwRate=fps;
+            break;
+        default:
+            _videostream.dwScale=1;
+            _videostream.dwRate=90000;
+            _mainaviheader.dwMicroSecPerFrame=ADM_UsecFromFps1000(fps);
+            break;
+    }
     return true;
 }
 /**
@@ -305,7 +321,7 @@
     for(int i=0;i<nbTracks;i++)
     {
         char header[40];
-        char body[40];
+        char body[80];
         std::string language=ADM_UNKNOWN_LANGUAGE;
         uint32_t fq,chan,br,codec,pid,muxing=0;
         sprintf(header,"Track%d.",i);
@@ -367,7 +383,8 @@
         {
             ADM_info("No extradata (%s)\n",body);
         }
-        bool append=(bool)index->getAsUint32("Append");
+        int append=index->getAsUint32("Append");
+        ADM_assert(append>=0);
         ADM_tsAccess *access=new ADM_tsAccess(name,pid,append,(ADM_TS_MUX_TYPE)muxing,extraLen,extraData);
         if(extraData) delete [] extraData;
         extraData=NULL;

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp Changed

@@ -63,7 +63,7 @@
     \fn open
     \brief dtor
 */
-bool tsPacket::open(const char *filenames,FP_TYPE append)
+bool tsPacket::open(const char *filenames, int append)
 {
     _file=new fileParser();
     if(!_file->open(filenames,&append))
@@ -233,7 +233,6 @@
     int payloadUnitStart=scratch[0]&0x40;
     int fieldControl=(scratch[2]>>4)&3;
     int continuity=(scratch[2]&0xf);
-    int len=TS_PACKET_LEN-4; // useful datas
 
     pkt->continuityCounter=continuity;
     pkt->payloadStart=payloadUnitStart;
@@ -308,7 +307,6 @@
     if(!nbRetries)
         startOffset=pkt.startAt;
     nbRetries++;
-    uint32_t tableId;
     uint32_t sectionLength=0;
     uint32_t transportStreamId=0;
     uint32_t dummy;
@@ -482,9 +480,8 @@
 {
     uint8_t  *start=pes->payload+6;
     uint8_t  *end=pes->payload+pes->payloadSize;
-    uint8_t  stream=pes->payload[3];
     uint32_t packLen=(pes->payload[4]<<8)+(pes->payload[5]);
-    int      align=0,c;
+    int      c;
 
 
     pes->dts=ADM_NO_PTS;
@@ -502,7 +499,6 @@
     if((c&0xc0)!=0x80) fail("No Mpeg2 marker");
     
         uint32_t ptsdts,len;
-        if(c & 4) align=1;      
         c=*start++;     // PTS/DTS
         //printf("%x ptsdts\n",c
         ptsdts=c>>6;
@@ -530,8 +526,7 @@
                                 #define PTS11_ADV 10 // nut monkey
                                 if(len>=PTS11_ADV)
                                 {
-                                        uint32_t skip=PTS11_ADV;
-                                        uint64_t pts1,pts2,dts,pts0;
+                                        uint64_t pts1,pts2,pts0;
                                                 //      printf("\n PTS10\n");
                                                 pts0=start[0];  
                                                 pts1=(start[1]<<8)+start[2]; 
@@ -563,14 +558,14 @@
         if(packLen)
         {
             //printf("***Zimbla***\n");
-            if(packLen<sizeCheck) 
+            if((int)packLen<sizeCheck)
             {
                 tail=sizeCheck-packLen;
                 pes->payloadSize-=tail; 
                 ADM_warning("[TS Packet]extra crap at the end %d\n",tail);
             }
             else
-                if(packLen>sizeCheck)
+                if((int)packLen>sizeCheck)
                 {
                     ADM_warning("[TS Packet] PackLen=%d, avalailble=%d\n",packLen,sizeCheck);
                     fail("Pes too long");
@@ -605,11 +600,8 @@
     count++;
     if(count>MAX_SKIPPED_PACKET) return false;
     *pid=id;
-    
-    int payloadUnitStart=scratch[0]&0x40;
+
     int fieldControl=(scratch[2]>>4)&3;
-    int continuity=(scratch[2]&0xf);
-    int len=TS_PACKET_LEN-4; // useful datas
 
     if(!(fieldControl & 1)) 
     {
@@ -665,8 +657,10 @@
         if(false==getNextPES(pesPacket))
         {
                 printf("[tsPacketLinear] Refill failed for pid : 0x%x (%d)\n",pesPacket->pid,pesPacket->pid);
+                eof=true;
                 return false;
         }
+        eof=false;
         return true;
 }
 #ifndef TS_PACKET_INLINE
@@ -681,12 +675,8 @@
         return pesPacket->payload[pesPacket->offset++];
     }
     if(false==refill()) 
-    {
-        eof=1;
         return 0;
-    }
     return pesPacket->payload[pesPacket->offset++];
-    
 }
 
 /**
@@ -897,6 +887,24 @@
     }
 }
 /**
+    \fn resetStats
+*/
+bool tsPacketLinearTracker::resetStats(void)
+{
+    if(!stats) return false;
+    for(uint32_t i=0; i<totalTracks; i++)
+    {
+        packetTSStats *s=stats+i;
+        s->count=0;
+        s->size=0;
+        s->startAt=0;
+        s->startCount=0;
+        s->startSize=0;
+        s->startDts=ADM_NO_PTS;
+    }
+    return true;
+}
+/**
     \fn findStartCode
     \brief Must check stillOk after calling this
 */
@@ -1007,11 +1015,8 @@
         if(id==stats[i].pid) found=i;
     if(found==-1) return false;
 
-    
     int payloadUnitStart=scratch[0]&0x40;
     int fieldControl=(scratch[2]>>4)&3;
-    int continuity=(scratch[2]&0xf);
-
 
     if(!payloadUnitStart) return false; // no PES start in here...
 
@@ -1113,8 +1118,7 @@
                                 #define PTS11_ADV 10 // nut monkey
                                 if(len>=PTS11_ADV)
                                 {
-                                        uint32_t skip=PTS11_ADV;
-                                        uint64_t pts1,pts2,dts,pts0;
+                                        uint64_t pts1,pts2,pts0;
                                                 //      printf("\n PTS10\n");
                                                 pts0=start[0];  
                                                 pts1=(start[1]<<8)+start[2]; 
@@ -1143,4 +1147,81 @@
 
     return true;
 }
+/**
+    \fn collectStats
+    \brief Read from current position until we get the stats, then seek back
+*/
+bool tsPacketLinearTracker::collectStats(void)
+{
+    if(!resetStats()) // no audio tracks, nothing to do
+        return false;
+
+    bool success=false;
+    uint32_t i,found=0,count=0;
+    const uint32_t max=1<<24; // 16 MiB, should be enough
+    const uint32_t remember=consumed;
+    dmxPacketInfo info;
+    getInfo(&info);
+
+    const uint32_t len=sizeof(packetTSStats)*totalTracks;
+    packetTSStats *first=(packetTSStats *)malloc(len);
+    if(!first)
+        return false;
+
+    memset(first,0,len);
+    for(i=0; i<totalTracks; i++)
+    {
+        first[i].startDts=ADM_NO_PTS;
+    }
+
+    while(count<max && stillOk())
+    {
+        found=0;
+        count++;
+        readi8();
+        for(i=0; i<totalTracks; i++)
+        {
+            if(first[i].startAt) continue; // already set
+            if(stats[i].startAt)
+            {
+#define CPY(x) first[i].x = stats[i].x;
+                CPY(pid)
+                CPY(count)
+                CPY(size)
+                CPY(startAt)
+                CPY(startCount)
+                CPY(startSize)
+                CPY(startDts)
+                found++;
+#undef CPY
+            }
+        }
+        if(found==totalTracks)
+        {
+            success=true;
+            break;
+        }
+    }
+    // Now sync back
+    for(i=0; i<totalTracks; i++)
+    {
+        if(!first[i].startAt) continue;
+#define CPY(x) stats[i].x = first[i].x;
+        CPY(pid)
+        CPY(count)
+        CPY(size)
+        CPY(startAt)
+        CPY(startCount)
+        CPY(startSize)
+        CPY(startDts)
+#undef CPY
+    }
+    free(first);
+    first=NULL;
+
+    ADM_info("Stats for %u tracks out of %u populated, bytes used: %u\n",found,totalTracks,count);
+    consumed=remember;
+    seek(info.startAt,info.offset);
+    return success;
+}
 // EOF

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.h Changed

@@ -128,7 +128,7 @@
 public:
                         tsPacket(void);
     virtual            ~tsPacket();
-    virtual bool        open(const char *filenames,FP_TYPE append);
+    virtual bool        open(const char *filenames, int append);
     virtual bool        close(void);
     virtual bool        getPacket(uint32_t maxSize, uint8_t *pid, uint32_t *packetSize,uint64_t *pts,uint64_t *dts,uint8_t *buffer,uint64_t *startAt);
             bool        getNextPid(int *pid);
@@ -193,12 +193,8 @@
         return pesPacket->payload[pesPacket->offset++];
     }
     if(false==refill()) 
-    {
-        eof=1;
         return 0;
-    }
     return pesPacket->payload[pesPacket->offset++];
-    
 }
 
 /**
@@ -252,15 +248,17 @@
 class tsPacketLinearTracker : public tsPacketLinear
 {
 protected:
-        
         TS_PESpacket *otherPes;
         packetTSStats *stats;
         uint32_t      totalTracks;
+
+        bool    resetStats(void);
 public:
                 tsPacketLinearTracker(uint32_t videoPid,listOfTsAudioTracks *audioTracks);
                 ~tsPacketLinearTracker();
         bool    getStats(uint32_t *nb,packetTSStats **stats);
 virtual bool    updateStats(uint8_t *data);
+        bool    collectStats(void);
         int     findStartCode(void);
         int     findStartCode2(bool &fourBytes);
 };

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Pictures/ADM_pics.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_demuxers/Pictures/ADM_pics.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/avi_utils.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/avi_utils.cpp Changed

@@ -66,14 +66,14 @@
 {
     memset(header,0,sizeof(*header));
     header->dwMicroSecPerFrame= ADM_UsecFromFps1000(video->getAvgFps1000()); //int32_t	dwMicroSecPerFrame;	// frame display rate (or 0L)
-    header->dwMaxBytesPerSec=8*1000*1000; //int32_t	dwMaxBytesPerSec;	// max. transfer rate
+    //header->dwMaxBytesPerSec=8*1000*1000; //int32_t	dwMaxBytesPerSec;	// max. transfer rate
     header->dwPaddingGranularity=0; //int32_t	dwPaddingGranularity;	// pad to multiples of this
 					// size; normally 2K.
     header->dwFlags= AVIF_HASINDEX + AVIF_ISINTERLEAVED; // FIXME HAS INDEX //int32_t	dwFlags;		// the ever-present flags
     //header->dwTotalFrames=0; //int32_t	dwTotalFrames;		// # frames in file
     header->dwInitialFrames=0; //int32_t	dwInitialFrames;
    // Must be set by caller  header->dwStreams=int32_t	dwStreams;
-    header->dwSuggestedBufferSize=64*1024;// int32_t	dwSuggestedBufferSize;
+    //header->dwSuggestedBufferSize=64*1024;// int32_t	dwSuggestedBufferSize;
 
     header->dwWidth=video->getWidth();//int32_t	dwWidth;
     header->dwHeight=video->getHeight();//int32_t	dwHeight;
@@ -99,7 +99,7 @@
 	header->dwRate=video->getAvgFps1000();// int32_t	dwRate;		/* dwRate / dwScale == samples/second */
 	header->dwStart=0;// int32_t	dwStart;
 	header->dwLength=0; // int32_t	dwLength;	/* In units above... */
-	header->dwSuggestedBufferSize=1000000;// int32_t	dwSuggestedBufferSize;
+	//header->dwSuggestedBufferSize=1000000;// int32_t	dwSuggestedBufferSize;
 	header->dwQuality=0;// int32_t	dwQuality;
 	header->dwSampleSize=0;// int32_t	dwSampleSize;
         header->rcFrame.right=video->getWidth();// int32_t	dwSampleSize;

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.h Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/op_aviwrite.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/op_aviwrite.cpp Changed

@@ -211,25 +211,20 @@
                 header->dwInitialFrames =1;
                 header->dwSuggestedBufferSize=2048;
                 break;
-		case WAV_AAC:
+        case WAV_AAC:
           {
             // nb sample in stream
             // since it is vbr, assume N packet of 1024 samples
-			double len;
-			len=_videostream.dwLength;
-			len/=_videostream.dwRate;
-			len*=_videostream.dwScale;
-			len*=wav->frequency;
-			len/=1024;
+            uint32_t frameLength=stream->getSamplesPerPacket();
             header->dwFlags=1;
             header->dwInitialFrames=0;
             header->dwRate=wav->frequency;
-            header->dwScale=1024; //sample/packet 1024 seems good for aac
+            header->dwScale=frameLength;
             header->dwSampleSize = 0;
             header->dwSuggestedBufferSize=8192;
             header->dwInitialFrames = 0;
 
-            wav->blockalign=1024;
+            wav->blockalign=frameLength;
             wav->bitspersample = 0;
 
             uint32_t aLen;
@@ -245,8 +240,9 @@
             }else
             {
                 int SRI=4;	// Default 44.1 khz
+                if(frameLength==(AAC_DEFAULT_FRAME_LENGTH<<1)) // SBR
+                    wav->frequency>>=1; // make it implicit SBR, using the real extradata doesn't work well
                 for(int i=0;i<16;i++) if(wav->frequency==aacBitrate[i]) SRI=i;
-            
                 extra[2]=(2<<3)+(SRI>>1); // Profile LOW
                 extra[3]=((SRI&1)<<7)+((wav->channels)<<3);
             }

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp Changed

@@ -146,12 +146,21 @@
         av_dict_set(&dict, "preload", buf, 0);
         av_dict_set(&dict, "max_delay", "200000", 0);
 
-        ADM_assert(avformat_write_header(oc, &dict) >= 0);
+        //ADM_assert(avformat_write_header(oc, &dict) >= 0);
+        er = avformat_write_header(oc, &dict);
+        if(er < 0)
+        {
+            char str[AV_ERROR_MAX_STRING_SIZE]={0};
+            av_make_error_string(str, AV_ERROR_MAX_STRING_SIZE, er);
+            ADM_error("Writing header failed with error %d (%s)\n", er, str);
+            av_dict_free(&dict);
+            avio_close(oc->pb);
+            return false;
+        }
         ADM_info("Timebase codec = %d/%d\n",video_st->time_base.num,video_st->time_base.den);
         ADM_info("Timebase codec2 = %d/%d\n",c->time_base.num,c->time_base.den);
 //        ADM_info("Original timebase = %d/%d\n",myTimeBase.num,myTimeBase.den);
-        
-        
+        av_dict_free(&dict);
         vStream=s;
         aStreams=a;
         nbAStreams=nbAudioTrack;

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer.conf -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer.conf Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer.h Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer_desc.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer_desc.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp Changed

@@ -35,7 +35,8 @@
     MP4_MUXER_OPT_FASTSTART,
     false,
     WIDE,
-    MP4_MUXER_ROTATE_0
+    MP4_MUXER_ROTATE_0,
+    MP4_MUXER_CLOCK_FREQ_AUTO
 };
 
 
@@ -55,6 +56,25 @@
 {
 
 }
+
+static uint32_t getClockFreqFromEnum(MP4_MUXER_CLOCK_FREQUENCIES type)
+{
+    switch(type)
+    {
+        case MP4_MUXER_CLOCK_FREQ_AUTO: return 0;
+        case MP4_MUXER_CLOCK_FREQ_24KHZ: return 24000;
+        case MP4_MUXER_CLOCK_FREQ_25KHZ: return 25000;
+        case MP4_MUXER_CLOCK_FREQ_30KHZ: return 30000;
+        case MP4_MUXER_CLOCK_FREQ_50KHZ: return 50000;
+        case MP4_MUXER_CLOCK_FREQ_60KHZ: return 60000;
+        case MP4_MUXER_CLOCK_FREQ_90KHZ: return 90000;
+        case MP4_MUXER_CLOCK_FREQ_180KHZ: return 180000;
+        default:
+            ADM_warning("Illegal type = %u\n",type);
+            return 0;
+    }
+}
+
 /**
     \fn open
     \brief Check that the streams are ok, initialize context...
@@ -62,24 +82,50 @@
 
 bool muxerMP4::open(const char *file, ADM_videoStream *s,uint32_t nbAudioTrack,ADM_audioStream **a)
 {
-    if(!isMpeg4Compatible(s->getFCC()) && !isH264Compatible(s->getFCC()) && !isH265Compatible(s->getFCC()))
+    uint32_t fcc=s->getFCC();
+    if(!isMpeg4Compatible(fcc) && !isH264Compatible(fcc) && !isH265Compatible(fcc) && !fourCC::check(fcc,(const uint8_t *)"av01"))
     {
-            GUI_Error_HIG(QT_TRANSLATE_NOOP("mp4muxer","Unsupported"),QT_TRANSLATE_NOOP("mp4muxer","Only MP4Video, H264, and H265 supported for video"));
+            GUI_Error_HIG(QT_TRANSLATE_NOOP("mp4muxer","Unsupported"),QT_TRANSLATE_NOOP("mp4muxer","Only MP4Video, H264, H265 and AV1 supported for video"));
             return false;
     }
+    bool muxModeMov=false;
     if(nbAudioTrack)
+    {
         for(int i=0;i<nbAudioTrack;i++)
         {
             uint32_t acc=a[i]->getInfo()->encoding;
-            if(acc!=WAV_MP2 && acc!=WAV_MP3 && acc!=WAV_AAC && acc!=WAV_AC3 && acc!=WAV_EAC3)
+            if( acc!=WAV_AAC &&
+                acc!=WAV_AC3 &&
+                acc!=WAV_EAC3 &&
+                acc!=WAV_LPCM &&
+                acc!=WAV_MP2 &&
+                acc!=WAV_MP3 &&
+                acc!=WAV_OGG_VORBIS)
             {
-                GUI_Error_HIG(QT_TRANSLATE_NOOP("mp4muxer","Unsupported"),QT_TRANSLATE_NOOP("mp4muxer","Only AAC, AC3, E-AC3 and mpegaudio supported for audio"));
+                GUI_Error_HIG(QT_TRANSLATE_NOOP("mp4muxer","Unsupported"),QT_TRANSLATE_NOOP("mp4muxer","Only AAC, AC3, E-AC3, LPCM, MP2, MP3 and Vorbis supported for audio"));
                 return false;
             }
+            if(acc==WAV_LPCM)
+                muxModeMov=true;
         }
+    }
     /* All seems fine, open stuff */
-    const char *f="mp4";
-    if(muxerConfig.muxerType==MP4_MUXER_PSP) f="psp";
+    const char *f;
+    if(muxerConfig.muxerType==MP4_MUXER_PSP)
+    {
+        if(muxModeMov)
+        {
+            GUI_Error_HIG(QT_TRANSLATE_NOOP("mp4muxer","Incompatible Format"),QT_TRANSLATE_NOOP("mp4muxer","PSP format is incompatible with LPCM audio"));
+            return false;
+        }
+        f="psp";
+    }else if(muxModeMov)
+    {
+        f="mov";
+    }else
+    {
+        f="mp4";
+    }
     if(false==setupMuxer(f,file))
     {
         printf("[MP4] Failed to open muxer\n");
@@ -98,9 +144,31 @@
         c = video_st->codec;
         AVCodecParameters *par;
         par = video_st->codecpar;
-        if(isH265Compatible(s->getFCC()))
+        if(isH265Compatible(fcc))
             par->codec_tag = MKTAG('h', 'v', 'c', '1');
-        rescaleFps(s->getAvgFps1000(),&(c->time_base));
+        uint32_t timescale=getClockFreqFromEnum((MP4_MUXER_CLOCK_FREQUENCIES)muxerConfig.clockfreq);
+        uint32_t clockFreq=s->getTimeBaseDen();
+        uint32_t nbTicks=s->getTimeBaseNum();
+        if(timescale)
+        {
+            if(clockFreq && nbTicks>1 && nbTicks<(1<<14))
+            {
+                if(!((nbTicks*timescale)%clockFreq))
+                    nbTicks=(nbTicks*timescale)/clockFreq;
+                else
+                    nbTicks=1;
+            }else
+            {
+                nbTicks=1;
+            }
+            clockFreq=timescale;
+        }
+        if(clockFreq && nbTicks)
+        {
+            c->time_base.den=clockFreq;
+            c->time_base.num=nbTicks;
+        }else
+            rescaleFps(s->getAvgFps1000(),&(c->time_base));
         myTimeBase=video_st->time_base=c->time_base;
         ADM_info("Video stream time base :%d,%d\n",video_st->time_base.num,video_st->time_base.den);
         c->gop_size=15;
@@ -196,15 +264,25 @@
             ADM_info("Setting rotation to %s degrees clockwise\n",angle);
             av_dict_set(&(video_st->metadata), "rotate", angle, 0);
         }
-        ADM_assert(avformat_write_header(oc, &dict) >= 0);
+        //ADM_assert(avformat_write_header(oc, &dict) >= 0);
+        er = avformat_write_header(oc, &dict);
+        if(er < 0)
+        {
+            char str[AV_ERROR_MAX_STRING_SIZE]={0};
+            av_make_error_string(str, AV_ERROR_MAX_STRING_SIZE, er);
+            ADM_error("Writing header failed with error %d (%s)\n", er, str);
+            av_dict_free(&dict);
+            avio_close(oc->pb);
+            return false;
+        }
 
         ADM_info("Timebase codec = %d/%d\n",c->time_base.num,c->time_base.den);
         ADM_info("Timebase stream = %d/%d\n",video_st->time_base.num,video_st->time_base.den);
-        // The reason to enforce strict CFR is unclear. Disable rounding, which may result in collisions, for now.
-        if(myTimeBase.den==video_st->time_base.den && video_st->time_base.num==1)
+        // Rounding may result in timestamp collisions due to bad choice of timebase, handle with care.
+        if(myTimeBase.den>1 && myTimeBase.den==video_st->time_base.den && video_st->time_base.num==1)
         {
-            //roundup=myTimeBase.num;
-            ADM_info("Timebase roundup would have been %d, ignoring\n",myTimeBase.num);
+            roundup=myTimeBase.num;
+            ADM_info("Using %d as timebase roundup.\n",myTimeBase.num);
         }
         av_dict_free(&dict);
         vStream=s;

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.h Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp Changed

@@ -21,11 +21,13 @@
 
 bool mp4Configure(void)
 {
-        uint32_t fmt=(uint32_t)muxerConfig.muxerType;
-        uint32_t dar=(uint32_t)muxerConfig.aspectRatio;
-        uint32_t rot=(uint32_t)muxerConfig.rotation;
-        uint32_t opt=(uint32_t)muxerConfig.optimize;
-        bool force=muxerConfig.forceAspectRatio;
+        uint32_t fmt = muxerConfig.muxerType;
+        uint32_t dar = muxerConfig.aspectRatio;
+        uint32_t rot = muxerConfig.rotation;
+        uint32_t opt = muxerConfig.optimize;
+        uint32_t clk = muxerConfig.clockfreq;
+        bool force   = muxerConfig.forceAspectRatio;
+
         diaMenuEntry format[]={{MP4_MUXER_MP4,"MP4"},{MP4_MUXER_PSP,"PSP"}};
         diaElemMenu  menuFormat(&fmt,QT_TRANSLATE_NOOP("mp4muxer","Muxing Format"),2,format,"");
         diaMenuEntry streamOpt[]={
@@ -37,6 +39,7 @@
         diaElemToggle forceAR(&force,QT_TRANSLATE_NOOP("mp4muxer","Force aspect ratio"));
         diaMenuEntry aspect[]={{STANDARD,"4:3"},{WIDE,"16:9"},{UNI,"18:9"},{CINEMA,"64:27"}};
         diaElemMenu  menuAspect(&dar,QT_TRANSLATE_NOOP("mp4muxer","Aspect Ratio (DAR)"),4,aspect,"");
+        forceAR.link(1,&menuAspect);
         diaMenuEntry rotation[]={
             {MP4_MUXER_ROTATE_0,QT_TRANSLATE_NOOP("mp4muxer","Do not rotate")},
             {MP4_MUXER_ROTATE_90,QT_TRANSLATE_NOOP("mp4muxer","90°")},
@@ -44,15 +47,29 @@
             {MP4_MUXER_ROTATE_270,QT_TRANSLATE_NOOP("mp4muxer","270°")}
         };
         diaElemMenu menuRotation(&rot,QT_TRANSLATE_NOOP("mp4muxer","Rotate video"),4,rotation,"");
-        diaElem *tabs[]={&menuFormat,&menuOptimize,&forceAR,&menuAspect,&menuRotation};
 
-        if( diaFactoryRun(QT_TRANSLATE_NOOP("mp4muxer","MP4 Muxer"),5,tabs))
+        diaMenuEntry clockFrequencies[]={
+            {MP4_MUXER_CLOCK_FREQ_AUTO,QT_TRANSLATE_NOOP("mp4muxer","Auto")},
+            {MP4_MUXER_CLOCK_FREQ_24KHZ,QT_TRANSLATE_NOOP("mp4muxer","24 kHz")},
+            {MP4_MUXER_CLOCK_FREQ_25KHZ,QT_TRANSLATE_NOOP("mp4muxer","25 kHz")},
+            {MP4_MUXER_CLOCK_FREQ_30KHZ,QT_TRANSLATE_NOOP("mp4muxer","30 kHz")},
+            {MP4_MUXER_CLOCK_FREQ_50KHZ,QT_TRANSLATE_NOOP("mp4muxer","50 kHz")},
+            {MP4_MUXER_CLOCK_FREQ_60KHZ,QT_TRANSLATE_NOOP("mp4muxer","60 kHz")},
+            {MP4_MUXER_CLOCK_FREQ_90KHZ,QT_TRANSLATE_NOOP("mp4muxer","90 kHz")},
+            {MP4_MUXER_CLOCK_FREQ_180KHZ,QT_TRANSLATE_NOOP("mp4muxer","180 kHz")},
+        };
+        diaElemMenu menuClock(&clk,QT_TRANSLATE_NOOP("mp4muxer","Time scale"),8,clockFrequencies,NULL);
+
+        diaElem *tabs[]={&menuFormat,&menuOptimize,&forceAR,&menuAspect,&menuRotation,&menuClock};
+
+        if( diaFactoryRun(QT_TRANSLATE_NOOP("mp4muxer","MP4 Muxer"),6,tabs))
         {
             muxerConfig.muxerType=(MP4_MUXER_TYPE)fmt;
             muxerConfig.optimize=(MP4_MUXER_OPTIMIZE)opt;
             muxerConfig.forceAspectRatio=force;
             muxerConfig.aspectRatio=(MP4_MUXER_DAR)dar;
             muxerConfig.rotation=(MP4_MUXER_ROTATION)rot;
+            muxerConfig.clockfreq=(MP4_MUXER_CLOCK_FREQUENCIES)clk;
             return true;
         }
         return false;

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Video.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Video.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp Changed

@@ -61,7 +61,9 @@
 {
     // We only support VP8 + Vorbis
     uint32_t fcc=s->getFCC();
-    if(!fourCC::check(fcc,(const uint8_t *)"VP8 ") && !fourCC::check(fcc,(const uint8_t *)"VP9 "))
+    if( !fourCC::check(fcc,(const uint8_t *)"VP8 ")
+        && !fourCC::check(fcc,(const uint8_t *)"VP9 ")
+        && !fourCC::check(fcc,(const uint8_t *)"av01"))
     {
         GUI_Error_HIG("Webm",QT_TRANSLATE_NOOP("webmmuxer","Unsupported Video.\nOnly VP8/VP9 video and Vorbis/Opus audio supported"));
         return false;
@@ -99,6 +101,8 @@
         par = video_st->codecpar;
         rescaleFps(s->getAvgFps1000(),&(c->time_base));
         video_st->time_base=c->time_base;
+        video_st->avg_frame_rate.den =c->time_base.num;
+        video_st->avg_frame_rate.num =c->time_base.den;
         c->gop_size=15;
         
         if(true==WebmMuxerConfig.forceDisplayWidth && WebmMuxerConfig.displayWidth)
@@ -136,11 +140,20 @@
         av_dict_set(&dict, "max_delay", "200000", 0);
 		av_dict_set(&dict, "muxrate", "10080000", 0);
 
-        ADM_assert(avformat_write_header(oc, &dict) >= 0);
+        //ADM_assert(avformat_write_header(oc, &dict) >= 0);
+        er = avformat_write_header(oc, &dict);
+        if(er < 0)
+        {
+            char str[AV_ERROR_MAX_STRING_SIZE]={0};
+            av_make_error_string(str, AV_ERROR_MAX_STRING_SIZE, er);
+            ADM_error("Writing header failed with error %d (%s)\n", er, str);
+            av_dict_free(&dict);
+            avio_close(oc->pb);
+            return false;
+        }
         ADM_info("Timebase codec = %d/%d\n",video_st->time_base.num,video_st->time_base.den);
 //        ADM_info("Original timebase = %d/%d\n",myTimeBase.num,myTimeBase.den);
-        
-        
+        av_dict_free(&dict);
         vStream=s;
         aStreams=a;
         nbAStreams=nbAudioTrack;

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.h Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonScriptWriter.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonScriptWriter.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/adm_gen.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/adm_gen.cpp Changed

@@ -588,6 +588,19 @@
   int r =   pyGetAudioChannels(p0,p1); 
   return tp_number(r);
 }
+// seekKeyFrame -> void editor->seekKeyFrame (int ) 
+static tp_obj zzpy_seekKeyFrame(TP)
+ {
+  tp_obj self = tp_getraw(tp);
+  IScriptEngine *engine = (IScriptEngine*)tp_get(tp, tp->builtins, tp_string("userdata")).data.val;
+  IEditor *editor = engine->editor();
+  TinyParams pm(tp);
+  void *me = (void *)pm.asThis(&self, ADM_PYID_AVIDEMUX);
+
+  int p0 = pm.asInt();
+  editor->seekKeyFrame(p0); 
+ return tp_None;
+}
 tp_obj zzpy__pyAdm_get(tp_vm *vm)
 {
   tp_obj self = tp_getraw(vm);
@@ -772,6 +785,10 @@
   {
      return tp_method(vm, self, zzpy_audioChannels);
   }
+  if (!strcmp(key, "seekKeyFrame"))
+  {
+     return tp_method(vm, self, zzpy_seekKeyFrame);
+  }
   return tp_get(vm, self, tp_string(key));
 }
 tp_obj zzpy__pyAdm_set(tp_vm *vm)
@@ -857,6 +874,7 @@
 	engine->callEventHandlers(IScriptEngine::Information, NULL, -1, "audioAddExternal(IEditor,str)\n");
 	engine->callEventHandlers(IScriptEngine::Information, NULL, -1, "audioSetPal2Film(IEditor,int,int)\n");
 	engine->callEventHandlers(IScriptEngine::Information, NULL, -1, "audioChannels(IEditor, int)\n");
+	engine->callEventHandlers(IScriptEngine::Information, NULL, -1, "seekKeyFrame(int)\n");
 
 	return tp_None;
 };

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/binding/adm.admPyClass -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/binding/adm.admPyClass Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/binding/editor.admPyClass -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/binding/editor.admPyClass Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/editor_gen.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/editor_gen.cpp Changed

@@ -66,6 +66,44 @@
   double r =   pyGetPts(p0,p1); 
   return tp_number(r);
 }
+// getCurrentPts -> double editor->getCurrentFramePts (void ) 
+static tp_obj zzpy_getCurrentPts(TP)
+ {
+  tp_obj self = tp_getraw(tp);
+  IScriptEngine *engine = (IScriptEngine*)tp_get(tp, tp->builtins, tp_string("userdata")).data.val;
+  IEditor *editor = engine->editor();
+  TinyParams pm(tp);
+  void *me = (void *)pm.asThis(&self, ADM_PYID_EDITOR);
+
+  double r =   editor->getCurrentFramePts(); 
+  return tp_number(r);
+}
+// getPrevKFramePts -> double pyGetPrevKFramePts (IEditor ) 
+static tp_obj zzpy_getPrevKFramePts(TP)
+ {
+  tp_obj self = tp_getraw(tp);
+  IScriptEngine *engine = (IScriptEngine*)tp_get(tp, tp->builtins, tp_string("userdata")).data.val;
+  IEditor *editor = engine->editor();
+  TinyParams pm(tp);
+  void *me = (void *)pm.asThis(&self, ADM_PYID_EDITOR);
+
+  IEditor *p0 = editor;
+  double r =   pyGetPrevKFramePts(p0); 
+  return tp_number(r);
+}
+// getNextKFramePts -> double pyGetNextKFramePts (IEditor ) 
+static tp_obj zzpy_getNextKFramePts(TP)
+ {
+  tp_obj self = tp_getraw(tp);
+  IScriptEngine *engine = (IScriptEngine*)tp_get(tp, tp->builtins, tp_string("userdata")).data.val;
+  IEditor *editor = engine->editor();
+  TinyParams pm(tp);
+  void *me = (void *)pm.asThis(&self, ADM_PYID_EDITOR);
+
+  IEditor *p0 = editor;
+  double r =   pyGetNextKFramePts(p0); 
+  return tp_number(r);
+}
 // getVideoDuration -> double editor->getVideoDuration (void ) 
 static tp_obj zzpy_getVideoDuration(TP)
  {
@@ -170,6 +208,18 @@
   {
      return tp_method(vm, self, zzpy_getPts);
   }
+  if (!strcmp(key, "getCurrentPts"))
+  {
+     return tp_method(vm, self, zzpy_getCurrentPts);
+  }
+  if (!strcmp(key, "getPrevKFramePts"))
+  {
+     return tp_method(vm, self, zzpy_getPrevKFramePts);
+  }
+  if (!strcmp(key, "getNextKFramePts"))
+  {
+     return tp_method(vm, self, zzpy_getNextKFramePts);
+  }
   if (!strcmp(key, "getVideoDuration"))
   {
      return tp_method(vm, self, zzpy_getVideoDuration);
@@ -230,6 +280,9 @@
 	engine->callEventHandlers(IScriptEngine::Information, NULL, -1, "hexDumpFrame(IEditor,int)\n");
 	engine->callEventHandlers(IScriptEngine::Information, NULL, -1, "getDts(IEditor,int)\n");
 	engine->callEventHandlers(IScriptEngine::Information, NULL, -1, "getPts(IEditor,int)\n");
+	engine->callEventHandlers(IScriptEngine::Information, NULL, -1, "getCurrentPts(void)\n");
+	engine->callEventHandlers(IScriptEngine::Information, NULL, -1, "getPrevKFramePts(IEditor)\n");
+	engine->callEventHandlers(IScriptEngine::Information, NULL, -1, "getNextKFramePts(IEditor)\n");
 	engine->callEventHandlers(IScriptEngine::Information, NULL, -1, "getVideoDuration(void)\n");
 	engine->callEventHandlers(IScriptEngine::Information, NULL, -1, "nextFrame(IEditor)\n");
 	engine->callEventHandlers(IScriptEngine::Information, NULL, -1, "dumpRefVideo(void)\n");

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/patches/100_intercept_stackdump.diff -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/patches/100_intercept_stackdump.diff Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/tinypy.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/tinypy.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoDecoder/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoDecoder/CMakeLists.txt Changed

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoDecoder/aom Added

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoDecoder/aom/ADM_aomDec.cpp Added

@@ -0,0 +1,139 @@
+/***************************************************************************
+            \file  ADM_aomDec.cpp
+            \brief AV1 decoder using libaom
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+#include "ADM_aomDec.h"
+#include "aom/aom_decoder.h"
+#include "aom/aomdx.h"
+#define AX ((aom_codec_ctx_t *)cookie)
+/**
+    \fn ctor
+*/
+decoderAom::decoderAom(uint32_t w, uint32_t h, uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData, uint32_t bpp)
+    : decoders(w,h,fcc,extraDataLen,extraData,bpp)
+{
+    drain=false;
+    alive=false;
+    cookie=NULL;
+    aom_codec_dec_cfg_t cfg;
+    aom_codec_flags_t flags=0;
+    aom_codec_ctx_t *instance=new aom_codec_ctx_t;
+    if(fcc!=MKFCC('a','v','0','1'))
+    {
+        ADM_warning("Unsupported FCC\n");
+        delete instance;
+        return;
+    }
+
+    memset(instance,0,sizeof(*instance));
+    memset(&cfg,0,sizeof(cfg));
+    cfg.threads=ADM_cpu_num_processors();
+    cfg.w=w;
+    cfg.h=h;
+    cfg.allow_lowbitdepth=1;
+    aom_codec_err_t err=aom_codec_dec_init(instance, &aom_codec_av1_dx_algo, &cfg, flags);
+    if(err!=AOM_CODEC_OK)
+    {
+        delete instance;
+        ADM_warning("libaom decoder init failed with error %d: %s.\n",(int)err,aom_codec_err_to_string(err));
+    }else
+    {
+        alive=true;
+        cookie=(void *)instance;
+        ADM_info("libaom decoder init succeeded, threads: %d\n",cfg.threads);
+    }
+}
+/**
+    \fn dtor
+*/
+decoderAom::~decoderAom()
+{
+    ADM_info("Destroying libaom decoder.\n");
+    if(cookie)
+    {
+        aom_codec_ctx_t *a=AX;
+        aom_codec_destroy(a);
+        delete a;
+        cookie=NULL;
+    }
+}
+/**
+    \fn flush
+*/
+bool decoderAom::flush(void)
+{
+    drain=false;
+    return true;
+}
+/**
+    \fn uncompress
+*/
+bool decoderAom::uncompress(ADMCompressedImage *in, ADMImage *out)
+{
+    aom_codec_err_t err;
+    if(drain)
+        err=aom_codec_decode(AX, NULL, 0, NULL);
+    else
+        err=aom_codec_decode(AX, in->data, in->dataLength, NULL);
+    if(err!=AOM_CODEC_OK)
+    {
+        ADM_warning("Error %d (%s) decoding AV1 frame.\n",(int)err,aom_codec_err_to_string(err));
+        return false;
+    }
+    aom_image_t *img;
+    const void *iter = NULL;
+    img = aom_codec_get_frame(AX, &iter);
+    if(drain)
+        ADM_info("Draining AOM decoder, %s.\n", img? "delayed picture received" : "no delayed pictures left");
+    if(img)
+    {
+        ADM_colorspace color = ADM_COLOR_YV12;
+        switch(img->fmt)
+        {
+            case AOM_IMG_FMT_I420:
+                if(img->bit_depth == 8) break;
+                ADM_warning("Unsupported bit depth %u for AOM_IMG_FMT_I420 image format.\n",img->bit_depth);
+                return false;
+            case AOM_IMG_FMT_I42016:
+                if(img->bit_depth == 10)
+                {
+                    color = ADM_COLOR_YV12_10BITS;
+                    break;
+                }
+                ADM_warning("Unsupported bit depth %u for AOM_IMG_FMT_I42016 image format.\n",img->bit_depth);
+                return false;
+            default:
+                ADM_warning("Unsupported colorspace 0x%x, bit depth: %u\n",(int)img->fmt,img->bit_depth);
+                return false;
+        }
+        ADMImageRef *r=out->castToRef();
+        if(r)
+        {
+            r->_planes[0]=img->planes[0];
+            r->_planes[1]=img->planes[2];
+            r->_planes[2]=img->planes[1];
+            r->_planeStride[0]=img->stride[0];
+            r->_planeStride[1]=img->stride[2];
+            r->_planeStride[2]=img->stride[1];
+            r->_colorspace=color;
+            r->Pts=in->demuxerPts;
+            r->flags=in->flags;
+            return true;
+        }
+        ADM_warning("AV1 decoder accepts ref image only.\n");
+    }
+    return false;
+}
+// EOF

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoDecoder/aom/ADM_aomDec.h Added

@@ -0,0 +1,42 @@
+/***************************************************************************
+            \file  ADM_aomDec.h
+            \brief I/f to libaom (decoder)
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#ifndef ADM_AOMDEC_H
+#define ADM_AOMDEC_H
+#include "ADM_codec.h"
+/**
+    \class decoderAom
+*/
+class decoderAom : public decoders
+{
+protected:
+            bool drain;
+            bool alive;
+            void *cookie;
+public:
+            decoderAom (uint32_t w, uint32_t h, uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData, uint32_t bpp);
+            ~decoderAom();
+    virtual bool uncompress(ADMCompressedImage *in, ADMImage *out);
+    virtual void setDrainingState(bool yesno) { drain=yesno; }
+    virtual bool getDrainingState(void) { return drain; }
+    virtual bool flush(void);
+    virtual bool bFramePossible (void) { return false; }
+    virtual const char *getDecoderName(void) { return "libaom"; }
+    virtual bool initializedOk(void) { return alive; }
+    virtual bool dontcopy(void) {return true; }
+};
+
+#endif
+//EOF
+

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoDecoder/aom/CMakeLists.txt Added

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoDecoder/aom/aomDecPlugin.cpp Added

@@ -0,0 +1,25 @@
+/***************************************************************************
+    \fn     aomDecPlugin
+    \brief  Video decoder plugin for libaom
+    \author eumagga0x2a based on vpx decoder by mean fixounet@free.fr (C) 2010
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "ADM_default.h"
+#include "ADM_coreVideoDecoderInternal.h"
+#include "ADM_aomDec.h"
+static uint32_t fccs[]={MKFCC('a','v','0','1'),0};
+ADM_DECLARE_VIDEO_DECODER_PREAMBLE(decoderAom);
+ADM_DECLARE_VIDEO_DECODER_MAIN("aom",
+                               "AV1",
+                               "Decoder using libaom (c) mean 2010 / eumagga0x2a 2019",
+                                fccs, // No configuration
+                                NULL,
+                                1,0,0
+);

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoDecoder/vpx/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoDecoder/vpx/CMakeLists.txt Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/CMakeLists.txt Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp Changed

@@ -68,6 +68,41 @@
             return false;
     }
     presetContext(&Settings);
+    if(Settings.lavcSettings.interlaced)
+        _context->flags |= (AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME);
+    if(!Settings.lavcSettings.widescreen)
+    { // we handle only default resolutions
+        if(getHeight()==480) // NTSC
+        {
+            switch(getWidth())
+            {
+                case 704:
+                    _context->sample_aspect_ratio.num=10;
+                    _context->sample_aspect_ratio.den=11;
+                    break;
+                case 720:
+                    _context->sample_aspect_ratio.num=8;
+                    _context->sample_aspect_ratio.den=9;
+                    break;
+                default:break;
+            }
+        }
+        if(getHeight()==576) // PAL
+        {
+            switch(getWidth())
+            {
+                case 704:
+                    _context->sample_aspect_ratio.num=12;
+                    _context->sample_aspect_ratio.den=11;
+                    break;
+                case 720:
+                    _context->sample_aspect_ratio.num=16;
+                    _context->sample_aspect_ratio.den=15;
+                    break;
+                default:break;
+            }
+        }
+    }
     // Override some parameters specific to this codec
     // Set matrix if any...
 #define MX(a,b,c) case a: _context->intra_matrix=b,_context->inter_matrix=c;break;
@@ -97,7 +132,8 @@
 */
 bool ADM_ffMpeg2Encoder::setup(void)
 {
-
+    if(Settings.lavcSettings.interlaced)
+        av_dict_set(&_options, "alternate_scan", "1", 0);
     if(false== ADM_coreVideoEncoderFFmpeg::setup(AV_CODEC_ID_MPEG2VIDEO))
         return false;
     printf("[ffMpeg] Setup ok\n");
@@ -127,11 +163,6 @@
     sz=0;
     if(false==preEncode()) // Pop - out the frames stored in the queue due to B-frames
     {
-        AVPacket pkt;
-        av_init_packet(&pkt);
-        pkt.data=out->data;
-        pkt.size=out->bufferSize;
-
         r=encodeWrapper(NULL,out);
         if(r<0)
         {
@@ -179,6 +210,8 @@
                                      _context->bit_rate,  _frame->quality, _frame->quality/ FF_QP2LAMBDA,q);     
     
     _frame->reordered_opaque=image->Pts;
+    _frame->interlaced_frame=Settings.lavcSettings.interlaced;
+    _frame->top_field_first=!Settings.lavcSettings.bff;
     r=encodeWrapper(_frame,out);
     if(r<0)
     {

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp Changed

@@ -51,19 +51,45 @@
 */
 bool ADM_ffNvEncEncoder::configureContext(void)
 {
-    switch(NvEncSettings.preset)
+    _context->bit_rate = -1;
+    _context->rc_max_rate = -1;
+
+    _context->gop_size = NvEncSettings.gopsize;
+    _context->max_b_frames = NvEncSettings.bframes;
+
+    switch(NvEncSettings.rc_mode)
     {
-#define MIAOU(x,y) case NV_FF_PRESET_##x: ADM_assert(!av_opt_set(_context->priv_data,"preset",y, 0));break;  
-        
-     MIAOU(HP,"hp")   
-     MIAOU(BD,"bd")   
-     MIAOU(LL,"ll")   
-     MIAOU(LLHP,"llhp")   
-     MIAOU(LLHQ,"llhq")   
-     MIAOU(HQ,"hq")
-default:break;
+        case NV_FF_RC_AUTO:
+            switch(NvEncSettings.preset)
+            {
+#define MIAOU(x,y) case NV_FF_PRESET_##x: ADM_assert(!av_opt_set(_context->priv_data,"preset",y, 0));break;
+                MIAOU(HP,"hp")
+                MIAOU(HQ,"hq")
+                MIAOU(BD,"bd")
+                MIAOU(LL,"ll")
+                MIAOU(LLHP,"llhp")
+                MIAOU(LLHQ,"llhq")
+                default:break;
 #undef MIAOU
-    };
+            }
+            break;
+        case NV_FF_RC_CONSTQP:
+            _context->qmin = _context->qmax = NvEncSettings.quality;
+            ADM_assert(!av_opt_set(_context->priv_data,"rc","constqp",0));
+            break;
+        case NV_FF_RC_CBR:
+            _context->bit_rate = _context->rc_max_rate = NvEncSettings.bitrate*1000;
+            ADM_assert(!av_opt_set(_context->priv_data,"rc","cbr",0));
+            break;
+        case NV_FF_RC_VBR:
+            _context->bit_rate=NvEncSettings.bitrate*1000;
+            _context->rc_max_rate=NvEncSettings.max_bitrate*1000;
+            ADM_assert(!av_opt_set(_context->priv_data,"rc","vbr",0));
+            break;
+        default:
+            ADM_warning("Unsupported mode %d\n",NvEncSettings.rc_mode);
+            break;
+    }
 
     switch(NvEncSettings.profile)
     {
@@ -76,10 +102,6 @@
 #undef MIAOU
     };
 
-    _context->bit_rate=NvEncSettings.bitrate*1000;
-    _context->rc_max_rate=NvEncSettings.max_bitrate*1000;
-    _context->gop_size=NvEncSettings.gopsize;
-    _context->max_b_frames=NvEncSettings.bframes;
 #ifdef USE_NV12    
     _context->pix_fmt=  AV_PIX_FMT_NV12;        
 #else    
@@ -203,7 +225,20 @@
 
 */
 bool         ADM_ffNvEncEncoder::isDualPass(void)
-{   
+{
+    if(NvEncSettings.twopass)
+        return true;
+    if(NvEncSettings.rc_mode == NV_FF_RC_AUTO)
+    {
+        if(NvEncSettings.preset == NV_FF_PRESET_SLOW ||
+           NvEncSettings.preset == NV_FF_PRESET_LL ||
+           NvEncSettings.preset == NV_FF_PRESET_LLHP ||
+           NvEncSettings.preset == NV_FF_PRESET_LLHQ)
+            return true;
+    }else if(NvEncSettings.rc_mode == NV_FF_RC_CBR_LOWDELAY_HQ ||
+             NvEncSettings.rc_mode == NV_FF_RC_CBR_HQ ||
+             NvEncSettings.rc_mode == NV_FF_RC_VBR_HQ)
+        return true;
     return false;
 }
 
@@ -214,6 +249,12 @@
 
 bool         ffNvEncConfigure(void)
 {
+diaMenuEntry meRcMode[]={
+  {NV_FF_RC_AUTO,QT_TRANSLATE_NOOP("ffnvenc","Controlled by Preset")},
+  {NV_FF_RC_CONSTQP,QT_TRANSLATE_NOOP("ffnvenc","Constant Quality")},
+  {NV_FF_RC_CBR,QT_TRANSLATE_NOOP("ffnvenc","Constant Bitrate")},
+  {NV_FF_RC_VBR,QT_TRANSLATE_NOOP("ffnvenc","Variable Bitrate")},
+};
 diaMenuEntry mePreset[]={ 
   {NV_FF_PRESET_HP,QT_TRANSLATE_NOOP("ffnvenc","Low Quality")},
   {NV_FF_PRESET_HQ,QT_TRANSLATE_NOOP("ffnvenc","High Quality")},
@@ -233,23 +274,52 @@
 
 #define PX(x) &(conf->x)
 
+        diaElemMenu      rcmode(PX(rc_mode),QT_TRANSLATE_NOOP("ffnvenc","RC Mode:"),4,meRcMode);
         diaElemMenu      qzPreset(PX(preset),QT_TRANSLATE_NOOP("ffnvenc","Preset:"),6,mePreset);
         diaElemMenu      profile(PX(profile),QT_TRANSLATE_NOOP("ffnvenc","Profile:"),3,meProfile);
+
+        diaElemUInteger  qual(PX(quality),QT_TRANSLATE_NOOP("ffnvenc","Quality:"),0,51);
         diaElemUInteger  bitrate(PX(bitrate),QT_TRANSLATE_NOOP("ffnvenc","Bitrate (kbps):"),1,50000);
         diaElemUInteger  maxBitrate(PX(max_bitrate),QT_TRANSLATE_NOOP("ffnvenc","Max Bitrate (kbps):"),1,50000);
         diaElemUInteger  gopSize(PX(gopsize),QT_TRANSLATE_NOOP("ffnvenc","GOP Size:"),8,250);
         diaElemUInteger  maxBframes(PX(bframes),QT_TRANSLATE_NOOP("ffnvenc","Maximum Consecutive B-Frames:"),0,4);
+
+        diaElemToggle    dualPass(PX(twopass),QT_TRANSLATE_NOOP("ffnvenc","2-Pass Mode"));
+        diaElemReadOnlyText hint(QT_TRANSLATE_NOOP("ffnvenc","Low Latency presets always use 2-pass mode"),NULL);
+
         diaElemFrame     rateControl(QT_TRANSLATE_NOOP("ffnvenc","Rate Control"));
         diaElemFrame     frameControl(QT_TRANSLATE_NOOP("ffnvenc","Frame Control"));
 
+        rateControl.swallow(&rcmode);
+        rateControl.swallow(&qzPreset);
+        rateControl.swallow(&qual);
         rateControl.swallow(&bitrate);
         rateControl.swallow(&maxBitrate);
+        rateControl.swallow(&dualPass);
+        rateControl.swallow(&hint);
+
+        rcmode.link(meRcMode,1,&qzPreset);
+        rcmode.link(meRcMode+1,1,&qual);
+        rcmode.link(meRcMode+1,1,&dualPass);
+        rcmode.link(meRcMode+2,1,&bitrate);
+        rcmode.link(meRcMode+2,1,&dualPass);
+        rcmode.link(meRcMode+3,1,&bitrate);
+        rcmode.link(meRcMode+3,1,&maxBitrate);
+        rcmode.link(meRcMode+3,1,&dualPass);
+
+        qzPreset.link(mePreset,1,&dualPass);
+        qzPreset.link(mePreset+1,1,&dualPass);
+        qzPreset.link(mePreset+2,1,&dualPass);
+
+        profile.link(meProfile+1,1,&maxBframes);
+        profile.link(meProfile+2,1,&maxBframes);
+
         frameControl.swallow(&gopSize);
         frameControl.swallow(&maxBframes);
           /* First Tab : encoding mode */
-        diaElem *diamode[]={&qzPreset,&profile,&rateControl,&frameControl};
+        diaElem *diamode[]={&profile,&rateControl,&frameControl};
 
-        if( diaFactoryRun(QT_TRANSLATE_NOOP("ffnvenc","NVENC H.264 configuration"),4,diamode))
+        if( diaFactoryRun(QT_TRANSLATE_NOOP("ffnvenc","NVENC H.264 configuration"),3,diamode))
         {
           
           return true;

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.h Changed

@@ -21,34 +21,47 @@
 
 enum FF_NVencPreset
 {
-  NV_FF_PRESET_HP=1,
-  NV_FF_PRESET_HQ=2,
-  NV_FF_PRESET_BD=3,
-  NV_FF_PRESET_LL=4,
-  NV_FF_PRESET_LLHP=5,
-  NV_FF_PRESET_LLHQ=6
+  NV_FF_PRESET_SLOW=1, // dual-pass
+  NV_FF_PRESET_MEDIUM=2,
+  NV_FF_PRESET_FAST=3,
+  NV_FF_PRESET_HP=4,
+  NV_FF_PRESET_HQ=5,
+  NV_FF_PRESET_BD=6,
+  NV_FF_PRESET_LL=7, // dual-pass
+  NV_FF_PRESET_LLHP=8, // dual-pass
+  NV_FF_PRESET_LLHQ=9 // dual-pass
 };
 
 enum FF_NVencProfile
 {
-  NV_FF_PROFILE_BASELINE=1,
-  NV_FF_PROFILE_MAIN=2,
-  NV_FF_PROFILE_HIGH=3
+  NV_FF_PROFILE_BASELINE=0,
+  NV_FF_PROFILE_MAIN=1,
+  NV_FF_PROFILE_HIGH=2
 };
 
-
+enum FF_NVencRateControl
+{
+  NV_FF_RC_AUTO=0, // controlled by preset
+  NV_FF_RC_CONSTQP=1,
+  NV_FF_RC_CBR=2,
+  NV_FF_RC_CBR_LOWDELAY_HQ=3, // dual-pass
+  NV_FF_RC_CBR_HQ=4, // dual-pass
+  NV_FF_RC_VBR=5,
+  NV_FF_RC_VBR_HQ=6 // dual-pass
+};
 
 #define NVENC_CONF_DEFAULT \
 { \
-		NV_FF_PRESET_HQ, \
-		NV_FF_PROFILE_HIGH, \
-		100, \
-		0, \
-                10000, \
-                20000,\
-	}
-
-
+  NV_FF_PRESET_HQ, \
+  NV_FF_PROFILE_HIGH, \
+  NV_FF_RC_AUTO, \
+  20, \
+  100, \
+  0, \
+  10000, \
+  20000,\
+  0 \
+}
 
 /**
         \class ADM_ffNvEncEncoder

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEncPlugin.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEncPlugin.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc.conf -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc.conf Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc.h Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc_desc.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc_desc.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc_json.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc_json.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp Changed

@@ -51,20 +51,46 @@
 */
 bool ADM_ffNvEncEncoderHEVC::configureContext(void)
 {
-    switch(NvEncSettings.preset)
+    _context->bit_rate = -1;
+    _context->rc_max_rate = -1;
+
+    _context->gop_size = NvEncSettings.gopsize;
+    _context->max_b_frames = NvEncSettings.bframes;
+
+    switch(NvEncSettings.rc_mode)
     {
-#define MIAOU(x,y) case NV_FF_PRESET_##x: ADM_assert(!av_opt_set(_context->priv_data,"preset",y, 0));break;  
-        
-     MIAOU(HP,"hp")   
-     MIAOU(BD,"bd")   
-     MIAOU(LL,"ll")   
-     MIAOU(LLHP,"llhp")   
-     MIAOU(LLHQ,"llhq")   
-     MIAOU(HQ,"hq")                
-default:break;
+        case NV_FF_RC_AUTO:
+            switch(NvEncSettings.preset)
+            {
+#define MIAOU(x,y) case NV_FF_PRESET_##x: ADM_assert(!av_opt_set(_context->priv_data,"preset",y, 0));break;
+                MIAOU(HP,"hp")
+                MIAOU(HQ,"hq")
+                MIAOU(BD,"bd")
+                MIAOU(LL,"ll")
+                MIAOU(LLHP,"llhp")
+                MIAOU(LLHQ,"llhq")
+                default:break;
+#undef MIAOU
+            }
+            break;
+        case NV_FF_RC_CONSTQP:
+            _context->qmin = _context->qmax = NvEncSettings.quality;
+            ADM_assert(!av_opt_set(_context->priv_data,"rc","constqp",0));
+            break;
+        case NV_FF_RC_CBR:
+            _context->bit_rate = _context->rc_max_rate = NvEncSettings.bitrate*1000;
+            ADM_assert(!av_opt_set(_context->priv_data,"rc","cbr",0));
+            break;
+        case NV_FF_RC_VBR:
+            _context->bit_rate=NvEncSettings.bitrate*1000;
+            _context->rc_max_rate=NvEncSettings.max_bitrate*1000;
+            ADM_assert(!av_opt_set(_context->priv_data,"rc","vbr",0));
+            break;
+        default:
+            ADM_warning("Unsupported mode %d\n",NvEncSettings.rc_mode);
+            break;
     }
-    _context->bit_rate=NvEncSettings.bitrate*1000;
-    _context->rc_max_rate=NvEncSettings.max_bitrate*1000;
+
 #ifdef USE_NV12    
     _context->pix_fmt=  AV_PIX_FMT_NV12;        
 #else    
@@ -177,17 +203,34 @@
 
 */
 bool         ADM_ffNvEncEncoderHEVC::isDualPass(void)
-{   
+{
+    if(NvEncSettings.twopass)
+        return true;
+    if(NvEncSettings.rc_mode == NV_FF_RC_AUTO)
+    {
+#define EQL(desc) NvEncSettings.preset == NV_FF_PRESET_##desc
+        if(EQL(SLOW) || EQL(LL) || EQL(LLHP) || EQL(LLHQ))
+            return true;
+#undef EQL
+#define EQL(desc) NvEncSettings.rc_mode == NV_FF_RC_##desc
+    }else if(EQL(CBR_LOWDELAY_HQ) || EQL(CBR_HQ) || EQL(VBR_HQ))
+        return true;
+#undef EQL
     return false;
 }
 
 /**
-    \fn jpegConfigure
-    \brief UI configuration for jpeg encoder
+    \fn ffNvEncConfigure
+    \brief UI configuration dialog
 */
-
-bool         ffNvEncConfigure(void)
+bool ffNvEncConfigure(void)
 {
+diaMenuEntry meRcMode[]={
+  {NV_FF_RC_AUTO,QT_TRANSLATE_NOOP("ffnvenc","Controlled by Preset")},
+  {NV_FF_RC_CONSTQP,QT_TRANSLATE_NOOP("ffnvenc","Constant Quality")},
+  {NV_FF_RC_CBR,QT_TRANSLATE_NOOP("ffnvenc","Constant Bitrate")},
+  {NV_FF_RC_VBR,QT_TRANSLATE_NOOP("ffnvenc","Variable Bitrate")},
+};
 diaMenuEntry mePreset[]={ 
   {NV_FF_PRESET_HP,QT_TRANSLATE_NOOP("ffnvenc","Low Quality")},
   {NV_FF_PRESET_HQ,QT_TRANSLATE_NOOP("ffnvenc","High Quality")},
@@ -197,21 +240,53 @@
   {NV_FF_PRESET_LLHQ,QT_TRANSLATE_NOOP("ffnvenc","Low Latency (HQ)")}
 };
 
-        ffnvenc_encoder *conf=&NvEncSettings;
+    ffnvenc_encoder *conf=&NvEncSettings;
 
 #define PX(x) &(conf->x)
 
-        diaElemMenu      qzPreset(PX(preset),QT_TRANSLATE_NOOP("ffnvenc","Preset:"),6,mePreset);        
-        diaElemUInteger  bitrate(PX(bitrate),QT_TRANSLATE_NOOP("ffnvenc","Bitrate (kbps):"),1,50000);
-        diaElemUInteger  maxBitrate(PX(max_bitrate),QT_TRANSLATE_NOOP("ffnvenc","Max Bitrate (kbps):"),1,50000);
-          /* First Tab : encoding mode */
-        diaElem *diamode[]={&qzPreset,&bitrate,&maxBitrate};
+    diaElemMenu     rcmode(PX(rc_mode),QT_TRANSLATE_NOOP("ffnvenc","RC Mode:"),4,meRcMode);
+    diaElemMenu     qzPreset(PX(preset),QT_TRANSLATE_NOOP("ffnvenc","Preset:"),6,mePreset);
 
-        if( diaFactoryRun(QT_TRANSLATE_NOOP("ffnvenc","nvEnc HEVC  configuration"),3,diamode))
-        {
-          
-          return true;
-        }
-         return false;
+    diaElemUInteger qual(PX(quality),QT_TRANSLATE_NOOP("ffnvenc","Quality:"),0,51);
+    diaElemUInteger bitrate(PX(bitrate),QT_TRANSLATE_NOOP("ffnvenc","Bitrate (kbps):"),1,800000);
+    diaElemUInteger maxBitrate(PX(max_bitrate),QT_TRANSLATE_NOOP("ffnvenc","Max Bitrate (kbps):"),1,800000);
+    diaElemUInteger gopSize(PX(gopsize),QT_TRANSLATE_NOOP("ffnvenc","GOP Size:"),8,250);
+    diaElemUInteger maxBframes(PX(bframes),QT_TRANSLATE_NOOP("ffnvenc","Maximum Consecutive B-Frames:"),0,4);
+
+    diaElemToggle   dualPass(PX(twopass),QT_TRANSLATE_NOOP("ffnvenc","2-Pass Mode"));
+    diaElemReadOnlyText hint(QT_TRANSLATE_NOOP("ffnvenc","Low Latency presets always use 2-pass mode"),NULL);
+
+    diaElemFrame    rateControl(QT_TRANSLATE_NOOP("ffnvenc","Rate Control"));
+    diaElemFrame    frameControl(QT_TRANSLATE_NOOP("ffnvenc","Frame Control"));
+
+    rateControl.swallow(&rcmode);
+    rateControl.swallow(&qzPreset);
+    rateControl.swallow(&qual);
+    rateControl.swallow(&bitrate);
+    rateControl.swallow(&maxBitrate);
+    rateControl.swallow(&dualPass);
+    rateControl.swallow(&hint);
+
+    rcmode.link(meRcMode,  1,&qzPreset);
+    rcmode.link(meRcMode+1,1,&qual);
+    rcmode.link(meRcMode+1,1,&dualPass);
+    rcmode.link(meRcMode+2,1,&bitrate);
+    rcmode.link(meRcMode+2,1,&dualPass);
+    rcmode.link(meRcMode+3,1,&bitrate);
+    rcmode.link(meRcMode+3,1,&maxBitrate);
+    rcmode.link(meRcMode+3,1,&dualPass);
+
+    qzPreset.link(mePreset,  1,&dualPass);
+    qzPreset.link(mePreset+1,1,&dualPass);
+    qzPreset.link(mePreset+2,1,&dualPass);
+
+    frameControl.swallow(&gopSize);
+    frameControl.swallow(&maxBframes);
+
+    diaElem *diamode[]={&rateControl,&frameControl};
+
+    if(diaFactoryRun(QT_TRANSLATE_NOOP("ffnvenc","NVENC HEVC configuration"),2,diamode))
+        return true;
+    return false;
 }
 // EOF

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.h Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffNvEncPlugin.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffNvEncPlugin.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc.conf -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc.conf Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc.h Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc_desc.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc_desc.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc_json.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc_json.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp Changed

@@ -21,6 +21,7 @@
 #undef ADM_MINIMAL_UI_INTERFACE // we need the full UI
 #include "DIA_factory.h"
 //#define USE_NV12
+//#define USE_VBR
 #if 1
 #define aprintf(...) {}
 #else
@@ -62,10 +63,26 @@
         SAY(HIGH)
         default:break;
 #undef SAY
-    };
-
-    _context->bit_rate=VaEncSettings.bitrate*1000;
-    _context->rc_max_rate=VaEncSettings.max_bitrate*1000;
+    }
+    switch(VaEncSettings.rc_mode)
+    {
+        case ADM_FFVAENC_RC_CRF:
+            _context->global_quality=VaEncSettings.quality;
+            break;
+        case ADM_FFVAENC_RC_VBR:
+#ifdef USE_VBR
+            _context->bit_rate=VaEncSettings.bitrate*1000;
+            _context->rc_max_rate=VaEncSettings.max_bitrate*1000;
+            break;
+#endif
+        case ADM_FFVAENC_RC_CBR:
+            _context->bit_rate=VaEncSettings.bitrate*1000;
+            _context->rc_max_rate=_context->bit_rate;
+            break;
+        default:
+            ADM_error("Unknown rate control mode %u\n",VaEncSettings.rc_mode);
+            return false;
+    }
     _context->max_b_frames=VaEncSettings.bframes;
     _context->pix_fmt =AV_PIX_FMT_VAAPI;
 
@@ -258,29 +275,6 @@
 }
 
 /**
- * \fn encodeWrapper
- */
-int ADM_ffVAEncH264Encoder::encodeWrapper(AVFrame *in,ADMBitstream *out)
-{
-    int r,gotData;
-    AVPacket pkt;
-    av_init_packet(&pkt);
-
-    r = avcodec_encode_video2(_context,&pkt,in,&gotData);
-    if(r<0)
-        return r;
-    if(!gotData)
-    {
-        ADM_warning("Encoder produced no data\n");
-        return 0;
-    }
-    lavPtsFromPacket=pkt.pts;
-    packetFlags=pkt.flags;
-    memcpy(out->data,pkt.data,pkt.size);
-    return pkt.size;
-}
-
-/**
     \fn encode
 */
 bool         ADM_ffVAEncH264Encoder::encode (ADMBitstream * out)
@@ -307,7 +301,7 @@
     aprintf("[CODEC] Flags=%#x, QSCALE=%x, bit_rate=%d, quality=%d, qz=%d, incoming qz=%d\n",
         _context->flags,
         AV_CODEC_FLAG_QSCALE,
-        _context->bit_rate,
+        (int)_context->bit_rate,
         hwFrame->quality,
         hwFrame->quality / FF_QP2LAMBDA,
         q);
@@ -352,23 +346,46 @@
         {FF_PROFILE_H264_MAIN,QT_TRANSLATE_NOOP("ffVAEncH264","Main")},
         {FF_PROFILE_H264_HIGH,QT_TRANSLATE_NOOP("ffVAEncH264","High")}
     };
+    diaMenuEntry rateControlMode[]={
+        {ADM_FFVAENC_RC_CRF,QT_TRANSLATE_NOOP("ffVAEncH264","Constant Rate Factor")},
+        {ADM_FFVAENC_RC_CBR,QT_TRANSLATE_NOOP("ffVAEncH264","Constant Bitrate")},
+#ifdef USE_VBR
+        {ADM_FFVAENC_RC_VBR,QT_TRANSLATE_NOOP("ffVAEncH264","Variable Bitrate")}
+#endif
+    };
 
 #define PX(x) &(conf->x)
 
     diaElemMenu profile(PX(profile),QT_TRANSLATE_NOOP("ffVAEncH264","Profile:"),3,h264Profile);
+#ifdef USE_VBR
+    diaElemMenu rcMode(PX(rc_mode),QT_TRANSLATE_NOOP("ffVAEncH264","Rate Control:"),3,rateControlMode);
+    diaElemUInteger maxBitrate(PX(max_bitrate), QT_TRANSLATE_NOOP("ffVAEncH264","Max Bitrate (kbps):"),1,50000);
+#else
+    diaElemMenu rcMode(PX(rc_mode),QT_TRANSLATE_NOOP("ffVAEncH264","Rate Control:"),2,rateControlMode);
+#endif
     diaElemUInteger gopSize(PX(gopsize),QT_TRANSLATE_NOOP("ffVAEncH264","GOP Size:"),1,250);
 
     if(conf->profile==FF_PROFILE_H264_CONSTRAINED_BASELINE)
         conf->bframes=0;
 
     diaElemUInteger maxBframes(PX(bframes),QT_TRANSLATE_NOOP("ffVAEncH264","Maximum Consecutive B-Frames:"),0,4);
+    diaElemUInteger quality(PX(quality), QT_TRANSLATE_NOOP("ffVAEncH264","Quality:"),1,51);
     diaElemUInteger bitrate(PX(bitrate), QT_TRANSLATE_NOOP("ffVAEncH264","Bitrate (kbps):"),1,50000);
-    diaElemUInteger maxBitrate(PX(max_bitrate), QT_TRANSLATE_NOOP("ffVAEncH264","Max Bitrate (kbps):"),1,50000);
     diaElemFrame rateControl(QT_TRANSLATE_NOOP("ffVAEncH264","Rate Control"));
     diaElemFrame frameControl(QT_TRANSLATE_NOOP("ffVAEncH264","Frame Control"));
 
+    rateControl.swallow(&rcMode);
+    rateControl.swallow(&quality);
     rateControl.swallow(&bitrate);
+#ifdef USE_VBR
     rateControl.swallow(&maxBitrate);
+
+    rcMode.link(rateControlMode+2,1,&maxBitrate);
+    rcMode.link(rateControlMode+2,1,&bitrate);
+#endif
+    rcMode.link(rateControlMode,1,&quality);
+    rcMode.link(rateControlMode+1,1,&bitrate);
+
     frameControl.swallow(&gopSize);
     frameControl.swallow(&maxBframes);

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.h Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEncH264_plugin.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEncH264_plugin.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264.conf -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264.conf Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264.h Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264_desc.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264_desc.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264_json.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264_json.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp Changed

@@ -21,6 +21,7 @@
 #undef ADM_MINIMAL_UI_INTERFACE // we need the full UI
 #include "DIA_factory.h"
 //#define USE_NV12
+//#define USE_VBR
 #if 1
 #define aprintf(...) {}
 #else
@@ -55,8 +56,26 @@
     ADM_info("Configuring context for VAAPI encoder\n");
     ADM_info("Our display: %#x\n",admLibVA::getDisplay());
 
-    _context->bit_rate=VaEncHevcSettings.bitrate*1000;
-    _context->rc_max_rate=VaEncHevcSettings.max_bitrate*1000;
+    switch(VaEncHevcSettings.rc_mode)
+    {
+        case ADM_FFVAENC_RC_CRF:
+            _context->global_quality=VaEncHevcSettings.quality;
+            break;
+        case ADM_FFVAENC_RC_VBR:
+#ifdef USE_VBR
+            _context->bit_rate=VaEncHevcSettings.bitrate*1000;
+            _context->rc_max_rate=VaEncHevcSettings.max_bitrate*1000;
+            break;
+#endif
+        case ADM_FFVAENC_RC_CBR:
+            _context->bit_rate=VaEncHevcSettings.bitrate*1000;
+            _context->rc_max_rate=_context->bit_rate;
+            break;
+        default:
+            ADM_error("Unknown rate control mode %u\n",VaEncHevcSettings.rc_mode);
+            return false;
+    }
+
     _context->max_b_frames=VaEncHevcSettings.bframes;
     _context->pix_fmt =AV_PIX_FMT_VAAPI;
 
@@ -249,29 +268,6 @@
 }
 
 /**
- * \fn encodeWrapper
- */
-int ADM_ffVAEncHEVC::encodeWrapper(AVFrame *in,ADMBitstream *out)
-{
-    int r,gotData;
-    AVPacket pkt;
-    av_init_packet(&pkt);
-
-    r = avcodec_encode_video2(_context,&pkt,in,&gotData);
-    if(r<0)
-        return r;
-    if(!gotData)
-    {
-        ADM_warning("Encoder produced no data\n");
-        return 0;
-    }
-    lavPtsFromPacket=pkt.pts;
-    packetFlags=pkt.flags;
-    memcpy(out->data,pkt.data,pkt.size);
-    return pkt.size;
-}
-
-/**
     \fn encode
 */
 bool ADM_ffVAEncHEVC::encode (ADMBitstream * out)
@@ -338,18 +334,43 @@
 {
     ffvaHEVC_encoder *conf=&VaEncHevcSettings;
 
+    diaMenuEntry rateControlMode[]={
+        {ADM_FFVAENC_RC_CRF,QT_TRANSLATE_NOOP("ffVAEncHEVC","Constant Rate Factor")},
+        {ADM_FFVAENC_RC_CBR,QT_TRANSLATE_NOOP("ffVAEncHEVC","Constant Bitrate")},
+#ifdef USE_VBR
+        {ADM_FFVAENC_RC_VBR,QT_TRANSLATE_NOOP("ffVAEncHEVC","Variable Bitrate")}
+#endif
+    };
+
 #define PX(x) &(conf->x)
 
+#ifdef USE_VBR
+    diaElemMenu rcMode(PX(rc_mode),QT_TRANSLATE_NOOP("ffVAEncHEVC","Rate Control:"),3,rateControlMode);
+    diaElemUInteger maxBitrate(PX(max_bitrate),QT_TRANSLATE_NOOP("ffVAEncHEVC","Max Bitrate (kbps):"),1,50000);
+#else
+    diaElemMenu rcMode(PX(rc_mode),QT_TRANSLATE_NOOP("ffVAEncHEVC","Rate Control:"),2,rateControlMode);
+#endif
     diaElemUInteger gopSize(PX(gopsize),QT_TRANSLATE_NOOP("ffVAEncHEVC","GOP Size:"),1,250);
-
     diaElemUInteger maxBframes(PX(bframes),QT_TRANSLATE_NOOP("ffVAEncHEVC","Maximum Consecutive B-Frames:"),0,4);
+
+    diaElemUInteger quality(PX(quality), QT_TRANSLATE_NOOP("ffVAEncHEVC","Quality:"),1,51);
     diaElemUInteger bitrate(PX(bitrate), QT_TRANSLATE_NOOP("ffVAEncHEVC","Bitrate (kbps):"),1,50000);
-    diaElemUInteger maxBitrate(PX(max_bitrate), QT_TRANSLATE_NOOP("ffVAEncHEVC","Max Bitrate (kbps):"),1,50000);
+
     diaElemFrame rateControl(QT_TRANSLATE_NOOP("ffVAEncHEVC","Rate Control"));
     diaElemFrame frameControl(QT_TRANSLATE_NOOP("ffVAEncHEVC","Frame Control"));
 
+    rateControl.swallow(&rcMode);
+    rateControl.swallow(&quality);
     rateControl.swallow(&bitrate);
+#ifdef USE_VBR
     rateControl.swallow(&maxBitrate);
+
+    rcMode.link(rateControlMode+2,1,&bitrate);
+    rcMode.link(rateControlMode+2,1,&maxBitrate);
+#endif
+    rcMode.link(rateControlMode,1,&quality);
+    rcMode.link(rateControlMode+1,1,&bitrate);
+
     frameControl.swallow(&gopSize);
     frameControl.swallow(&maxBframes);

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.h Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ffVAEncHEVC_plugin.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ffVAEncHEVC_plugin.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ffVAEnc_HEVC.conf -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ffVAEnc_HEVC.conf Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ffVAEnc_HEVC.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ffVAEnc_HEVC.h Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ffVAEnc_HEVC_desc.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ffVAEnc_HEVC_desc.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ffVAEnc_HEVC_json.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ffVAEnc_HEVC_json.cpp Changed

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/vp9 Added

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9.cpp Added

@@ -0,0 +1,485 @@
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+#include "ADM_vp9.h"
+#include "vpx/vp8cx.h"
+#include "vp9_encoder.h"
+
+#define VP9_MAX_QUANTIZER 63
+#define MMSET(x) memset(&(x),0,sizeof(x))
+
+vp9_encoder vp9Settings = VP9_DEFAULT_CONF;
+
+/**
+ *  \fn vp9Encoder
+ */
+vp9Encoder::vp9Encoder(ADM_coreVideoFilter *src, bool globalHeader) : ADM_coreVideoEncoder(src)
+{
+    ADM_info("Creating VP9 encoder\n");
+    MMSET(context);
+    MMSET(param);
+    iface=NULL;
+    pic=NULL;
+    flush=false;
+    passNumber=0;
+    statFd=NULL;
+    statBuf=NULL;
+}
+
+static void dumpParams(vpx_codec_enc_cfg_t *cfg)
+{
+    int i;
+    printf("\n");
+#define PI(x) printf(#x":\t%d\n",(int)cfg->x);
+    PI(g_usage)
+    PI(g_threads)
+    PI(g_profile)
+    PI(g_w)
+    PI(g_h)
+    PI(g_bit_depth)
+    PI(g_input_bit_depth)
+    PI(g_timebase.num)
+    PI(g_timebase.den)
+    PI(g_error_resilient)
+    PI(g_pass)
+    PI(g_lag_in_frames)
+    printf("**********************************\n");
+    printf("********   rate control   ********\n");
+    printf("**********************************\n");
+    PI(rc_dropframe_thresh)
+    PI(rc_resize_allowed)
+    PI(rc_resize_up_thresh)
+    PI(rc_resize_down_thresh)
+    PI(rc_end_usage)
+#define PP(x) printf(#x":\t%p\n",cfg->x);
+    PP(rc_twopass_stats_in.buf)
+    PI(rc_twopass_stats_in.sz)
+    PI(rc_target_bitrate)
+    PI(rc_min_quantizer)
+    PI(rc_max_quantizer)
+    PI(rc_undershoot_pct)
+    PI(rc_overshoot_pct)
+    PI(rc_buf_sz)
+    PI(rc_buf_initial_sz)
+    PI(rc_buf_optimal_sz)
+    PI(rc_2pass_vbr_bias_pct)
+    PI(rc_2pass_vbr_minsection_pct)
+    PI(rc_2pass_vbr_maxsection_pct)
+#if VPX_ENCODER_ABI_VERSION >= 14
+    PI(rc_2pass_vbr_corpus_complexity)
+#endif
+    printf("**********************************\n");
+    printf("******  temporal layering  *******\n");
+    printf("**********************************\n");
+    PI(ts_number_layers)
+#define LOOPI(x,y,z) for(i=0; i<(z); i++) { printf(#x", "#y" %d:\t%d\n",i,cfg->x[i]); }
+    LOOPI(ts_target_bitrate,layer,VPX_TS_MAX_LAYERS)
+    LOOPI(ts_rate_decimator,layer,VPX_TS_MAX_LAYERS)
+    PI(ts_periodicity)
+    LOOPI(ts_layer_id,sequence_number,VPX_TS_MAX_PERIODICITY)
+    printf("**********************************\n");
+    printf("******  keyframe settings  *******\n");
+    printf("**********************************\n");
+    PI(kf_mode)
+    PI(kf_min_dist)
+    PI(kf_max_dist)
+    printf("\n");
+}
+
+static const char *packetTypeToString(int type)
+{
+    char msg[32]={0};
+#define REPORT(x) case x: snprintf(msg,32,#x);break;
+    switch(type)
+    {
+        REPORT(VPX_CODEC_CX_FRAME_PKT)
+        REPORT(VPX_CODEC_STATS_PKT)
+        REPORT(VPX_CODEC_FPMB_STATS_PKT)
+        REPORT(VPX_CODEC_PSNR_PKT)
+        REPORT(VPX_CODEC_CUSTOM_PKT)
+        default: snprintf(msg,32,"unknown packet type"); break;
+    }
+    return ADM_strdup(msg);
+}
+
+static int64_t scaleTime(uint32_t num, uint32_t den, uint64_t time)
+{
+    if(time==ADM_NO_PTS)
+        return (int64_t)time;
+    ADM_assert(!(time>>62));
+    ADM_assert(num);
+    double d=time;
+    d/=1000.;
+    d*=den;
+    d/=1000.;
+    d+=d/2.;
+    d/=num;
+    return (int64_t)d;
+}
+
+/**
+ * \fn setup
+ */
+bool vp9Encoder::setup(void)
+{
+    vpx_codec_err_t ret;
+
+    image=new ADMImageDefault(getWidth(),getHeight());
+    if(!image)
+    {
+        ADM_error("Cannot allocate image.\n");
+        return false;
+    }
+
+    iface=vpx_codec_vp9_cx();
+    if(!iface)
+    {
+        ADM_error("No VP9 interface available.\n");
+        return false;
+    }
+
+    ret=vpx_codec_enc_config_default(iface,&param,0);
+    if(ret!=VPX_CODEC_OK)
+    {
+        ADM_error("[vp9Encoder] Cannot set default configuration, error %d: %s.\n",(int)ret,vpx_codec_err_to_string(ret));
+        return false;
+    }
+    ADM_info("Initial default config:\n");
+    dumpParams(&param);
+
+    param.g_w=getWidth();
+    param.g_h=getHeight();
+    uint32_t threads=vp9Settings.autoThreads? ADM_cpu_num_processors() : vp9Settings.nbThreads;
+    if(threads>VP9_ENC_MAX_THREADS) threads=VP9_ENC_MAX_THREADS;
+    param.g_threads=vp9Settings.nbThreads=threads;
+    usSecondsToFrac(getFrameIncrement(),&(param.g_timebase.num),&(param.g_timebase.den));
+    ticks=param.g_timebase.num;
+
+    int speed=(vp9Settings.speed > 18)? 9 : vp9Settings.speed-9;
+
+    param.rc_min_quantizer=vp9Settings.ratectl.qz;
+    param.rc_max_quantizer=VP9_MAX_QUANTIZER;
+    switch(vp9Settings.ratectl.mode)
+    {
+        case COMPRESS_CQ:
+            param.rc_max_quantizer=vp9Settings.ratectl.qz;
+            param.rc_end_usage=VPX_CQ;
+            break;
+        case COMPRESS_CBR:
+            param.rc_target_bitrate=vp9Settings.ratectl.bitrate;
+            param.rc_end_usage=VPX_CBR;
+            break;
+        case COMPRESS_2PASS:
+        case COMPRESS_2PASS_BITRATE:
+            if(passNumber!=1 && passNumber!=2)
+            {
+                ADM_error("Invalid pass number %d provided.\n",(int)passNumber);
+                return false;
+            }
+            ADM_info("[vp9Encoder] Starting pass %d\n",passNumber);
+            if(passNumber==1)
+            {
+                param.g_lag_in_frames=0;
+                speed=1;
+            }else
+            {
+                int64_t sz=ADM_fileSize(logFile.c_str());
+                if(sz<=0)
+                {
+                    ADM_error("Stats file not found or empty, cannot proceed with the second pass.\n");
+                    return false;
+                }
+                if(sz>(1LL<<30))
+                {
+                    ADM_error("Stats file size %" PRId64" exceeds one GiB, this cannot be right, not trying to load it into memory.\n",sz);
+                    return false;
+                }
+                statBuf=ADM_alloc(sz);
+                if(!statBuf)
+                {
+                    ADM_error("Allocating memory for stats from the first pass failed.\n");
+                    return false;
+                }
+                statFd=ADM_fopen(logFile.c_str(),"r");
+                if(!ADM_fread(statBuf,sz,1,statFd))
+                {
+                    ADM_error("Reading stats file %s failed.\n",logFile.c_str());
+                    fclose(statFd);
+                    statFd=NULL;
+                    return false;
+                }
+                fclose(statFd);
+                statFd=NULL;
+                param.rc_twopass_stats_in.buf=statBuf; // should be freed by vpx_codec_destroy()
+                param.rc_twopass_stats_in.sz=sz;
+            }
+            {
+                uint32_t bitrate=0;
+                if(vp9Settings.ratectl.mode==COMPRESS_2PASS)
+                {
+                    uint64_t duration=source->getInfo()->totalDuration;
+                    if(vp9Settings.ratectl.finalsize)
+                    {
+                        if(false==ADM_computeAverageBitrateFromDuration(duration, vp9Settings.ratectl.finalsize, &bitrate))
+                            return false;
+                    }
+                }else
+                {
+                    bitrate=vp9Settings.ratectl.avg_bitrate;
+                }
+                if(bitrate)
+                {
+                    param.rc_target_bitrate=bitrate;
+                    param.rc_2pass_vbr_maxsection_pct=100; // max. bitrate = 2*target
+                    param.rc_end_usage=VPX_CQ;
+                }else
+                {
+                    param.rc_target_bitrate=0;
+                    param.rc_end_usage=VPX_Q;
+                }
+            }
+            break;
+        default:
+            break;
+    }
+    param.g_pass=(!passNumber)? VPX_RC_ONE_PASS : (passNumber==1)? VPX_RC_FIRST_PASS : VPX_RC_LAST_PASS;
+    param.kf_max_dist=vp9Settings.keyint;
+
+    ADM_info("Trying to init encoder with the following configuration:\n");
+    dumpParams(&param);
+
+    ret=vpx_codec_enc_init(&context,iface,&param,0);
+    if(ret!=VPX_CODEC_OK)
+    {
+        ADM_error("[vp9Encoder] Init failed with error %d: %s\n",(int)ret,vpx_codec_err_to_string(ret));
+        return false;
+    }
+
+    uint32_t alignment=16;
+
+    pic=vpx_img_alloc(pic,VPX_IMG_FMT_I420,param.g_w,param.g_h,alignment);
+    if(!pic)
+    {
+        ADM_error("[vp9Encoder] Cannot allocate VPX image.\n");
+        return false;
+    }
+
+    dline=VPX_DL_GOOD_QUALITY;
+    switch(vp9Settings.deadline)
+    {
+        case 0:
+            if(passNumber==1)
+                break;
+            dline=VPX_DL_REALTIME;
+            param.g_lag_in_frames=0;
+            break;
+        case 1:
+            break;
+        case 2:
+            dline=VPX_DL_BEST_QUALITY;
+            break;
+        default:
+            break;
+    }
+
+    if(VPX_CODEC_OK!=vpx_codec_control(&context,VP8E_SET_CPUUSED,speed))
+    {
+        ADM_warning("[vp9Encoder] Cannot set VP8E_SET_CPUUSED codec control to %d\n",speed);
+    }
+    if(param.rc_end_usage==VPX_CQ && VPX_CODEC_OK!=vpx_codec_control(&context,VP8E_SET_CQ_LEVEL,vp9Settings.ratectl.qz))
+    {
+        ADM_warning("[vp9Encoder] Cannot set VP8E_SET_CQ_LEVEL codec control to %u\n",vp9Settings.ratectl.qz);
+    }
+    if(VPX_CODEC_OK!=vpx_codec_control(&context,VP9E_SET_COLOR_RANGE,vp9Settings.fullrange))
+    {
+        ADM_warning("[vp9Encoder] Cannot set VP9E_SET_COLOR_RANGE codec control to %d\n",vp9Settings.fullrange);
+    }
+    return true;
+}
+
+/**
+ *  \fn ~vp9Encoder
+ */
+vp9Encoder::~vp9Encoder()
+{
+    ADM_info("[vp9] Destroying.\n");
+    if(pic)
+    {
+        vpx_img_free(pic);
+        pic=NULL;
+    }
+    if(statFd)
+        fclose(statFd);
+    statFd=NULL;
+    vpx_codec_destroy(&context);
+}
+
+/**
+ *  \fn setPassAndLogFile
+ */
+bool vp9Encoder::setPassAndLogFile(int pass, const char *name)
+{
+    ADM_info("Initializing pass %d, log file: %s\n",pass,name);
+    logFile=std::string(name);
+    passNumber=pass;
+    return true;
+}
+
+/**
+    \fn encode
+*/
+bool vp9Encoder::encode(ADMBitstream *out)
+{
+    // 1 fetch a frame...
+    uint32_t nb;
+    uint64_t pts;
+    vpx_codec_err_t er;
+
+    // update
+again:
+    if(!flush && source->getNextFrame(&nb,image)==false)
+    {
+        ADM_warning("[vp9] Cannot get next image\n");
+        flush=true;
+    }else
+    {
+        pic->planes[VPX_PLANE_Y] = YPLANE(image);
+        pic->planes[VPX_PLANE_U] = VPLANE(image);
+        pic->planes[VPX_PLANE_V] = UPLANE(image);
+        pic->stride[VPX_PLANE_Y] = image->GetPitch(PLANAR_Y);
+        pic->stride[VPX_PLANE_U] = image->GetPitch(PLANAR_V);
+        pic->stride[VPX_PLANE_V] = image->GetPitch(PLANAR_U);
+        pic->bit_depth = 8;
+
+        pts=image->Pts;
+        queueOfDts.push_back(pts);
+        uint64_t real=pts;
+        pts=scaleTime(ticks, param.g_timebase.den, real);
+        ADM_timeMapping map;
+        map.realTS=real;
+        map.internalTS=pts;
+        mapper.push_back(map);
+    }
+
+    if(flush)
+    {
+        ADM_info("Flushing delayed frames\n");
+        pts+=ticks;
+        er=vpx_codec_encode(&context,NULL,pts,ticks,0,dline);
+    }else
+    {
+        er=vpx_codec_encode(&context,pic,pts,ticks,0,dline);
+    }
+    if(er!=VPX_CODEC_OK)
+    {
+        ADM_error("Encoding error %d: %s\n",(int)er,vpx_codec_err_to_string(er));
+        return false;
+    }
+
+    out->flags=0;
+
+    if(!postAmble(out))
+    {
+        if(flush) return false;
+        goto again;
+    }
+
+    return true;
+}
+
+/**
+    \fn isDualPass
+
+*/
+bool vp9Encoder::isDualPass(void)
+{
+    uint32_t encmode=vp9Settings.ratectl.mode;
+    if(encmode==COMPRESS_2PASS || encmode==COMPRESS_2PASS_BITRATE)
+        return true;
+    return false;
+}
+
+/**
+    \fn postAmble
+    \brief update after a frame has been succesfully encoded
+*/
+bool vp9Encoder::postAmble(ADMBitstream *out)
+{
+    const vpx_codec_cx_pkt *pkt;
+    const void *iter=NULL;
+
+    while((pkt=vpx_codec_get_cx_data(&context,&iter)))
+    {
+        if(passNumber != 1 && pkt->kind != VPX_CODEC_CX_FRAME_PKT)
+        {
+            const char *msg=packetTypeToString(pkt->kind);
+            ADM_info("Got packet of type: %s\n",msg);
+            ADM_dealloc(msg);
+            msg=NULL;
+            continue;
+        }
+        if(passNumber == 1 && pkt->kind != VPX_CODEC_STATS_PKT)
+        {
+            const char *msg=packetTypeToString(pkt->kind);
+            ADM_warning("Unexpected packet type %s during the first pass.\n",msg);
+            ADM_dealloc(msg);
+            msg=NULL;
+            continue;
+        }
+        packetQueue.push_back(pkt);
+    }
+
+    if(packetQueue.size())
+    {
+        pkt=packetQueue.front();
+        packetQueue.erase(packetQueue.begin());
+        memcpy(out->data,pkt->data.frame.buf,pkt->data.frame.sz);
+        out->len=pkt->data.frame.sz;
+        if(passNumber!=1)
+        {
+            int quantizer=0;
+            if(VPX_CODEC_OK==vpx_codec_control(&context,VP8E_GET_LAST_QUANTIZER_64,&quantizer))
+            { // The value filled by codec control does not apply to this particular frame, but oh well...
+                if(quantizer<=0) quantizer=vp9Settings.ratectl.qz;
+                out->out_quantizer=quantizer;
+            }
+            getRealPtsFromInternal(pkt->data.frame.pts,&out->dts,&out->pts);
+        }else
+        {
+            if(queueOfDts.size())
+            {
+                lastDts=out->dts=out->pts=queueOfDts.front();
+                queueOfDts.erase(queueOfDts.begin());
+            }else
+            {
+                lastDts+=getFrameIncrement();
+                out->dts=out->pts=lastDts;
+            }
+            if(!statFd)
+            {
+                statFd=ADM_fopen(logFile.c_str(),"wb");
+                if(!statFd)
+                {
+                    ADM_error("Cannot open log file %s for writing.\n",logFile.c_str());
+                    return false;
+                }
+            }
+            ADM_fwrite(out->data,out->len,1,statFd);
+        }
+        if(pkt->data.frame.flags & VPX_FRAME_IS_KEY)
+            out->flags=AVI_KEY_FRAME;
+        return true;
+    }
+
+    return false;
+}
+
+// EOF
+

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9.h Added

@@ -0,0 +1,80 @@
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#ifndef ADM_VP9_H
+#define ADM_VP9_H
+#include "ADM_coreVideoEncoder.h"
+#include "ADM_encoderConf.h"
+
+extern "C"
+{
+#include "vpx/vpx_encoder.h"
+};
+
+enum vp9DeadlinePreset
+{
+    REALTIME=0,
+    GOOD_QUALITY=1,
+    BEST_QUALITY=2
+};
+
+#define VP9_ENC_MAX_THREADS 16
+
+#define VP9_DEFAULT_CONF \
+{ \
+    { \
+        COMPRESS_2PASS_BITRATE, /* COMPRESSION_MODE mode */ \
+        20, /* qz */ \
+        2000, /* bitrate in kb/s */ \
+        200, /* finalsize in MiB */ \
+        0, /* avg_bitrate in kb/s */ \
+        ADM_ENC_CAP_CBR+ADM_ENC_CAP_CQ+ADM_ENC_CAP_2PASS+ADM_ENC_CAP_2PASS_BR+ADM_ENC_CAP_GLOBAL \
+    }, \
+     2, /* nbThreads */ \
+     1, /* autoThreads */ \
+    13, /* speed = VP8E_SET_CPUUSED + 9 */ \
+     1, /* deadline = 1s */ \
+   128, /* keyint */ \
+     0  /* fullrange */ \
+}
+
+/**
+    \class vp9Encoder
+    \brief libvpx VP9 encoder
+*/
+class vp9Encoder : public ADM_coreVideoEncoder
+{
+protected:
+                vpx_codec_ctx_t     context;
+                vpx_codec_enc_cfg_t param;
+                vpx_codec_iface_t   *iface;
+                vpx_image_t         *pic;
+                std::vector <const vpx_codec_cx_pkt *> packetQueue;
+
+                int                 plane;
+                uint32_t            ticks;
+                uint32_t            dline;
+                bool                flush;
+                bool                postAmble(ADMBitstream *out);
+
+                std::string         logFile;
+                FILE                *statFd;
+                int                 passNumber;
+                void                *statBuf;
+                uint64_t            lastDts;
+public:
+                                    vp9Encoder(ADM_coreVideoFilter *src, bool globalHeader);
+    virtual                         ~vp9Encoder();
+    virtual     bool                setup(void);
+    virtual     bool                encode(ADMBitstream *out);
+    virtual     const char          *getFourcc(void) {return "VP9 ";}
+    virtual     bool                isDualPass(void);
+    virtual     bool                setPassAndLogFile(int pass, const char *name);
+};
+
+#endif

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp Added

@@ -0,0 +1,72 @@
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+#include "ADM_vp9.h"
+#include "vp9_encoder.h"
+#undef ADM_MINIMAL_UI_INTERFACE // we need the full UI
+#include "DIA_factory.h"
+
+extern vp9_encoder vp9Settings;
+
+/**
+ *  \fn vp9EncoderConfigure
+ *  \brief Configuration UI for VP9 encoder
+ */
+bool vp9EncoderConfigure(void)
+{
+    vp9_encoder *cfg = &vp9Settings;
+    int spdi = cfg->speed - 9;
+
+    diaMenuEntry dltype[]={
+        {REALTIME,QT_TRANSLATE_NOOP("vp9encoder","Realtime")},
+        {GOOD_QUALITY,QT_TRANSLATE_NOOP("vp9encoder","Good quality")},
+        {BEST_QUALITY,QT_TRANSLATE_NOOP("vp9encoder","Best quality")}
+    };
+#define PX(x) &(cfg->x)
+    diaElemBitrate bitrate(PX(ratectl),NULL);
+    diaElemReadOnlyText advice(QT_TRANSLATE_NOOP("vp9encoder","For optimal quality, select 2-pass average bitrate mode and set target bitrate to zero"),NULL);
+
+    diaElemMenu menudl(PX(deadline),QT_TRANSLATE_NOOP("vp9encoder","Deadline"),3,dltype);
+    diaElemInteger speedi(&spdi,QT_TRANSLATE_NOOP("vp9encoder","Speed"),-9,9);
+    diaElemUInteger conc(PX(nbThreads),QT_TRANSLATE_NOOP("vp9encoder","Threads"),1,VP9_ENC_MAX_THREADS);
+    diaElemToggle thrmatic(PX(autoThreads),QT_TRANSLATE_NOOP("vp9encoder","Use as many threads as CPU cores"));
+
+    thrmatic.link(0,&conc);
+
+    diaElemUInteger gopsize(PX(keyint),QT_TRANSLATE_NOOP("vp9encoder","GOP Size"),0,1000);
+    diaElemToggle range(PX(fullrange),QT_TRANSLATE_NOOP("vp9encoder","Use full color range"));
+
+    diaElemFrame frameEncMode(QT_TRANSLATE_NOOP("vp9encoder","Encoding Mode"));
+    frameEncMode.swallow(&bitrate);
+    frameEncMode.swallow(&advice);
+
+    diaElemFrame frameEncSpeed(QT_TRANSLATE_NOOP("vp9encoder","Speed vs Quality"));
+    frameEncSpeed.swallow(&speedi);
+    frameEncSpeed.swallow(&conc);
+    frameEncSpeed.swallow(&thrmatic);
+    frameEncSpeed.swallow(&menudl);
+
+    diaElemFrame frameIdr(QT_TRANSLATE_NOOP("vp9encoder","Keyframes"));
+    frameIdr.swallow(&gopsize);
+
+    diaElemFrame frameMisc(QT_TRANSLATE_NOOP("vp9encoder","Miscellaneous"));
+    frameMisc.swallow(&range);
+
+    diaElem *dialog[] = {&frameEncMode,&frameEncSpeed,&frameIdr,&frameMisc};
+    if(diaFactoryRun(QT_TRANSLATE_NOOP("vp9encoder","libvpx VP9 Encoder Configuration"),4,dialog))
+    {
+        cfg->speed=spdi+9;
+        return true;
+    }
+    return false;
+}
+
+// EOF
+

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Plugin.cpp Added

@@ -0,0 +1,39 @@
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+#include "ADM_vp9.h"
+#include "ADM_coreVideoEncoderInternal.h"
+#include "vp9_encoder.h"
+#include "vp9_encoder_desc.cpp"
+
+extern bool vp9EncoderConfigure(void);
+extern vp9_encoder vp9Settings;
+
+void resetConfigurationData()
+{
+    vp9_encoder conf = VP9_DEFAULT_CONF;
+    memcpy(&vp9Settings, &conf, sizeof(vp9_encoder));
+}
+
+ADM_DECLARE_VIDEO_ENCODER_PREAMBLE(vp9Encoder);
+ADM_DECLARE_VIDEO_ENCODER_MAIN("vp9",
+                               "VP9 (libvpx)",
+                               "libvpx based VP9 Encoder",
+                                vp9EncoderConfigure, // configuration dialog
+                                ADM_UI_ALL,
+                                1,0,0,
+                                vp9_encoder_param, // conf template
+                                &vp9Settings, // conf var
+                                NULL, // setProfile
+                                NULL  // getProfile
+);
+
+// EOF
+

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/vp9/CMakeLists.txt Added

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/vp9/vp9_encoder.conf Added

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/vp9/vp9_encoder.h Added

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/vp9/vp9_encoder_desc.cpp Added

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.cpp Changed

@@ -49,6 +49,8 @@
     this->globalHeader=globalHeader;
     passNumber=0;
     logFile=NULL;
+    flush=false;
+    firstIdr=true;
 }
 
 /**
@@ -162,56 +164,61 @@
 {
     // 1 fetch a frame...
     uint32_t nb;
+    x264_picture_t pic_out;
+    x264_nal_t *nal;
+    int er,nbNal;
 
     // update
-again:    
-    bool gotFrame=true;
-    if(source->getNextFrame(&nb,image)==false)
+again:
+    if(!flush)
     {
-        ADM_warning("[x264] Cannot get next image\n");
-        gotFrame=false;
-        //return false;
-    }else
-    {
-        //printf("[PPPP] x264 Incoming : %" PRIu64"us \n",image->Pts);    
-        // 2-preamble   
-        if(false==preAmble(image))
+        if(source->getNextFrame(&nb,image))
         {
-            ADM_warning("[x264] preAmble failed\n");
-            return false;
+            // 2-preamble
+            if(false==preAmble(image))
+            {
+                ADM_warning("[x264] preAmble failed\n");
+                return false;
+            }
+        }else
+        {
+            ADM_warning("[x264] Cannot get next image\n");
+            flush=true;
         }
     }
-    //
-      x264_nal_t        *nal;
-      int               nbNal = 0;
-      x264_picture_t    pic_out;
 
-      out->flags = 0;
-      
-        int er;
-        if(false==gotFrame)     
+    nbNal = 0;
+    x264_picture_init(&pic_out);
+    out->flags = 0;
+
+    if(flush)
+    {
+        ADM_info("Flushing delayed frames\n");
+        er=x264_encoder_encode (handle, &nal, &nbNal, NULL, &pic_out);
+        if(er<0)
         {
-            ADM_info("Flushing delayed frames\n");
-            er=x264_encoder_encode (handle, &nal, &nbNal, NULL, &pic_out);
-            if(er<=0)
-            {
-                ADM_info ("End of flush\n");
-                return false;
-            }
-        }else 
+            ADM_error ("[x264] Encode error %d while flushing delayed frames.\n",er);
+            return false;
+        }
+        if(!er && !x264_encoder_delayed_frames(handle))
         {
-            er=x264_encoder_encode (handle, &nal, &nbNal, &pic, &pic_out);
-            if(er<0)
-            {
-              ADM_error ("[x264] Error encoding %d\n",er);
-              return false;
-            }
+            ADM_info ("End of flush\n");
+            return false;
         }
-        if(!nbNal)
+    }else
+    {
+        er=x264_encoder_encode (handle, &nal, &nbNal, &pic, &pic_out);
+        if(er<0)
         {
-            ADM_info("[x264] Null frame\n");
-            goto again;
+            ADM_error ("[x264] Error encoding %d\n",er);
+            return false;
         }
+    }
+    if(!nbNal)
+    {
+        ADM_info("[x264] Null frame\n");
+        goto again;
+    }
 
 
     // 3-encode
@@ -269,6 +276,16 @@
         out->len=size;
         aprintf("--PostAmble--\n");
         // Make sure PTS & DTS > 0
+        if(firstIdr)
+        {
+            if(picout->i_dts<0)
+                encoderDelay=-picout->i_dts;
+            else
+                encoderDelay=0;
+            ADM_info("First IDR out of encoder with DTS = %" PRId64" us, setting encoder delay to %" PRId64" us.\n",
+                picout->i_dts,
+                (int64_t)encoderDelay);
+        }
         int64_t finalDts=picout->i_dts+(int64_t)getEncoderDelay();
         if(finalDts<0)
         {
@@ -311,7 +328,6 @@
           {
               // Put our SEI front...
               // first a temp location...
-              firstIdr=false;
               uint8_t *tmpBuffer=new uint8_t[size];
               memcpy(tmpBuffer,out->data,size);
               uint8_t *dout=out->data;
@@ -326,6 +342,7 @@
               out->len = size; // update total size
               delete [] tmpBuffer;
           }
+          firstIdr=false;
           break;
         case X264_TYPE_I:
           out->flags = AVI_P_FRAME;

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp Changed

@@ -23,6 +23,7 @@
 #include "DIA_coreToolkit.h"
 #include "ADM_vidMisc.h"
 #include "ADM_coreUtils.h"
+#include <climits>
 
 #if 1
     #define aprintf(...) {}
@@ -98,11 +99,23 @@
   param.i_log_level=X264_LOG_INFO; //DEBUG; //INFO;
 
   //Framerate
-  int n,d;    
+  int n,d;
   uint64_t f=source->getInfo()->frameIncrement;
-  usSecondsToFrac(f,&n,&d);
+  usSecondsToFrac(f,&n,&d,INT_MAX);
   param.i_fps_num = d;
   param.i_fps_den = n;
+  n = source->getInfo()->timeBaseNum & 0x7FFFFFFF;
+  d = source->getInfo()->timeBaseDen & 0x7FFFFFFF;
+  ADM_assert(d);
+  param.i_timebase_num = n;
+  param.i_timebase_den = d;
+#if 0
+  bool constantFps = (n * 1000 * 1000 + (d / 2))/ d >= f;
+  param.b_vfr_input = !constantFps;
+#else
+// We do pseudo cfr ...
+  param.b_vfr_input=0;
+#endif
 
   // -------------- vui------------
   #undef MKPARAM
@@ -194,9 +207,6 @@
   else
       param.b_repeat_headers=1;
 
-  // We do pseudo cfr ...
-  param.b_vfr_input=0;
-
   if(x264Settings.useAdvancedConfiguration)
   {  
 
@@ -326,6 +336,8 @@
     x264_param_apply_profile(&param, x264Settings.general.profile.c_str());
   }
 
+  setConstraintsByLevel();
+
   dumpx264Setup(&param);
   ADM_info("Creating x264 encoder\n");
   handle = x264_encoder_open (&param);
@@ -347,9 +359,107 @@
   return true;
 }
 /**
+    \fn setConstraintsByLevel
+    \brief Copied from Handbrake code
+*/
+bool x264Encoder::setConstraintsByLevel(void)
+{
+    if(param.i_level_idc < 0)
+        return true;
+    if(param.i_width <= 0 || param.i_height <= 0)
+    {
+        ADM_warning("Invalid dimensions: %d:%d\n",param.i_width,param.i_height);
+        return false;
+    }
+    const x264_level_t *level = NULL;
+    int val = param.i_level_idc;
+    for(int i=0; x264_levels[i].level_idc; i++)
+    {
+        if(x264_levels[i].level_idc == val)
+        {
+            level = &x264_levels[i];
+            break;
+        }
+    }
+    if(!level)
+    {
+        ADM_warning("Invalid level %d\n",val);
+        return false;
+    }
+    if(level->frame_only && (param.b_interlaced || param.b_fake_interlaced))
+    {
+        ADM_warning("Interlaced flag not supported for level %d, disabling",val);
+        param.b_interlaced = param.b_fake_interlaced = 0;
+    }
+    // Calculate frame dimensions and rate (in macroblocks)
+    int mbW = (param.i_width + 15) >> 4;
+    int mbH = (param.i_height + 15) >> 4;
+    if(param.b_interlaced || param.b_fake_interlaced)
+    {
+        // interlaced: encoded height must divide cleanly by 32
+        mbH = (mbH + 1) & ~1;
+    }
+    int nbMb = mbW * mbH;
+    int mbRate;
+    if(param.i_fps_den <= 0 || param.i_fps_num <= 0)
+        mbRate = 0;
+    else
+        mbRate = (int64_t)nbMb * param.i_fps_num / param.i_fps_den;
+    // Sanitize frame_reference
+    if(param.i_keyint_max != 1)
+    {
+        int decBufSize = level->dpb / nbMb;
+        if(decBufSize < 1) decBufSize = 1;
+        if(decBufSize > 16) decBufSize = 16;
+        if(decBufSize < param.i_frame_reference)
+        {
+            ADM_warning("Number of ref frames %d too high for the IDC level, setting to %d\n",param.i_frame_reference,decBufSize);
+            param.i_frame_reference = decBufSize;
+        }
+        // Now disable B-frames and pyramid if necessary.
+        if(decBufSize < 2)
+        {
+            if(param.i_bframe)
+            {
+                ADM_warning("B-frames forbidden by the IDC level, disabling.\n");
+                param.i_bframe = 0;
+            }
+        }else if(decBufSize < 4 && param.i_bframe_pyramid != X264_B_PYRAMID_NONE)
+        {
+            ADM_warning("B-frame pyramid forbidden by the IDC level, disabling.\n");
+            param.i_bframe_pyramid = X264_B_PYRAMID_NONE;
+        }
+    }
+    // Sanitize VBV depending on profile, simple mode only
+    if(!x264Settings.useAdvancedConfiguration && x264Settings.general.profile != std::string("high444"))
+    {
+        int codedPicBufFactor = 4;
+        if(x264Settings.general.profile == std::string("high"))
+            codedPicBufFactor = 5;
+        int maxVbvBitrate = (level->bitrate * codedPicBufFactor) >> 2;
+        if(!param.rc.i_vbv_max_bitrate || param.rc.i_vbv_max_bitrate > maxVbvBitrate)
+        {
+            param.rc.i_vbv_max_bitrate = maxVbvBitrate;
+        }
+        int maxVbvBufSize = (level->cpb * codedPicBufFactor) >> 2;
+        if(!param.rc.i_vbv_buffer_size || param.rc.i_vbv_buffer_size > maxVbvBitrate)
+        {
+            param.rc.i_vbv_buffer_size = maxVbvBitrate;
+        }
+    }
+    // Log warnings about constraints violation which are impossible to correct
+    if(level->frame_size < nbMb)
+        ADM_warning("Too many macroblocks per frame for the IDC level: %d (max: %d)\n",nbMb,level->frame_size);
+    if(level->mbps < mbRate)
+    {
+        ADM_warning("Framerate %d/%d too high for IDC level (mb/s: %d, max: %d)\n",param.i_fps_num,param.i_fps_den,mbRate,level->mbps);
+    }
+    return true;
+}
+/**
     \fn dumpx264Setup
 */
-void dumpx264Setup(x264_param_t *param)
+static void dumpx264Setup(x264_param_t *param)
 {
 #define PI(x) printf(#x"\t:%d\n",(int)param->x);
     PI(cpu);
@@ -381,7 +491,7 @@
 
     PI(i_timebase_num);
     PI(i_timebase_den);
-
+    PI(b_vfr_input);
         
     PI(i_frame_reference);
     PI(i_keyint_max);
@@ -440,7 +550,6 @@
     PI(b_aud);
     PI(b_repeat_headers);
     PI(b_annexb);
-    PI(b_vfr_input);
     
     AI(i_luma_deadzone[0]);
     AI(i_luma_deadzone[1]);

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp Changed

@@ -49,6 +49,7 @@
     this->globalHeader=globalHeader;
     passNumber=0;
     logFile=NULL;
+    firstIdr=true;
 }
 /**
  * 
@@ -289,6 +290,16 @@
         out->len=size;
         aprintf("--PostAmble--\n");
         // Make sure PTS & DTS > 0
+        if(firstIdr)
+        {
+            if(picout->dts<0)
+                encoderDelay=-picout->dts;
+            else
+                encoderDelay=0;
+            ADM_info("First IDR out of encoder with DTS = %" PRId64" us, setting encoder delay to %" PRId64" us.\n",
+                picout->dts,
+                (int64_t)encoderDelay);
+        }
         int64_t finalDts=picout->dts+(int64_t)getEncoderDelay();
         if(finalDts<0)
         {
@@ -336,7 +347,6 @@
           {
               // Put our SEI front...
               // first a temp location...
-              firstIdr=false;
               uint8_t *tmpBuffer=new uint8_t[size];
               memcpy(tmpBuffer,out->data,size);
               uint8_t *dout=out->data;
@@ -351,6 +361,7 @@
               out->len = size; // update total size
               delete [] tmpBuffer;
           }
+          firstIdr=false;
           break;
         case X265_TYPE_I:
           aprintf("NAL I\n");

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp Changed

@@ -146,7 +146,7 @@
                 plugins[0].param = &pass1;
                 memset(&pass1,0,sizeof(pass1));
                 pass1.version=XVID_VERSION;
-                pass1.filename=ADM_strdup(logFile.c_str()); // LEAK!
+                pass1.filename=ADM_strdup(logFile.c_str());
                 break;
         case 2:
                 {
@@ -154,7 +154,7 @@
                 plugins[0].param = &pass2;
                 memset(&pass2,0,sizeof(pass2));
                 pass2.version=XVID_VERSION;
-                pass2.filename=ADM_strdup(logFile.c_str()); // LEAK!
+                pass2.filename=ADM_strdup(logFile.c_str());
                 uint64_t duration=source->getInfo()->totalDuration;
                 switch(xvid4Settings.params.mode)
                 {
@@ -189,7 +189,7 @@
 */
 bool xvid4Encoder::setup(void)
 {
-  ADM_info("Xvid4, setting up");
+  ADM_info("Xvid4, setting up\n");
   query();
   xvid_enc_create_t xvid_enc_create;
   // Here we go...
@@ -263,7 +263,8 @@
   xvid_enc_create.plugins = plugins;
   xvid_enc_create.num_plugins = 2;
 
-  xvid_enc_create.max_bframes = xvid4Settings.maxBFrame;
+  xvid_enc_create.max_bframes = (xvid4Settings.enableFrameDrop)? 0 : xvid4Settings.maxBFrame;
+  xvid_enc_create.frame_drop_ratio = (xvid4Settings.enableFrameDrop)? xvid4Settings.frameDropRatio : 0;
   xvid_enc_create.max_key_interval = xvid4Settings.maxKeyFrameInterval;
     // dummy
     for(int i=0;i<3;i++)
@@ -313,6 +314,10 @@
         xvid_encore(handle, XVID_ENC_DESTROY, NULL, NULL);
         handle=NULL;
     }
+    ADM_dealloc(pass1.filename);
+    pass1.filename=NULL;
+    ADM_dealloc(pass2.filename);
+    pass2.filename=NULL;
 }
 
 /**

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.h Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp Changed

@@ -20,14 +20,9 @@
 #undef ADM_MINIMAL_UI_INTERFACE // we need the full UI
 #include "DIA_factory.h"
 
-#if 1
-#define aprintf(...) {}
-#else
-#define aprintf printf
-#endif
 /**
-    \fn jpegConfigure
-    \brief UI configuration for jpeg encoder
+    \fn xvidConfigure
+    \brief UI configuration for xvid4 encoder
 */
 extern xvid4_encoder xvid4Settings;
 bool         xvid4Configure(void)
@@ -84,7 +79,7 @@
 #define PX(x) &(xvid4Settings.x)
 
          diaElemBitrate   bitrate(&(xvid4Settings.params),NULL);
-         diaElemMenu      meM(PX(motionEstimation),QT_TRANSLATE_NOOP("xvid4","MotionEstimation"),4,meE);
+         diaElemMenu      meM(PX(motionEstimation),QT_TRANSLATE_NOOP("xvid4","Motion Estimation"),4,meE);
 
          diaElemMenu      threadM(PX(nbThreads),QT_TRANSLATE_NOOP("xvid4","Threading"),4,threads);
 
@@ -96,6 +91,9 @@
          diaElemToggle    trellis(PX(trellis),QT_TRANSLATE_NOOP("xvid4","_Trellis quantization"));         
          diaElemUInteger  max_b_frames(PX(maxBFrame),QT_TRANSLATE_NOOP("xvid4","_Number of B frames:"),0,32);
 
+         diaElemToggle    fdrop(PX(enableFrameDrop),QT_TRANSLATE_NOOP("xvid4","_Drop identical frames (this disables B-frames)"),0);
+         diaElemUInteger  fdRatio(PX(frameDropRatio),QT_TRANSLATE_NOOP("xvid4","Framedrop _Ratio:"),1,100);
+
          diaElemMenu     qzM(PX(cqmMode),QT_TRANSLATE_NOOP("xvid4","_Quantization type:"),2,qzE);
          
          diaElemMenu     rdM(PX(rdMode),QT_TRANSLATE_NOOP("xvid4","_Macroblock decision:"),5,rdE);
@@ -116,17 +114,24 @@
         diaElemToggle fcc(PX(useXvidFCC),QT_TRANSLATE_NOOP("xvid4","Use XVID fcc (else DIVX)"));
         
           /* First Tab : encoding mode */
-       
-        diaElemFrame frameMe(QT_TRANSLATE_NOOP("xvid4","Advanced Simple Profile"));
-        frameMe.swallow(&profileM);
-        frameMe.swallow(&max_b_frames);
-        frameMe.swallow(&GopSize);
-        frameMe.swallow(&bitrate);
-        frameMe.swallow(&fcc);
-       
-        
-        diaElem *diaME[]={&frameMe};
-        diaElemTabs tabME(QT_TRANSLATE_NOOP("xvid4","Motion Estimation"),1,diaME);
+        diaElemFrame frameBr(QT_TRANSLATE_NOOP("xvid4","Encoding Mode"));
+        frameBr.swallow(&profileM);
+        frameBr.swallow(&bitrate);
+
+        diaElemFrame frameGop(QT_TRANSLATE_NOOP("xvid4","Frame Settings"));
+        frameGop.swallow(&max_b_frames);
+        frameGop.swallow(&fdrop);
+        frameGop.swallow(&fdRatio);
+        frameGop.swallow(&GopSize);
+
+        fdrop.link(0,&max_b_frames);
+        fdrop.link(1,&fdRatio);
+
+        diaElemFrame frameMisc(QT_TRANSLATE_NOOP("xvid4","Miscellaneous"));
+        frameMisc.swallow(&fcc);
+
+        diaElem *diaEM[]={&frameBr,&frameGop,&frameMisc};
+        diaElemTabs tabEM(QT_TRANSLATE_NOOP("xvid4","Encoding Mode"),3,diaEM);
 
         /* 2nd Tab : Qz */
        
@@ -149,9 +154,11 @@
          diaElem *diaRC[]={&filetol,&qzComp,&qzBlur};
         diaElemTabs tabRC(QT_TRANSLATE_NOOP("xvid4","Rate Control"),3,diaRC);
         #endif
-         diaElemTabs *tabs[]={&tabME,&tabQz,&tabThread,&tabAR};
+        diaElemTabs *tabs[]={&tabEM,&tabQz,&tabThread,&tabAR};
         if( diaFactoryRunTabs(QT_TRANSLATE_NOOP("xvid4","Xvid4 MPEG-4 ASP configuration"),4,tabs))
         {
+            if(xvid4Settings.enableFrameDrop)
+                xvid4Settings.maxBFrame=0;
             return true;
         }
          return false;

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder.conf -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder.conf Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder.h Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder_desc.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder_desc.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder_json.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder_json.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/CMakeLists.txt Changed

@@ -12,30 +12,32 @@
 #
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 SET(ADM_LIB ADM_libass)
-SET(Asm x86/blend_bitmaps.asm  
-        x86/blur.asm    
-        x86/cpuid.asm  
-        x86/rasterizer.asm  
-        x86/utils.asm  
-        x86/x86inc.asm
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/x86)
+SET(Asm_srcs x86/blend_bitmaps  
+        x86/blur    
+        x86/cpuid  
+        x86/rasterizer  
+        x86/utils  
+        x86/x86inc
 )
 IF(ADM_CPU_X86_64)
-        SET(Asm ${Asm} x86/be_blur.asm )
+        SET(Asm_srcs ${Asm_srcs} x86/be_blur )
 ENDIF(ADM_CPU_X86_64)
 IF(ADM_CPU_X86)
         ADD_DEFINITIONS(-DCONFIG_ASM) 
 ENDIF(ADM_CPU_X86)
 #
+YASMIFY(asmFiles ${Asm_srcs})
+#
 SET(${ADM_LIB}_SRCS 
 ass_bitmap.c  ass.c  ass_cache.c  ass_fontconfig.c  ass_library.c   ass_render.c  ass_utils.c
 ass_font.c ass_parse.c ass_drawing.c ass_render_api.c ass_strtod.c ass_shaper.c
 ass_rasterizer_c.c ass_blur.c ass_font.c ass_rasterizer.c
-${Asm}
 )
 
 ADD_DEFINITIONS(" -std=gnu99 ")
 #
-ADD_LIBRARY(${ADM_LIB} STATIC ${${ADM_LIB}_SRCS})
+ADD_LIBRARY(${ADM_LIB} STATIC ${${ADM_LIB}_SRCS} ${asmFiles})
 ADD_DEFINITIONS(${FREETYPE2_CFLAGS} ${FRIBIDI_CFLAGS})
 INCLUDE_DIRECTORIES(${LIBICONV_INCLUDE_DIR})

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt Changed

@@ -13,22 +13,19 @@
 
     IF(DO_COMMON)
         IF(USE_EXTERNAL_LIBASS OR MSVC)
-			IF(MSVC)
-				MESSAGE(STATUS "Checking libass external lib for visual studio...")
-				PKG_CHECK_MODULES(LIBASS libass) 
-				IF (LIBASS_FOUND)
-					ADD_DEFINITIONS(${LIBASS_CFLAGS})
-					SET(LIBASS_LIBRARIES ${LIBASS_LDFLAGS})					
-					MESSAGE(STATUS "   found, lib is ${LIBASS_LIBRARIES}")
-				ELSE (LIBASS_FOUND)
-					MESSAGE(FATAL_ERROR "Cant locate libass ! cancelling")
-				ENDIF (LIBASS_FOUND)
-			ENDIF(MSVC)
-            ADD_DEFINITIONS("-DUSE_EXTERNAL_LIBASS")
-			TARGET_LINK_LIBRARIES(ADM_vf_ssa ${LIBASS_LIBRARIES} ${FREETYPE2_LDFLAGS} ${FRIBIDI_LDFLAGS} ADM_coreSubtitles6)
+            MESSAGE(STATUS "Checking libass external lib ...")
+            PKG_CHECK_MODULES(LIBASS libass)
+            IF (LIBASS_FOUND)
+                ADD_DEFINITIONS(${LIBASS_CFLAGS})
+                SET(LIBASS_LIBRARIES ${LIBASS_LDFLAGS})
+                MESSAGE(STATUS "   found, lib is ${LIBASS_LIBRARIES}")
+            ELSE (LIBASS_FOUND)
+                MESSAGE(FATAL_ERROR "Cant locate libass ! cancelling")
+            ENDIF (LIBASS_FOUND)
+            TARGET_LINK_LIBRARIES(ADM_vf_ssa ${LIBASS_LIBRARIES} ${FREETYPE2_LDFLAGS} ${FRIBIDI_LDFLAGS} ADM_coreSubtitles6)
         ELSE(USE_EXTERNAL_LIBASS OR MSVC)
             ADD_SUBDIRECTORY(ADM_libass)
-	    TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass ${FREETYPE2_LDFLAGS} ${FRIBIDI_LDFLAGS} ADM_coreSubtitles6)
+            TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass ${FREETYPE2_LDFLAGS} ${FRIBIDI_LDFLAGS} ADM_coreSubtitles6)
         ENDIF(USE_EXTERNAL_LIBASS OR MSVC)
         # We force the use of fontconfig
         ADD_DEFINITIONS("-DUSE_FONTCONFIG")

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/probe.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/probe.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder.conf -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder.conf Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder.h Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder_desc.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder_desc.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/Q_blackenBorders.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/Q_blackenBorders.cpp Changed

@@ -18,8 +18,11 @@
 //	Video is in RGB Colorspace
 //
 //
+/**
+ * \fn ctor
+ */
 Ui_blackenWindow::Ui_blackenWindow(QWidget* parent, blackenBorder *param,ADM_coreVideoFilter *in) : QDialog(parent)
-  {
+{
     uint32_t width,height;
     ui.setupUi(this);    
     lock=0;
@@ -30,39 +33,40 @@
     canvas=new ADM_QCanvas(ui.graphicsView,width,height);
     
     myBlacken=new flyBlacken( this,width, height,in,canvas,ui.horizontalSlider);
-    myBlacken->left=param->left;
-    myBlacken->right=param->right;
-    myBlacken->top=param->top;
-    myBlacken->bottom=param->bottom;
+    myBlacken->left=param->left&0xffffe;
+    myBlacken->right=param->right&0xffffe;
+    myBlacken->top=param->top&0xffffe;
+    myBlacken->bottom=param->bottom&0xffffe;
     myBlacken->_cookie=&ui;
     myBlacken->addControl(ui.toolboxLayout);
     myBlacken->upload();
     myBlacken->sliderChanged();
+
     myBlacken->rubber->nestedIgnore=1;
+    myBlacken->rubber_is_hidden=param->rubber_is_hidden;
+    ui.checkBoxRubber->setChecked(myBlacken->rubber_is_hidden);
 
     connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+    connect( ui.checkBoxRubber,SIGNAL(stateChanged(int)),this,SLOT(toggleRubber(int)));
     connect( ui.pushButtonReset,SIGNAL(clicked(bool)),this,SLOT(reset(bool)));
 #define SPINNER(x) connect( ui.spinBox##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); 
     SPINNER(Left);
     SPINNER(Right);
     SPINNER(Top);
     SPINNER(Bottom);
+#undef SPINNER
+#define SPINNER(x) ui.spinBox##x->setSingleStep(2); ui.spinBox##x->setKeyboardTracking(false);
+    SPINNER(Left)
+    SPINNER(Right)
+    SPINNER(Top)
+    SPINNER(Bottom)
+#undef SPINNER
 
     setModal(true);
-  }
-  void Ui_blackenWindow::sliderUpdate(int foo)
-  {
-    myBlacken->sliderChanged();
-  }
-  void Ui_blackenWindow::gather(blackenBorder *param)
-  {
-
-    myBlacken->download();
-    param->left=myBlacken->left;
-    param->right=myBlacken->right;
-    param->top=myBlacken->top;
-    param->bottom=myBlacken->bottom;
 }
+/**
+ * \fn dtor
+ */
 Ui_blackenWindow::~Ui_blackenWindow()
 {
   if(myBlacken) 
@@ -72,17 +76,52 @@
       delete canvas;
   canvas=NULL;
 }
+/**
+ * \fn sliderUpdate
+ */
+void Ui_blackenWindow::sliderUpdate(int foo)
+{
+    myBlacken->sliderChanged();
+}
+/**
+ * \fn gather
+ */
+void Ui_blackenWindow::gather(blackenBorder *param)
+{
+    myBlacken->download();
+    param->left=myBlacken->left;
+    param->right=myBlacken->right;
+    param->top=myBlacken->top;
+    param->bottom=myBlacken->bottom;
+    param->rubber_is_hidden=myBlacken->rubber_is_hidden;
+}
+/**
+ * \fn toggleRubber
+ */
+void Ui_blackenWindow::toggleRubber(int checkState)
+{
+    bool visible=true;
+    if(checkState)
+        visible=false;
+    myBlacken->rubber->rubberband->setVisible(visible);
+    myBlacken->rubber_is_hidden=!visible;
+}
+/**
+ * \fn valueChanged
+ */
 void Ui_blackenWindow::valueChanged( int f )
 {
-  if(lock) return;
-  lock++;
-  myBlacken->rubber->nestedIgnore++;
-  myBlacken->download();
-  myBlacken->sameImage();
-  myBlacken->rubber->nestedIgnore--;
-  lock--;
+    if(lock) return;
+    lock++;
+    myBlacken->rubber->nestedIgnore++;
+    myBlacken->download();
+    myBlacken->sameImage();
+    myBlacken->rubber->nestedIgnore--;
+    lock--;
 }
-
+/**
+ * \fn reset
+ */
 void Ui_blackenWindow::reset( bool f )
 {
     myBlacken->left=0;
@@ -94,7 +133,9 @@
     myBlacken->sameImage();
     lock--;
 }
-
+/**
+ * \fn resizeEvent
+ */
 void Ui_blackenWindow::resizeEvent(QResizeEvent *event)
 {
     if(!canvas->height())
@@ -115,9 +156,10 @@
     myBlacken->rubber->resize(w,h);
     myBlacken->rubber->nestedIgnore--;
     myBlacken->blockChanges(false);
-    
 }
-
+/**
+ * \fn showEvent
+ */
 void Ui_blackenWindow::showEvent(QShowEvent *event)
 {
     myBlacken->rubber->rubberband->show(); // must be called first
@@ -125,6 +167,8 @@
     myBlacken->adjustCanvasPosition();
     canvas->parentWidget()->setMinimumSize(30,30); // allow resizing both ways after the dialog has settled
     myBlacken->rubber->nestedIgnore=0;
+    if(myBlacken->rubber_is_hidden)
+        myBlacken->rubber->rubberband->hide();
 }
 
 //************************
@@ -160,7 +204,7 @@
 {
     int reject=0;
     Ui_blackenDialog *w=(Ui_blackenDialog *)_cookie;
-#define SPIN_GET(x,y) x=w->spinBox##y->value();
+#define SPIN_GET(x,y) x=w->spinBox##y->value(); if(x&1) { x&=0xffffe; blockChanges(true); w->spinBox##y->setValue(x); blockChanges(false); }
         SPIN_GET(left,Left);
         SPIN_GET(right,Right);
         SPIN_GET(top,Top);
@@ -168,11 +212,6 @@
 
         printf("%d %d %d %d\n",left,right,top,bottom);
 
-        left&=0xffffe;
-        right&=0xffffe;
-        top&=0xffffe;
-        bottom&=0xffffe;
-
         if((top+bottom)>_h)
                 {
                         top=bottom=0;

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/Q_blackenBorders.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/Q_blackenBorders.h Changed

@@ -6,30 +6,30 @@
 #include "blackenBorder.h"
 class Ui_blackenWindow : public QDialog
 {
-	Q_OBJECT
+    Q_OBJECT
 
-protected: 
-	int lock;
+protected:
+    int lock;
 
 public:
-	flyBlacken *myBlacken;
-	ADM_QCanvas *canvas;
-	Ui_blackenWindow(QWidget* parent, blackenBorder *param,ADM_coreVideoFilter *in);
-	~Ui_blackenWindow();
-	Ui_blackenDialog ui;
+    flyBlacken *myBlacken;
+    ADM_QCanvas *canvas;
+    Ui_blackenWindow(QWidget* parent, blackenBorder *param,ADM_coreVideoFilter *in);
+    ~Ui_blackenWindow();
+    Ui_blackenDialog ui;
 
 public slots:
-	void gather(blackenBorder *param);
+    void gather(blackenBorder *param);
 
 private slots:
-	void sliderUpdate(int foo);
-	void valueChanged(int foo);
-	void reset(bool f);
-        //void toggleRubber(int checkState);
+    void sliderUpdate(int foo);
+    void valueChanged(int foo);
+    void reset(bool f);
+    void toggleRubber(int checkState);
 
 private:
-        void resizeEvent(QResizeEvent *event);
-        void showEvent(QShowEvent *event);
+    void resizeEvent(QResizeEvent *event);
+    void showEvent(QShowEvent *event);
 };

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui Changed

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>507</width>
+    <width>639</width>
     <height>300</height>
    </rect>
   </property>
@@ -46,28 +46,14 @@
      <property name="spacing">
       <number>6</number>
      </property>
-     <item row="0" column="3">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Right:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_4">
-       <property name="text">
-        <string>Top:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="4">
-      <widget class="QSpinBox" name="spinBoxRight">
+     <item row="1" column="4">
+      <widget class="QSpinBox" name="spinBoxBottom">
        <property name="maximum">
         <number>2147483647</number>
        </property>
       </widget>
      </item>
-     <item row="0" column="2">
+     <item row="1" column="2">
       <spacer>
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -83,11 +69,35 @@
        </property>
       </spacer>
      </item>
-     <item row="1" column="5">
+     <item row="1" column="3">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Bottom:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="6">
+      <widget class="QCheckBox" name="checkBoxRubber">
+       <property name="text">
+        <string>&amp;Hide Rubber Band</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="3">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Right:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="7">
       <spacer>
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::MinimumExpanding</enum>
+       </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
@@ -96,31 +106,17 @@
        </property>
       </spacer>
      </item>
-     <item row="1" column="6">
-      <widget class="QPushButton" name="pushButtonReset">
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_4">
        <property name="text">
-        <string>Reset</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QSpinBox" name="spinBoxTop">
-       <property name="maximum">
-        <number>2147483647</number>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="4">
-      <widget class="QSpinBox" name="spinBoxBottom">
-       <property name="maximum">
-        <number>2147483647</number>
+        <string>Top:</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="3">
-      <widget class="QLabel" name="label_3">
+     <item row="1" column="8">
+      <widget class="QPushButton" name="pushButtonReset">
        <property name="text">
-        <string>Bottom:</string>
+        <string>Reset</string>
        </property>
       </widget>
      </item>
@@ -131,7 +127,14 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="5">
+     <item row="1" column="1">
+      <widget class="QSpinBox" name="spinBoxTop">
+       <property name="maximum">
+        <number>2147483647</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="7">
       <spacer>
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -154,7 +157,7 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="2">
+     <item row="0" column="2">
       <spacer>
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -170,6 +173,45 @@
        </property>
       </spacer>
      </item>
+     <item row="0" column="4">
+      <widget class="QSpinBox" name="spinBoxRight">
+       <property name="maximum">
+        <number>2147483647</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="5">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>26</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="0" column="5">
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>26</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
     </layout>
    </item>
    <item>
@@ -209,6 +251,7 @@
   <tabstop>spinBoxRight</tabstop>
   <tabstop>spinBoxTop</tabstop>
   <tabstop>spinBoxBottom</tabstop>
+  <tabstop>checkBoxRubber</tabstop>
   <tabstop>pushButtonReset</tabstop>
   <tabstop>horizontalSlider</tabstop>
   <tabstop>graphicsView</tabstop>

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/blend Added

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp Added

@@ -0,0 +1,221 @@
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include <math.h>
+#include <string>
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "DIA_coreToolkit.h"
+#include "DIA_factory.h"
+#include "ADM_vidMisc.h"
+#include "blend.h"
+#include "blend_desc.cpp"
+/**
+        \class AVDM_BlendFrames
+ *      \brief fade video plugin
+ */
+class AVDM_BlendFrames : public  ADM_coreVideoFilter
+{
+protected:
+                blend          param;
+                uint32_t       **buffer;
+                uint32_t      accumulated;
+                //void         AccumulateFrame(ADMImage *buffer,ADMImage *frame);
+                //void         WriteFrameAndClearBuffer(ADMImage *buffer,ADMImage *frame,uint32_t N);
+public:
+                             AVDM_BlendFrames(ADM_coreVideoFilter *previous,CONFcouple *conf);
+                             ~AVDM_BlendFrames();
+
+        virtual const char   *getConfiguration(void);                   /// Return  current configuration as a human readable string
+        virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+   //  virtual FilterInfo  *getInfo(void);                             /// Return picture parameters after this filter
+        virtual bool         getCoupledConf(CONFcouple **couples);   /// Return the current filter configuration
+        virtual void         setCoupledConf(CONFcouple *couples);
+        virtual bool         configure(void);           /// Start graphical user interface
+
+};
+
+// Add the hook to make it valid plugin
+DECLARE_VIDEO_FILTER(AVDM_BlendFrames,
+	1,0,0,              // Version
+	ADM_UI_ALL,         // UI
+	VF_TRANSFORM,       // Category
+	"blend",            // internal name (must be uniq!)
+	QT_TRANSLATE_NOOP("blend","Blend Frames"),// Display name
+	QT_TRANSLATE_NOOP("blend","Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.") // Description
+);   
+/**
+ * \fn configure
+ * \brief UI configuration
+ * @param 
+ * @return 
+ */
+bool AVDM_BlendFrames::configure()
+{
+#define MAX_BLEND_FRAMES 16777216//2^32/2^8 This is the in-all-cases limit, but on average it should be able to support probably 25% more.  However, no frames will be exported unless the number of frames in the video is equal or greater.
+  diaElemUInteger N(&(param.N),QT_TRANSLATE_NOOP("blend","Frames"),1,MAX_BLEND_FRAMES);
+  diaElem *elems[1]={&N};
+  if(diaFactoryRun(QT_TRANSLATE_NOOP("blend","Blend"),1,elems)){
+    info.totalDuration=previousFilter->getInfo()->totalDuration/((uint64_t)param.N);//This bad boy reports the proper duration to the loading bar
+    return 1;
+  }else
+    return 0;
+}
+/**
+ *      \fn getConfiguration
+ * 
+ */
+const char *AVDM_BlendFrames::getConfiguration(void)
+{
+    static char conf[12];
+    snprintf(conf,12," N:%d ",param.N);
+    return conf;
+}
+
+/**
+ * \fn ctor
+ * @param in
+ * @param couples
+ */
+AVDM_BlendFrames::AVDM_BlendFrames(ADM_coreVideoFilter *in,CONFcouple *setup) : ADM_coreVideoFilter(in,setup)
+{
+    if(!setup || !ADM_paramLoad(setup,blend_param,&param))
+    {
+        // Default value
+        param.N=1;
+    }
+    accumulated=0;
+    buffer=NULL;
+    info.totalDuration=previousFilter->getInfo()->totalDuration/((uint64_t)param.N);
+}
+/**
+ * \fn setCoupledConf
+ * \brief save current setup from couples
+ * @param couples
+ */
+void AVDM_BlendFrames::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, blend_param, &param);
+}
+
+/**
+ * \fn getCoupledConf
+ * @param couples
+ * @return setup as couples
+ */
+bool AVDM_BlendFrames::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, blend_param,&param);
+}
+
+/**
+ * \fn dtor
+ */
+AVDM_BlendFrames::~AVDM_BlendFrames(void)
+{
+	if(buffer)      
+	{
+    	for(int i=0;i<1;i++)
+    		delete [] buffer[i];
+		delete [] buffer;
+		buffer=NULL;
+	}
+}
+/**
+ * 
+ * @param source
+ * @param source2
+ * @param dest
+ * @param offset
+ * @return 
+ */
+
+/**
+ * \fn getNextFrame
+ * @param fn
+ * @param image
+ * @return 
+ */
+bool AVDM_BlendFrames::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+	while(true){
+		if(previousFilter->getNextFrame(fn,image)==false)
+			return false;
+		
+		if(buffer==NULL){
+			//Create new 32 bit accumulation buffer
+			buffer = new uint32_t*[3];
+			for(int i=0;i<3;i++)
+			{
+				int w=(int)image->GetWidth((ADM_PLANE)i);
+				int h=(int)image->GetHeight((ADM_PLANE)i);
+				buffer[i] = new uint32_t[w*h];
+				//I know that there is some way to initialize this with zeroes more efficiently, but I don't know how to do it.
+				for(int y=0;y<h;y++)
+				{
+					for(int x=0;x<w;x++)
+					{
+						buffer[i][y*w+x]=0;
+					}
+				}
+			}
+		}
+
+		//Accumulate frame into buffer
+		uint8_t *fplanes[3];
+		int fpitches[3];
+		image->GetReadPlanes(fplanes);
+		image->GetPitches(fpitches);
+		for(int i=0;i<3;i++)
+		{
+			int w=(int)image->GetWidth((ADM_PLANE)i);
+			int h=(int)image->GetHeight((ADM_PLANE)i);
+			uint8_t *f=fplanes[i];
+			for(int y=0;y<h;y++)
+			{
+				for(int x=0;x<w;x++)
+				{
+					buffer[i][y*w+x]+=(uint32_t)f[x];//
+				}
+				f+=fpitches[i];
+			}        
+		}
+		accumulated++;
+
+		//Output a frame when N frames have been accumulated
+		if(accumulated==param.N){
+			accumulated=0;
+			//Divide buffer by N and write to 'image'
+			//image=new ADMImageDefault(frame->GetWidth(PLANAR_Y),frame->GetHeight(PLANAR_Y));
+			//image->copyInfo(frame);//Who knows what crazy info the frame has
+			if(image->Pts!=ADM_NO_PTS)
+				image->Pts=image->Pts/param.N;
+			uint8_t *iplanes[3];
+			image->GetWritePlanes(iplanes);
+			for(int i=0;i<3;i++)
+			{
+				int w=(int)image->GetWidth((ADM_PLANE)i);
+				int h=(int)image->GetHeight((ADM_PLANE)i);
+				uint8_t *ip=iplanes[i];
+				for(int y=0;y<h;y++)
+				{
+					for(int x=0;x<w;x++)
+					{
+						ip[x]=(uint8_t)(buffer[i][y*w+x]/(uint32_t)param.N);//Not sure if this will cast weirdly//It casted weirdly and made everything green, fixed now
+						buffer[i][y*w+x]=0;//Reset buffer to 0
+					}
+					ip+=fpitches[i];
+				}
+			}
+			return true;
+		}
+	}
+	return false;
+}
+//EOF
\ No newline at end of file

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/blend/CMakeLists.txt Added

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/blend/blend.conf Added

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/blend/blend.h Added

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/blend/blend_desc.cpp Added

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/blend/blend_json.cpp Added

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp Changed

@@ -42,7 +42,7 @@
  {QT_TRANSLATE_NOOP("changeFps","23.976 (Film)"),  24000,1001},
  {QT_TRANSLATE_NOOP("changeFps","29.97 (NTSC)"),   30000,1001},
  {QT_TRANSLATE_NOOP("changeFps","50 (Pal)"),       50000,1000},
- {QT_TRANSLATE_NOOP("changeFps","59.93  (NTSC)"),  60000,1001}
+ {QT_TRANSLATE_NOOP("changeFps","59.94  (NTSC)"),  60000,1001}
 };
 
 #define nbPredefined (sizeof(predefinedFps)/sizeof(PredefinedFps_t))
@@ -84,7 +84,7 @@
 const char *changeFps::getConfiguration( void )
 {
 static char buf[100];
- snprintf(buf,99," Change FPS from %2.2f to %2.2f fps",
+ snprintf(buf,99," Change FPS from %2.3f to %2.2f fps",
         (double)configuration.oldFpsNum/configuration.oldFpsDen,
         (double)configuration.newFpsNum/configuration.newFpsDen);
  return buf;  
@@ -191,6 +191,11 @@
     timing/=configuration.newFpsNum;
     timing/=configuration.oldFpsDen;
     info.totalDuration=(uint64_t)timing;
+
+    // 3 update timebase
+    info.timeBaseDen=configuration.newFpsNum;
+    info.timeBaseNum=configuration.newFpsDen;
+
     return true;
 }
 /**
@@ -217,7 +222,7 @@
     
 
     diaElemMenu mFps(&(configuration.oldMode),   QT_TRANSLATE_NOOP("changeFps","Source Fps:"), 6,tFps);
-    diaElemFloat fps(&oldFrac,QT_TRANSLATE_NOOP("changeFps","Source frame rate:"),1,200.);
+    diaElemFloat fps(&oldFrac,QT_TRANSLATE_NOOP("changeFps","Source frame rate:"),1,240.,NULL,3);
 
     mFps.link(tFps+0,1,&fps); // only activate entry in custom mode

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/DIA_flyCrop.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/DIA_flyCrop.h Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.cpp Changed

@@ -67,8 +67,7 @@
   }
   void Ui_cropWindow::gather(crop *param)
   {
-    
-        myCrop->download();
+        myCrop->download(true);
         param->left=myCrop->left;
         param->right=myCrop->right;
         param->top=myCrop->top;
@@ -130,36 +129,59 @@
         
         return 1;
 }
-uint8_t flyCrop::download(void)
+uint8_t flyCrop::download(bool even)
 {
-        int reject=0;
-Ui_cropDialog *w=(Ui_cropDialog *)_cookie;
+    int reject=0;
+    Ui_cropDialog *w=(Ui_cropDialog *)_cookie;
 #define SPIN_GET(x,y) x=w->spinBox##y->value();
-                        SPIN_GET(left,Left);
-                        SPIN_GET(right,Right);
-                        SPIN_GET(top,Top);
-                        SPIN_GET(bottom,Bottom);
-                        
-                        printf("%d %d %d %d\n",left,right,top,bottom);
-                        
-                        left&=0xffffe;
-                        right&=0xffffe;
-                        top&=0xffffe;
-                        bottom&=0xffffe;
-                        
-                        if((top+bottom)>_h)
-                                {
-                                        top=bottom=0;
-                                        reject=1;
-                                }
-                        if((left+right)>_w)
-                                {
-                                        left=right=0;
-                                        reject=1;
-                                }
-                        if(reject)
-                                upload();
-                        return true;
+    SPIN_GET(left,Left);
+    SPIN_GET(right,Right);
+    SPIN_GET(top,Top);
+    SPIN_GET(bottom,Bottom);
+
+    printf("%d %d %d %d\n",left,right,top,bottom);
+
+    if((top+bottom)>_h)
+    {
+        top=bottom=0;
+        reject=1;
+        ADM_warning(" ** Rejected top bottom **\n");
+    }
+    if((left+right)>_w)
+    {
+        left=right=0;
+        reject=1;
+        ADM_warning(" ** Rejected left right **\n");
+    }
+    if(reject)
+        return upload();
+
+    if(even)
+    {
+        if((_w-left-right)&1)
+        {
+            if(left&1)
+                left&=0xfffe;
+            else if(right)
+                right--;
+            else if(left)
+                left--;
+            else
+                right++;
+        }
+        if((_h-top-bottom)&1)
+        {
+            if(top&1)
+                top&=0xfffe;
+            else if(bottom)
+                bottom--;
+            else if(top)
+                top--;
+            else
+                bottom++;
+        }
+    }
+    return 1;
 }
 
 /**

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp Changed

@@ -266,10 +266,11 @@
     return 1;
 }
 /**
- * 
+ * Read crop values from UI
+ * @param even Fixup crop values to make resulting width and height even
  * @return 
  */
-uint8_t flyCrop::download(void)
+uint8_t flyCrop::download(bool even)
 {
 int reject=0;
 Ui_cropDialog *w=(Ui_cropDialog *)_cookie;
@@ -281,11 +282,6 @@
 
     aprintf("%d %d %d %d\n",left,right,top,bottom);
 
-    left&=0xffffe;
-    right&=0xffffe;
-    top&=0xffffe;
-    bottom&=0xffffe;
-
     if((top+bottom)>_h)
     {
             top=bottom=0;
@@ -303,6 +299,31 @@
     else
     {
         blockChanges(true);
+        if(even)
+        {
+            if((_w-left-right)&1)
+            {
+                if(left&1)
+                    left&=0xfffe;
+                else if(right)
+                    right--;
+                else if(left)
+                    left--;
+                else
+                    right++;
+            }
+            if((_h-top-bottom)&1)
+            {
+                if(top&1)
+                    top&=0xfffe;
+                else if(bottom)
+                    bottom--;
+                else if(top)
+                    top--;
+                else
+                    bottom++;
+            }
+        }
         rubber->nestedIgnore++;
         rubber->move(_zoom*(float)left,_zoom*(float)top);
         rubber->resize(_zoom*(float)(_w-left-right),_zoom*(float)(_h-top-bottom));
@@ -382,7 +403,7 @@
  */
 void Ui_cropWindow::gather(crop *param)
 {
-    myCrop->download();
+    myCrop->download(true);
     param->left=myCrop->left;
     param->right=myCrop->right;
     param->top=myCrop->top;
@@ -421,7 +442,7 @@
     bool visible=true;
     if(checkState)
         visible=false;
-    myCrop->rubber->setVisible(visible);
+    myCrop->rubber->rubberband->setVisible(visible);
     myCrop->rubber_is_hidden=!visible;
 }
 /**
@@ -482,7 +503,7 @@
 void Ui_cropWindow::showEvent(QShowEvent *event)
 {
     myCrop->rubber->rubberband->show(); // must be called first
-    myCrop->rubber->setVisible(!(myCrop->rubber_is_hidden));
+    myCrop->rubber->rubberband->setVisible(!(myCrop->rubber_is_hidden));
     QDialog::showEvent(event);
     myCrop->adjustCanvasPosition();
     canvas->parentWidget()->setMinimumSize(30,30); // allow resizing both ways after the dialog has settled

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.h Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui Changed

@@ -104,7 +104,7 @@
       </widget>
      </item>
      <item row="1" column="0">
-      <widget class="QSlider" name="horizontalSliderContrast">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderContrast">
        <property name="minimum">
         <number>-200</number>
        </property>
@@ -117,7 +117,7 @@
       </widget>
      </item>
      <item row="3" column="0">
-      <widget class="QSlider" name="horizontalSliderBrightness">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderBrightness">
        <property name="minimum">
         <number>-100</number>
        </property>
@@ -130,7 +130,7 @@
       </widget>
      </item>
      <item row="5" column="0">
-      <widget class="QSlider" name="horizontalSliderSaturation">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderSaturation">
        <property name="maximum">
         <number>300</number>
        </property>
@@ -169,7 +169,7 @@
       <number>6</number>
      </property>
      <item row="2" column="1">
-      <widget class="QSlider" name="horizontalSliderGreen">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderGreen">
        <property name="maximum">
         <number>300</number>
        </property>
@@ -179,7 +179,7 @@
       </widget>
      </item>
      <item row="3" column="1">
-      <widget class="QSlider" name="horizontalSliderBlue">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderBlue">
        <property name="maximum">
         <number>300</number>
        </property>
@@ -217,7 +217,7 @@
       </widget>
      </item>
      <item row="1" column="1">
-      <widget class="QSlider" name="horizontalSliderRed">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderRed">
        <property name="maximum">
         <number>300</number>
        </property>
@@ -234,7 +234,7 @@
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="QSlider" name="horizontalSliderInitial">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderInitial">
        <property name="maximum">
         <number>300</number>
        </property>
@@ -244,7 +244,7 @@
       </widget>
      </item>
      <item row="4" column="1">
-      <widget class="QSlider" name="horizontalSliderWeight">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderWeight">
        <property name="maximum">
         <number>300</number>
        </property>
@@ -269,6 +269,11 @@
    <extends>QSlider</extends>
    <header>ADM_toolkitQt.h</header>
   </customwidget>
+  <customwidget>
+   <class>ADM_SliderIndicator</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>horizontalSlider</tabstop>

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp Changed

@@ -24,6 +24,8 @@
 {
 protected:
                 fade            param;
+                uint32_t        mx;
+                void            boundsCheck(void);
                 bool            buildLut(void);
                 ADMImage        *first;
                 bool            process(ADMImage *source,ADMImage *source2, ADMImage *dest,int offset);
@@ -31,14 +33,13 @@
                                 AVDM_FadeTo(ADM_coreVideoFilter *previous,CONFcouple *conf);
                                 ~AVDM_FadeTo();
 
-        virtual const char   *getConfiguration(void);                   /// Return  current configuration as a human readable string
-        virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
-	 //  virtual FilterInfo  *getInfo(void);                             /// Return picture parameters after this filter
-        virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
-		virtual void setCoupledConf(CONFcouple *couples);
-        virtual bool         configure(void) ;           /// Start graphical user interface
-        uint16_t             lookupLuma[256][256];
-        uint16_t             lookupChroma[256][256];
+        virtual const char      *getConfiguration(void); /// Return  current configuration as a human readable string
+        virtual bool            getNextFrame(uint32_t *fn,ADMImage *image); /// Return the next image
+        virtual bool            getCoupledConf(CONFcouple **couples); /// Return the current filter configuration
+        virtual void            setCoupledConf(CONFcouple *couples);
+        virtual bool            configure(void); /// Start graphical user interface
+                uint16_t        lookupLuma[256][256];
+                uint16_t        lookupChroma[256][256];
 
 };
 
@@ -47,13 +48,13 @@
 
 
 DECLARE_VIDEO_FILTER(AVDM_FadeTo,
-                1,0,0,              // Version
-                     ADM_UI_ALL,         // UI
-                     VF_TRANSFORM,            // Category
-                     "fadeTo",            // internal name (must be uniq!)
-                     QT_TRANSLATE_NOOP("fadeTo","Fade"),            // Display name
-                     QT_TRANSLATE_NOOP("fadeTo","Fade.") // Description
-                 );   
+                    1,0,0,          // Version
+                    ADM_UI_ALL,     // UI
+                    VF_TRANSFORM,   // Category
+                    "fadeTo",       // internal name (must be uniq!)
+                    QT_TRANSLATE_NOOP("fadeTo","Fade"), // Display name
+                    QT_TRANSLATE_NOOP("fadeTo","Fade.") // Description
+);
 /**
  * \fn configure
  * \brief UI configuration
@@ -62,32 +63,26 @@
  */
 bool  AVDM_FadeTo::configure()
 {
-    
-  uint32_t start,end;
-  
-  
-while(1)
-{
-    uint32_t mx=(uint32_t)(previousFilter->getInfo()->totalDuration/1000);
+    uint32_t eInOut=(uint32_t)param.inOut;
+
+    diaMenuEntry fadeDirection[2]={
+        {0,QT_TRANSLATE_NOOP("fadeTo","From"),QT_TRANSLATE_NOOP("fadeTo","Fade from the first picture into movie")},
+        {1,QT_TRANSLATE_NOOP("fadeTo","To"),QT_TRANSLATE_NOOP("fadeTo","Fade from movie to the first picture")}
+    };
 
+    diaElemMenu menu(&(eInOut),QT_TRANSLATE_NOOP("fadeTo","_Fade direction:"),2,fadeDirection);
     diaElemTimeStamp start(&(param.startFade),QT_TRANSLATE_NOOP("fadeTo","_Start time:"),0,mx);
     diaElemTimeStamp end(&(param.endFade),QT_TRANSLATE_NOOP("fadeTo","_End time:"),0,mx);
-    diaElem *elems[2]={&start,&end};
-  
-    if( diaFactoryRun(QT_TRANSLATE_NOOP("fadeTo","Fade"),2+0*1,elems))
+    diaElem *elems[3]={&menu,&start,&end};
+
+    if( diaFactoryRun(QT_TRANSLATE_NOOP("fadeTo","Fade"),3,elems))
     {
-        if(param.startFade > param.endFade)
-        {
-            uint32_t swap=param.startFade;
-            param.startFade=param.endFade;
-            param.endFade=swap;
-        }
+        param.inOut=(bool)eInOut;
         buildLut();
+        boundsCheck();
         return 1;
-    }else
-        return 0;
-} 
-  return 1;
+    }
+    return 0;
 }
 /**
  *      \fn getConfiguration
@@ -98,7 +93,8 @@
     static char conf[256];
     std::string start=std::string(ADM_us2plain(param.startFade*1000LL));
     std::string end=std::string(ADM_us2plain(param.endFade*1000LL));
-    snprintf(conf,255," Fade : Start %s End %s",start.c_str(),end.c_str());
+    const char *type=(param.inOut)? "to" : "from";
+    snprintf(conf,255," Fade %s: Start %s End %s",type,start.c_str(),end.c_str());
     return conf;
 }
 
@@ -109,11 +105,13 @@
  */
 AVDM_FadeTo::AVDM_FadeTo(ADM_coreVideoFilter *in,CONFcouple *setup) :  ADM_coreVideoFilterCached(3,in,setup)
 {
+    mx=(uint32_t)(in->getInfo()->totalDuration/1000);
     if(!setup || !ADM_paramLoad(setup,fade_param,&param))
     {
         // Default value
         param.startFade=0; 
         param.endFade=0;
+        param.inOut=false;
     }
     buildLut();
     nextFrame=0;
@@ -144,10 +142,10 @@
  */
 AVDM_FadeTo::~AVDM_FadeTo(void)
 {
-    if(first)      
+    if(first)
     {
-      delete first;
-      first=NULL;
+        delete first;
+        first=NULL;
     }
 }
 /**
@@ -160,7 +158,6 @@
  */
 bool AVDM_FadeTo::process(ADMImage *source,ADMImage *source2, ADMImage *dest,int offset)
 {
-  
     uint8_t *splanes[3],*splanes2[3],*dplanes[3];
     int      spitches[3],spitches2[3],dpitches[3];
 
@@ -170,7 +167,6 @@
     source2->GetPitches(spitches2);
     dest->GetWritePlanes(dplanes);
     dest->GetPitches(dpitches);
-    
 
     for(int i=0;i<3;i++)
     {
@@ -179,9 +175,9 @@
         int colorOffset=128<<8;
         if(!i) 
         {
-          indx=lookupLuma[offset];
-          revindex=lookupLuma[255-offset];
-          colorOffset=0;
+            indx=lookupLuma[offset];
+            revindex=lookupLuma[255-offset];
+            colorOffset=0;
         }
         int    w=(int)dest->GetWidth((ADM_PLANE)i);
         int    h=(int)dest->GetHeight((ADM_PLANE)i);
@@ -199,7 +195,7 @@
             d+=dpitches[i];
             s+=spitches[i];
             s2+=spitches2[i];
-        }        
+        }
     }
     return true;
 }
@@ -212,39 +208,35 @@
  */
 bool AVDM_FadeTo::getNextFrame(uint32_t *fn,ADMImage *image)
 {
-  *fn=nextFrame;
-  ADMImage *next= vidCache->getImage(nextFrame);
-  if(!next)
-  {
-      ADM_info("[Fade] Cant get image \n");
-      return false;
-  }
-  
-  image->Pts=next->Pts;
-  
-  uint64_t absPts=next->Pts+getAbsoluteStartTime();
-  
-  bool out_of_scope=false;
-  if(absPts<param.startFade*1000LL) out_of_scope=true;
-  if(absPts>param.endFade*1000LL)   out_of_scope=true;
-  
-  
-  if(!out_of_scope && !first)
-  {
-      first=new ADMImageDefault(next->GetWidth (PLANAR_Y),next->GetHeight(PLANAR_Y));
-      first->duplicateFull (next);
-  }
-  if( out_of_scope || !first)
-  {
-      image->duplicate(next);
-      nextFrame++;
-      vidCache->unlockAll();
-      return true;
-  }
-  
-  double scope=1000LL*(param.endFade-param.startFade);
-  double in;
-    if(!scope) 
+    *fn=nextFrame;
+    ADMImage *next= vidCache->getImage(nextFrame);
+    if(!next)
+    {
+        ADM_info("[Fade] Cant get image \n");
+        return false;
+    }
+    image->Pts=next->Pts;
+    uint64_t absPts=next->Pts+getAbsoluteStartTime();
+    bool out_of_scope=false;
+
+    if(absPts<param.startFade*1000LL) out_of_scope=true;
+    if(absPts>param.endFade*1000LL)   out_of_scope=true;
+
+    if(!out_of_scope && !first)
+    {
+        first=new ADMImageDefault(next->GetWidth (PLANAR_Y),next->GetHeight(PLANAR_Y));
+        first->duplicateFull (next);
+    }
+    if( out_of_scope || !first)
+    {
+        image->duplicate(next);
+        nextFrame++;
+        vidCache->unlockAll();
+        return true;
+    }
+    double scope=1000LL*(param.endFade-param.startFade);
+    double in;
+    if(!scope)
     {
         scope=1;
         in=1;
@@ -254,13 +246,11 @@
     }
     in=in/scope;
     in*=255;
-  
-  
-  uint32_t offset=(uint32_t)floor(in+0.4); // normalized to 0--255, begin -- end
-  
-  
+
+    uint32_t offset=(uint32_t)floor(in+0.4); // normalized to 0--255, begin -- end
+
     process(first,next,image,offset);
-  
+
     vidCache->unlockAll();
     nextFrame++;
     return 1;
@@ -272,27 +262,41 @@
  */
 bool  AVDM_FadeTo::buildLut(void)
 {
-  float f,ration;
-  for(int i=0;i<256;i++)
-  {
-    if(!param.inOut) ration=255-i;
-    else ration=i;
-    for(int r=0;r<256;r++)
+    float f,ration;
+    for(int i=0;i<256;i++)
     {
-      f=r;
-      f=f*ration;
-      lookupLuma[i][r]=(uint16_t)(f+0.4);
-
-      f=r-128;
-      f=f*ration;
-      lookupChroma[i][r]=(128<<8)+(uint16_t)(f+0.4);
+        if(!param.inOut)
+            ration=255.-i;
+        else
+            ration=(float)i;
+        for(int r=0;r<256;r++)
+        {
+            f=(float)r;
+            f=f*ration;
+            lookupLuma[i][r]=(uint16_t)(f+0.4);
 
+            f=r-128.;
+            f=f*ration;
+            lookupChroma[i][r]=(128<<8)+(uint16_t)(f+0.4);
+        }
+    }
+    return true;
+}
+/**
+ * \fn boundsCheck
+ * \brief Reset invalid start and end values
+ */
+void AVDM_FadeTo::boundsCheck(void)
+{
+    if(param.endFade < param.startFade)
+    {
+        uint32_t tmp=param.startFade;
+        param.startFade=param.endFade;
+        param.endFade=tmp;
     }
-    
-  }
-  return true;
+    if(param.endFade > mx)
+        param.endFade=mx;
+    if(param.startFade > mx)
+        param.startFade=0;
 }
 //EOF
-
-
-

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeTo/fade.conf -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeTo/fade.conf Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeTo/fade.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeTo/fade.h Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeTo/fade_desc.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeTo/fade_desc.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp Changed

@@ -23,24 +23,23 @@
  */
 class AVDM_Fade : public  ADM_coreVideoFilterCached
 {
-                uint32_t        max;
-                void            boundsCheck(void);
 protected:
                 fade            param;
+                uint32_t        max;
+                void            boundsCheck(void);
                 bool            buildLut(void);
 
 public:
                                 AVDM_Fade(ADM_coreVideoFilter *previous,CONFcouple *conf);
                                 ~AVDM_Fade();
 
-        virtual const char   *getConfiguration(void);                   /// Return  current configuration as a human readable string
-        virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
-	 //  virtual FilterInfo  *getInfo(void);                             /// Return picture parameters after this filter
-        virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
-		virtual void setCoupledConf(CONFcouple *couples);
-        virtual bool         configure(void) ;           /// Start graphical user interface
-        uint16_t             lookupLuma[256][256];
-        uint16_t             lookupChroma[256][256];
+        virtual const char      *getConfiguration(void); /// Return  current configuration as a human readable string
+        virtual bool            getNextFrame(uint32_t *fn,ADMImage *image); /// Return the next image
+        virtual bool            getCoupledConf(CONFcouple **couples) ; /// Return the current filter configuration
+        virtual void            setCoupledConf(CONFcouple *couples);
+        virtual bool            configure(void) ; /// Start graphical user interface
+        uint16_t                lookupLuma[256][256];
+        uint16_t                lookupChroma[256][256];
 
 };
 
@@ -49,13 +48,13 @@
 
 
 DECLARE_VIDEO_FILTER(AVDM_Fade,
-                1,0,0,              // Version
-                     ADM_UI_ALL,         // UI
-                     VF_TRANSFORM,            // Category
-                     "fadeToBlack",            // internal name (must be uniq!)
-                     QT_TRANSLATE_NOOP("fadeToBlack","Fade to black"),            // Display name
-                     QT_TRANSLATE_NOOP("fadeToBlack","Fade to black in/out.") // Description
-                 );   
+                    1,0,0,          // Version
+                    ADM_UI_ALL,     // UI
+                    VF_TRANSFORM,   // Category
+                    "fadeToBlack",  // internal name (must be uniq!)
+                    QT_TRANSLATE_NOOP("fadeToBlack","Fade to black"), // Display name
+                    QT_TRANSLATE_NOOP("fadeToBlack","Fade to black in/out.") // Description
+);
 /**
  * \fn configure
  * \brief UI configuration
@@ -64,29 +63,23 @@
  */
 bool  AVDM_Fade::configure()
 {
-  diaMenuEntry menuE[2]={{0,QT_TRANSLATE_NOOP("fadeToBlack","Out"),QT_TRANSLATE_NOOP("fadeToBlack","Fade out")},{1,QT_TRANSLATE_NOOP("fadeToBlack","In"),QT_TRANSLATE_NOOP("fadeToBlack","Fade in")}};
-  uint32_t start,end;
-  
-  
-while(1)
-{
+    diaMenuEntry menuE[2]={{0,QT_TRANSLATE_NOOP("fadeToBlack","Out"),QT_TRANSLATE_NOOP("fadeToBlack","Fade out")},{1,QT_TRANSLATE_NOOP("fadeToBlack","In"),QT_TRANSLATE_NOOP("fadeToBlack","Fade in")}};
+
     uint32_t eInOut=(uint32_t)param.inOut;
 
     diaElemMenu     menu(&(eInOut),QT_TRANSLATE_NOOP("fadeToBlack","_Fade type:"), 2,menuE);
     diaElemTimeStamp start(&(param.startFade),QT_TRANSLATE_NOOP("fadeToBlack","_Start time:"),0,max);
     diaElemTimeStamp end(&(param.endFade),QT_TRANSLATE_NOOP("fadeToBlack","_End time:"),0,max);
     diaElem *elems[3]={&menu,&start,&end};
-  
+
     if( diaFactoryRun(QT_TRANSLATE_NOOP("fadeToBlack","Fade to black"),3+0*1,elems))
     {
         param.inOut=eInOut;
         buildLut();
         boundsCheck();
         return 1;
-    }else
-        return 0;
-} 
-  return 1;
+    }
+    return 0;
 }
 /**
  *      \fn getConfiguration
@@ -97,7 +90,8 @@
  static char conf[256];
     std::string start=std::string(ADM_us2plain(param.startFade*1000LL));
     std::string end=std::string(ADM_us2plain(param.endFade*1000LL));
-    snprintf(conf,255," Fade : Start %s End %s",start.c_str(),end.c_str());
+    const char *type=(param.inOut)? "in" : "out";
+    snprintf(conf,255," Fade %s: Start %s End %s",type,start.c_str(),end.c_str());
     return conf;
 }
 
@@ -146,8 +140,6 @@
  */
 AVDM_Fade::~AVDM_Fade(void)
 {
-                
-  
 }
 
 /**
@@ -158,84 +150,77 @@
  */
 bool AVDM_Fade::getNextFrame(uint32_t *fn,ADMImage *image)
 {
-  *fn=nextFrame;
-  ADMImage *next= vidCache->getImage(nextFrame);
-  if(!next)
-  {
-      ADM_info("[Fade] Cant get image \n");
-      return false;
-  }
-  
-  image->Pts=next->Pts;
-  
-  uint64_t absPts=next->Pts+getAbsoluteStartTime();
-  
-  bool out_of_scope=false;
-  if(absPts<param.startFade*1000LL) out_of_scope=true;
-  if(absPts>param.endFade*1000LL)   out_of_scope=true;
-  
-  
-  if( out_of_scope)
-  {
-      image->duplicate(next);
-      nextFrame++;
-      vidCache->unlockAll();
-      return true;
-  }
-  
-  double scope=1000LL*(param.endFade-param.startFade);
-  double in;
-  if(!scope) 
-  {
-      scope=1;
-      in=1;
-  }else
-  {
+    *fn=nextFrame;
+    ADMImage *next= vidCache->getImage(nextFrame);
+    if(!next)
+    {
+        ADM_info("[Fade] Cant get image \n");
+        return false;
+    }
+    image->Pts=next->Pts;
+    uint64_t absPts=next->Pts+getAbsoluteStartTime();
+    bool out_of_scope=false;
+
+    if(absPts<param.startFade*1000LL) out_of_scope=true;
+    if(absPts>param.endFade*1000LL)   out_of_scope=true;
+
+    if( out_of_scope)
+    {
+        image->duplicate(next);
+        nextFrame++;
+        vidCache->unlockAll();
+        return true;
+    }
+    double scope=1000LL*(param.endFade-param.startFade);
+    double in;
+    if(!scope)
+    {
+        scope=1;
+        in=1;
+    }else
+    {
         in=absPts-param.startFade*1000LL;
-  }
+    }
     in=in/scope;
     in*=255;
-  
-  
-  uint32_t offset=(uint32_t)floor(in+0.4); // normalized to 0--255
-  
 
-  if(param.toBlack)
-  {
-    uint8_t *splanes[3],*dplanes[3];
-    int  spitches[3],dpitches[3];
+    uint32_t offset=(uint32_t)floor(in+0.4); // normalized to 0--255
 
-    next->GetReadPlanes(splanes);
-    next->GetPitches(spitches);
-    image->GetReadPlanes(dplanes);
-    image->GetPitches(dpitches);
-
-    for(int i=0;i<3;i++)
+    if(param.toBlack)
     {
-        uint16_t *indx=lookupChroma[offset];
-        if(!i) indx=lookupLuma[offset];
-        int    w=(int)image->GetWidth((ADM_PLANE)i);
-        int    h=(int)image->GetHeight((ADM_PLANE)i);
-        uint8_t *s=splanes[i];
-        uint8_t *d=dplanes[i];
-        for(int y=0;y<h;y++)
+        uint8_t *splanes[3],*dplanes[3];
+        int spitches[3],dpitches[3];
+
+        next->GetReadPlanes(splanes);
+        next->GetPitches(spitches);
+        image->GetReadPlanes(dplanes);
+        image->GetPitches(dpitches);
+
+        for(int i=0;i<3;i++)
         {
-            for(int x=0;x<w;x++)
+            uint16_t *indx=lookupChroma[offset];
+            if(!i) indx=lookupLuma[offset];
+            int w=(int)image->GetWidth((ADM_PLANE)i);
+            int h=(int)image->GetHeight((ADM_PLANE)i);
+            uint8_t *s=splanes[i];
+            uint8_t *d=dplanes[i];
+            for(int y=0;y<h;y++)
             {
-                d[x]=indx[s[x]]>>8;
+                for(int x=0;x<w;x++)
+                {
+                    d[x]=indx[s[x]]>>8;
+                }
+                d+=dpitches[i];
+                s+=spitches[i];
             }
-            d+=dpitches[i];
-            s+=spitches[i];
-        }        
+        }
+        vidCache->unlockAll();
+        nextFrame++;
+        return 1;
     }
     vidCache->unlockAll();
     nextFrame++;
     return 1;
-  }
-
-  vidCache->unlockAll();
-  nextFrame++;
-  return 1;
 }
 /**
  * \fn buildLut
@@ -244,25 +229,23 @@
  */
 bool  AVDM_Fade::buildLut(void)
 {
-  float f,ration;
-  for(int i=0;i<256;i++)
-  {
-    if(!param.inOut) ration=255-i;
-    else ration=i;
-    for(int r=0;r<256;r++)
+    float f,ration;
+    for(int i=0;i<256;i++)
     {
-      f=r;
-      f=f*ration;
-      lookupLuma[i][r]=(uint16_t)(f+0.4);
-
-      f=r-128;
-      f=f*ration;
-      lookupChroma[i][r]=(128<<8)+(uint16_t)(f+0.4);
+        if(!param.inOut) ration=255.-i;
+        else ration=(float)i;
+        for(int r=0;r<256;r++)
+        {
+            f=(float)r;
+            f=f*ration;
+            lookupLuma[i][r]=(uint16_t)(f+0.4);
 
+            f=r-128.;
+            f=f*ration;
+            lookupChroma[i][r]=(128<<8)+(uint16_t)(f+0.4);
+        }
     }
-    
-  }
-  return true;
+    return true;
 }
 /**
  * \fn boundsCheck
@@ -282,6 +265,3 @@
         param.startFade=0;
 }
 //EOF
-
-
-

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp Changed

@@ -45,7 +45,7 @@
  {QT_TRANSLATE_NOOP("resampleFps","23.976 (Film)"),  24000,1001},
  {QT_TRANSLATE_NOOP("resampleFps","29.97 (NTSC)"),   30000,1001},
  {QT_TRANSLATE_NOOP("resampleFps","50 (Pal)"),       50000,1000},
- {QT_TRANSLATE_NOOP("resampleFps","59.93  (NTSC)"),  60000,1001}
+ {QT_TRANSLATE_NOOP("resampleFps","59.94  (NTSC)"),  60000,1001}
 };
 
 #define nbPredefined (sizeof(predefinedFps)/sizeof(PredefinedFps_t))
@@ -92,8 +92,11 @@
 {
     float f=configuration.newFpsNum*1000;
     f/=configuration.newFpsDen;
+    f+=0.49;
     info.frameIncrement=ADM_UsecFromFps1000((uint32_t)f);
-  
+    info.timeBaseDen=configuration.newFpsNum;
+    info.timeBaseNum=configuration.newFpsDen;
+
     return true;
 }
 /**
@@ -189,10 +192,11 @@
           if(false==refill()) return false;
           prefillDone=true;
     }
-    float offset=configuration.newFpsDen;
+    double offset=configuration.newFpsDen;
     offset*=1000000LL;
     offset*=nextFrame;
-    offset=(offset+(configuration.newFpsNum/2-1))/configuration.newFpsNum;
+    offset/=configuration.newFpsNum;
+    offset+=0.49;
     uint64_t thisTime=baseTime+(uint64_t)offset;
 
 again:

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp Changed

@@ -35,13 +35,18 @@
         1.454545  // PAL 704:576 DAR 16:9 PAR 16:11
     }
 };
-#define aprintf
+
+#if 0
+#define aprintf printf
+#else
+#define aprintf(...) {}
+#endif
 
 resizeWindow::resizeWindow(QWidget *parent, resParam *param) : QDialog(parent)
- {
-     ui.setupUi(this);
-	 lastPercentage = 100;
-     _param=param;
+{
+    ui.setupUi(this);
+    lastPercentage = 100;
+    _param=param;
 
 #define ADD_PAR(x) ui.comboBoxSource->addItem(x); ui.comboBoxDestination->addItem(x);
 
@@ -59,29 +64,35 @@
         ADD_PAR("NTSC 704:480 DAR 16:9 PAR 40:33")
     }
 
-     ui.lockArCheckBox->setChecked(_param->rsz.lockAR);
-     ui.checkBoxRoundup->setChecked(_param->rsz.roundup);
-     ui.spinBoxWidth->setValue(_param->rsz.width);
-     ui.spinBoxHeight->setValue(_param->rsz.height);
-     ui.horizontalSlider->setValue(100);
-	 ui.comboBoxAlgo->setCurrentIndex(_param->rsz.algo);
-     ui.comboBoxSource->setCurrentIndex(_param->rsz.sourceAR);
-     ui.comboBoxDestination->setCurrentIndex(_param->rsz.targetAR);
-     if(_param->rsz.lockAR)
-         updateWidthHeightSpinners();
-     enableControls(_param->rsz.lockAR);
-
-	 connect(ui.comboBoxSource, SIGNAL(currentIndexChanged(int)), this, SLOT(aspectRatioChanged(int)));
-	 connect(ui.comboBoxDestination, SIGNAL(currentIndexChanged(int)), this, SLOT(aspectRatioChanged(int)));
-	 connect(ui.checkBoxRoundup, SIGNAL(toggled(bool)), this, SLOT(roundupToggled(bool)));
-	 connect(ui.lockArCheckBox, SIGNAL(toggled(bool)), this, SLOT(lockArToggled(bool)));
-	 connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(okButtonClicked()));
-
-	 connectDimensionControls();
- }
-
- void resizeWindow::gather(void)
- {
+    ui.lockArCheckBox->setChecked(_param->rsz.lockAR);
+    ui.checkBoxRoundup->setChecked(_param->rsz.roundup);
+
+    ui.spinBoxWidth->setKeyboardTracking(false);
+    ui.spinBoxHeight->setKeyboardTracking(false);
+    ui.percentageSpinBox->setKeyboardTracking(false);
+
+    ui.spinBoxWidth->setValue(_param->rsz.width & 0xfffffe);
+    ui.spinBoxHeight->setValue(_param->rsz.height & 0xfffffe);
+    ui.horizontalSlider->setValue(100);
+    ui.comboBoxAlgo->setCurrentIndex(_param->rsz.algo);
+    ui.comboBoxSource->setCurrentIndex(_param->rsz.sourceAR);
+    ui.comboBoxDestination->setCurrentIndex(_param->rsz.targetAR);
+    if(_param->rsz.lockAR)
+        updateWidthHeightSpinners();
+    enableControls(_param->rsz.lockAR);
+    roundupToggled(_param->rsz.roundup);
+
+    connect(ui.comboBoxSource, SIGNAL(currentIndexChanged(int)), this, SLOT(aspectRatioChanged(int)));
+    connect(ui.comboBoxDestination, SIGNAL(currentIndexChanged(int)), this, SLOT(aspectRatioChanged(int)));
+    connect(ui.checkBoxRoundup, SIGNAL(toggled(bool)), this, SLOT(roundupToggled(bool)));
+    connect(ui.lockArCheckBox, SIGNAL(toggled(bool)), this, SLOT(lockArToggled(bool)));
+    connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(okButtonClicked()));
+
+    connectDimensionControls();
+}
+
+void resizeWindow::gather(void)
+{
     _param->rsz.width=ui.spinBoxWidth->value();
     _param->rsz.height=ui.spinBoxHeight->value();
     _param->rsz.algo=ui.comboBoxAlgo->currentIndex();
@@ -89,197 +100,206 @@
     _param->rsz.targetAR=ui.comboBoxDestination->currentIndex();
     _param->rsz.lockAR=ui.lockArCheckBox->isChecked();
     _param->rsz.roundup=ui.checkBoxRoundup->isChecked();
- }
- 
- void resizeWindow::sliderChanged(int value)
+}
+
+void resizeWindow::sliderChanged(int value)
 {
-	disconnectDimensionControls();
+    disconnectDimensionControls();
 
-	percentageSpinBoxChanged(value);
+    percentageSpinBoxChanged(value);
 
-	connectDimensionControls();
+    connectDimensionControls();
 }
 
 void resizeWindow::percentageSpinBoxChanged(int value)
 {
-	disconnectDimensionControls();
+    disconnectDimensionControls();
+
+    float width = _param->originalWidth;
 
-	if (ui.checkBoxRoundup->isChecked())
-	{
-		if (lastPercentage > value)
-			ui.spinBoxWidth->setValue(ui.spinBoxWidth->value() - 16);
-		else
-			ui.spinBoxWidth->setValue(ui.spinBoxWidth->value() + 16);
-	}
-	else
-	{
-		float width = _param->originalWidth;
+    width /= 100.;
+    width *= value;
+    width += 0.5;
 
-		width /= 100.;
-		width *= value;
+    uint32_t iw = floor(width);
 
-		ui.spinBoxWidth->setValue(floor(width + 0.5));
-	}
+    if (ui.checkBoxRoundup->isChecked())
+    {
+        iw = (iw + 7) & 0xfffff0;
+        if ((int)iw == ui.spinBoxWidth->value())
+        {
+            if (lastPercentage > value)
+                iw = iw >= 32 ? iw - 16 : 16;
+            else
+                iw += 16;
+        }
+    }
 
-	updateWidthHeightSpinners(false);
+    ui.spinBoxWidth->setValue(iw);
 
-	lastPercentage = ui.percentageSpinBox->value();
+    updateWidthHeightSpinners(false);
 
-	connectDimensionControls();
+    lastPercentage = ui.percentageSpinBox->value();
+
+    connectDimensionControls();
 }
 
 void resizeWindow::widthSpinBoxChanged(int value)
 {
-	disconnectDimensionControls();
+    disconnectDimensionControls();
 
-	if (ui.lockArCheckBox->isChecked())
-		updateWidthHeightSpinners(false);
+    if (ui.lockArCheckBox->isChecked())
+        updateWidthHeightSpinners(false);
+    else
+        ui.spinBoxWidth->setValue((uint32_t)value & 0xfffffe);
 
-	connectDimensionControls();
+    connectDimensionControls();
 }
 
 void resizeWindow::heightSpinBoxChanged(int value)
 {
-	disconnectDimensionControls();
+    disconnectDimensionControls();
 
-	if (ui.lockArCheckBox->isChecked())
-		updateWidthHeightSpinners(true);
+    if (ui.lockArCheckBox->isChecked())
+        updateWidthHeightSpinners(true);
+    else
+        ui.spinBoxHeight->setValue((uint32_t)value & 0xfffffe);
 
-	connectDimensionControls();
+    connectDimensionControls();
 }
 
 void resizeWindow::aspectRatioChanged(int index)
 {
-	disconnectDimensionControls();
+    disconnectDimensionControls();
 
-	if (ui.lockArCheckBox->isChecked())
-		updateWidthHeightSpinners();
+    if (ui.lockArCheckBox->isChecked())
+        updateWidthHeightSpinners();
 
-	connectDimensionControls();
+    connectDimensionControls();
 }
 
 void resizeWindow::disconnectDimensionControls()
 {
-	disconnect(ui.spinBoxHeight, SIGNAL(valueChanged(int)), this, SLOT(heightSpinBoxChanged(int)));
-	disconnect(ui.spinBoxWidth, SIGNAL(valueChanged(int)), this, SLOT(widthSpinBoxChanged(int)));
-	disconnect(ui.horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(sliderChanged(int)));
-	disconnect(ui.percentageSpinBox, SIGNAL(valueChanged(int)), this, SLOT(percentageSpinBoxChanged(int)));
+    disconnect(ui.spinBoxHeight, SIGNAL(valueChanged(int)), this, SLOT(heightSpinBoxChanged(int)));
+    disconnect(ui.spinBoxWidth, SIGNAL(valueChanged(int)), this, SLOT(widthSpinBoxChanged(int)));
+    disconnect(ui.horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(sliderChanged(int)));
+    disconnect(ui.percentageSpinBox, SIGNAL(valueChanged(int)), this, SLOT(percentageSpinBoxChanged(int)));
 }
 
 void resizeWindow::connectDimensionControls()
 {
-	connect(ui.spinBoxHeight, SIGNAL(valueChanged(int)), this, SLOT(heightSpinBoxChanged(int)));
-	connect(ui.spinBoxWidth, SIGNAL(valueChanged(int)), this, SLOT(widthSpinBoxChanged(int)));
-	connect(ui.horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(sliderChanged(int)));
-	connect(ui.percentageSpinBox, SIGNAL(valueChanged(int)), this, SLOT(percentageSpinBoxChanged(int)));
+    connect(ui.spinBoxHeight, SIGNAL(valueChanged(int)), this, SLOT(heightSpinBoxChanged(int)));
+    connect(ui.spinBoxWidth, SIGNAL(valueChanged(int)), this, SLOT(widthSpinBoxChanged(int)));
+    connect(ui.horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(sliderChanged(int)));
+    connect(ui.percentageSpinBox, SIGNAL(valueChanged(int)), this, SLOT(percentageSpinBoxChanged(int)));
 }
 
 void resizeWindow::updateWidthHeightSpinners(bool useHeightAsRef)
 {
-	int sar = ui.comboBoxSource->currentIndex();
-	int dar = ui.comboBoxDestination->currentIndex();
-	float x = ui.spinBoxWidth->value();
-	float y = ui.spinBoxHeight->value();
-	float sr_mul = 1.;
-	float dst_mul = 1.;
-	float ar = 1.;
-
-	if (sar)
-	{  // source pixel aspect ratio is not 1:1
-		sr_mul = aspectRatio[_param->pal][sar];
-	}
+    int sar = ui.comboBoxSource->currentIndex();
+    int dar = ui.comboBoxDestination->currentIndex();
+    float x = ui.spinBoxWidth->value();
+    float y = ui.spinBoxHeight->value();
+    float sr_mul = 1.;
+    float dst_mul = 1.;
+    float ar = 1.;
+
+    if (sar)
+    {  // source pixel aspect ratio is not 1:1
+        sr_mul = aspectRatio[_param->pal][sar];
+    }
 
-	if (dar)
-	{  // dst pixel aspect ratio is not 1:1
-		dst_mul = 1 / aspectRatio[_param->pal][dar];
-	}
+    if (dar)
+    {  // dst pixel aspect ratio is not 1:1
+        dst_mul = 1 / aspectRatio[_param->pal][dar];
+    }
 
-	aprintf("source mul %02.2f , dst mul: %02.2f\n", sr_mul, dst_mul);
+    aprintf("source mul %02.2f , dst mul: %02.2f\n", sr_mul, dst_mul);
 
-	ar = _param->originalWidth / (_param->originalHeight / (sr_mul * dst_mul));
+    ar = _param->originalWidth / (_param->originalHeight / (sr_mul * dst_mul));
 
-	if (useHeightAsRef)
-		x = y * ar;
-	else
-		y = x / ar;
+    if (useHeightAsRef)
+        x = y * ar;
+    else
+        y = x / ar;
 
-	aprintf("x, y: %03f, %03f\n", x, y);
+    aprintf("x, y: %03f, %03f\n", x, y);
 
-	int xx = floor(x + 0.5);
-	int yy = floor(y + 0.5);
+    int xx = floor(x + 0.5);
+    int yy = floor(y + 0.5);
 
-	if (xx & 1)
-		xx--;
+    if (xx & 1)
+        xx--;
 
-	if (yy & 1)
-		yy--;
+    if (yy & 1)
+        yy--;
 
-	roundUp(xx, yy);
-	updateSlider();
+    roundUp(xx, yy);
+    updateSlider();
 }
 
 void resizeWindow::updateSlider()
 {
-	float percent = (((float)ui.spinBoxWidth->value() / (float)_param->originalWidth) * 100.) + 0.5;
+    float percent = (((float)ui.spinBoxWidth->value() / (float)_param->originalWidth) * 100.) + 0.5;
 
-	ui.horizontalSlider->setValue(percent);
-	ui.percentageSpinBox->setValue(percent);
+    ui.horizontalSlider->setValue(percent);
+    ui.percentageSpinBox->setValue(percent);
 }
 
 void resizeWindow::roundUp(int xx, int yy)
 {
-	float erx = 0.;
-	float ery = 0.;
+    float erx = 0.;
+    float ery = 0.;
 
-	if (ui.checkBoxRoundup->checkState())
-	{
-		int ox = xx, oy = yy;
+    if (ui.checkBoxRoundup->checkState())
+    {
+        int ox = xx, oy = yy;
 
-		xx = (xx + 7) & 0xfffff0;
-		yy = (yy + 7) & 0xfffff0;
+        xx = (xx + 7) & 0xfffff0;
+        yy = (yy + 7) & 0xfffff0;
 
-		erx = xx - ox;
-		erx = erx / xx;
-		ery = yy - oy;
-		ery = ery / yy;
+        erx = xx - ox;
+        erx = erx / xx;
+        ery = yy - oy;
+        ery = ery / yy;
 
-		aprintf("x: %d -> %d : err %f\n", ox, xx, erx);
-		aprintf("y: %d -> %d : err %f\n", oy, yy, ery);
-	}
+        aprintf("x: %d -> %d : err %f\n", ox, xx, erx);
+        aprintf("y: %d -> %d : err %f\n", oy, yy, ery);
+    }
 
-	ui.spinBoxWidth->setValue(xx);
-	ui.spinBoxHeight->setValue(yy);
+    ui.spinBoxWidth->setValue(xx);
+    ui.spinBoxHeight->setValue(yy);
 
-	ui.labelErrorXY->setText(QString("%1").arg(erx * 100., 0, 'f', 2) + " / " + QString("%1").arg(ery * 100., 0, 'f', 2));
+    ui.labelErrorXY->setText(QString("%1").arg(erx * 100., 0, 'f', 2) + " / " + QString("%1").arg(ery * 100., 0, 'f', 2));
 }
 
 void resizeWindow::lockArToggled(bool toggled)
 {
-	if (ui.lockArCheckBox->isChecked())
-		widthSpinBoxChanged(0);
-	else
-		ui.checkBoxRoundup->setChecked(false);
+    if (ui.lockArCheckBox->isChecked())
+        widthSpinBoxChanged(0);
+    else
+        ui.checkBoxRoundup->setChecked(false);
 
     enableControls(toggled);
 }
 
 void resizeWindow::roundupToggled(bool toggled)
 {
-	if (toggled)
-	{
-		disconnectDimensionControls();
-
-		ui.spinBoxWidth->setSingleStep(16);
-		ui.spinBoxHeight->setSingleStep(16);
-		widthSpinBoxChanged(0);
-
-		connectDimensionControls();
-	}
-	else
-	{
-		ui.spinBoxWidth->setSingleStep(2);
-		ui.spinBoxHeight->setSingleStep(2);
-	}
+    if (toggled)
+    {
+        disconnectDimensionControls();
+
+        ui.spinBoxWidth->setSingleStep(16);
+        ui.spinBoxHeight->setSingleStep(16);
+        widthSpinBoxChanged(0);
+
+        connectDimensionControls();
+    }
+    else
+    {
+        ui.spinBoxWidth->setSingleStep(2);
+        ui.spinBoxHeight->setSingleStep(2);
+    }
 }
 
 void resizeWindow::enableControls(bool lockArChecked)
@@ -302,48 +322,46 @@
 
 void resizeWindow::okButtonClicked()
 {
-	if (ui.spinBoxWidth->value() & 1 || ui.spinBoxHeight->value() & 1)
-		GUI_Error_HIG(QT_TRANSLATE_NOOP("resize","Width and height cannot be odd"), NULL);
-	else
-		accept();
+    if (ui.spinBoxWidth->value() & 1 || ui.spinBoxHeight->value() & 1)
+        GUI_Error_HIG(QT_TRANSLATE_NOOP("resize","Width and height cannot be odd"), NULL);
+    else
+        accept();
 }
 
 /**
     \fn DIA_resize
     \brief Handle resize dialo
 */
-bool         DIA_resize(uint32_t originalWidth,uint32_t originalHeight,uint32_t fps1000,swresize *resize)
+bool DIA_resize(uint32_t originalWidth,uint32_t originalHeight,uint32_t fps1000,swresize *resize)
 {
-bool r=false;
-      resParam param={  
+    bool r=false;
+    resParam param={
                         originalWidth,
                         originalHeight,
                         fps1000,
                         0,
                         *resize
-                    };
-      //
-      if((fps1000>24600 && fps1000<25400) || (fps1000>49200 && fps1000<50800))
-        {
-                param.pal=1;
-        }
-       
+                   };
 
-     // Fetch info
-     resizeWindow resizewindow(qtLastRegisteredDialog(), &param);
 
-     qtRegisterDialog(&resizewindow);
+    if((fps1000>24600 && fps1000<25400) || (fps1000>49200 && fps1000<50800))
+        param.pal=1;
 
-     if(resizewindow.exec()==QDialog::Accepted)
-     {
-       resizewindow.gather();
-       *resize=param.rsz;
-       r=true;
-     }
+    // Fetch info
+    resizeWindow resizewindow(qtLastRegisteredDialog(), &param);
 
-	 qtUnregisterDialog(&resizewindow);
+    qtRegisterDialog(&resizewindow);
 
-     return r;
-}  
+    if(resizewindow.exec()==QDialog::Accepted)
+    {
+        resizewindow.gather();
+        *resize=param.rsz;
+        r=true;
+    }
+
+    qtUnregisterDialog(&resizewindow);
+
+    return r;
+}
 //********************************************
 //EOF

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.h -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.h Changed

@@ -7,42 +7,41 @@
 
 typedef struct resParam
 {
-	uint32_t originalWidth, originalHeight;
-	uint32_t fps1000;
+    uint32_t originalWidth, originalHeight;
+    uint32_t fps1000;
     uint32_t pal;
     swresize rsz;
-	
 } resParam;
 
 class resizeWindow : public QDialog
 {
-	Q_OBJECT
+    Q_OBJECT
 
 private:
-	int lastPercentage;
-	void updateWidthHeightSpinners(bool useHeightAsRef = false);
-	void updateSlider();
-	void connectDimensionControls();
-	void disconnectDimensionControls();
-	void roundUp(int xx, int yy);
-	void enableControls(bool enable);
+    int lastPercentage;
+    void updateWidthHeightSpinners(bool useHeightAsRef = false);
+    void updateSlider();
+    void connectDimensionControls();
+    void disconnectDimensionControls();
+    void roundUp(int xx, int yy);
+    void enableControls(bool enable);
 
 protected:
-	resParam *_param;
+    resParam *_param;
 
 public:
-	resizeWindow(QWidget *parent, resParam *param);
-	Ui_resizeDialog ui;
+    resizeWindow(QWidget *parent, resParam *param);
+    Ui_resizeDialog ui;
 
 public slots:
-	void gather(void);
-	void okButtonClicked();
-	void sliderChanged(int value);
-	void percentageSpinBoxChanged(int value);
-	void widthSpinBoxChanged(int value);
-	void heightSpinBoxChanged(int value);
-	void lockArToggled(bool toggled);
-	void roundupToggled(bool toggled);
-	void aspectRatioChanged(int index);
+    void gather(void);
+    void okButtonClicked();
+    void sliderChanged(int value);
+    void percentageSpinBoxChanged(int value);
+    void widthSpinBoxChanged(int value);
+    void heightSpinBoxChanged(int value);
+    void lockArToggled(bool toggled);
+    void roundupToggled(bool toggled);
+    void aspectRatioChanged(int index);
 };
-#endif	// Q_resizing_h
+#endif // Q_resizing_h

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp Changed

@@ -22,21 +22,12 @@
 #include "vaapiFilter.h"
 #include "vaapiFilter_desc.cpp"
 
-
-
-
-#include "ADM_coreLibVA.h"
-//
-#define ADM_INVALID_FRAME_NUM 0x80000000
-#define ADM_NB_SURFACES 3
-
 /**
     \class vaapiVideoFilter
 */
 class vaapiVideoFilter : public  ADM_coreVideoFilterCached
 {
 protected:
-                    ADMColorScalerSimple *scaler;
                     ADM_vaSurface        *sourceSurface,*destSurface;
                     VAConfigID           configID;
                     VAContextID          contextID;
@@ -61,11 +52,11 @@
 // Add the hook to make it valid plugin
 DECLARE_VIDEO_FILTER(   vaapiVideoFilter,   // Class
                         1,0,0,              // Version
-                        ADM_UI_QT4+ADM_FEATURE_LIBVA,     // We need a display for VDPAU; so no cli...
+                        (ADM_UI_QT4+ADM_FEATURE_LIBVA), // We need a display for VDPAU; so no cli...
                         VF_TRANSFORM,            // Category
                         "vaapiResize",            // internal name (must be uniq!)
-                        QT_TRANSLATE_NOOP("vaapiResize","vaapi: Resize"),            // Display name
-                        QT_TRANSLATE_NOOP("vaapiResize","vaapi: Resize image using vaapi.") // Description
+                        QT_TRANSLATE_NOOP("vaapiResize","VA-API Resize"), // Display name
+                        QT_TRANSLATE_NOOP("vaapiResize","Resize image using VA-API.") // Description
 )
        
 /**
@@ -74,12 +65,7 @@
 bool vaapiVideoFilter::setupVaapi(void)
 {
     FilterInfo *prevInfo=previousFilter->getInfo();
-    FilterInfo *currentInfo=getInfo();
 
-    scaler=NULL;
-    info.width=configuration.targetWidth;
-    info.height=configuration.targetHeight;
-    
     if(configuration.targetWidth==prevInfo->width && configuration.targetHeight==prevInfo->height && !configuration.mpeg2ToPC)
     {
         ADM_info("Passthrough\n");
@@ -97,17 +83,17 @@
     
     // Allocate source and target surface
     sourceSurface=ADM_vaSurface::allocateWithSurface(prevInfo->width,prevInfo->height);
-    destSurface=ADM_vaSurface::allocateWithSurface(currentInfo->width,currentInfo->height);
+    destSurface=ADM_vaSurface::allocateWithSurface(configuration.targetWidth,configuration.targetHeight);
     if(!sourceSurface || !destSurface )
     {
         ADM_warning("Cannot allocate surface\n");
         cleanupVaapi();
         return false;
     }
-    VASurfaceID surfaces[2]={sourceSurface->surface,destSurface->surface};
+    // Only the output surface matters for context creation
     VAStatus status= vaCreateContext(admLibVA::getDisplay(),configID,
                           configuration.targetWidth,configuration.targetHeight, VA_PROGRESSIVE,
-                          surfaces, 2,
+                          &destSurface->surface, 1,
                           &contextID);
     if(status!=VA_STATUS_SUCCESS)
     {
@@ -199,18 +185,19 @@
 */
 bool vaapiVideoFilter::configure( void) 
 {
-     diaElemUInteger  tWidth(&(configuration.targetWidth),QT_TRANSLATE_NOOP("vaapiResize","Width :"),16,2048);
-     diaElemUInteger  tHeight(&(configuration.targetHeight),QT_TRANSLATE_NOOP("vaapiResize","Height :"),16,2048);
-     diaElemToggle    tMpeg2PC(&(configuration.mpeg2ToPC),   QT_TRANSLATE_NOOP("vaapiResize","mpeg->PC:"));
+     diaElemUInteger  tWidth(&(configuration.targetWidth),QT_TRANSLATE_NOOP("vaapiResize","Width :"),16,MAXIMUM_SIZE);
+     diaElemUInteger  tHeight(&(configuration.targetHeight),QT_TRANSLATE_NOOP("vaapiResize","Height :"),16,MAXIMUM_SIZE);
+     diaElemToggle    tMpeg2PC(&(configuration.mpeg2ToPC),QT_TRANSLATE_NOOP("vaapiResize","mpeg->PC"));
      
      diaElem *elems[]={&tWidth,&tHeight,&tMpeg2PC};
      
      if(diaFactoryRun(QT_TRANSLATE_NOOP("vaapiResize","vaapi"),sizeof(elems)/sizeof(diaElem *),elems))
      {
-                ADM_info("New dimension : %d x %d\n",info.width,info.height);
+                ADM_info("Requested dimensions: %ux%u\n",configuration.targetWidth,configuration.targetHeight);
                 cleanupVaapi();
                 bool status=setupVaapi();
                 updateInfo(status);
+                ADM_info("Effective dimensions: %ux%u\n",info.width,info.height);
                 return true;
      }
      return false;

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilterDeint.cpp Added

@@ -0,0 +1,766 @@
+/**
+    \brief vaapi filters
+    \author mean (C) 2016
+ *  Use VA-API video processing API
+ * (c) mean 2016
+ * 
+*/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "ADM_default.h"
+#include <list>
+#include "ADM_coreLibVA.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_videoFilterCache.h"
+#include "ADM_vidMisc.h"
+#include "DIA_factory.h"
+#include "DIA_coreToolkit.h"
+#include "vaapiFilterDeint.h"
+#include "vaapiFilterDeint_desc.cpp"
+
+/**
+    \class vaapiSlot
+*/
+class vaapiSlot
+{
+public:
+    ADM_vaSurface           *surface;
+    bool                    external;
+    uint64_t                pts;
+
+                            vaapiSlot();
+                            ~vaapiSlot();
+    void                    reset(void);
+};
+
+vaapiSlot::vaapiSlot()
+{
+    reset();
+}
+vaapiSlot::~vaapiSlot() {}
+
+void vaapiSlot::reset(void)
+{
+    surface=NULL;
+    external=false;
+    pts=ADM_NO_PTS;
+}
+#define ADM_VAAPI_DEINT_MAX_REF 8
+
+/**
+    \class vaapiVideoFilterDeint
+*/
+class vaapiVideoFilterDeint : public  ADM_coreVideoFilterCached
+{
+protected:
+    enum
+    {
+        ADM_VAAPI_DEINT_TOP_FIELD_FIRST=0,
+        ADM_VAAPI_DEINT_BOTTOM_FIELD_FIRST=1
+    };
+    enum
+    {
+        ADM_VAAPI_DEINT_SEND_FRAME=0,
+        ADM_VAAPI_DEINT_SEND_FIELD=1
+    };
+
+    vaapiSlot               *inputQueue;
+    uint32_t                queueLength;
+    std::list <ADM_vaSurface *> freeSurfaces;
+    ADM_vaSurface           *surfacePool[ADM_VAAPI_DEINT_MAX_REF];
+    ADM_vaSurface           *outputSurface;
+    VAConfigID              configId;
+    VAContextID             contextId;
+    VABufferID              filterBuffer;
+    uint32_t                algoCount; // actually supported by hardware and driver
+    uint32_t                unsupported; // specified deint method rejected by driver
+    VASurfaceID             *forwardRefs, *backwardRefs;
+    uint32_t                nbForwardRefs,nbBackwardRefs;
+
+    vaapiFilterDeint        configuration;
+    uint64_t                deltaPts;
+    bool                    passThrough;
+    bool                    preloadCompleted;
+    bool                    secondField;
+
+    bool                    setupVaapi(void);
+    bool                    cleanupVaapi(void);
+
+    bool                    rotateSlots(void);
+    bool                    clearSlots(void);
+    bool                    fillSlot(uint32_t slot,ADMImage *image);
+
+    bool                    updateInfo(bool status);
+
+public:
+        
+                            vaapiVideoFilterDeint(ADM_coreVideoFilter *previous,CONFcouple *conf);
+                            ~vaapiVideoFilterDeint();
+
+    virtual const char      *getConfiguration(void); // Return  current configuration as a human readable string
+    virtual bool            getNextFrame(uint32_t *fn,ADMImage *image); // Return the next image
+    virtual bool            getCoupledConf(CONFcouple **couples); // Return the current filter configuration
+    virtual void            setCoupledConf(CONFcouple *couples);
+    virtual bool            configure(void); // Start graphical user interface
+    virtual bool            goToTime(uint64_t usSeek);
+};
+
+// Add the hook to make it valid plugin
+DECLARE_VIDEO_FILTER(       vaapiVideoFilterDeint, // Class
+                            1,0,0, // Version
+                            (ADM_UI_QT4+ADM_FEATURE_LIBVA), // We need a display for VA-API; so no cli...
+                            VF_INTERLACING, // Category
+                            "vaapiDeint", // internal name (must be uniq!)
+                            QT_TRANSLATE_NOOP("vaapiDeint","VA-API Deinterlacer"), // Display name
+                            QT_TRANSLATE_NOOP("vaapiDeint","Deinterlace and optionally resize video using VA-API.") // Description
+)
+
+static const char *deintModeToString(uint32_t mode)
+{
+    switch(mode)
+    {
+#define DEINT(algo,name) case VAProcDeinterlacing##algo: return #name;
+        DEINT(Bob,Bob)
+        DEINT(Weave,Weave)
+        DEINT(MotionAdaptive,Motion-Adaptive)
+        DEINT(MotionCompensated,Motion-Compensated)
+        default:
+            return "Invalid";
+#undef DEINT
+    }
+}
+
+/**
+    \fn setupVaapi
+*/
+bool vaapiVideoFilterDeint::setupVaapi(void)
+{
+    unsupported = 0;
+
+    if(!admLibVA::isOperationnal())
+    {
+        ADM_warning("HW accel is not available.\n");
+        return false;
+    }
+
+    configId = admLibVA::createFilterConfig();
+    if(configId == VA_INVALID)
+    {
+        ADM_warning("Cannot create config\n");
+        return false;
+    }
+    // Allocate output surface
+    uint32_t outWidth=configuration.targetWidth;
+    uint32_t outHeight=configuration.targetHeight;
+    FilterInfo *prevInfo=previousFilter->getInfo();
+    ADM_assert(prevInfo);
+
+    if(!configuration.resize)
+    {
+        outWidth=prevInfo->width;
+        outHeight=prevInfo->height;
+    }
+
+    outputSurface = ADM_vaSurface::allocateWithSurface(outWidth, outHeight);
+    if(!outputSurface)
+    {
+        ADM_warning("Cannot allocate output surface with size %u x %u\n", outWidth, outHeight);
+        cleanupVaapi();
+        return false;
+    }
+
+    VAStatus status = vaCreateContext(admLibVA::getDisplay(), configId,
+                        outWidth, outHeight, VA_PROGRESSIVE,
+                        &outputSurface->surface, 1, &contextId);
+
+    if(status != VA_STATUS_SUCCESS)
+    {
+        ADM_warning("Cannot create context: error %d (%s)\n",status,vaErrorStr(status));
+        cleanupVaapi();
+        return false;
+    }
+    // Query supported deinterlacing algorithms
+    VAProcFilterCapDeinterlacing deintCaps[VAProcDeinterlacingCount];
+    algoCount = VAProcDeinterlacingCount;
+
+    status = vaQueryVideoProcFilterCaps(admLibVA::getDisplay(), contextId,
+                        VAProcFilterDeinterlacing, &deintCaps, &algoCount);
+
+    if(status != VA_STATUS_SUCCESS)
+    {
+        ADM_warning("Cannot query deinterlacing capabilities: error %d (%s)\n",status,vaErrorStr(status));
+        cleanupVaapi();
+        return false;
+    }
+    if(algoCount)
+        ADM_info("Driver reports %u deinterlacing methods as supported.\n",algoCount);
+    else
+    {
+        ADM_error("Driver reports that deinterlacing is not supported.\n");
+        cleanupVaapi();
+        return false;
+    }
+    uint32_t i,best=(uint32_t)deintCaps[algoCount-1].type;
+    int algo = -1;
+    for(i=0; i < algoCount; i++)
+    {
+        if((uint32_t)deintCaps[i].type != configuration.deintMode)
+            continue;
+        algo = i;
+        break;
+    }
+    if(algo == -1)
+    {
+        ADM_warning("Requested deinterlacing mode %s is not supported.\n",deintModeToString(configuration.deintMode));
+        ADM_warning("Using %s instead.\n",deintModeToString(best));
+        unsupported = configuration.deintMode;
+        configuration.deintMode = best;
+    }
+    // Query required number of reference surfaces
+    VAProcFilterParameterBufferDeinterlacing deintParams;
+
+    deintParams.type = VAProcFilterDeinterlacing;
+    deintParams.algorithm = (VAProcDeinterlacingType)configuration.deintMode;
+    deintParams.flags = 0;
+
+    status = vaCreateBuffer(admLibVA::getDisplay(), contextId,
+                        VAProcFilterParameterBufferType, sizeof(deintParams),
+                        1, &deintParams, &filterBuffer);
+    if(status != VA_STATUS_SUCCESS)
+    {
+        ADM_warning("Cannot create parameter buffer: error %d (%s)\n",status,vaErrorStr(status));
+        cleanupVaapi();
+        return false;
+    }
+
+    VAProcPipelineCaps caps;
+
+    status = vaQueryVideoProcPipelineCaps(admLibVA::getDisplay(), contextId,
+                        &filterBuffer, 1, &caps);
+    if(status != VA_STATUS_SUCCESS)
+    {
+        ADM_warning("Cannot query video pipeline capabilities: error %d (%s)\n",status,vaErrorStr(status));
+        cleanupVaapi();
+        return false;
+    }
+    nbForwardRefs = caps.num_forward_references;
+    nbBackwardRefs = caps.num_backward_references;
+    if(nbForwardRefs)
+    {
+        forwardRefs = (VASurfaceID *)malloc(nbForwardRefs * sizeof(VASurfaceID));
+        if(!forwardRefs)
+        {
+            cleanupVaapi();
+            return false;
+        }
+    }
+    if(nbBackwardRefs)
+    {
+        backwardRefs = (VASurfaceID *)malloc(nbBackwardRefs * sizeof(VASurfaceID));
+        if(!backwardRefs)
+        {
+            cleanupVaapi();
+            return false;
+        }
+    }
+    queueLength = nbForwardRefs + nbBackwardRefs + 1;
+    ADM_info("Video processing pipeline for mode %s operates with %u forward and %u backward references.\n",
+                        deintModeToString(configuration.deintMode),
+                        nbForwardRefs,nbBackwardRefs);
+    if(queueLength + 1 > ADM_VAAPI_DEINT_MAX_REF)
+    {
+        ADM_error("Pipeline requires too many references (%u forward, %u back).\n",nbForwardRefs,nbBackwardRefs);
+        cleanupVaapi();
+        return false;
+    }
+    // Allocate source surfaces
+    for(i=0; i < queueLength; i++)
+    {
+        ADM_vaSurface *s = ADM_vaSurface::allocateWithSurface(prevInfo->width,prevInfo->height);
+        if(!s)
+        {
+            ADM_warning("Cannot allocate input surface %d\n",i);
+            cleanupVaapi();
+            return false;
+        }
+        surfacePool[i] = s;
+    }
+    freeSurfaces.clear();
+    for(i=0; i < queueLength; i++)  
+        freeSurfaces.push_back(surfacePool[i]);
+    inputQueue = new vaapiSlot[queueLength];
+    return true;    
+}
+/**
+    \fn cleanupVaapi
+*/
+bool vaapiVideoFilterDeint::cleanupVaapi(void)
+{
+    for(uint32_t i=0; i < queueLength; i++)
+    {
+        ADM_vaSurface *s = surfacePool[i];
+        if(s)
+        {
+            delete s;
+            surfacePool[i]=NULL;
+        }
+    }
+    if(filterBuffer!=VA_INVALID)
+    {
+        vaDestroyBuffer(admLibVA::getDisplay(), filterBuffer);
+        filterBuffer=VA_INVALID;
+    }
+    if(outputSurface)
+    {
+        delete outputSurface;
+        outputSurface=NULL;
+    }
+    if(configId!=VA_INVALID)
+    {
+        admLibVA::destroyFilterConfig(configId);
+        configId=VA_INVALID;
+    }
+    if(contextId!=VA_INVALID)
+    {
+        admLibVA::destroyFilterContext(contextId);
+        contextId=VA_INVALID;
+    }
+    if(forwardRefs)
+        free(forwardRefs);
+    forwardRefs=NULL;
+    if(backwardRefs)
+        free(backwardRefs);
+    backwardRefs=NULL;
+    if(inputQueue)
+        delete [] inputQueue;
+    inputQueue=NULL;
+    unsupported=0;
+    return true;
+}
+/**
+ * \fn updateInfo
+ * @param status
+ * @return 
+ */
+bool vaapiVideoFilterDeint::updateInfo(bool status)
+{
+    passThrough=!status;
+    memcpy(&info,previousFilter->getInfo(),sizeof(info));
+    if(passThrough)
+    {
+        ADM_warning("PassThrough mode\n");
+        return true;
+    }
+    if(configuration.framePerField==ADM_VAAPI_DEINT_SEND_FIELD)
+    {
+        info.frameIncrement /= 2;
+        if(info.timeBaseNum && info.timeBaseDen)
+        {
+            if(info.timeBaseDen <= 30000 || (info.timeBaseNum & 1))
+                info.timeBaseDen *= 2;
+            else
+                info.timeBaseNum /= 2;
+            /* The frame increment passed along the filter chain may be based on
+            the average frame rate, but we need the minimum increment here.
+            Check whether the time base ~ matches the average increment and derive
+            the minimum increment from time base if possible. */
+            double f=1000.*1000.;
+            f /= info.timeBaseDen;
+            f *= info.timeBaseNum;
+            f += 0.49;
+            if((uint64_t)f > (uint64_t)info.frameIncrement*3/4)
+                info.frameIncrement = (uint32_t)f;
+        }
+        ADM_info("New frame increment: %u us, new time base: %u / %u\n", info.frameIncrement, info.timeBaseNum, info.timeBaseDen);
+    }
+    if(configuration.resize)
+    {
+        info.width=configuration.targetWidth;
+        info.height=configuration.targetHeight;
+    }
+    return true;
+}
+/**
+    \fn constructor
+*/
+vaapiVideoFilterDeint::vaapiVideoFilterDeint(ADM_coreVideoFilter *in, CONFcouple *setup)
+        : ADM_coreVideoFilterCached(ADM_VAAPI_DEINT_MAX_REF,in,setup)
+{
+    preloadCompleted=false;
+    secondField=false;
+    configId=VA_INVALID;
+    contextId=VA_INVALID;
+    for(int i=0; i < ADM_VAAPI_DEINT_MAX_REF; i++)
+        surfacePool[i]=NULL;
+    outputSurface=NULL;
+    forwardRefs=NULL;
+    backwardRefs=NULL;
+    inputQueue=NULL;
+    queueLength=0;
+    nbForwardRefs=0;
+    nbBackwardRefs=0;
+    deltaPts=0;
+    if(!setup || !ADM_paramLoad(setup,vaapiFilterDeint_param,&configuration))
+    {
+        // Default value
+        configuration.deintMode=4;
+        configuration.fieldOrder=0;
+        configuration.framePerField=0;
+        configuration.targetWidth=info.width;
+        configuration.targetHeight=info.height;
+        configuration.resize=false;
+    }
+
+    myName="vaapiDeint";
+    bool status=setupVaapi();
+    updateInfo(status);
+}
+/**
+    \fn destructor
+*/
+vaapiVideoFilterDeint::~vaapiVideoFilterDeint()
+{
+    cleanupVaapi();
+}
+/**
+    \fn configure
+*/
+bool vaapiVideoFilterDeint::configure( void) 
+{
+    diaMenuEntry deintMethod[]={
+        { VAProcDeinterlacingBob,               QT_TRANSLATE_NOOP("vaapiDeint","Bob"),NULL },
+        { VAProcDeinterlacingWeave,             QT_TRANSLATE_NOOP("vaapiDeint","Weave"),NULL },
+        { VAProcDeinterlacingMotionAdaptive,    QT_TRANSLATE_NOOP("vaapiDeint","Motion-Adaptive"),NULL },
+        { VAProcDeinterlacingMotionCompensated, QT_TRANSLATE_NOOP("vaapiDeint","Motion-Compensated"),NULL }
+    };
+    diaMenuEntry fieldOrder[]={
+        { ADM_VAAPI_DEINT_TOP_FIELD_FIRST,          QT_TRANSLATE_NOOP("vaapiDeint","Top Field First"),NULL },
+        { ADM_VAAPI_DEINT_BOTTOM_FIELD_FIRST,       QT_TRANSLATE_NOOP("vaapiDeint","Bottom Field First"),NULL }
+    };
+    diaMenuEntry outputPolicy[]={
+        { ADM_VAAPI_DEINT_SEND_FRAME,   QT_TRANSLATE_NOOP("vaapiDeint","Frame per Frame"),NULL },
+        { ADM_VAAPI_DEINT_SEND_FIELD,   QT_TRANSLATE_NOOP("vaapiDeint","Double Framerate"),NULL }
+    };
+
+    diaElemMenu dMode(&configuration.deintMode, QT_TRANSLATE_NOOP("vaapiDeint","_Mode:"), 4, deintMethod);
+    diaElemMenu fOrder(&configuration.fieldOrder, QT_TRANSLATE_NOOP("vaapiDeint","_Field Order:"), 2, fieldOrder);
+    diaElemMenu outPol(&configuration.framePerField, QT_TRANSLATE_NOOP("vaapiDeint","_Output:"), 2, outputPolicy);
+
+    diaElemFrame frameDeint(QT_TRANSLATE_NOOP("vaapiDeint","Deinterlacing"));
+    frameDeint.swallow(&dMode);
+    frameDeint.swallow(&fOrder);
+    frameDeint.swallow(&outPol);
+
+    diaElemToggle tResize(&configuration.resize, QT_TRANSLATE_NOOP("vaapiDeint","_Resize"));
+    diaElemUInteger tWidth(&configuration.targetWidth, QT_TRANSLATE_NOOP("vaapiDeint","Width:"), 16, MAXIMUM_SIZE);
+    diaElemUInteger tHeight(&configuration.targetHeight, QT_TRANSLATE_NOOP("vaapiDeint","Height:"), 16, MAXIMUM_SIZE);
+
+    diaElemFrame frameResize(QT_TRANSLATE_NOOP("vaapiDeint","Transformation"));
+    frameResize.swallow(&tResize);
+    frameResize.swallow(&tWidth);
+    frameResize.swallow(&tHeight);
+
+    tResize.link(1,&tWidth);
+    tResize.link(1,&tHeight);
+
+    diaElem *elems[]={&frameDeint,&frameResize};
+    if(diaFactoryRun(QT_TRANSLATE_NOOP("vaapiDeint","VA-API Deinterlacer and Resizer"),2,elems))
+    {
+        cleanupVaapi();
+        bool status=setupVaapi();
+        if(unsupported)
+        {
+            
+            GUI_Info_HIG( ADM_LOG_IMPORTANT,
+                          QT_TRANSLATE_NOOP("vaapiDeint","Unsupported Mode"),
+                          QT_TRANSLATE_NOOP("vaapiDeint","Specified deinterlacing mode %s is not supported, replaced with %s."),
+                              deintModeToString(unsupported), deintModeToString(configuration.deintMode));
+            unsupported = 0;
+        }
+        if(!status)
+        {
+            GUI_Error_HIG(QT_TRANSLATE_NOOP("vaapiDeint","VA-API Setup Error"),
+                          QT_TRANSLATE_NOOP("vaapiDeint","Could not setup VA-API, purely passthrough operation."));
+        }
+        updateInfo(status);
+        return true;
+    }
+    return false;
+}
+/**
+    \fn getCoupledConf
+    \brief Return our current configuration as couple name=value
+*/
+bool vaapiVideoFilterDeint::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, vaapiFilterDeint_param, &configuration);
+}
+
+void vaapiVideoFilterDeint::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, vaapiFilterDeint_param, &configuration);
+}
+
+/**
+    \fn getConfiguration
+    \brief Return current setting as a string
+*/
+const char *vaapiVideoFilterDeint::getConfiguration(void)
+{
+    static char conf[256];
+    sprintf(conf,"VA-API deint. mode: %s, parity: %s, double fps: %s",
+                        deintModeToString(configuration.deintMode),
+                        (configuration.fieldOrder==ADM_VAAPI_DEINT_TOP_FIELD_FIRST)? "top field first" : "bottom field first",
+                        (configuration.framePerField==ADM_VAAPI_DEINT_SEND_FIELD)? "yes" : "no");
+    if(configuration.resize)
+    {
+        char part2[80]={0};
+        sprintf(part2,", resize from %dx%d to %dx%d",
+                previousFilter->getInfo()->width, previousFilter->getInfo()->height,
+                configuration.targetWidth, configuration.targetHeight);
+        strcat(conf,part2);
+    }
+    conf[255]=0;
+    return conf;
+}
+
+/**
+    \fn goToTime
+    \brief called when seeking. Need to cleanup our stuff.
+*/
+bool vaapiVideoFilterDeint::goToTime(uint64_t usSeek)
+{
+    secondField=false;
+    preloadCompleted=false;
+    clearSlots();
+    uint32_t oldFrameIncrement=info.frameIncrement;
+    if(!passThrough && configuration.framePerField==ADM_VAAPI_DEINT_SEND_FIELD)
+        info.frameIncrement*=2;
+    bool r=ADM_coreVideoFilterCached::goToTime(usSeek);
+    info.frameIncrement=oldFrameIncrement;
+    return r;
+}
+
+/**
+    \fn fillSlot
+    \brief upload the image to the slot. 
+*/
+bool vaapiVideoFilterDeint::fillSlot(uint32_t slot,ADMImage *image)
+{
+    ADM_assert(slot<queueLength);
+    ADM_vaSurface *target;
+    bool external=false;
+    if(image->refType!=ADM_HW_LIBVA)
+    {
+        // provide a surface from our pool
+        ADM_assert(freeSurfaces.size());
+        target=freeSurfaces.front();
+        freeSurfaces.pop_front();
+        if(!target->fromAdmImage(image)) 
+            return false;
+    }else
+    {
+        // use the provided surface
+        target=(ADM_vaSurface *)image->refDescriptor.refHwImage;
+        //printf("Source image is already VAAPI, surface %d, slot %d, pts %s\n",(uint32_t)target->surface,slot,ADM_us2plain(image->Pts));
+        ADM_assert(target->refCount);
+        image->hwIncRefCount();
+        external=true;
+    }
+    inputQueue[slot].pts=image->Pts;
+    inputQueue[slot].surface=target;
+    inputQueue[slot].external=external;
+    return true;
+}
+
+/**
+    \fn rotateSlots
+*/
+bool vaapiVideoFilterDeint::rotateSlots(void)
+{
+    ADM_assert(queueLength);
+    vaapiSlot *s = &inputQueue[0];
+    if(s->surface)
+    {
+        if(!s->external)
+            freeSurfaces.push_back(s->surface);
+        else if(s->surface->refCount>0)
+            s->surface->refCount--;
+    }
+    for(int i=0; i < (int)queueLength-1; i++)
+        inputQueue[i] = inputQueue[i+1];
+    s = &inputQueue[queueLength-1];
+    s->reset();
+    return true;
+}
+
+/**
+    \fn clearSlots
+*/
+bool vaapiVideoFilterDeint::clearSlots(void)
+{
+    for(int i=0; i < (int)queueLength; i++)
+    {
+        vaapiSlot *s = &inputQueue[i];  
+        if(s->surface)
+        {
+            if(!s->external)
+                freeSurfaces.push_back(s->surface);
+            else if(s->surface->refCount>0)
+                s->surface->refCount--;
+        }
+        s->reset();
+    }
+    return true;
+}
+
+/**
+    \fn getNextFrame
+*/
+bool vaapiVideoFilterDeint::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    bool r=false;
+    uint32_t i;
+    if(passThrough) 
+    {
+        //ADM_info("VA-API deinterlacer: passthrough\n");
+        return previousFilter->getNextFrame(fn,image);
+    }
+    if(!secondField)
+    {
+        // shift frames;... free slot[0]
+        rotateSlots();
+
+        if(!preloadCompleted)
+        {
+            for(i=0; i < queueLength; i++)
+            {
+                ADMImage *ref = vidCache->getImageAs(ADM_HW_LIBVA,i);
+                if(!ref || false==fillSlot(i,ref))
+                {
+                    vidCache->unlockAll();
+                    ADM_error("Cannot fill the queue, need %u pictures, got %u, aborting.\n",queueLength,i);
+                    return false;
+                }
+            }
+            preloadCompleted=true;
+            nextFrame+=nbForwardRefs;
+            //ADM_info("Preloaded %u pictures, nextFrame = %u\n",queueLength,nextFrame);
+        }else
+        {
+            //printf("[vaapiVideoFilterDeint::getNextFrame] requesting frame %u from cache.\n",nextFrame);
+            ADMImage *next = vidCache->getImageAs(ADM_HW_LIBVA,nextFrame);
+            if(!next)
+            {
+                vidCache->unlockAll();
+                return false;
+            }
+            if(false==fillSlot(queueLength-1,next))
+            {
+                vidCache->unlockAll();
+                return false;
+            }
+        }
+    }
+    vaapiSlot *src = &inputQueue[nbForwardRefs];
+    ADM_assert(src);
+    vaapiSlot *prev = NULL;
+    if(nbForwardRefs)
+        prev = &inputQueue[nbForwardRefs-1];
+    if(prev && prev->pts!=ADM_NO_PTS && src->pts!=ADM_NO_PTS && src->pts > prev->pts)
+        deltaPts = src->pts - prev->pts;
+    image->Pts = src->pts;
+    if(secondField && image->Pts != ADM_NO_PTS)
+    {
+        if(deltaPts < info.frameIncrement*2)
+            image->Pts += deltaPts/2;
+        else
+            image->Pts += info.frameIncrement;
+    }
+
+    for(i=0; i < nbForwardRefs; i++)
+    {
+        forwardRefs[i] = inputQueue[nbForwardRefs-i-1].surface->surface;
+        //printf("forward ref %d is VASurfaceID %u\n",i,(uint32_t)forwardReferences[i]);
+    }
+    for(i=0; i < nbBackwardRefs; i++)
+    {
+        backwardRefs[i] = inputQueue[nbForwardRefs+i+1].surface->surface;
+        //printf("backward ref %d is VASurfaceID %u\n",i,(uint32_t)backwardReferences[i]);
+    }
+
+    //-- Perform --
+    VAProcPipelineParameterBuffer param;
+    VABufferID paramId;
+    VAStatus status;
+
+    memset(&param,0,sizeof(param));
+
+    param.surface = src->surface->surface;
+    param.surface_region = NULL;
+    param.surface_color_standard = VAProcColorStandardBT709 ; // FIXME
+    param.output_region = NULL;
+    param.output_background_color = 0xff000000;
+    param.output_color_standard = VAProcColorStandardBT709; // FIXME
+
+    param.filter_flags = VA_FRAME_PICTURE;
+    param.filter_flags |= VA_FILTER_SCALING_HQ;
+    param.pipeline_flags = 0;
+    param.filters = &filterBuffer;
+    param.num_filters = 1;
+
+    param.forward_references = forwardRefs;
+    param.num_forward_references = nbForwardRefs;
+    param.backward_references = backwardRefs;
+    param.num_backward_references = nbBackwardRefs;
+
+    VAProcFilterParameterBufferDeinterlacing *deintParams;
+    void *deintParamsPtr;
+
+#define CHECK(x) { status=x; if(status!=VA_STATUS_SUCCESS) { ADM_warning( #x " failed with error %d: %s\n",status,vaErrorStr(status)); goto failed; }}
+    CHECK(vaMapBuffer(admLibVA::getDisplay(), filterBuffer, &deintParamsPtr))
+
+    deintParams = (VAProcFilterParameterBufferDeinterlacing *)deintParamsPtr;
+    deintParams->flags = 0;
+    if(configuration.fieldOrder == ADM_VAAPI_DEINT_BOTTOM_FIELD_FIRST)
+        deintParams->flags |= VA_DEINTERLACING_BOTTOM_FIELD_FIRST;
+    if(secondField == (configuration.fieldOrder == ADM_VAAPI_DEINT_TOP_FIELD_FIRST))
+        deintParams->flags |= VA_DEINTERLACING_BOTTOM_FIELD;
+    deintParamsPtr=NULL;
+ 
+    CHECK(vaUnmapBuffer(admLibVA::getDisplay(), filterBuffer))
+
+    CHECK(vaBeginPicture(admLibVA::getDisplay(), contextId, outputSurface->surface))
+    CHECK(vaCreateBuffer(admLibVA::getDisplay(), contextId,
+                         VAProcPipelineParameterBufferType,
+                         sizeof(param), 1,
+                         &param, &paramId))
+    // Go
+    CHECK(vaRenderPicture(admLibVA::getDisplay(), contextId, &paramId, 1))
+    CHECK(vaEndPicture(admLibVA::getDisplay(), contextId))
+
+    // Download result to regular ADMImage
+    r = outputSurface->toAdmImage(image);
+    //printf("Result is %d\n",r);
+failed:
+    if(paramId!=VA_INVALID)
+        vaDestroyBuffer(admLibVA::getDisplay(), paramId);
+    if(configuration.framePerField==ADM_VAAPI_DEINT_SEND_FIELD) 
+    {
+        *fn=(nextFrame-nbForwardRefs)*2+secondField;
+        secondField=!secondField;
+        //printf("%s, frame number: %u, pts: %s\n",secondField? "First field" : "Second field",*fn,ADM_us2plain(image->Pts));
+    }else
+        *fn=nextFrame-nbForwardRefs;
+    if(!secondField) nextFrame++;
+    vidCache->unlockAll();
+    return r;
+}
+// EOF

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/vaapiFilters/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/vaapiFilters/CMakeLists.txt Changed

@@ -13,12 +13,18 @@
 
         IF(hasHeader)
                 MESSAGE(STATUS "yes")
-                SET(ADM_vf_vaapiFilter_SRCS ADM_vidVaapiFilter.cpp )
+                SET(ADM_vf_vaapiFilter_SRCS ADM_vidVaapiFilter.cpp)
+                SET(ADM_vf_vaapiFilterDeint_SRCS ADM_vidVaapiFilterDeint.cpp)
                 ADD_VIDEO_FILTER(ADM_vf_vaapiFilter ${ADM_vf_vaapiFilter_SRCS})
-                TARGET_LINK_LIBRARIES( ADM_vf_vaapiFilter ADM_coreLibVA6 ) 
+                ADD_VIDEO_FILTER(ADM_vf_vaapiFilterDeint ${ADM_vf_vaapiFilterDeint_SRCS})
+                TARGET_LINK_LIBRARIES( ADM_vf_vaapiFilter ADM_coreLibVA6)
                 TARGET_LINK_LIBRARIES( ADM_vf_vaapiFilter va)
+                TARGET_LINK_LIBRARIES( ADM_vf_vaapiFilterDeint ADM_coreLibVA6)
+                TARGET_LINK_LIBRARIES( ADM_vf_vaapiFilterDeint va)
                 INIT_VIDEO_FILTER(ADM_vf_vaapiFilter)
+                INIT_VIDEO_FILTER(ADM_vf_vaapiFilterDeint)
                 INSTALL_VIDEO_FILTER(ADM_vf_vaapiFilter)
+                INSTALL_VIDEO_FILTER(ADM_vf_vaapiFilterDeint)
         ELSE(hasHeader)
                 MESSAGE(STATUS "no ")
         ENDIF(hasHeader)

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilterDeint.conf Added

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilterDeint.h Added

avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilterDeint_desc.cpp Added

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp Changed

@@ -139,25 +139,28 @@
 */
 bool vdpauVideoFilterDeint::updateConf(void)
 {
+    memcpy(&info,previousFilter->getInfo(),sizeof(info));
     if(passThrough)
     {
         ADM_warning("PassThrough mode\n");
-        info=*(previousFilter->getInfo());
         return true;
     }
     if(configuration.resizeToggle)
     {
         info.width=configuration.targetWidth;
         info.height=configuration.targetHeight;
-    }else
-    {
-            info=*(previousFilter->getInfo());
     }
-    uint64_t prev=previousFilter->getInfo()->frameIncrement;
     if(configuration.deintMode==ADM_KEEP_BOTH)
-        info.frameIncrement=prev/2;
-    else
-        info.frameIncrement=prev;
+    {
+        info.frameIncrement/=2;
+        if(info.timeBaseNum && info.timeBaseDen)
+        {
+            if(info.timeBaseDen<=30000 && (info.timeBaseNum & 1))
+                info.timeBaseDen*=2;
+            else
+                info.timeBaseNum/=2;
+        }
+    }
     return true;
 }
 /**
@@ -169,7 +172,12 @@
     secondField=false;
     eof=false;
     clearSlots();
-    return ADM_coreVideoFilterCached::goToTime(usSeek);
+    uint32_t oldFrameIncrement=info.frameIncrement;
+    if(configuration.deintMode==ADM_KEEP_BOTH)
+        info.frameIncrement*=2;
+    bool r=ADM_coreVideoFilterCached::goToTime(usSeek);
+    info.frameIncrement=oldFrameIncrement;
+    return r;
 }
 /**
     \fn setIdentityCSC
@@ -251,12 +259,16 @@
 bool vdpauVideoFilterDeint::cleanupVdpau(void)
 {
     for(int i=0;i<ADM_NB_SURFACES;i++)
-        if(surfacePool[i]!=VDP_INVALID_HANDLE) admVdpau::surfaceDestroy(surfacePool[i]);
+    {
+        if(surfacePool[i]!=VDP_INVALID_HANDLE)
+        {
+            admVdpau::surfaceDestroy(surfacePool[i]);
+            surfacePool[i]=VDP_INVALID_HANDLE;
+        }
+    }
     if(outputSurface!=VDP_INVALID_HANDLE)  admVdpau::outputSurfaceDestroy(outputSurface);
-    if(mixer!=VDP_INVALID_HANDLE) admVdpau::mixerDestroy(mixer);
     outputSurface=VDP_INVALID_HANDLE;
-    for(int i=0;i<ADM_NB_SURFACES;i++)
-        surfacePool[i]=VDP_INVALID_HANDLE;
+    if(mixer!=VDP_INVALID_HANDLE) admVdpau::mixerDestroy(mixer);
     mixer=VDP_INVALID_HANDLE;
     if(tempBuffer) delete [] tempBuffer;
     tempBuffer=NULL;
@@ -298,7 +310,7 @@
     passThrough=false;
     updateConf();    
     passThrough=!setupVdpau();
-    
+    nextPts=0;
 }
 /**
     \fn destructor
@@ -321,11 +333,11 @@
           };
      bool doResize=configuration.resizeToggle;
      bool doIvtc=configuration.enableIvtc;
-     diaElemToggle    tIvtc(&(doIvtc),   QT_TRANSLATE_NOOP("vdpaudeint","_Ivtc:"));
-     diaElemToggle    tResize(&(doResize),   QT_TRANSLATE_NOOP("vdpaudeint","_Resize:"));
+     diaElemToggle    tIvtc(&(doIvtc),   QT_TRANSLATE_NOOP("vdpaudeint","_IVTC"));
+     diaElemToggle    tResize(&(doResize),   QT_TRANSLATE_NOOP("vdpaudeint","_Resize"));
      diaElemMenu      mMode(&(configuration.deintMode),   QT_TRANSLATE_NOOP("vdpaudeint","_Deint Mode:"), 3,tMode);
-     diaElemUInteger  tWidth(&(configuration.targetWidth),QT_TRANSLATE_NOOP("vdpaudeint","Width :"),16,2048);
-     diaElemUInteger  tHeight(&(configuration.targetHeight),QT_TRANSLATE_NOOP("vdpaudeint","Height :"),16,2048);
+     diaElemUInteger  tWidth(&(configuration.targetWidth),QT_TRANSLATE_NOOP("vdpaudeint","Width:"),16,MAXIMUM_SIZE);
+     diaElemUInteger  tHeight(&(configuration.targetHeight),QT_TRANSLATE_NOOP("vdpaudeint","Height:"),16,MAXIMUM_SIZE);
      
      diaElem *elems[]={&mMode,&tIvtc,&tResize,&tWidth,&tHeight};
      
@@ -333,17 +345,9 @@
      {
                 configuration.resizeToggle=(bool)doResize;
                 configuration.enableIvtc=doIvtc;
-                if(doResize)
-                {
-                    info.width=configuration.targetWidth;
-                    info.height=configuration.targetHeight;
-                }else
-                {
-                    info.width=previousFilter->getInfo()->width;
-                    info.height=previousFilter->getInfo()->height;
-                }
-                ADM_info("New dimension : %d x %d\n",info.width,info.height);
                 updateConf();
+                if(doResize)
+                    ADM_info("New dimension : %d x %d\n",info.width,info.height);
                 cleanupVdpau();
                 passThrough=!setupVdpau();
                 
@@ -448,7 +452,6 @@
         tgt=render->surface;
         external=true;
     }
-    nextPts=image->Pts;
     slots[slot].pts=image->Pts;
     slots[slot].surface=tgt;
     slots[slot].isExternal=external;
@@ -590,9 +593,13 @@
             secondField=false;
             *fn=nextFrame*2+1;
             if(false==getResult(image)) return false;
-            if(ADM_NO_PTS==nextPts) image->Pts=nextPts;
-                else image->Pts=nextPts-info.frameIncrement;
-            aprintf("2ndField : Pts=%s\n",ADM_us2plain(image->Pts));
+            if(ADM_NO_PTS==nextPts) image->Pts=ADM_NO_PTS;
+            else
+            {
+                aprintf("2nd field: nextPts = %s - frame increment = %d ms =",ADM_us2plain(nextPts),(int)(info.frameIncrement/1000LL));
+                image->Pts=nextPts-info.frameIncrement;
+                aprintf(" %s\n",ADM_us2plain(image->Pts));
+            }
             return true;
         }
      // shift frames;... free slot[0]
@@ -603,12 +610,12 @@
     {
             aprintf("This is our first image, filling slot 1\n");
             ADMImage *prev= vidCache->getImageAs(ADM_HW_VDPAU,0);
-            if(false==fillSlot(1,prev))
+            if(!prev || false==fillSlot(1,prev))
             {
                     vidCache->unlockAll();
                     return false;
             }
-            
+            nextPts=prev->Pts;
     }
     // regular image, in fact we get the next image here
     ADMImage *next= vidCache->getImageAs(ADM_HW_VDPAU,nextFrame+1);
@@ -656,7 +663,7 @@
     nextFrame++;
     image->Pts=nextPts;
     if(next) nextPts=next->Pts;
-   // printf("VDPAU OUT PTS= %"PRIu64"\n",image->Pts);
+    aprintf("VDPAU OUT PTS: %s\n",ADM_us2plain(image->Pts));
     return r;
 }
 #else // USE_VDPAU

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp Changed

@@ -102,18 +102,18 @@
 class yadifFilter : public  ADM_coreVideoFilterCached
 {
 protected:
-                    ADMImage    *original;
                     yadif       configuration;
                     void        updateInfo(void);
 public:
                     yadifFilter(ADM_coreVideoFilter *previous,CONFcouple *conf);
-                    ~yadifFilter();
+                    ~yadifFilter() {};
 
         virtual const char   *getConfiguration(void);                 /// Return  current configuration as a human readable string
         virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);           /// Return the next image
         virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
 		virtual void setCoupledConf(CONFcouple *couples);
         virtual bool         configure(void) ;                        /// Start graphical user interface
+        virtual bool         goToTime(uint64_t usSeek);
         
 protected:
     void (*filter_line) (uint8_t *dst, const uint8_t  *prev, const uint8_t  *cur, const uint8_t  *next, int w, int prefs, int mrefs, int parity, int mode);
@@ -134,8 +134,6 @@
                     );
 
 //
-static void filter_plane(int mode, uint8_t *dst, int dst_stride, const uint8_t *prev0, const uint8_t *cur0, const uint8_t *next0, int refs, int w, int h, int parity, int tff, int mmx);
-
 
 /**
     \fn constructor
@@ -143,13 +141,12 @@
 yadifFilter::yadifFilter(ADM_coreVideoFilter *in, CONFcouple *setup): 
             ADM_coreVideoFilterCached(10,in,setup)
 {
-    original=new ADMImageDefault(in->getInfo()->width,in->getInfo()->height);
     if(!setup || !ADM_paramLoad(setup,yadif_param,&configuration))
     {
         // Default value
         configuration.mode=YADIF_MODE_SEND_FRAME;
         configuration.deint=YADIF_DEINT_ALL; 
-        configuration.parity=YADIF_PARITY_AUTO;
+        configuration.parity=YADIF_PARITY_TFF;
     }
     updateInfo();
 
@@ -158,7 +155,7 @@
     filter_end=filter_end_c;
 
 #ifdef CAN_DO_INLINE_X86_ASM    
-     if (CpuCaps::hasSSE3()) 
+     if (CpuCaps::hasSSSE3())
      {
         filter_line=adm_yadif_filter_line_ssse3;
      }else 
@@ -171,27 +168,25 @@
     myName="yadif";
 }
 /**
-    \fn destructor
-*/
-yadifFilter::~yadifFilter()
-{
-        delete  original;
-        original=NULL;
-}
-/**
     \fn updateInfo
 */
-
 void yadifFilter::updateInfo(void)
 {
-  memcpy(&info,previousFilter->getInfo(),sizeof(info)); 
-  if(configuration.mode &1 ) // Bob
-  {
-    info.frameIncrement/=2;
-  }
+    memcpy(&info,previousFilter->getInfo(),sizeof(info));
+    if(configuration.mode &1 ) // Bob
+    {
+        info.frameIncrement/=2;
+        if(info.timeBaseNum && info.timeBaseDen)
+        {
+            if(info.timeBaseDen<=30000 && (info.timeBaseNum & 1))
+                info.timeBaseDen*=2;
+            else
+                info.timeBaseNum/=2;
+        }
+    }
 }
 /**
-    \fn updateInfo
+    \fn configure
 */
 bool yadifFilter::configure( void) 
 {
@@ -255,5 +250,18 @@
     return conf;
 }
 
+/**
+    \fn goToTime
+    \brief Seek in filter preview mode
+*/
+bool yadifFilter::goToTime(uint64_t usSeek)
+{
+    uint32_t oldFrameIncrement=info.frameIncrement;
+    if(configuration.mode &1) // Bob
+        info.frameIncrement*=2;
+    bool r=ADM_coreVideoFilterCached::goToTime(usSeek);
+    info.frameIncrement=oldFrameIncrement;
+    return r;
+}
 
 #include "ADM_vidYadif_body.cpp"

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif_body.cpp -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif_body.cpp Changed

@@ -33,7 +33,6 @@
         int parity;
         int tff;
         int iplane;
-        int cpu;
         int n;
         ADMImage *src, *dst, * prev, *next;
         
@@ -80,9 +79,9 @@
 //		tff = avs_is_tff(&p->vi) == 0 ? 0 : 1; // 0 or 1
                 tff = avs_get_parity(p->child, n) ? 1 : 0; // 0 or 1
         else
-#endif
                 tff = configuration.parity;	
-        
+#endif
+        tff = (configuration.parity > 0) ? 0 : 1;
         parity = (mode & 1) ? (nextFrame & 1) ^ (1^tff) : (tff ^ 1);  // 0 or 1
 
       //MEANX  cpu = avs_get_cpu_flags(p->env);
@@ -165,15 +164,15 @@
         int df = 1;
         int pix_3 = 3 * df;
         int edge = 3 + MAX_ALIGN / df - 1;
-        memcpy(dst, cur0, w);
-        memcpy(dst + dst_stride, cur0 + refs, w);
-        for(int y=2; y<h-1; y++){
+        //memcpy(dst, cur0, w);
+        //memcpy(dst + dst_stride, cur0 + refs, w);
+        for(int y=0; y<h; y++){
             if(((y ^ parity) & 1)){
                 const uint8_t *prev= prev0 + y*refs;
                 const uint8_t *cur = cur0 + y*refs;
                 const uint8_t *next= next0 + y*refs;
                 uint8_t *dst2= dst + y*dst_stride;
-                
+                int mode = y == 1 || y + 2 == h ? 2 : 0;
                 filter_line(dst2 + pix_3, prev + pix_3, cur + pix_3,   next + pix_3, 
                              w - edge,
                            y + 1 < h ? refs : -refs,
@@ -189,7 +188,7 @@
                 memcpy(dst + y*dst_stride, cur0 + y*refs, w);
             }
         }
-        memcpy(dst + (h-1)*dst_stride, cur0 + (h-1)*refs, w);
+        //memcpy(dst + (h-1)*dst_stride, cur0 + (h-1)*refs, w);
 
 }

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/CMakeLists.txt -> avidemux_2.7.6.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/CMakeLists.txt Changed

avidemux_2.7.4.tar.gz/bootStrapCrossMingwQt5_mxe.sh -> avidemux_2.7.6.tar.gz/bootStrapCrossMingwQt5_mxe.sh Changed

avidemux_2.7.6.tar.gz/bootStrapOsx_Catalina.bash Added

@@ -0,0 +1,334 @@
+#!/bin/bash
+# Bootstrapper to semi-automatically build avidemux from source on OSX
+# (c) Mean 2009
+fallback_qtdir=/usr/local/opt/qt5
+if [ "x$MYQT" != "x" ] && [ -e "${MYQT}/bin/qmake" ] ; then
+    export PATH=$PATH:$MYQT/bin:/opt/local/libexec/qt5/bin # for macports; /usr/local/bin is in PATH by default anyway
+else
+    export PATH=$PATH:/opt/local/libexec/qt5/bin
+fi
+if ! $(which -s qmake) && [ -e "${fallback_qtdir}/bin/qmake" ] ; then
+    echo "Using ${fallback_qtdir} as fallback qt5 install path"
+    export PATH=$PATH:${fallback_qtdir}/bin
+fi
+if ! $(which -s qmake) ; then
+    echo "Error: No qmake executable found, aborting."
+    exit 1
+fi
+
+export MAJOR=`cat cmake/avidemuxVersion.cmake | grep "VERSION_MAJOR " | sed 's/..$//g' | sed 's/^.*"//g'`
+export MINOR=`cat cmake/avidemuxVersion.cmake | grep "VERSION_MINOR " | sed 's/..$//g' | sed 's/^.*"//g'`
+export PATCH=`cat cmake/avidemuxVersion.cmake | grep "VERSION_P " | sed 's/..$//g' | sed 's/^.*"//g'`
+export API_VERSION="${MAJOR}.${MINOR}"
+
+DAT=`date +"%y%m%d-%Hh%Mm"`
+gt=`git log --format=oneline -1 | head -c 11`
+export REV="${DAT}_$gt"
+#
+# To move as parameter
+#
+export FLAVOR="-DENABLE_QT5=True"
+export qt_ext=Qt5
+#
+packages_ext=""
+do_core=1
+do_cli=1
+do_gtk=0   # Note that gtk is no fully longer supported on OSX. You are on your own here
+do_qt4=1
+do_plugins=1
+do_rebuild=0
+debug=0
+create_app_bundle=1
+external_libass=0
+external_liba52=0
+external_libmad=0
+external_libmp4v2=0
+
+# /usr/include is no more on Catalina
+export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
+#export MACOSX_DEPLOYMENT_TARGET=$(xcrun --sdk macosx --show-sdk-version)
+export MACOSX_DEPLOYMENT_TARGET=10.12
+
+test -f $HOME/myCC  && export COMPILER="-DCMAKE_C_COMPILER=$HOME/myCC -DCMAKE_CXX_COMPILER=$HOME/myC++"
+
+fail()
+{
+        echo "** Failed at $1**"
+        exit 1
+}
+setupPaths()
+{
+# Specify the the directory where you want to install avidemux (a.k.a. the cmake_install_prefix)
+# like export BASE_INSTALL_DIR="<full_path_to_installation>". This can be /usr/local or /opt/local (macports) or /sw (Fink)
+        if [ "x$create_app_bundle" = "x1" ] ; then
+            export BASE_INSTALL_DIR="/"
+            export BASE_APP="$PWD/Avidemux${API_VERSION}.app"
+            export PREFIX="${BASE_APP}/Contents/Resources"
+            if [ ! -e $BASE_APP/Contents/Resources ] ; then
+                mkdir -p $BASE_APP/Contents/Resources
+            fi
+        else
+            export BASE_INSTALL_DIR="$PWD/out"
+            export BASE_APP="$BASE_INSTALL_DIR"
+            export PREFIX="$BASE_INSTALL_DIR"
+        fi
+}
+Process()
+{
+        export BUILDDIR=$1
+        export SOURCEDIR=$2
+        export FAKEROOT="-DFAKEROOT=$FAKEROOT_DIR"
+        export EXTRA="$3"
+        export DEBUG=""
+        BUILDER="Unix Makefiles"
+        echo "**************** $1 *******************"
+        if [ "x$debug" = "x1" ] ; then 
+                DEBUG="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug  "
+                BUILDDIR="${BUILDDIR}_debug"
+                BUILDER="CodeBlocks - Unix Makefiles"
+        fi
+
+        echo "Building $BUILDDIR from $SOURCEDIR with EXTRA=<$EXTRA>, DEBUG=<$DEBUG>"
+        if [ "x$do_rebuild" != x1 ] ; then
+            rm -Rf ./$BUILDDIR
+        fi
+        mkdir -p $BUILDDIR || fail mkdir
+        cd $BUILDDIR 
+        cmake $COMPILER $PKG $FAKEROOT -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_EDIT_COMMAND=vim -DAVIDEMUX_SOURCE_DIR=$TOP -DAVIDEMUX_VERSION="$ADM_VERSION" $EXTRA $FLAVOR $DEBUG -G "$BUILDER" $SOURCEDIR || fail cmakeZ
+        make -j 2 > /tmp/log$BUILDDIR || fail make
+        echo "** installing at $FAKEROOT_DIR **"
+        make install DESTDIR=$FAKEROOT_DIR || fail install
+}
+printModule()
+{
+        value=$1
+        name=$2
+        if [ "x$value" = "x1" ]; then echo "    $name will be built"
+        else echo "     $name will be skipped"
+        fi
+}
+config()
+{
+        setupPaths
+        echo "Build configuration :"
+        echo "******************* :"
+        echo "Build type :"
+        if [ "x$debug" = "x1" ] ; then echo   "Debug build"
+        else echo   "Release build"
+        fi
+        if [ "x$adm_version" = "x" ] ; then
+            export ADM_VERSION="${MAJOR}.${MINOR}.${PATCH}"
+        else
+            export ADM_VERSION=$adm_version
+        fi
+        echo "Avidemux version : $ADM_VERSION"
+        if [ "x$create_app_bundle" != "x1" ] ; then
+            echo "No macOS app bundle will be created"
+        fi
+        if [ "x$do_rebuild" != "x1" -a "x$BASE_APP" != "x" ] ; then
+            rm -Rf $BASE_APP/*
+        fi
+        printModule $do_core Core
+        printModule $do_gtk Gtk
+        printModule $do_qt4 Qt
+        printModule $do_cli Cli
+        printModule $do_plugins Plugins
+}
+usage()
+{
+        echo "Bootstrap avidemux ${API_VERSION}:"
+        echo "***********************"
+        echo "  --help                : Print usage"
+        echo "  --tgz                 : Build tgz packages"
+        echo "  --nopkg               : Don't create macOS app bundle"
+        echo "  --debug               : Switch debugging on"
+        echo "  --rebuild             : Preserve existing build directories"
+        echo "  --output=NAME         : Specify a custom basename for dmg"
+        echo "  --version=STRING      : Specify a custom Avidemux version string"
+        echo "  --with-core           : Build core (default)"
+        echo "  --without-core        : Don't build core"
+        echo "  --with-cli            : Build cli (default)"
+        echo "  --without-cli         : Don't build cli"
+        echo "  --with-qt             : Build qt (default)"
+        echo "  --without-qt          : Don't build qt"
+        echo "  --with-plugins        : Build plugins (default)"
+        echo "  --without-plugins     : Don't build plugins"
+        echo "  --with-system-libass  : Use system libass instead of the bundled one"
+        echo "  --with-system-liba52  : Use system liba52 (a52dec) instead of the bundled one"
+        echo "  --with-system-libmad  : Use system libmad instead of the bundled one"
+        echo "  --with-system-libmp4v2: Use system libmp4v2 instead of the bundled one"
+        config
+}
+option_value()
+{
+        echo $(echo $* | cut -d '=' -f 2-)
+}
+validate()
+{
+        opt="$1"
+        str="$2"
+        if [ "$opt" = "adm_version" ] ; then
+            reg="[^a-zA-Z0-9_.-]"
+            msg="Only alphanumeric characters, hyphen, underscore and period are allowed for Avidemux version, aborting."
+        elif [ "$opt" = "output" ] ; then
+            reg="[^a-zA-Z0-9\ _.-]"
+            msg="Only alphanumeric characters, space, hyphen, underscore and period are allowed for .dmg basename, aborting."
+        else
+            >&2 echo "incorrect usage of validate(), aborting."
+            exit 1
+        fi
+        if [[ "$str" =~ $reg ]] ; then
+            >&2 echo $msg
+            exit 1
+        fi
+}
+# Could probably do it with getopts...
+while [ $# != 0 ] ;do
+        config_option="$1"
+        case "$config_option" in
+         -h|--help)
+             usage
+             exit 1
+             ;;
+         --debug)
+                debug=1
+                ;;
+         --rebuild)
+                do_rebuild=1
+                ;;
+         --tgz)
+                packages_ext=tar.gz
+                PKG="$PKG -DAVIDEMUX_PACKAGER=tgz"
+                ;;
+         --nopkg)
+                create_app_bundle=0
+                ;;
+         --output=*)
+                output=$(option_value "$config_option")
+                ;;
+         --version=*)
+                adm_version=$(option_value "$config_option")
+                ;;
+         --without-qt)
+                do_qt4=0
+             ;;
+         --without-cli)
+                do_cli=0
+             ;;
+         --without-plugins)
+                do_plugins=0
+             ;;
+         --without-core)
+                do_core=0
+             ;;
+         --with-qt)
+                do_qt4=1
+             ;;
+         --with-cli)
+                do_cli=1
+             ;;
+         --with-plugins)
+                do_plugins=1
+             ;;
+         --with-core)
+                do_core=1
+             ;;
+         --with-system-libass)
+                external_libass=1
+             ;;
+         --with-system-liba52)
+                external_liba52=1
+             ;;
+         --with-system-libmad)
+                external_libmad=1
+             ;;
+         --with-system-libmp4v2)
+                external_libmp4v2=1
+             ;;
+        *)
+                echo "unknown parameter $config_option"
+                usage
+                exit 1
+                ;;
+     esac
+     shift
+done
+validate adm_version "$adm_version" || exit 1
+validate output "$output" || exit 1
+config
+echo "** BootStrapping avidemux **"
+export TOP=$PWD
+export POSTFIX=""
+echo "Top dir : $TOP"
+if [ "x$debug" = "x1" ] ; then echo
+POSTFIX="_debug"
+fi
+if [ "x$external_libass" = "x1" ]; then
+    export EXTRA_CMAKE_DEFS="-DUSE_EXTERNAL_LIBASS=true $EXTRA_CMAKE_DEFS"
+fi
+if [ "x$external_liba52" = "x1" ]; then
+    export EXTRA_CMAKE_DEFS="-DUSE_EXTERNAL_LIBA52=true $EXTRA_CMAKE_DEFS"
+fi
+if [ "x$external_libmad" = "x1" ]; then
+    export EXTRA_CMAKE_DEFS="-DUSE_EXTERNAL_LIBMAD=true $EXTRA_CMAKE_DEFS"
+fi
+if [ "x$external_libmp4v2" = "x1" ]; then
+    export EXTRA_CMAKE_DEFS="-DUSE_EXTERNAL_MP4V2=true $EXTRA_CMAKE_DEFS"
+fi
+if [ "x$create_app_bundle" = "x1" ] ; then
+    export DO_BUNDLE="-DCREATE_BUNDLE=true"
+else
+    export DO_BUNDLE="-UCREATE_BUNDLE"
+fi
+if [ "x$do_core" = "x1" ] ; then
+        echo "** CORE **"
+        cd $TOP
+        Process buildCore ../avidemux_core $DO_BUNDLE
+fi
+if [ "x$do_qt4" = "x1" ] ; then
+        echo "** QT **"
+        cd $TOP
+        Process build${qt_ext} ../avidemux/qt4 $DO_BUNDLE
+fi
+if [ "x$do_cli" = "x1" ] ; then
+        echo "** CLI **"
+        cd $TOP
+        Process buildCli ../avidemux/cli
+fi
+if [ "x$do_plugins" = "x1" ] ; then
+        echo "** Plugins **"
+        cd $TOP
+        Process buildPluginsCommon ../avidemux_plugins "-DPLUGIN_UI=COMMON $EXTRA_CMAKE_DEFS"
+fi
+if [ "x$do_plugins" = "x1" -a "x$do_qt4" = "x1" ] ; then
+        echo "** Plugins Qt **"
+        cd $TOP
+        Process buildPlugins${qt_ext} ../avidemux_plugins "-DPLUGIN_UI=QT4 EXTRA_CMAKE_DEFS"
+fi
+if [ "x$do_plugins" = "x1" -a "x$do_cli" = "x1" ] ; then
+        echo "** Plugins CLI **"
+        cd $TOP
+        Process buildPluginsCLI ../avidemux_plugins "-DPLUGIN_UI=CLI $EXTRA_CMAKE_DEFS"
+fi
+if [ "x$do_plugins" = "x1" ] ; then
+        echo "** Plugins Settings **"
+        cd $TOP
+        Process buildPluginsSettings ../avidemux_plugins "-DPLUGIN_UI=SETTINGS $EXTRA_CMAKE_DEFS"
+fi
+# 
+cd $TOP
+if [ "x$create_app_bundle" = "x1" ] ; then
+    mkdir $PREFIX/fonts
+    cp $TOP/cmake/osx/fonts.conf $PREFIX/fonts
+    # Copy icons
+    echo "Copying icons"
+    cp $TOP/cmake/osx/*.icns $PREFIX/
+    mkdir -p $PREFIX/../MacOS
+    mkdir -p installer
+    rm -Rf installer/*
+    cd installer
+    cmake -DAVIDEMUX_VERSION="$ADM_VERSION" -DDMG_BASENAME="$output" -DBUILD_REV="$REV" ../avidemux/osxInstaller
+    make && make package
+echo "** Preparing packaging **"
+fi
+echo "** ALL DONE **"

avidemux_2.7.4.tar.gz/cmake/ADM_coreConfig.h.cmake -> avidemux_2.7.6.tar.gz/cmake/ADM_coreConfig.h.cmake Changed

avidemux_2.7.6.tar.gz/cmake/admCheckAom.cmake Added

avidemux_2.7.4.tar.gz/cmake/admCheckFdkAac.cmake -> avidemux_2.7.6.tar.gz/cmake/admCheckFdkAac.cmake Changed

@@ -1,7 +1,6 @@
 # Outputs:
-#   FDK_AAC_INCLUDE_DIR
-#   FDK_AAC_LIBRARY_DIR
-#   FDK_AAC_OLD_PROTOTYPE
+#   FDK_AAC_INCLUDEDIR
+#   FDK_AAC_LINK_LIBRARIES
 #   ENV{ADM_HAVE_FDK_AAC}
 
 MACRO(checkFdkAAC)
@@ -12,16 +11,18 @@
         MESSAGE(STATUS "*****************")
 
         IF (FDK_AAC)
-            FIND_HEADER_AND_LIB(FDK_AAC fdk-aac/aacenc_lib.h fdk-aac) # Use pkg config ?
+            #FIND_HEADER_AND_LIB(FDK_AAC fdk-aac/aacenc_lib.h fdk-aac) # Use pkg config ?
+            PKG_CHECK_MODULES(FDK_AAC fdk-aac)
+#            DUMP_ALL_VARS()
 
             IF (FDK_AAC_FOUND)
-                ADM_CHECK_FUNCTION_EXISTS(aacEncOpen "${FDK_AAC_LIBRARY_DIR}" FDK_OPEN_FUNCTION_FOUND "" -I"${FDK_AAC_INCLUDE_DIR}")
+                PRINT_LIBRARY_INFO("FDK_AAC" FDK_AAC_FOUND "${FDK_AAC_INCLUDEDIR}" "${FDK_AAC_LDFLAGS}")
+                ADM_CHECK_FUNCTION_EXISTS(aacEncOpen "${FDK_AAC_LDFLAGS}" FDK_OPEN_FUNCTION_FOUND "" -I"${FDK_AAC_INCLUDEDIR}")
                 IF (FDK_OPEN_FUNCTION_FOUND)
                         SET(FDK_AAC_FOUND 1)
                         SET(USE_FDK_AAC  1)
                 ENDIF (FDK_OPEN_FUNCTION_FOUND)
             ENDIF (FDK_AAC_FOUND)
-            PRINT_LIBRARY_INFO("FDK_AAC" FDK_AAC_FOUND "${FDK_AAC_INCLUDE_DIR}" "${FDK_AAC_LIBRARY_DIR}")
         ELSE (FDK_AAC)
             MESSAGE("${MSG_DISABLE_OPTION}")
         ENDIF (FDK_AAC)

avidemux_2.7.4.tar.gz/cmake/admCheckQt5.cmake -> avidemux_2.7.6.tar.gz/cmake/admCheckQt5.cmake Changed

avidemux_2.7.6.tar.gz/cmake/admCheckSqlLite.cmake Added

avidemux_2.7.4.tar.gz/cmake/admCheckVpx.cmake -> avidemux_2.7.6.tar.gz/cmake/admCheckVpx.cmake Changed

@@ -1,20 +1,48 @@
 MACRO(checkVpxDec)
 		OPTION(VPXDEC "" ON)
 
-		MESSAGE(STATUS "Checking for Vpx")
-		MESSAGE(STATUS "*****************")
+		MESSAGE(STATUS "Checking for Vpx (decoding)")
+		MESSAGE(STATUS "***************************")
 
 		IF (VPXDEC)
-			FIND_HEADER_AND_LIB(VPX vpx/vpx_decoder.h vpx vpx_codec_dec_init_ver)
-			PRINT_LIBRARY_INFO("Vpx" VPX_FOUND "${VPX_INCLUDE_DIR}" "${VPX_LIBRARY_DIR}")
-                        IF(VPX_FOUND)
-                                SET(USE_VPX 1)
-		                MESSAGE(STATUS "Linking to vpx decoder library ")
-                        ENDIF(VPX_FOUND)
+            PKG_CHECK_MODULES(VPX vpx)
+            IF (VPX_FOUND)
+              PRINT_LIBRARY_INFO("VPX" VPX_FOUND "${VPX_INCLUDEDIR}" "${VPX_LDFLAGS}")
+			  ADM_CHECK_FUNCTION_EXISTS(vpx_codec_dec_init_ver "${VPX_LDFLAGS}" VPX_DEC_INIT_FOUND "" "-I${VPX_INCLUDEDIR}")
+                        IF(VPX_DEC_INIT_FOUND)
+                                SET(USE_VPX_DEC 1)
+		                        MESSAGE(STATUS "Linking to vpx decoder library ")
+                        ENDIF(VPX_DEC_INIT_FOUND)
+            ENDIF (VPX_FOUND)
 		ELSE (VPXDEC)
 			MESSAGE("${MSG_DISABLE_OPTION}")
 		ENDIF (VPXDEC)
 		MESSAGE("")
 
-		APPEND_SUMMARY_LIST("Video Decoder" "libvpx" "${VPX_FOUND}")
+		APPEND_SUMMARY_LIST("Video Decoder" "libvpx" "${USE_VPX_DEC}")
 ENDMACRO(checkVpxDec)
+
+MACRO(checkVpxEnc)
+    OPTION(VPXENC "" ON)
+
+    MESSAGE(STATUS "Checking for Vpx encoding capability")
+    MESSAGE(STATUS "*****************")
+    IF (VPXENC)
+            PKG_CHECK_MODULES(VPX vpx)
+            IF (VPX_FOUND)
+              PRINT_LIBRARY_INFO("VPX" VPX_FOUND "${VPX_INCLUDEDIR}" "${VPX_LDFLAGS}")
+			  ADM_CHECK_FUNCTION_EXISTS(vpx_codec_enc_init_ver "${VPX_LDFLAGS}" VPX_ENC_INIT_FOUND "" "-I${VPX_INCLUDEDIR}")
+                        IF(VPX_ENC_INIT_FOUND)
+                                SET(USE_VP9_ENC 1)
+                                SET(VPX_ENC_LIBRARY_DIR "${VPX_LDFLAGS}")
+                                SET(VPX_ENC_INCLUDE_DIR "${VPX_INCLUDEDIR}")
+		                        MESSAGE(STATUS "Linking to vpx encoder library ")
+                        ENDIF(VPX_ENC_INIT_FOUND)
+            ENDIF (VPX_FOUND)
+     ELSE (VPXENC)
+         MESSAGE("${MSG_DISABLE_OPTION}")
+     ENDIF (VPXENC)
+     MESSAGE("")
+
+    APPEND_SUMMARY_LIST("Video Encoder" "libvpx" "${USE_VP9_ENC}")
+ENDMACRO(checkVpxEnc)

avidemux_2.7.4.tar.gz/cmake/admCheckX264.cmake -> avidemux_2.7.6.tar.gz/cmake/admCheckX264.cmake Changed

@@ -13,17 +13,12 @@
                                 STRING(REGEX MATCH "#define[ ]+X264_BUILD[ ]+([0-9]+)" X264_H "${X264_H}")
                                 STRING(REGEX REPLACE ".*[ ]([0-9]+).*" "\\1" x264_version "${X264_H}")
                                 MESSAGE(STATUS "  core version: ${x264_version}")
-
-                                IF (x264_version LESS 67)
-                                        MESSAGE("WARNING: x264 core version is too old.  At least version 67 is required.")
+                                IF (x264_version LESS 144)
+                                        MESSAGE("WARNING: x264 core version is too old.  At least version 144 is required.")
                                         SET(X264_FOUND 0)
-                                ELSE (x264_version LESS 67)
-                                        IF (x264_version GREATER 73)
-                                                FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open_${x264_version})
-                                        ELSE (x264_version GREATER 73)
-                                                FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open)
-                                        ENDIF (x264_version GREATER 73)
-                                ENDIF (x264_version LESS 67)
+                                ELSE (x264_version LESS 144)
+                                        FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open_${x264_version})
+                                ENDIF (x264_version LESS 144)
                                 IF (X264_FOUND)
                                         SET(USE_X264 True CACHE BOOL "")
                                 ENDIF(X264_FOUND)

avidemux_2.7.4.tar.gz/cmake/admConfigHelper.cmake -> avidemux_2.7.6.tar.gz/cmake/admConfigHelper.cmake Changed

avidemux_2.7.4.tar.gz/cmake/admDetermineSystem.cmake -> avidemux_2.7.6.tar.gz/cmake/admDetermineSystem.cmake Changed

avidemux_2.7.4.tar.gz/cmake/admFFmpegBuild_helpers.cmake -> avidemux_2.7.6.tar.gz/cmake/admFFmpegBuild_helpers.cmake Changed

@@ -19,16 +19,24 @@
 set(FFMPEG_SOURCE_DIR "${FFMPEG_BASE_DIR}/source")
 set(FFMPEG_BINARY_DIR "${FFMPEG_BASE_DIR}/build")
 
-set(FFMPEG_DECODERS  aac ac3 eac3 adpcm_ima_amv  amv  bmp  cinepak  cyuv  dca  dnxhd  dvbsub  dvvideo  ffv1  ffvhuff  fic  flv  fraps  h263  h264
-                                         hevc  huffyuv  mjpeg
-                     mjpegb  mpeg2video  mpeg4  msmpeg4v2  msmpeg4v3  msvideo1  nellymoser  png  qdm2  rawvideo  snow
-                     svq3  theora  tscc  mp2 mp3 mp2_float mp3_float
-                     vc1  vp3  vp6  vp6a  vp6f  vp8 vp9 wmapro wmav2  wmv1  wmv2  wmv3 cscd lagarith flac vorbis)
-set(FFMPEG_ENCODERS  ac3  ac3_float dvvideo  ffv1  ffvhuff  flv  h263  huffyuv  mjpeg  mp2  mpeg1video  mpeg2video  mpeg4  png  snow aac dca flac)
-set(FFMPEG_MUXERS  flv  matroska  mpeg1vcd  mpeg2dvd  mpeg2svcd  mpegts  mov  mp4  psp webm)
-set(FFMPEG_PARSERS  ac3  h263  h264  hevc  mpeg4video)
-set(FFMPEG_PROTOCOLS  file)
-set(FFMPEG_BSFS h264_mp4toannexb aac_adtstoasc)
+set(FFMPEG_DECODERS     aac  ac3  adpcm_ima_amv  amv  bmp  cinepak  cscd  cyuv
+                        dca  dnxhd  dvbsub  dvvideo  eac3  ffv1  ffvhuff  fic
+                        flac  flv  fraps  h263  h264  hevc  huffyuv  lagarith
+                        mjpeg  mjpegb  mp2  mp3  mpeg2video  mpeg4  msmpeg4v2  msmpeg4v3
+                        msvideo1  nellymoser  png  qdm2  rawvideo  snow  svq3  theora
+                        tscc  vc1  vorbis  vp3  vp6  vp6a  vp6f  vp8
+                        vp9  wmapro  wmav2  wmv1  wmv2  wmv3)
+
+set(FFMPEG_ENCODERS     aac  ac3  dca  dvvideo  ffv1  ffvhuff  flac  flv  h263  huffyuv
+                        mjpeg  mp2  mpeg1video  mpeg2video  mpeg4  png  snow)
+
+set(FFMPEG_MUXERS       flv  matroska  mpeg1vcd  mpeg2dvd  mpeg2svcd  mpegts  mov  mp4  psp  webm)
+
+set(FFMPEG_PARSERS      ac3  h263  h264  hevc  mpeg4video)
+
+set(FFMPEG_PROTOCOLS    file)
+
+set(FFMPEG_BSFS         h264_mp4toannexb aac_adtstoasc)
 
 #
 #

avidemux_2.7.4.tar.gz/cmake/admFFmpegBuild_native.cmake -> avidemux_2.7.6.tar.gz/cmake/admFFmpegBuild_native.cmake Changed

avidemux_2.7.4.tar.gz/cmake/admFFmpegVersion.cmake -> avidemux_2.7.6.tar.gz/cmake/admFFmpegVersion.cmake Changed

avidemux_2.7.4.tar.gz/cmake/admInstallDir.cmake -> avidemux_2.7.6.tar.gz/cmake/admInstallDir.cmake Changed

avidemux_2.7.4.tar.gz/cmake/admMainChecks.cmake -> avidemux_2.7.6.tar.gz/cmake/admMainChecks.cmake Changed

avidemux_2.7.4.tar.gz/cmake/admSerialization.py -> avidemux_2.7.6.tar.gz/cmake/admSerialization.py Changed

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 # Take a .conf file and generate :
 # 1- Couple header   (.h)
 # 2- Couple template (_desc.cpp)
@@ -140,7 +140,7 @@
 print("Processing "+str(sys.argv[1]))
 inputFile=sys.argv[1]
 if(not os.path.isfile(inputFile)):
-    print "no such file "+str(inputFile)
+    print("no such file "+str(inputFile))
     exit(1)
 structName=re.sub(r'.conf',r'',inputFile)
 #
@@ -189,7 +189,7 @@
         fullPath=".".join(nested)
     elif(line.find(':')!=-1):
         if(gotName==False):
-            print "No structure name !"
+            print("No structure name !")
             exit(1)
         line=re.sub(r'#.*$',r'',line)
         line=re.sub(r'//.*$',r'',line)
@@ -206,7 +206,7 @@
         varType=varType.strip()
         processLine(varType,varName)
     else:
-        print "Invalid line "+str(line)
+        print("Invalid line "+str(line))
         exit(1)
 f.close()
 writeDescFooter()
@@ -215,4 +215,4 @@
 headerFile.close()
 descFile.close()
 jsonFile.close()
-print "All done"
+print("All done")

avidemux_2.7.4.tar.gz/cmake/admWindRes.cmake -> avidemux_2.7.6.tar.gz/cmake/admWindRes.cmake Changed

@@ -3,40 +3,53 @@
         ELSE(CROSS)
                 SET(WINDRES windres.exe)
         ENDIF(CROSS)
-include(admTimeStamp)
 #
-MACRO(WINDRESIFY input icon src)
-        # add icon and version info
-        SET(FILEVERSION_STRING "${AVIDEMUX_VERSION}")
-        SET(PRODUCTVERSION_STRING "${AVIDEMUX_VERSION}")
-        STRING(REPLACE "." "," FILEVERSION ${FILEVERSION_STRING})
-        STRING(REPLACE "." "," PRODUCTVERSION ${PRODUCTVERSION_STRING})
-        ADM_TIMESTAMP(date)
-        SET(PRODUCTVERSION "${PRODUCTVERSION},${date}")
-        SET(FILEVERSION "${FILEVERSION},${date}")
+MACRO(WINDRESIFY tag icon src basename desc)
 
         IF (ADM_CPU_X86_64)
-	        SET(WIN_RES_TARGET "pe-x86-64")
+            SET(WIN_RES_TARGET "pe-x86-64")
         ELSE (ADM_CPU_X86_64)
-	        SET(WIN_RES_TARGET "pe-i386")
+            SET(WIN_RES_TARGET "pe-i386")
         ENDIF (ADM_CPU_X86_64)
 
-        #SET(AVIDEMUX_ICON "adm.ico")
-        #SET(FULL_PATH "${CMAKE_CURRENT_SOURCE_DIR}//avidemux/common/xpm/${AVIDEMUX_ICON}")
         # Convert to native absolute path
         SET(FULL_PATH "${icon}")
         get_filename_component(abs "${FULL_PATH}" ABSOLUTE)
         file(TO_NATIVE_PATH ${abs} ICON_PATH)
         # replace c:\foo by c:\\foo
         STRING(REPLACE "\\" "\\\\" ICON_PATH ${ICON_PATH})
-        
-        CONFIGURE_FILE(${input} ${CMAKE_CURRENT_BINARY_DIR}/admWin.rc IMMEDIATE)
+        IF(${CMAKE_VERSION} VERSION_GREATER 2.8.11)
+                STRING(TIMESTAMP CURRENT_YEAR "%Y")
+                STRING(TIMESTAMP BUILD_ID "%y%j")
+        ELSE()
+                STRING(TIMESTAMP CURRENT_YEAR "2020")
+                STRING(TIMESTAMP BUILD_ID "0")
+        ENDIF()
+        SET(COPYRIGHT_STRING "Copyright © 2001-${CURRENT_YEAR} Mean / eumagga0x2a")
+        SET(EXECUTABLE_DESCRIPTION "${desc}")
+        SET(EXECUTABLE_FILENAME "${basename}.exe")
+        SET(EXECUTABLE_REVISION "${BUILD_ID}")
 
-        if (MINGW)
-	        SET(ADM_WIN_RES "adm.obj")
-	        SET( ${src} ${ADM_WIN_RES})
-	        ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ADM_WIN_RES} COMMAND ${WINDRES} -F ${WIN_RES_TARGET} -i ${CMAKE_CURRENT_BINARY_DIR}/admWin.rc -o ${CMAKE_CURRENT_BINARY_DIR}/${ADM_WIN_RES} -O coff --define VS_VERSION_INFO=1)
-        else (MINGW) # MSVC
-            SET(${src}  ${CMAKE_CURRENT_BINARY_DIR}/admWin.rc )
-        endif (MINGW)
-ENDMACRO(WINDRESIFY input icon src)
+        include(generate_product_version)
+        generate_product_version(ProductVersionFiles_${tag}
+                NAME "${EXECUTABLE_DESCRIPTION}"
+                BUNDLE Avidemux
+                VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}
+                VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}
+                VERSION_PATCH ${CPACK_PACKAGE_VERSION_P}
+                ICON          ${ICON_PATH}
+                VERSION_REVISION ${EXECUTABLE_REVISION}
+                COMPANY_NAME avidemux.org
+                COMPANY_COPYRIGHT "${COPYRIGHT_STRING}"
+                ORIGINAL_FILENAME "${EXECUTABLE_FILENAME}"
+                INTERNAL_NAME avidemux)
+        IF(MSVC)
+                SET( ${src} ${ProductVersionFiles_${tag}})
+                MESSAGE(STATUS "RC file info : ${${src}}")
+        ELSE(MSVC) # MINGW
+                SET(ADM_WIN_RES "adm.obj")
+                SET( ${src} ${ADM_WIN_RES})
+                ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ADM_WIN_RES} COMMAND ${WINDRES} -F ${WIN_RES_TARGET} -i ${CMAKE_CURRENT_BINARY_DIR}/VersionResource.rc -o ${CMAKE_CURRENT_BINARY_DIR}/${ADM_WIN_RES} -O coff --define VS_VERSION_INFO=1)
+        ENDIF(MSVC)
+
+ENDMACRO(WINDRESIFY tag icon src basename desc)

avidemux_2.7.4.tar.gz/cmake/admYasm_gcc.cmake -> avidemux_2.7.6.tar.gz/cmake/admYasm_gcc.cmake Changed

@@ -1,6 +1,4 @@
 #
-MACRO(YASMIFY)
-ENDMACRO(YASMIFY)
 IF(ADM_CPU_X86 )
     MESSAGE(STATUS "Checking for YASM")
     MESSAGE(STATUS "*****************")
@@ -10,41 +8,38 @@
     ENDIF(YASM_YASM STREQUAL "<YASM_YASM>-NOTFOUND")
     MESSAGE(STATUS "Found as ${YASM_YASM}")
 
-    SET(ASM_DIALECT "_NASM")
 
     SET(CMAKE_ASM_SOURCE_FILE_EXTENSIONS nasm;nas;asm)
-    ENABLE_LANGUAGE(ASM_NASM)
-    SET(CMAKE_ASM_NASM_COMPILER ${YASM_YASM})
     SET(ASM_ARGS "")
     IF(APPLE)
-            SET(ASM_ARGS_FORMAT  "-f macho64 -DPREFIX -DPIC")
+            SET(ASM_ARGS_FORMAT  -f macho64 -DPREFIX -DPIC)
     ELSE(APPLE)
       IF(WIN32)
         IF(ADM_CPU_X86_64)
-            SET(ASM_ARGS_FORMAT  "-f win64")
+            SET(ASM_ARGS_FORMAT  -f win64)
         ELSE(ADM_CPU_X86_64)
-            SET(ASM_ARGS_FORMAT  "-f win32 ")
+            SET(ASM_ARGS_FORMAT  -f win32 )
         ENDIF(ADM_CPU_X86_64)
       ELSE(WIN32) # Linux
-        SET(ASM_ARGS_FORMAT      "-f elf -DPIC")
+        SET(ASM_ARGS_FORMAT      -f elf -DPIC)
       ENDIF(WIN32)
     ENDIF(APPLE)
 
     IF(WIN32 AND NOT ADM_CPU_X86_64)
-        SET(ASM_ARGS_FLAGS       "-DHAVE_ALIGNED_STACK=0 -DPREFIX")
+        SET(ASM_ARGS_FLAGS       -DHAVE_ALIGNED_STACK=0 -DPREFIX)
     ELSE(WIN32 AND NOT ADM_CPU_X86_64)
-        SET(ASM_ARGS_FLAGS       "-DHAVE_ALIGNED_STACK=1")
+        SET(ASM_ARGS_FLAGS       -DHAVE_ALIGNED_STACK=1)
     ENDIF(WIN32 AND NOT ADM_CPU_X86_64)
 
       
      
     IF( ADM_CPU_X86_64 )
-        SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT} -m amd64 -DARCH_X86_64=1 -DARCH_X86_32=0")
+        SET(ASM_ARGS_FORMAT ${ASM_ARGS_FORMAT} -m amd64 -DARCH_X86_64=1 -DARCH_X86_32=0)
     ELSE( ADM_CPU_X86_64 )
-        SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT}  -DARCH_X86_64=0 -DARCH_X86_32=1")
+        SET(ASM_ARGS_FORMAT ${ASM_ARGS_FORMAT}  -DARCH_X86_64=0 -DARCH_X86_32=1)
     ENDIF( ADM_CPU_X86_64 )
     
-    SET(ASM_ARGS_FLAGS "${ASM_ARGS_FLAGS} -DHAVE_CPUNOP=0") # Not sure what this is for ?
+    SET(ASM_ARGS_FLAGS ${ASM_ARGS_FLAGS} -DHAVE_CPUNOP=0 ) # Not sure what this is for ?
 
    IF(AVIDEMUX_THIS_IS_CORE)
         SET(NASM_MACRO_FOLDER  ${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_core/include)
@@ -56,14 +51,25 @@
     
 
     if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-        SET(ASM_ARGS_FLAGS "${ASM_ARGS_FLAGS} -gdwarf2")
+        SET(ASM_ARGS_FLAGS ${ASM_ARGS_FLAGS} -gdwarf2)
     endif (CMAKE_BUILD_TYPE STREQUAL "Debug")
+   
     
-    SET(CMAKE_ASM_NASM_FLAGS "${ASM_ARGS_FORMAT} ${ASM_ARGS_FLAGS} -I${NASM_MACRO_FOLDER}" CACHE INTERNAL "" )
+    MACRO(YASMIFY out )
+           MESSAGE(STATUS "YASMIFY : ${filez}")
+           foreach(fl ${ARGN})
+             MESSAGE(STATUS "    ${CMAKE_CURRENT_SOURCE_DIR}/${fl}.asm ==> ${CMAKE_CURRENT_BINARY_DIR}/${fl}.obj")
+             add_custom_command(
+                 OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${fl}.obj
+                 COMMAND ${CMAKE_COMMAND} -E echo   ${YASM_YASM} ARGS ${ASM_ARGS_FORMAT} ${ASM_ARGS_FLAGS} -I${NASM_MACRO_FOLDER}  -o ${CMAKE_CURRENT_BINARY_DIR}/${fl}.obj ${CMAKE_CURRENT_SOURCE_DIR}/${fl}.asm
+                 COMMAND ${YASM_YASM} ARGS ${ASM_ARGS_FORMAT} ${ASM_ARGS_FLAGS} -I${NASM_MACRO_FOLDER}  -o ${CMAKE_CURRENT_BINARY_DIR}/${fl}.obj ${CMAKE_CURRENT_SOURCE_DIR}/${fl}.asm
+                 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${fl}.asm)
+                 LIST( APPEND ${out} ${CMAKE_CURRENT_BINARY_DIR}/${fl}.obj)
+            endforeach(fl ${filez})
+        MESSAGE(STATUS "ASM files : ${${out}}")
+    ENDMACRO(YASMIFY out ${ARGN})
+
 
-    
-    INCLUDE(CMakeASMInformation)
-    SET( CMAKE_ASM_NASM_COMPILE_OBJECT  "<CMAKE_ASM_NASM_COMPILER> ${CMAKE_ASM_NASM_FLAGS} -o <OBJECT> <SOURCE>" CACHE INTERNAL "")
 
 #
 #
@@ -74,4 +80,6 @@
 
 ELSE(ADM_CPU_X86 )
     MESSAGE(STATUS "Not X86, no need for yasm")
+    MACRO(YASMIFY)
+    ENDMACRO(YASMIFY)
 ENDIF(ADM_CPU_X86 ) # Temp hack

avidemux_2.7.4.tar.gz/cmake/admYasm_vs.cmake -> avidemux_2.7.6.tar.gz/cmake/admYasm_vs.cmake Changed

@@ -7,11 +7,12 @@
    ENDIF(YASM_YASM STREQUAL "<YASM_YASM>-NOTFOUND")
    MESSAGE(STATUS "Found as ${YASM_YASM}")
 
-   SET(ASM_DIALECT "_NASM")
+   SET(YASM_YASM "yasm.exe") # newer cmakes do not like to be given absolute paths for that wtf ?
+   #SET(ASM_DIALECT "_NASM")
 
    SET(CMAKE_ASM_SOURCE_FILE_EXTENSIONS nasm;nas;asm)
    ENABLE_LANGUAGE(ASM_NASM)
-   SET(CMAKE_ASM_NASM_COMPILER ${YASM_YASM})
+   #SET(CMAKE_ASM_NASM_COMPILER ${YASM_YASM})
    SET(ASM_ARGS "")
    SET(ASM_ARGS_FLAGS  -DHAVE_ALIGNED_STACK=1  -DHAVE_CPUNOP=0)
    SET(ASM_ARGS_FORMAT -f win64 -m amd64 -DARCH_X86_64=1 -DARCH_X86_32=0)
@@ -24,16 +25,16 @@
 
 
     
-    SET(CMAKE_ASM_NASM_FLAGS ${ASM_ARGS_FORMAT} ${ASM_ARGS_FLAGS} -I${NASM_MACRO_FOLDER}  )
-    INCLUDE(CMakeASMInformation)
-    SET( CMAKE_ASM_NASM_COMPILE_OBJECT  "<CMAKE_ASM_NASM_COMPILER> ${CMAKE_ASM_NASM_FLAGS} -o <OBJECT> <SOURCE>" CACHE INTERNAL "")
+    #SET(CMAKE_ASM_NASM_FLAGS ${ASM_ARGS_FORMAT} ${ASM_ARGS_FLAGS} -I${NASM_MACRO_FOLDER}  )
+    #INCLUDE(CMakeASMInformation)
+    #SET( CMAKE_ASM_NASM_COMPILE_OBJECT  "<CMAKE_ASM_NASM_COMPILER> ${CMAKE_ASM_NASM_FLAGS} -o <OBJECT> <SOURCE>" CACHE INTERNAL "")
 
 
 
 
-MACRO(YASMIFY out filez)
+MACRO(YASMIFY out )
            MESSAGE(STATUS "YASMIFY : ${filez}")
-           foreach(fl ${filez})
+           foreach(fl ${ARGN})
              MESSAGE(STATUS "    ${CMAKE_CURRENT_SOURCE_DIR}/${fl}.asm ==> ${CMAKE_CURRENT_BINARY_DIR}/${fl}.obj")
              add_custom_command(
                  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${fl}.obj
@@ -41,9 +42,9 @@
                  COMMAND ${YASM_YASM} ARGS ${ASM_ARGS_FORMAT} ${ASM_ARGS_FLAGS} -I${NASM_MACRO_FOLDER}  -o ${CMAKE_CURRENT_BINARY_DIR}/${fl}.obj ${CMAKE_CURRENT_SOURCE_DIR}/${fl}.asm
                  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${fl}.asm)
                  LIST( APPEND ${out} ${CMAKE_CURRENT_BINARY_DIR}/${fl}.obj)
-            endforeach(fl ${filez})
+            endforeach(fl ${ARGN})
         MESSAGE(STATUS "ASM files : ${${out}}")
-ENDMACRO(YASMIFY out filez)
+ENDMACRO(YASMIFY out )
 
 
 #

avidemux_2.7.4.tar.gz/cmake/avidemuxVersion.cmake -> avidemux_2.7.6.tar.gz/cmake/avidemuxVersion.cmake Changed

avidemux_2.7.4.tar.gz/cmake/cmake_compile_check/cpu_armel_check.cpp -> avidemux_2.7.6.tar.gz/cmake/cmake_compile_check/cpu_armel_check.cpp Changed

avidemux_2.7.4.tar.gz/cmake/cmake_compile_check/cpu_x86-64_check.cpp -> avidemux_2.7.6.tar.gz/cmake/cmake_compile_check/cpu_x86-64_check.cpp Changed

avidemux_2.7.4.tar.gz/cmake/cmake_compile_check/cpu_x86_check.cpp -> avidemux_2.7.6.tar.gz/cmake/cmake_compile_check/cpu_x86_check.cpp Changed

avidemux_2.7.6.tar.gz/cmake/cmake_win32_rc Added

avidemux_2.7.6.tar.gz/cmake/cmake_win32_rc/LICENSE Added

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015, by [halex2005](mailto:akharlov@gmail.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

avidemux_2.7.6.tar.gz/cmake/cmake_win32_rc/VersionInfo.in Added

@@ -0,0 +1,82 @@
+#pragma once
+
+#ifndef PRODUCT_VERSION_MAJOR
+#define PRODUCT_VERSION_MAJOR @PRODUCT_VERSION_MAJOR@
+#endif
+
+#ifndef PRODUCT_VERSION_MINOR
+#define PRODUCT_VERSION_MINOR @PRODUCT_VERSION_MINOR@
+#endif
+
+#ifndef PRODUCT_VERSION_PATCH
+#define PRODUCT_VERSION_PATCH @PRODUCT_VERSION_PATCH@
+#endif
+
+#ifndef PRODUCT_VERSION_BUILD
+#define PRODUCT_VERSION_BUILD @PRODUCT_VERSION_REVISION@
+#endif
+
+#ifndef FILE_VERSION_MAJOR
+#define FILE_VERSION_MAJOR @PRODUCT_VERSION_MAJOR@
+#endif
+
+#ifndef FILE_VERSION_MINOR
+#define FILE_VERSION_MINOR @PRODUCT_VERSION_MINOR@
+#endif
+
+#ifndef FILE_VERSION_PATCH
+#define FILE_VERSION_PATCH @PRODUCT_VERSION_PATCH@
+#endif
+
+#ifndef FILE_VERSION_BUILD
+#define FILE_VERSION_BUILD @PRODUCT_VERSION_REVISION@
+#endif
+
+#ifndef __TO_STRING
+#define __TO_STRING_IMPL(x) #x
+#define __TO_STRING(x) __TO_STRING_IMPL(x)
+#endif
+
+#define PRODUCT_VERSION_MAJOR_MINOR_STR        __TO_STRING(PRODUCT_VERSION_MAJOR) "." __TO_STRING(PRODUCT_VERSION_MINOR)
+#define PRODUCT_VERSION_MAJOR_MINOR_PATCH_STR  PRODUCT_VERSION_MAJOR_MINOR_STR "." __TO_STRING(PRODUCT_VERSION_PATCH)
+#define PRODUCT_VERSION_FULL_STR               PRODUCT_VERSION_MAJOR_MINOR_PATCH_STR "." __TO_STRING(PRODUCT_VERSION_BUILD)
+#define PRODUCT_VERSION_RESOURCE               PRODUCT_VERSION_MAJOR,PRODUCT_VERSION_MINOR,PRODUCT_VERSION_PATCH,PRODUCT_VERSION_BUILD
+#define PRODUCT_VERSION_RESOURCE_STR           PRODUCT_VERSION_FULL_STR "\0"
+
+#define FILE_VERSION_MAJOR_MINOR_STR        __TO_STRING(FILE_VERSION_MAJOR) "." __TO_STRING(FILE_VERSION_MINOR)
+#define FILE_VERSION_MAJOR_MINOR_PATCH_STR  FILE_VERSION_MAJOR_MINOR_STR "." __TO_STRING(FILE_VERSION_PATCH)
+#define FILE_VERSION_FULL_STR               FILE_VERSION_MAJOR_MINOR_PATCH_STR "." __TO_STRING(FILE_VERSION_BUILD)
+#define FILE_VERSION_RESOURCE               FILE_VERSION_MAJOR,FILE_VERSION_MINOR,FILE_VERSION_PATCH,FILE_VERSION_BUILD
+#define FILE_VERSION_RESOURCE_STR           FILE_VERSION_FULL_STR "\0"
+
+#ifndef PRODUCT_ICON
+#define PRODUCT_ICON "@PRODUCT_ICON@"
+#endif
+
+#ifndef PRODUCT_COMMENTS
+#define PRODUCT_COMMENTS           "@PRODUCT_COMMENTS@\0"
+#endif
+
+#ifndef PRODUCT_COMPANY_NAME
+#define PRODUCT_COMPANY_NAME       "@PRODUCT_COMPANY_NAME@\0"
+#endif
+
+#ifndef PRODUCT_COMPANY_COPYRIGHT
+#define PRODUCT_COMPANY_COPYRIGHT  "@PRODUCT_COMPANY_COPYRIGHT@\0"
+#endif
+
+#ifndef PRODUCT_FILE_DESCRIPTION
+#define PRODUCT_FILE_DESCRIPTION   "@PRODUCT_FILE_DESCRIPTION@\0"
+#endif
+
+#ifndef PRODUCT_INTERNAL_NAME
+#define PRODUCT_INTERNAL_NAME      "@PRODUCT_NAME@\0"
+#endif
+
+#ifndef PRODUCT_ORIGINAL_FILENAME
+#define PRODUCT_ORIGINAL_FILENAME  "@PRODUCT_ORIGINAL_FILENAME@\0"
+#endif
+
+#ifndef PRODUCT_BUNDLE
+#define PRODUCT_BUNDLE             "@PRODUCT_BUNDLE@\0"
+#endif

avidemux_2.7.6.tar.gz/cmake/cmake_win32_rc/VersionResource.rc Added

@@ -0,0 +1,52 @@
+#pragma code_page(65001) // UTF-8
+
+#include "VersionInfo.h"
+
+#if defined(__MINGW64__) || defined(__MINGW32__)
+	// MinGW-w64, MinGW
+	#if defined(__has_include) && __has_include(<winres.h>)
+		#include <winres.h>
+	#else
+		#include <afxres.h>
+		#include <winresrc.h>
+	#endif
+#else
+	// MSVC, Windows SDK
+	#include <winres.h>
+#endif
+
+IDI_ICON1               ICON                    PRODUCT_ICON
+
+VS_VERSION_INFO VERSIONINFO
+    FILEVERSION FILE_VERSION_RESOURCE
+    PRODUCTVERSION PRODUCT_VERSION_RESOURCE
+    FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+    FILEFLAGS 0x1L
+#else
+    FILEFLAGS 0x0L
+#endif
+    FILEOS 0x4L
+    FILETYPE 0x1L
+    FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "Comments", PRODUCT_COMMENTS
+            VALUE "CompanyName", PRODUCT_COMPANY_NAME
+            VALUE "FileDescription", PRODUCT_FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_RESOURCE_STR
+            VALUE "InternalName", PRODUCT_INTERNAL_NAME
+            VALUE "LegalCopyright", PRODUCT_COMPANY_COPYRIGHT
+            VALUE "OriginalFilename", PRODUCT_ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_BUNDLE
+            VALUE "ProductVersion", PRODUCT_VERSION_RESOURCE_STR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END

avidemux_2.7.6.tar.gz/cmake/cmake_win32_rc/admPackage.txt Added

avidemux_2.7.6.tar.gz/cmake/cmake_win32_rc/generate_product_version.cmake Added

@@ -0,0 +1,107 @@
+include (CMakeParseArguments)
+
+set (GenerateProductVersionCurrentDir ${CMAKE_CURRENT_LIST_DIR})
+
+# generate_product_version() function
+#
+# This function uses VersionInfo.in template file and VersionResource.rc file
+# to generate WIN32 resource with version information and general resource strings.
+#
+# Usage:
+#   generate_product_version(
+#     SomeOutputResourceVariable
+#     NAME MyGreatProject
+#     ICON ${PATH_TO_APP_ICON}
+#     VERSION_MAJOR 2
+#     VERSION_MINOR 3
+#     VERSION_PATCH ${BUILD_COUNTER}
+#     VERSION_REVISION ${BUILD_REVISION}
+#   )
+# where BUILD_COUNTER and BUILD_REVISION could be values from your CI server.
+#
+# You can use generated resource for your executable targets:
+#   add_executable(target-name ${target-files} ${SomeOutputResourceVariable})
+#
+# You can specify resource strings in arguments:
+#   NAME               - name of executable (no defaults, ex: Microsoft Word)
+#   BUNDLE             - bundle (${NAME} is default, ex: Microsoft Office)
+#   ICON               - path to application icon (${CMAKE_SOURCE_DIR}/product.ico by default)
+#   VERSION_MAJOR      - 1 is default
+#   VERSION_MINOR      - 0 is default
+#   VERSION_PATCH      - 0 is default
+#   VERSION_REVISION   - 0 is default
+#   COMPANY_NAME       - your company name (no defaults)
+#   COMPANY_COPYRIGHT  - ${COMPANY_NAME} (C) Copyright ${CURRENT_YEAR} is default
+#   COMMENTS           - ${NAME} v${VERSION_MAJOR}.${VERSION_MINOR} is default
+#   ORIGINAL_FILENAME  - ${NAME} is default
+#   INTERNAL_NAME      - ${NAME} is default
+#   FILE_DESCRIPTION   - ${NAME} is default
+function(generate_product_version outfiles)
+    set (options)
+    set (oneValueArgs
+        NAME
+        BUNDLE
+        ICON
+        VERSION_MAJOR
+        VERSION_MINOR
+        VERSION_PATCH
+        VERSION_REVISION
+        COMPANY_NAME
+        COMPANY_COPYRIGHT
+        COMMENTS
+        ORIGINAL_FILENAME
+        INTERNAL_NAME
+        FILE_DESCRIPTION)
+    set (multiValueArgs)
+    cmake_parse_arguments(PRODUCT "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    if (NOT PRODUCT_BUNDLE OR "${PRODUCT_BUNDLE}" STREQUAL "")
+        set(PRODUCT_BUNDLE "${PRODUCT_NAME}")
+    endif()
+    if (NOT PRODUCT_ICON OR "${PRODUCT_ICON}" STREQUAL "")
+        set(PRODUCT_ICON "${CMAKE_SOURCE_DIR}/product.ico")
+    endif()
+
+    if (NOT PRODUCT_VERSION_MAJOR EQUAL 0 AND (NOT PRODUCT_VERSION_MAJOR OR "${PRODUCT_VERSION_MAJOR}" STREQUAL ""))
+        set(PRODUCT_VERSION_MAJOR 1)
+    endif()
+    if (NOT PRODUCT_VERSION_MINOR EQUAL 0 AND (NOT PRODUCT_VERSION_MINOR OR "${PRODUCT_VERSION_MINOR}" STREQUAL ""))
+        set(PRODUCT_VERSION_MINOR 0)
+    endif()
+    if (NOT PRODUCT_VERSION_PATCH EQUAL 0 AND (NOT PRODUCT_VERSION_PATCH OR "${PRODUCT_VERSION_PATCH}" STREQUAL ""))
+        set(PRODUCT_VERSION_PATCH 0)
+    endif()
+    if (NOT PRODUCT_VERSION_REVISION EQUAL 0 AND (NOT PRODUCT_VERSION_REVISION OR "${PRODUCT_VERSION_REVISION}" STREQUAL ""))
+        set(PRODUCT_VERSION_REVISION 0)
+    endif()
+
+    if (NOT PRODUCT_COMPANY_COPYRIGHT OR "${PRODUCT_COMPANY_COPYRIGHT}" STREQUAL "")
+        string(TIMESTAMP PRODUCT_CURRENT_YEAR "%Y")
+        set(PRODUCT_COMPANY_COPYRIGHT "${PRODUCT_COMPANY_NAME} (C) Copyright ${PRODUCT_CURRENT_YEAR}")
+    endif()
+    if (NOT PRODUCT_COMMENTS OR "${PRODUCT_COMMENTS}" STREQUAL "")
+        set(PRODUCT_COMMENTS "${PRODUCT_NAME} v${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}")
+    endif()
+    if (NOT PRODUCT_ORIGINAL_FILENAME OR "${PRODUCT_ORIGINAL_FILENAME}" STREQUAL "")
+        set(PRODUCT_ORIGINAL_FILENAME "${PRODUCT_NAME}")
+    endif()
+    if (NOT PRODUCT_INTERNAL_NAME OR "${PRODUCT_INTERNAL_NAME}" STREQUAL "")
+        set(PRODUCT_INTERNAL_NAME "${PRODUCT_NAME}")
+    endif()
+    if (NOT PRODUCT_FILE_DESCRIPTION OR "${PRODUCT_FILE_DESCRIPTION}" STREQUAL "")
+        set(PRODUCT_FILE_DESCRIPTION "${PRODUCT_NAME}")
+    endif()
+
+    set (_VersionInfoFile ${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.h)
+    set (_VersionResourceFile ${CMAKE_CURRENT_BINARY_DIR}/VersionResource.rc)
+    configure_file(
+        ${GenerateProductVersionCurrentDir}/VersionInfo.in
+        ${_VersionInfoFile}
+        @ONLY)
+    configure_file(
+        ${GenerateProductVersionCurrentDir}/VersionResource.rc
+        ${_VersionResourceFile}
+        COPYONLY)
+    list(APPEND ${outfiles} ${_VersionInfoFile} ${_VersionResourceFile})
+    set (${outfiles} ${${outfiles}} PARENT_SCOPE)
+endfunction()

avidemux_2.7.6.tar.gz/cmake/cmake_win32_rc/language_utf8.patch Added

avidemux_2.7.4.tar.gz/cmake/commonCmakeApplication.cmake -> avidemux_2.7.6.tar.gz/cmake/commonCmakeApplication.cmake Changed

avidemux_2.7.4.tar.gz/createDebFromSourceUbuntu.bash -> avidemux_2.7.6.tar.gz/createDebFromSourceUbuntu.bash Changed

@@ -26,7 +26,11 @@
     libpng-dev libaften-dev libmp3lame-dev libx264-dev libxvidcore-dev libfaad-dev libfaac-dev libopus-dev libvorbis-dev libogg-dev libdca-dev \
     || { echo "The installation at least of some of the build dependencies failed. Aborting." && exit 2; }
     sudo apt-get install libx265-dev \
-    || echo "Warning: libx265-dev cannot be installed using package management. Avidemux won't be able to encode in h265 unless the library and the headers have been installed manually. Continuing anyway." # there are no official libx265 packages for Ubuntu Trusty
+    || echo "Warning: libx265-dev cannot be installed using package management. Avidemux won't be able to encode HEVC unless the library and the headers have been installed manually. Continuing anyway." # there are no official libx265 packages for Ubuntu Trusty
+    sudo apt-get install libvpx-dev \
+    || echo "Warning: libvpx-dev cannot be installed using package management. Avidemux won't be able to encode VP9 unless the library and the headers have been installed manually. Continuing anyway."
+    sudo apt-get install libaom-dev \
+    || echo "Warning: libaom-dev cannot be installed using package management. Avidemux won't be able to decode AV1 unless the library and the headers have been installed manually. Continuing anyway." # available from Ubuntu Eoan on
 }
 #
 install_avidemux()

avidemux_2.7.4.tar.gz/createRpmFromSourceFedora.bash -> avidemux_2.7.6.tar.gz/createRpmFromSourceFedora.bash Changed

avidemux_2.7.4.tar.gz/cross-compiling.txt -> avidemux_2.7.6.tar.gz/cross-compiling.txt Changed

@@ -25,6 +25,7 @@
 then bind-mounted to /opt/mxe to save write cycles of an SSD where /opt
 resides. This has been done purely for convenience and is not required.
 
+##############################################################################
 
 2. Create /opt/mxe/settings.mk with
 
@@ -38,32 +39,72 @@
 
 to the settings.mk file.
 
+##############################################################################
 
 3. Build required MXE packages for the targets specified above with
 
     cd /opt/mxe
-    make qttools qtwinextras sdl2 ogg vorbis lame a52dec faad2 fdk-aac libmad opus fribidi libass xvidcore x264 x265
+    make qttools qtwinextras sdl2 ogg vorbis lame a52dec faad2 fdk-aac libmad opus fribidi libass xvidcore x264 x265 libvpx
 
 This pulls in all the dependencies and can take a couple of hours. The final
 total size of the /opt/mxe folder may be about 2.2G. Please note that twolame
-is not available as a shared library and x265 has not been packaged for MXE as
-of this writing.
+is not available as a shared library.
 
+NB: To build version 3.4 of x265 instead of 2.4 provided by MXE as of this
+writing, apply the "x265.patch" patch from the "mxe-patches" subdirectory of
+Avidemux source tree prior to running make: in the MXE root directory, run
+
+    patch -p1 < /path/to/avidemux2/mxe-patches/x265.patch
+
+and on success proceed with the make command as shown above.
+
+##############################################################################
 
 4. To enable hardware-accelerated encoding provided by NVIDIA graphics cards of
-the Kepler generation and later, download the file "nvEncodeAPI.h" e.g. from
+the Kepler generation and later, clone the nv-codec-headers repository
+
+    git clone https://github.com/FFmpeg/nv-codec-headers.git
+
+change directory to the created nv-codec-headers subdirectory
+
+    cd nv-codec-headers
+
+delete the first line of the Makefile to remove a hardcoded PREFIX value
+
+    sed -i 1d Makefile
+
+and run
+
+    PREFIX="/opt/mxe/usr/i686-w64-mingw32.shared" make install
+
+for the 32 bit environment or
+
+    PREFIX="/opt/mxe/usr/x86_64-w64-mingw32.shared" make install
+
+for the 64 bit environment within /opt/mxe as MXE root correspondingly. Adjust
+the path specified as value of the PREFIX variable if MXE is installed
+elsewhere.
+
+##############################################################################
+
+5. In order to enable the AV1 decoder plugin in Avidemux, libaom, not provided
+by MXE, needs to be installed. Run script "install-libaom.bash" from the
+"mxe-patches" subdirectory of Avidemux source tree with the path to the MXE
+root directory passed as argument to automatically build and install version
+2.0.0 of libaom in the 64 bit environment.
 
-    https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/compat/nvenc/nvEncodeAPI.h
+The script will use the present working directory for all intermediate steps.
 
-and copy it to /opt/mxe/usr/i686-w64-mingw32.shared/include/ or
-/opt/mxe/usr/x86_64-w64-mingw32.shared/include/ correspondingly.
+Build for the 32 bit environment has not been tested yet.
 
+##############################################################################
 
-5. Create a user-writable directory 'out' in '/opt/mxe/usr/x86_64-w64-mingw32.shared'
+6. Create a user-writable directory 'out' in '/opt/mxe/usr/x86_64-w64-mingw32.shared'
 and in '/opt/mxe/usr/i686-w64-mingw32.shared' respectively.
 
+##############################################################################
 
-6. Enter the Avidemux top source directory and run
+7. Enter the Avidemux top source directory and run
 
     bash bootStrapCrossMingwQt5_mxe.sh
 
@@ -80,9 +121,10 @@
 file from the 'packaged_mingw_build_YYMMDD-hhmmss' directory to a Windows
 partition, extract it on Windows and run 'avidemux.exe' from there.
 
+##############################################################################
 
-7. Issues:
+8. Issues:
 
 As of this writing, twolame, aften, vapoursynth and avsproxy are not available.
 
-2017-11-01 UTC 23:05
+2020-06-06 UTC 22:04

avidemux_2.7.6.tar.gz/makeAppImageBuster.sh Added

avidemux_2.7.6.tar.gz/mxe-patches Added

avidemux_2.7.6.tar.gz/mxe-patches/install-libaom.bash Added

@@ -0,0 +1,70 @@
+#!/bin/bash
+# This is a convenience script to automate installation of libaom in MXE
+failMsg()
+{
+    echo "** $1 **"
+    exit 1
+}
+
+#AOM_HOME=/home/eumagga/adm
+#MXE_ROOT=${AOM_HOME}/mxe
+
+MXE_ROOT="$1"
+
+if [ "x${MXE_ROOT}" = "x" ]; then
+    echo "Usage: $0 /path/to/MXE/root/directory"
+    exit 1
+fi
+if ! [ -d "${MXE_ROOT}" ]; then
+    failMsg "${MXE_ROOT} does not exist or is not a directory"
+fi
+if ! [ -f "${MXE_ROOT}/mxe.github.mk" ]; then
+    failMsg "${MXE_ROOT} does look like a MXE root directory"
+fi
+
+CROSS_PREFIX=x86_64-w64-mingw32.shared
+
+if [ "x${AOM_HOME}" = "x" ]; then
+    export AOM_HOME="$(pwd)"
+fi
+if ! [ -d "${AOM_HOME}" ]; then
+    failMsg "${AOM_HOME} does not exist or is not a directory"
+fi
+cd "${AOM_HOME}"
+if [ -d "${AOM_HOME}/aom" ] && ! [ -d "${AOM_HOME}/aom/.git" ]; then
+    echo "${AOM_HOME}/aom is not a git repository, will try to remove it"
+    rm -rf "${AOM_HOME}/aom" || failMsg "Cannot remove ${AOM_HOME}/aom"
+fi
+if ! [ -d "${AOM_HOME}/aom" ]; then
+    echo "Will clone aom source in ${AOM_HOME} directory"
+    git clone https://aomedia.googlesource.com/aom || failMsg "Failed cloning aom source"
+fi
+cd "${AOM_HOME}/aom"
+git checkout tags/v2.0.0 || failMsg "Cannot checkout v2.0.0"
+
+cd ..
+if [ -d build-aom ]; then
+    rm -rf build-aom || failMsg "Cannot remove old ${AOM_HOME}/build-aom directory"
+fi
+mkdir build-aom || failMsg "Cannot create ${AOM_HOME}/build-aom directory"
+cd build-aom
+
+export PATH=${PATH}:${MXE_ROOT}/usr/bin
+
+cmake ../aom/ \
+    -DCROSS="${CROSS_PREFIX}-" \
+    -DCMAKE_TOOLCHAIN_FILE=../aom/build/cmake/toolchains/x86_64-mingw-gcc.cmake \
+    -DENABLE_DOCS=0 \
+    -DENABLE_EXAMPLES=0 \
+    -DENABLE_TOOLS=0 \
+    -DBUILD_SHARED_LIBS=1 \
+    -DCONFIG_AV1_ENCODER=0 \
+    -DCONFIG_ANALYZER=0 \
+    -DFORCE_HIGHBITDEPTH_DECODING=0 \
+    -DCMAKE_INSTALL_PREFIX=${MXE_ROOT}/usr/${CROSS_PREFIX} || failMsg "Failed at cmake"
+make -j $(nproc) || failMsg "Failed at make"
+make install || failMsg "Failed at make install"
+DLL="${MXE_ROOT}/usr/${CROSS_PREFIX}/lib/libaom.dll"
+mv -v "${DLL}" "${MXE_ROOT}/usr/${CROSS_PREFIX}/bin/" || failMsg "Failed moving ${DLL} to ${MXE_ROOT}/usr/${CROSS_PREFIX}/bin/"
+echo "All done"
+exit 0

avidemux_2.7.6.tar.gz/mxe-patches/x264-snapshot.sh Added

avidemux_2.7.6.tar.gz/mxe-patches/x264.patch Added

@@ -0,0 +1,30 @@
+diff --git a/src/x264.mk b/src/x264.mk
+index 0170301b..1189ccd0 100644
+--- a/src/x264.mk
++++ b/src/x264.mk
+@@ -3,20 +3,13 @@
+ PKG             := x264
+ $(PKG)_WEBSITE  := https://www.videolan.org/developers/x264.html
+ $(PKG)_IGNORE   :=
+-$(PKG)_VERSION  := 20180806-2245
+-$(PKG)_CHECKSUM := 9f876c88aeb21fa9315e4a078931faf6fc0d3c3f47e05a306d2fdc62ea0afea2
+-$(PKG)_SUBDIR   := $(PKG)-snapshot-$($(PKG)_VERSION)
+-$(PKG)_FILE     := $(PKG)-snapshot-$($(PKG)_VERSION).tar.bz2
+-$(PKG)_URL      := https://download.videolan.org/pub/videolan/$(PKG)/snapshots/$($(PKG)_FILE)
++$(PKG)_VERSION  := 0.159-20200409git296494a
++$(PKG)_CHECKSUM := 3c884571fccd7f5a4e3b4e08c6386ad356f15ea2c381cf464e87a70af263c144
++$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
++$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
++$(PKG)_URL      :=
+ $(PKG)_DEPS     := cc liblsmash $(BUILD)~nasm
+ 
+-define $(PKG)_UPDATE
+-    $(WGET) -q -O- 'https://git.videolan.org/?p=x264.git;a=shortlog' | \
+-    $(SED) -n 's,.*$[0-9]\{4\}$-$[0-9]\{2\}$-$[0-9]\{2\}$.*,\1\2\3-2245,p' | \
+-    $(SORT) | \
+-    tail -1
+-endef
+-
+ define $(PKG)_BUILD
+     cd '$(BUILD_DIR)' && AS='$(PREFIX)/$(BUILD)/bin/nasm' '$(SOURCE_DIR)/configure'\
+         $(MXE_CONFIGURE_OPTS) \

avidemux_2.7.6.tar.gz/mxe-patches/x265.patch Added

@@ -0,0 +1,57 @@
+diff --git a/src/x265-1-fixes.patch b/src/x265-1-fixes.patch
+deleted file mode 100644
+index d996a477..00000000
+--- a/src/x265-1-fixes.patch
++++ /dev/null
+@@ -1,36 +0,0 @@
+-This file is part of MXE. See LICENSE.md for licensing information.
+-
+-Contains ad hoc patches for cross building.
+-
+-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+-From: darealshinji <djcj@gmx.de>
+-Date: Sat, 1 Jul 2017 17:09:40 +0200
+-Subject: [PATCH 1/1] Use C++14 so we can build with dynamicHDR
+-
+-
+-diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+-index 1111111..2222222 100644
+---- a/source/CMakeLists.txt
+-+++ b/source/CMakeLists.txt
+-@@ -187,7 +187,7 @@ endif()
+- if(GCC)
+-     add_definitions(-Wall -Wextra -Wshadow)
+-     add_definitions(-D__STDC_LIMIT_MACROS=1)
+--    add_definitions(-std=gnu++98)
+-+    add_definitions(-std=gnu++14)
+-     if(ENABLE_PIC)
+-          add_definitions(-fPIC)
+-     endif(ENABLE_PIC)
+-diff --git a/source/encoder/encoder.h b/source/encoder/encoder.h
+-index 1111111..2222222 100644
+---- a/source/encoder/encoder.h
+-+++ b/source/encoder/encoder.h
+-@@ -33,7 +33,7 @@
+- #include "framedata.h"
+- 
+- #ifdef ENABLE_DYNAMIC_HDR10
+--    #include "dynamicHDR10\hdr10plus.h"
+-+    #include "dynamicHDR10/hdr10plus.h"
+- #endif
+- 
+- struct x265_encoder {};
+diff --git a/src/x265.mk b/src/x265.mk
+index 3b0329e0..9ff07def 100644
+--- a/src/x265.mk
++++ b/src/x265.mk
+@@ -3,8 +3,8 @@
+ PKG             := x265
+ $(PKG)_WEBSITE  := http://x265.org/
+ $(PKG)_IGNORE   :=
+-$(PKG)_VERSION  := 2.4
+-$(PKG)_CHECKSUM := 9c2aa718d78f6fecdd783f08ab83b98d3169e5f670404da4c16439306907d729
++$(PKG)_VERSION  := 3.4
++$(PKG)_CHECKSUM := c2047f23a6b729e5c70280d23223cb61b57bfe4ad4e8f1471eeee2a61d148672
+ $(PKG)_SUBDIR   := x265_$($(PKG)_VERSION)
+ $(PKG)_FILE     := x265_$($(PKG)_VERSION).tar.gz
+ $(PKG)_URL      := https://bitbucket.org/multicoreware/x265/downloads/$($(PKG)_FILE)

avidemux_2.7.6.tar.gz/run_jobs_template.sh Added

@@ -0,0 +1,39 @@
+#!/bin/bash
+# This is a script template to run Avidemux Jobs on Linux without installation.
+# Adjust variables appropriately, copy it to a location included in $PATH
+# and make it executable.
+
+# TOPSRCDIR must match the location of the Avidemux source tree,
+# default: ${HOME}/avidemux2
+TOPSRCDIR="${HOME}/avidemux2"
+
+# PREFIX must match the prefix passed to bootStrap.bash when compiling Avidemux,
+# default when no prefix specified: /usr
+PREFIX="/usr"
+
+# Avidemux version
+MAJOR="2"
+MINOR="7"
+
+fail()
+{
+    echo "$1. Aborting."
+    exit 1
+}
+HERE="${TOPSRCDIR}/install${PREFIX}"
+CORECONFIG="${HERE}/include/avidemux/${MAJOR}.${MINOR}/ADM_coreConfig.h"
+if ! [ -e "${CORECONFIG}" ]; then
+    fail "${CORECONFIG} not found, can't determine the relative library directory"
+fi
+LIBDIR=$(grep ADM_RELATIVE_LIB_DIR "${CORECONFIG}" | cut -f 3 -d " " | sed -e 's/^"//' -e 's/"$//')
+if [ -z "${LIBDIR}" ]; then
+    fail "ADM_RELATIVE_LIB_DIR empty or not set in ${CORECONFIG}"
+fi
+
+if ! [ -e "${HERE}/lib" ]; then
+    ln -s "${HERE}/${LIBDIR}" "${HERE}/lib"
+fi
+
+export LD_LIBRARY_PATH="${HERE}/${LIBDIR}:${LD_LIBRARY_PATH}"
+"${HERE}/bin/avidemux3_jobs_qt5" --portable
+

Changes of Revision 49