Packman Build Service PMBS

Changes of Revision 46

avidemux3.changes Changed

@@ -1,4 +1,56 @@
 -------------------------------------------------------------------
+Sun Aug 18 22:41:51 UTC 2019 - enzokiel@kabelmail.de
+
+- Update to version 2.7.4
+  + New Feature:Detect and warn when cut points in H.264 video
+    streams may result in playback issues despite being on keyframes
+  + FFmpeg:Update to the 4.1.4 release
+  + Core:Fix MSVC++ builds do not run when the path to user
+    directory contains non-ASCII characters
+  + Decoder:Fix DXVA2 HW accelerated decoding on Windows 7
+  + Decoder:Fix DXVA2 HW accelerated decoding stops sometimes on
+    cuts
+  + Decoder:Enable HW accelerated decoding of 8-bit HEVC for recent
+    versions of Intel graphics driver on Windows
+  + Encoder:Fix regression with saved x264 and x265 profiles not
+    found (MSVC++ only)
+  + Demuxer:Dynamically load VapourSynth Script library to avoid
+    error messages on Windows if VapourSynth is not found
+  + Demuxer:Provide correct average audio bitrate in the Mp4
+    demuxer if the exact value for the particular codec is unknown
+  + Demuxer:Fix crash loading MP4 file with number of audio tracks
+    exceeding the max supported
+  + Demuxer:Support audio tracks in fragmented MP4 files (the
+    variety with empty moov only)
+  + Demuxer:Support E-AC3 audio tracks in MP4 files
+  + Demuxer:Fix ASF demuxer still broken by chance with MSVC++
+    only, the fix relevant for all platforms
+  + Demuxer:Support more varieties of BMP images
+  + Muxer:Optimize output of the Mp4 muxer for streaming on
+    Windows too
+  + Muxer:Add option to the Mp4 muxer to output fragmented MP4
+    files
+  + Muxer:Label HEVC video in Mp4 in a way compatible with
+    QuickTime on macOS
+  + Filter:Fix assembly in Yadif deinterlacer with MSVC++
+  + UI:Enable automatic application scaling on Windows for recent
+    Qt versions
+  + UI:Fix silent mode, automatically confirm dialogs instead of
+    choosing the default option
+  + Audio:Support WMAPRO audio codec for decoding
+  + Audio:Support AAC with signal band replication (SBR) in
+    external audio tracks
+  + Audio:Fix saving AAC audio tracks with SBR to a file
+  + Audio:Improve resilience to false positives when probing
+    external audio files for AAC
+  + Miscellaneous:Fix crash with OpenGL or DXVA2 video output in 32
+    bits Avidemux on Windows (better late than never)
+  + Miscellaneous:Fix regressed handling of empty frames in MPEG-4
+    and FRAPS video streams
+  + Miscellaneous:Numerous other fixes and polish
+- Removed avidemux-cmake-permissions.patch, fixed upstream.
+
+-------------------------------------------------------------------
 Fri Mar 22 22:41:51 UTC 2019 - enzokiel@kabelmail.de
 
 - Update to version 2.7.3

avidemux3.spec Changed

avidemux-cmake-permissions.patch Deleted

avidemux-package_version.patch Changed

@@ -1,6 +1,6 @@
-diff -uNr avidemux_2.7.2/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp avidemux_2.7.2.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp
---- avidemux_2.7.2/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2019-03-16 11:52:17.881954253 +0100
-+++ avidemux_2.7.2.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2019-03-16 11:56:10.833191154 +0100
+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
 @@ -143,7 +143,7 @@
      QString referenceFile = QCoreApplication::applicationDirPath() + "/help/" + ((FileAction*)sender())->filePath();
  #else
@@ -10,9 +10,9 @@
  #endif
  
      QDesktopServices::openUrl(QUrl("file:///" + referenceFile, QUrl::TolerantMode));
-diff -uNr avidemux_2.7.2/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.7.2.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp
---- avidemux_2.7.2/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2019-03-16 11:52:17.853954826 +0100
-+++ avidemux_2.7.2.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2019-03-16 11:56:07.877251594 +0100
+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 @@
      if(isPortable)
      {
@@ -30,7 +30,7 @@
          ADM_i18nDir=std::string(ppath);
          delete [] ppath;
          ppath=NULL;
-@@ -143,7 +143,7 @@
+@@ -142,7 +142,7 @@
      strcpy(ADM_basedir, homeEnv);
      AddSeparator(ADM_basedir);
  
@@ -39,9 +39,9 @@
  
      strcat(ADM_basedir, ADM_DIR_NAME);
      strcat(ADM_basedir, ADM_SEPARATOR);
-diff -uNr avidemux_2.7.2/avidemux_core/ADM_core/src/ADM_folder_mac.cpp avidemux_2.7.2.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp
---- avidemux_2.7.2/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2019-03-16 11:52:17.853954826 +0100
-+++ avidemux_2.7.2.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2019-03-16 11:56:07.877251594 +0100
+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 @@
      strcpy(ADM_basedir, homeEnv);
      AddSeparator(ADM_basedir);
@@ -63,9 +63,9 @@
  #endif
      std::string r=std::string(ppath);
      delete [] ppath;
-diff -uNr avidemux_2.7.2/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp avidemux_2.7.2.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp
---- avidemux_2.7.2/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2019-03-16 11:52:17.737957198 +0100
-+++ avidemux_2.7.2.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2019-03-16 11:56:04.405322583 +0100
+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
 @@ -265,7 +265,7 @@
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1,
  			(string("Executing ") + string(name) + string("...")).c_str());
@@ -75,9 +75,9 @@
  
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1, "Done");
  
-diff -uNr avidemux_2.7.2/cmake/se_plugin.cmake avidemux_2.7.2.new/cmake/se_plugin.cmake
---- avidemux_2.7.2/cmake/se_plugin.cmake	2019-03-16 11:52:17.401964068 +0100
-+++ avidemux_2.7.2.new/cmake/se_plugin.cmake	2019-03-16 11:56:12.493157213 +0100
+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
 @@ -16,7 +16,7 @@
  if (WIN32)
      set(helpDir "${CMAKE_INSTALL_PREFIX}/help/${_engineName}")
@@ -87,17 +87,17 @@
  endif (WIN32)
  
      install(DIRECTORY "${_sourceDirectory}" DESTINATION "${helpDir}" COMPONENT plugins)
-diff -uNr avidemux_2.7.2/cmake/sql/update.sh avidemux_2.7.2.new/cmake/sql/update.sh
---- avidemux_2.7.2/cmake/sql/update.sh	2019-03-16 11:52:17.921953435 +0100
-+++ avidemux_2.7.2.new/cmake/sql/update.sh	2019-03-16 11:56:12.229162611 +0100
+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
 @@ -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.2/cmake/Ts.cmake avidemux_2.7.2.new/cmake/Ts.cmake
---- avidemux_2.7.2/cmake/Ts.cmake	2019-03-16 11:52:17.393964231 +0100
-+++ avidemux_2.7.2.new/cmake/Ts.cmake	2019-03-16 11:56:12.265161875 +0100
+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")

avidemux_2.7.3.tar.gz/avidemux_core/ffmpeg_package/ffmpeg-4.1.1.tar.bz2 Deleted

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif_asm.c Deleted

@@ -1,232 +0,0 @@
-#include <stdlib.h>
-#include <inttypes.h>
-
-#include "ADM_default.h"
-
-
-#if defined( ADM_CPU_X86) && !defined(_MSC_VER)
- #define CAN_DO_INLINE_X86_ASM
-#endif
-
-
-#ifdef CAN_DO_INLINE_X86_ASM
-#ifdef ADM_CPU_64BIT
-typedef int64_t x86_reg;
-#else
-typedef int32_t x86_reg;
-#endif
-
-#define LOAD4(mem,dst) \
- "movd "mem", "#dst" \n\t"\
- "punpcklbw %%mm7, "#dst" \n\t"
-
-#define PABS(tmp,dst) \
- "pxor "#tmp", "#tmp" \n\t"\
- "psubw "#dst", "#tmp" \n\t"\
- "pmaxsw "#tmp", "#dst" \n\t"
-
-#define CHECK(pj,mj) \
- "movq "#pj"(%[cur],%[mrefs]), %%mm2 \n\t" /* cur[x-refs-1+j] */\
- "movq "#mj"(%[cur],%[prefs]), %%mm3 \n\t" /* cur[x+refs-1-j] */\
- "movq %%mm2, %%mm4 \n\t"\
- "movq %%mm2, %%mm5 \n\t"\
- "pxor %%mm3, %%mm4 \n\t"\
- "pavgb %%mm3, %%mm5 \n\t"\
- "pand %[pb1], %%mm4 \n\t"\
- "psubusb %%mm4, %%mm5 \n\t"\
- "psrlq $8, %%mm5 \n\t"\
- "punpcklbw %%mm7, %%mm5 \n\t" /* (cur[x-refs+j] + cur[x+refs-j])>>1 */\
- "movq %%mm2, %%mm4 \n\t"\
- "psubusb %%mm3, %%mm2 \n\t"\
- "psubusb %%mm4, %%mm3 \n\t"\
- "pmaxub %%mm3, %%mm2 \n\t"\
- "movq %%mm2, %%mm3 \n\t"\
- "movq %%mm2, %%mm4 \n\t" /* ABS(cur[x-refs-1+j] - cur[x+refs-1-j]) */\
- "psrlq $8, %%mm3 \n\t" /* ABS(cur[x-refs +j] - cur[x+refs -j]) */\
- "psrlq $16, %%mm4 \n\t" /* ABS(cur[x-refs+1+j] - cur[x+refs+1-j]) */\
- "punpcklbw %%mm7, %%mm2 \n\t"\
- "punpcklbw %%mm7, %%mm3 \n\t"\
- "punpcklbw %%mm7, %%mm4 \n\t"\
- "paddw %%mm3, %%mm2 \n\t"\
- "paddw %%mm4, %%mm2 \n\t" /* score */
-
-#define CHECK1 \
- "movq %%mm0, %%mm3 \n\t"\
- "pcmpgtw %%mm2, %%mm3 \n\t" /* if(score < spatial_score) */\
- "pminsw %%mm2, %%mm0 \n\t" /* spatial_score= score; */\
- "movq %%mm3, %%mm6 \n\t"\
- "pand %%mm3, %%mm5 \n\t"\
- "pandn %%mm1, %%mm3 \n\t"\
- "por %%mm5, %%mm3 \n\t"\
- "movq %%mm3, %%mm1 \n\t" /* spatial_pred= (cur[x-refs+j] + cur[x+refs-j])>>1; */
-
-#define CHECK2 /* pretend not to have checked dir=2 if dir=1 was bad.\
- hurts both quality and speed, but matches the C version. */\
- "paddw %[pw1], %%mm6 \n\t"\
- "psllw $14, %%mm6 \n\t"\
- "paddsw %%mm6, %%mm2 \n\t"\
- "movq %%mm0, %%mm3 \n\t"\
- "pcmpgtw %%mm2, %%mm3 \n\t"\
- "pminsw %%mm2, %%mm0 \n\t"\
- "pand %%mm3, %%mm5 \n\t"\
- "pandn %%mm1, %%mm3 \n\t"\
- "por %%mm5, %%mm3 \n\t"\
- "movq %%mm3, %%mm1 \n\t"
-
-void filter_line_mmx2(int mode, uint8_t *dst, const uint8_t *prev, const uint8_t *cur, const uint8_t *next, int w, int refs, int parity){
- static const uint64_t pw_1 = 0x0001000100010001ULL;
- static const uint64_t pb_1 = 0x0101010101010101ULL;
-// const int mode = p->mode;
- uint64_t tmp0, tmp1, tmp2, tmp3;
- int x;
-
-#define FILTER\
- for(x=0; x<w; x+=4){\
- asm volatile(\
- "pxor %%mm7, %%mm7 \n\t"\
- LOAD4("(%[cur],%[mrefs])", %%mm0) /* c = cur[x-refs] */\
- LOAD4("(%[cur],%[prefs])", %%mm1) /* e = cur[x+refs] */\
- LOAD4("(%["prev2"])", %%mm2) /* prev2[x] */\
- LOAD4("(%["next2"])", %%mm3) /* next2[x] */\
- "movq %%mm3, %%mm4 \n\t"\
- "paddw %%mm2, %%mm3 \n\t"\
- "psraw $1, %%mm3 \n\t" /* d = (prev2[x] + next2[x])>>1 */\
- "movq %%mm0, %[tmp0] \n\t" /* c */\
- "movq %%mm3, %[tmp1] \n\t" /* d */\
- "movq %%mm1, %[tmp2] \n\t" /* e */\
- "psubw %%mm4, %%mm2 \n\t"\
- PABS( %%mm4, %%mm2) /* temporal_diff0 */\
- LOAD4("(%[prev],%[mrefs])", %%mm3) /* prev[x-refs] */\
- LOAD4("(%[prev],%[prefs])", %%mm4) /* prev[x+refs] */\
- "psubw %%mm0, %%mm3 \n\t"\
- "psubw %%mm1, %%mm4 \n\t"\
- PABS( %%mm5, %%mm3)\
- PABS( %%mm5, %%mm4)\
- "paddw %%mm4, %%mm3 \n\t" /* temporal_diff1 */\
- "psrlw $1, %%mm2 \n\t"\
- "psrlw $1, %%mm3 \n\t"\
- "pmaxsw %%mm3, %%mm2 \n\t"\
- LOAD4("(%[next],%[mrefs])", %%mm3) /* next[x-refs] */\
- LOAD4("(%[next],%[prefs])", %%mm4) /* next[x+refs] */\
- "psubw %%mm0, %%mm3 \n\t"\
- "psubw %%mm1, %%mm4 \n\t"\
- PABS( %%mm5, %%mm3)\
- PABS( %%mm5, %%mm4)\
- "paddw %%mm4, %%mm3 \n\t" /* temporal_diff2 */\
- "psrlw $1, %%mm3 \n\t"\
- "pmaxsw %%mm3, %%mm2 \n\t"\
- "movq %%mm2, %[tmp3] \n\t" /* diff */\
-\
- "paddw %%mm0, %%mm1 \n\t"\
- "paddw %%mm0, %%mm0 \n\t"\
- "psubw %%mm1, %%mm0 \n\t"\
- "psrlw $1, %%mm1 \n\t" /* spatial_pred */\
- PABS( %%mm2, %%mm0) /* ABS(c-e) */\
-\
- "movq -1(%[cur],%[mrefs]), %%mm2 \n\t" /* cur[x-refs-1] */\
- "movq -1(%[cur],%[prefs]), %%mm3 \n\t" /* cur[x+refs-1] */\
- "movq %%mm2, %%mm4 \n\t"\
- "psubusb %%mm3, %%mm2 \n\t"\
- "psubusb %%mm4, %%mm3 \n\t"\
- "pmaxub %%mm3, %%mm2 \n\t"\
- "pshufw $9,%%mm2, %%mm3 \n\t"\
- "punpcklbw %%mm7, %%mm2 \n\t" /* ABS(cur[x-refs-1] - cur[x+refs-1]) */\
- "punpcklbw %%mm7, %%mm3 \n\t" /* ABS(cur[x-refs+1] - cur[x+refs+1]) */\
- "paddw %%mm2, %%mm0 \n\t"\
- "paddw %%mm3, %%mm0 \n\t"\
- "psubw %[pw1], %%mm0 \n\t" /* spatial_score */\
-\
- CHECK(-2,0)\
- CHECK1\
- CHECK(-3,1)\
- CHECK2\
- CHECK(0,-2)\
- CHECK1\
- CHECK(1,-3)\
- CHECK2\
-\
- /* if(p->mode<2) ... */\
- "movq %[tmp3], %%mm6 \n\t" /* diff */\
- "cmpl $2, %[mode] \n\t"\
- "jge 1f \n\t"\
- LOAD4("(%["prev2"],%[mrefs],2)", %%mm2) /* prev2[x-2*refs] */\
- LOAD4("(%["next2"],%[mrefs],2)", %%mm4) /* next2[x-2*refs] */\
- LOAD4("(%["prev2"],%[prefs],2)", %%mm3) /* prev2[x+2*refs] */\
- LOAD4("(%["next2"],%[prefs],2)", %%mm5) /* next2[x+2*refs] */\
- "paddw %%mm4, %%mm2 \n\t"\
- "paddw %%mm5, %%mm3 \n\t"\
- "psrlw $1, %%mm2 \n\t" /* b */\
- "psrlw $1, %%mm3 \n\t" /* f */\
- "movq %[tmp0], %%mm4 \n\t" /* c */\
- "movq %[tmp1], %%mm5 \n\t" /* d */\
- "movq %[tmp2], %%mm7 \n\t" /* e */\
- "psubw %%mm4, %%mm2 \n\t" /* b-c */\
- "psubw %%mm7, %%mm3 \n\t" /* f-e */\
- "movq %%mm5, %%mm0 \n\t"\
- "psubw %%mm4, %%mm5 \n\t" /* d-c */\
- "psubw %%mm7, %%mm0 \n\t" /* d-e */\
- "movq %%mm2, %%mm4 \n\t"\
- "pminsw %%mm3, %%mm2 \n\t"\
- "pmaxsw %%mm4, %%mm3 \n\t"\
- "pmaxsw %%mm5, %%mm2 \n\t"\
- "pminsw %%mm5, %%mm3 \n\t"\
- "pmaxsw %%mm0, %%mm2 \n\t" /* max */\
- "pminsw %%mm0, %%mm3 \n\t" /* min */\
- "pxor %%mm4, %%mm4 \n\t"\
- "pmaxsw %%mm3, %%mm6 \n\t"\
- "psubw %%mm2, %%mm4 \n\t" /* -max */\
- "pmaxsw %%mm4, %%mm6 \n\t" /* diff= MAX3(diff, min, -max); */\
- "1: \n\t"\
-\
- "movq %[tmp1], %%mm2 \n\t" /* d */\
- "movq %%mm2, %%mm3 \n\t"\
- "psubw %%mm6, %%mm2 \n\t" /* d-diff */\
- "paddw %%mm6, %%mm3 \n\t" /* d+diff */\
- "pmaxsw %%mm2, %%mm1 \n\t"\
- "pminsw %%mm3, %%mm1 \n\t" /* d = clip(spatial_pred, d-diff, d+diff); */\
- "packuswb %%mm1, %%mm1 \n\t"\
-\
- :[tmp0]"=m"(tmp0),\
- [tmp1]"=m"(tmp1),\
- [tmp2]"=m"(tmp2),\
- [tmp3]"=m"(tmp3)\
- :[prev] "r"(prev),\
- [cur] "r"(cur),\
- [next] "r"(next),\
- [prefs]"r"((x86_reg)refs),\
- [mrefs]"r"((x86_reg)-refs),\
- [pw1] "m"(pw_1),\
- [pb1] "m"(pb_1),\
- [mode] "g"(mode)\
- );\
- asm volatile("movd %%mm1, %0" :"=m"(*dst));\
- dst += 4;\
- prev+= 4;\
- cur += 4;\
- next+= 4;\
- }
-
- if(parity){
-#define prev2 "prev"
-#define next2 "cur"
- FILTER
-#undef prev2
-#undef next2
- }else{
-#define prev2 "cur"
-#define next2 "next"
- FILTER
-#undef prev2
-#undef next2
- }
-}
-#undef LOAD4
-#undef PABS
-#undef CHECK
-#undef CHECK1
-#undef CHECK2
-#undef FILTER
-#endif
-
-
-

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

avidemux_2.7.3.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_dialog/alert_none.cpp -> avidemux_2.7.4.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_dialog/alert_none.cpp Changed

@@ -3,7 +3,6 @@
 #include "config.h"
 
 #include "ADM_default.h"
-#include "prefs.h"
 #include "DIA_coreToolkit.h"
 #include "DIA_coreUI_internal.h"
 
@@ -11,24 +10,24 @@
 static int beQuiet=0;
 static void boxStart(void)
 {
- for(int i=0;i<BOX_SIZE;i++) fprintf(stderr,"*");
- fprintf(stderr,"\n"); 
+ for(int i=0;i<BOX_SIZE;i++) fprintf(stderr,"*");
+ fprintf(stderr,"\n");
 }
 static void boxEnd(void)
 {
- for(int i=0;i<BOX_SIZE;i++) fprintf(stderr,"*");
- fprintf(stderr,"\n"); 
+ for(int i=0;i<BOX_SIZE;i++) fprintf(stderr,"*");
+ fprintf(stderr,"\n");
 }
 static void boxAdd(const char *str)
 {
- int l=strlen(str);
- fprintf(stderr, "* %s",str);
- if(l+4<BOX_SIZE)
- {
- l=BOX_SIZE-l-4;
- for(int i=0;i<BOX_SIZE;i++) fprintf(stderr,"");
- }
- fprintf(stderr," *\n"); 
+ int l=strlen(str);
+ fprintf(stderr, "* %s",str);
+ if(l+4<BOX_SIZE)
+ {
+ l=BOX_SIZE-l-4;
+ for(int i=0;i<BOX_SIZE;i++) fprintf(stderr,"");
+ }
+ fprintf(stderr," *\n");
 }
 
 
@@ -37,167 +36,147 @@
 extern DIA_workingBase *createWorking(const char *title);
 extern DIA_encodingBase *createEncoding(uint64_t duration);
 extern DIA_audioTrackBase *createAudioTrack( PoolOfAudioTracks *pool, ActiveAudioTracks *active );
-void GUI_Info_HIG(const ADM_LOG_LEVEL level,const char *primary, const char *secondary_format)
+
+void GUI_Info_HIG(const ADM_LOG_LEVEL level,const char *primary, const char *secondary_format)
 {
- uint32_t msglvl=2;
+ boxStart();
+ boxAdd("Info");
+ boxAdd(primary);
 
- prefs->get(MESSAGE_LEVEL,&msglvl);
+ if(!secondary_format)
+ {
+ boxEnd();
+ return;
+ }
 
- boxStart();
- boxAdd("Info");
- boxAdd(primary); 
- 
- if(! secondary_format)
- {
- boxEnd();
- return;
- }
+ boxAdd(secondary_format);
+ boxEnd();
+}
 
+void GUI_Error_HIG(const char *primary, const char *secondary_format)
+{
+ boxStart();
+ boxAdd("Error");
+ boxAdd(primary);
+ if(!secondary_format)
+ {
+ boxEnd();
+ return;
+ }else
+ {
 boxAdd(secondary_format);
 boxEnd();
- 
+ }
 }
 
-void GUI_Error_HIG(const char *primary, const char *secondary_format)
-{
- boxStart();
- boxAdd("Error");
- boxAdd(primary); 
- if(!secondary_format)
- {
- boxEnd();
- return;
- }else
- {
- boxAdd(secondary_format);
- boxEnd();
- }
-}
-int GUI_Confirmation_HIG(const char *button_confirm, const char *primary, const char *secondary_format)
+int GUI_Confirmation_HIG(const char *button_confirm, const char *primary, const char *secondary_format)
 {
- uint32_t msglvl=2;
-
- prefs->get(MESSAGE_LEVEL,&msglvl);
-
- boxStart();
- boxAdd("Question");
+ boxStart();
+ boxAdd("Question");
 
- boxAdd(button_confirm);
- if(! secondary_format)
- {
- 
- boxEnd();
- }
- else
- {
- boxAdd(secondary_format);
- boxEnd();
- }
- if (beQuiet)
- {
- boxAdd("--> First one\n");
- return 0;
- }
- else
+ boxAdd(button_confirm);
+ if(!secondary_format)
+ {
+ boxEnd();
+ }else
+ {
+ boxAdd(secondary_format);
+ boxEnd();
+ }
+ if (beQuiet)
+ {
+ boxAdd("--> Automatically confirmed\n");
+ return 1;
+ }else
+ {
+ int x;
+ while(1)
 {
- int x;
- while(1)
- {
 printf("Are you sure (Y/y or N/n ):\n");
 x=tolower(getchar());
 if(x=='y') return 1;
 if(x=='n') return 0;
- }
 }
- return 0; 
+ }
+ return 0;
 }
 
-int GUI_YesNo(const char *primary, const char *secondary_format)
+int GUI_YesNo(const char *primary, const char *secondary_format)
 {
- uint32_t msglvl=2;
+ boxStart();
+ boxAdd("Question");
+ boxAdd(primary);
 
- prefs->get(MESSAGE_LEVEL,&msglvl);
-
- boxStart();
- boxAdd("Question");
- boxAdd(primary);
-
- 
- if(! secondary_format)
- {
- boxEnd();
- }
- else
- {
- boxAdd(secondary_format);
- boxEnd();
- }
- if (beQuiet)
- {
- boxAdd("--> First one\n");
- return 0;
- }
- else
+ if(!secondary_format)
+ {
+ boxEnd();
+ }else
+ {
+ boxAdd(secondary_format);
+ boxEnd();
+ }
+ if (beQuiet)
+ {
+ boxAdd("--> Automatically affirmed\n");
+ return 1;
+ }else
+ {
+ int x;
+ while(1)
 {
- int x;
- while(1)
- {
 printf("Yes or No (Y/y or N/n) :\n");
 x=tolower(getchar());
 if(x=='y') return 1;
 if(x=='n') return 0;
- }
- return 0; 
 }
+ }
+ return 0;
 }
 
-int GUI_Question(const char *alertstring)
+int GUI_Question(const char *alertstring, bool insuppressible)
 {
- 
- if(beQuiet) 
- {
- printf("%s => No\n",alertstring);
- return false;
- }
- 
- boxStart();
- boxAdd("Question");
- boxAdd(alertstring);
- boxEnd();
- 
- 
- 
- while(1)
- {
- printf("Yes or No (Y/y or N/n) :\n");
- int x=tolower(getchar());
- if(x=='y') return 1;
- if(x=='n') return 0;
- }
+ if(beQuiet && !insuppressible)
+ {
+ printf("%s => Yes\n",alertstring);
+ return 1;
+ }
+
+ boxStart();
+ boxAdd("Question");
+ boxAdd(alertstring);
+ boxEnd();
+
+ while(1)
+ {
+ printf("Yes or No (Y/y or N/n) :\n");
+ int x=tolower(getchar());
+ if(x=='y') return 1;
+ if(x=='n') return 0;
+ }
+ return 0;
 }
 
-int GUI_Alternate(const char *title,const char *choice1,const char *choice2)
+int GUI_Alternate(const char *title,const char *choice1,const char *choice2)
 {
- if(beQuiet) 
- {
- printf("%s => %s\n",title,choice1);
- return 0;
- }
- 
- 
- 
- boxStart();
- boxAdd("Choice");
- boxAdd(title);
- boxEnd();
- 
- while(1)
- {
- printf("0->%s 1->%s :\n",choice1,choice2);
- int x=tolower(getchar());
- if(x=='0') return 0;
- if(x=='1') return 1;
- }
+ if(beQuiet)
+ {
+ printf("%s => %s\n",title,choice1);
+ return 0;
+ }
+
+ boxStart();
+ boxAdd("Choice");
+ boxAdd(title);
+ boxEnd();
+
+ while(1)
+ {
+ printf("0->%s 1->%s :\n",choice1,choice2);
+ int x=tolower(getchar());
+ if(x=='0') return 0;
+ if(x=='1') return 1;
+ }
+ return 0;
 }
 
 uint8_t GUI_getDoubleValue(double *valye, float min, float max, const char *title)
@@ -210,22 +189,26 @@
 return 0; 
 }
 
-uint8_t		GUI_isQuiet(void)
+uint8_t GUI_isQuiet(void)
 {
 return beQuiet;
 }
-void GUI_Verbose(void)
+
+void GUI_Verbose(void)
 {
 beQuiet=0;
 }
-void GUI_Quiet(void)
+
+void GUI_Quiet(void)
 {
- beQuiet=1;
+ beQuiet=1;
 }
+
 int32_t UI_readJog(void)
 {
- return 0; 
+ return 0;
 }
+
 void getVersion(uint32_t *maj,uint32_t *minor)
 {
 *maj=ADM_CORE_TOOLKIT_MAJOR;
@@ -239,44 +222,47 @@
 class cliProcessing: public DIA_processingBase
 {
 public:
- cliProcessing(const char *title, uint64_t _totalToProcess ) : DIA_processingBase(title,_totalToProcess)
- {
- 
- }
- ~cliProcessing()
- {
- 
- }
- 
+ cliProcessing(const char *title, uint64_t _totalToProcess ) : DIA_processingBase(title,_totalToProcess)
+ {
+
+ }
+ ~cliProcessing()
+ {
+
+ }
 };
- DIA_processingBase *createProcessing(const char *title,uint64_t totalToProcess)
- {
- return new cliProcessing(title,totalToProcess); 
- }
+
+DIA_processingBase *createProcessing(const char *title,uint64_t totalToProcess)
+{
+ return new cliProcessing(title,totalToProcess);
+}
 
 }; // namespace
+
 static CoreToolkitDescriptor CliCoreToolkitDescriptor=
 {
-		&ADM_CliCoreUIToolkit::getVersion,
-		&ADM_CliCoreUIToolkit::GUI_Info_HIG,
-		&ADM_CliCoreUIToolkit::GUI_Error_HIG,
-		&ADM_CliCoreUIToolkit::GUI_Confirmation_HIG,
-		&ADM_CliCoreUIToolkit::GUI_YesNo,
-		&ADM_CliCoreUIToolkit::GUI_Question,
-		&ADM_CliCoreUIToolkit::GUI_Alternate,
-		&ADM_CliCoreUIToolkit::GUI_Verbose,
-		&ADM_CliCoreUIToolkit::GUI_Quiet,
-		&ADM_CliCoreUIToolkit::GUI_isQuiet,
- &ADM_CliCoreUIToolkit::createWorking,
- &ADM_CliCoreUIToolkit::createEncoding,
- &ADM_CliCoreUIToolkit::createAudioTrack,
- &ADM_CliCoreUIToolkit::UI_purge, 
- &ADM_CliCoreUIToolkit::createProcessing
-};
+ &ADM_CliCoreUIToolkit::getVersion,
+ &ADM_CliCoreUIToolkit::GUI_Info_HIG,
+ &ADM_CliCoreUIToolkit::GUI_Error_HIG,
+ &ADM_CliCoreUIToolkit::GUI_Confirmation_HIG,
+
+ &ADM_CliCoreUIToolkit::GUI_YesNo,
+ &ADM_CliCoreUIToolkit::GUI_Question,
+ &ADM_CliCoreUIToolkit::GUI_Alternate,
+ &ADM_CliCoreUIToolkit::GUI_Verbose,
 
+ &ADM_CliCoreUIToolkit::GUI_Quiet,
+ &ADM_CliCoreUIToolkit::GUI_isQuiet,
+ &ADM_CliCoreUIToolkit::createWorking,
+ &ADM_CliCoreUIToolkit::createEncoding,
+
+ &ADM_CliCoreUIToolkit::createAudioTrack,
+ &ADM_CliCoreUIToolkit::UI_purge,
+ &ADM_CliCoreUIToolkit::createProcessing
+};
 
 void InitCoreToolkit(void)
 {
-	DIA_toolkitInit(&CliCoreToolkitDescriptor);
+ DIA_toolkitInit(&CliCoreToolkitDescriptor);
 }
 //EOF

avidemux_2.7.3.tar.gz/avidemux/common/ADM_audioCodec/src/ADM_codecpcm16.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_audioCodec/src/ADM_codecpcm16.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_bridge.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_bridge.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_film2pal.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_film2pal.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_commonUI/CMakeLists.txt -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_commonUI/CMakeLists.txt Changed

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

@@ -31,7 +31,9 @@
 extern void 		AVDM_audioPref( void );
 extern const char* getNativeRendererDesc(int type);
 
-
+#if defined(USE_DXVA2) || defined(USE_VDPAU) || defined(USE_LIBVA) || defined(USE_VIDEOTOOLBOX)
+    #define HW_ACCELERATED_DECODING
+#endif
 
 uint8_t DIA_Preferences(void);
 
@@ -60,7 +62,6 @@
 bool     loadDefault=false;
 char     *alsaDevice=NULL;
 
-bool     balternate_mp3_tag=true;
 bool     lastReadDirAsTarget=false;
 bool     copyModeSanitizeDts=false;
 bool     altKeyboardShortcuts=false;
@@ -69,11 +70,18 @@
 uint32_t pp_type=3;
 uint32_t pp_value=5;
 
+uint32_t editor_cache_size=16;
+
+#ifdef USE_DXVA2
 bool     bdxva2=false;
+bool     bdxva2_override_version=false;
+bool     bdxva2_override_profile=false;
+#endif
 bool     bvdpau=false;
-bool     bxvba=false;
 bool     blibva=false;
+#ifdef USE_VIDEOTOOLBOX
 bool     bvideotoolbox=false;
+#endif
 bool     hzd,vzd,dring;
 bool     capsMMX,capsMMXEXT,caps3DNOW,caps3DNOWEXT,capsSSE,capsSSE2,capsSSE3,capsSSSE3,capsAll;
 bool     hasOpenGl=false;
@@ -140,22 +148,26 @@
         if( prefs->get(DEVICE_AUDIO_ALSA_DEVICE, &alsaDevice) != RC_OK )
                 alsaDevice = ADM_strdup("plughw:0,0");
 #endif
+        // Video cache
+        prefs->get(FEATURES_CACHE_SIZE,&editor_cache_size);
+#ifdef USE_DXVA2
         // dxva2
-        
-        prefs->get(FEATURES_DXVA2,&bdxva2);                
+        prefs->get(FEATURES_DXVA2,&bdxva2);
+        prefs->get(FEATURES_DXVA2_OVERRIDE_BLACKLIST_VERSION,&bdxva2_override_version);
+        prefs->get(FEATURES_DXVA2_OVERRIDE_BLACKLIST_PROFILE,&bdxva2_override_profile);
+#endif
+#ifdef USE_VDPAU
         // vdpau
         prefs->get(FEATURES_VDPAU,&bvdpau);
-        // xvba
-        prefs->get(FEATURES_XVBA,&bxvba);
+#endif
+#ifdef USE_LIBVA
         // libva
         prefs->get(FEATURES_LIBVA,&blibva);
-        // VideoToolbox
+#endif
 #ifdef USE_VIDEOTOOLBOX
+        // VideoToolbox
         prefs->get(FEATURES_VIDEOTOOLBOX,&bvideotoolbox);
 #endif
-        // Alternate mp3 tag (haali)
-        prefs->get(FEATURES_ALTERNATE_MP3_TAG,&balternate_mp3_tag);
-
         // Video renderer
         if(prefs->get(VIDEODEVICE,&render)!=RC_OK)
         {
@@ -215,18 +227,22 @@
         olddevice=newdevice=AVDM_getCurrentDevice();
         // Audio device
         /************************ Build diaelems ****************************************/
+#ifdef HW_ACCELERATED_DECODING
+    #if defined(USE_DXVA2)
         diaElemToggle useDxva2(&bdxva2,QT_TRANSLATE_NOOP("adm","Decode video using DXVA2 (windows)"));
+        diaElemToggle dxva2OverrideVersion(&bdxva2_override_version,QT_TRANSLATE_NOOP("adm","Ignore driver blacklist (Intel)"));
+        diaElemToggle dxva2OverrideProfile(&bdxva2_override_profile,QT_TRANSLATE_NOOP("adm","Ignore codec blacklist (Intel, HEVC 10bit)"));
+    #elif defined(USE_VIDEOTOOLBOX)
+        diaElemToggle useVideoToolbox(&bvideotoolbox,QT_TRANSLATE_NOOP("adm","Decode video using VideoToolbox (macOS)"));
+    #else
         diaElemToggle useVdpau(&bvdpau,QT_TRANSLATE_NOOP("adm","Decode video using VDPAU (NVIDIA)"));
-        diaElemToggle useXvba(&bxvba,QT_TRANSLATE_NOOP("adm","Decode video using XVBA (AMD)"));
         diaElemToggle useLibVA(&blibva,QT_TRANSLATE_NOOP("adm","Decode video using LIBVA (INTEL)"));
-#ifdef USE_VIDEOTOOLBOX
-        diaElemToggle useVideoToolbox(&bvideotoolbox,QT_TRANSLATE_NOOP("adm","Decode video using VideoToolbox (macOS)"));
-#endif
-        diaElemToggle useOpenGl(&hasOpenGl,QT_TRANSLATE_NOOP("adm","Enable openGl support"));
-#ifndef USE_VIDEOTOOLBOX
+    #endif
+    #ifndef USE_VIDEOTOOLBOX
         diaElemReadOnlyText hwAccelText(NULL,QT_TRANSLATE_NOOP("adm","If you use Hw decoding, it is better to use the matching display driver"),NULL);
+    #endif
 #endif
-
+        diaElemToggle useOpenGl(&hasOpenGl,QT_TRANSLATE_NOOP("adm","Enable openGl support"));
         diaElemToggle allowAnyMpeg(&mpeg_no_limit,QT_TRANSLATE_NOOP("adm","_Accept non-standard audio frequency for DVD"));
         diaElemToggle resetEncoder(&loadDefault,QT_TRANSLATE_NOOP("adm","_Revert to saved default output settings on video load"));
         diaElemToggle enableAltShortcuts(&altKeyboardShortcuts,QT_TRANSLATE_NOOP("adm","_Enable alternative keyboard shortcuts"));
@@ -286,10 +302,13 @@
         framePriority.swallow(&menuIndexPriority);
         framePriority.swallow(&menuPlaybackPriority);
 
-        diaElemToggle togTagMp3(&balternate_mp3_tag,QT_TRANSLATE_NOOP("adm","_Use alternative tag for MP3 in .mp4"));
         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 frameCache(QT_TRANSLATE_NOOP("adm","Caching of decoded pictures"));
+        diaElemUInteger cacheSize(&editor_cache_size,QT_TRANSLATE_NOOP("adm","_Cache size:"),8,16);
+        frameCache.swallow(&cacheSize);
+
         diaMenuEntry videoMode[]={
                              {RENDER_GTK, getNativeRendererDesc(0), NULL}
 #ifdef USE_XV
@@ -301,10 +320,6 @@
 #ifdef USE_DXVA2
                              ,{RENDER_DXVA2,   QT_TRANSLATE_NOOP("adm","DXVA2 (best)"),NULL}
 #endif
-#ifdef USE_XVBA
-                             //,{RENDER_XVBA,   QT_TRANSLATE_NOOP("adm","XVBA (best)"),NULL}
-#endif
-
 #ifdef USE_OPENGL
                              ,{RENDER_QTOPENGL,   QT_TRANSLATE_NOOP("adm","OpenGL (best)"),NULL}
 #endif
@@ -439,7 +454,7 @@
 
 
         /* Output */
-        diaElem *diaOutput[]={&allowAnyMpeg,&togTagMp3,&sanitizeDtsInCopyMode,&useLastReadAsTarget};
+        diaElem *diaOutput[]={&allowAnyMpeg,&sanitizeDtsInCopyMode,&useLastReadAsTarget,&frameCache};
         diaElemTabs tabOutput(QT_TRANSLATE_NOOP("adm","Output"),4,(diaElem **)diaOutput);
 
         /* Audio */
@@ -479,12 +494,15 @@
 #endif
         diaElemTabs tabVideo(QT_TRANSLATE_NOOP("adm","Display"),sizeof(diaVideo)/sizeof(diaElem *),(diaElem **)diaVideo);
         /* HW accel */
-#ifdef USE_VIDEOTOOLBOX
+#ifdef USE_DXVA2
+        diaElem *diaHwDecoding[]={&useDxva2,&dxva2OverrideVersion,&dxva2OverrideProfile,&hwAccelText};
+        diaElemTabs tabHwDecoding(QT_TRANSLATE_NOOP("adm","HW Accel"),4,(diaElem **)diaHwDecoding);
+#elif defined(USE_VIDEOTOOLBOX)
         diaElem *diaHwDecoding[]={&useVideoToolbox};
         diaElemTabs tabHwDecoding(QT_TRANSLATE_NOOP("adm","HW Accel"),1,(diaElem **)diaHwDecoding);
-#else
-        diaElem *diaHwDecoding[]={&useVdpau,&useXvba,&useLibVA,&useDxva2,&hwAccelText};
-        diaElemTabs tabHwDecoding(QT_TRANSLATE_NOOP("adm","HW Accel"),5,(diaElem **)diaHwDecoding);
+#elif defined(HW_ACCELERATED_DECODING)
+        diaElem *diaHwDecoding[]={&useVdpau,&useLibVA,&hwAccelText};
+        diaElemTabs tabHwDecoding(QT_TRANSLATE_NOOP("adm","HW Accel"),3,(diaElem **)diaHwDecoding);
 #endif
 
         /* CPU tab */
@@ -502,24 +520,18 @@
         diaElemTabs tabAvisynth("Avisynth",2,(diaElem **)diaAvisynth);
 
         /* Global Glyph tab */
-
-
-                diaElemTabs *tabs[]={&tabUser,&tabOutput,&tabAudio,&tabVideo,
-                                &tabHwDecoding,  &tabCpu,&tabThreading, &tabAvisynth};
-                
-       void *factoryCookiez=diaFactoryRunTabsPrepare(QT_TRANSLATE_NOOP("adm","Preferences"),8,tabs);
-
+#ifdef HW_ACCELERATED_DECODING
+        diaElemTabs *tabs[]={&tabUser, &tabOutput, &tabAudio, &tabVideo, &tabHwDecoding, &tabCpu, &tabThreading, &tabAvisynth};
+        void *factoryCookiez=diaFactoryRunTabsPrepare(QT_TRANSLATE_NOOP("adm","Preferences"),8,tabs);
+#else
+        diaElemTabs *tabs[]={&tabUser, &tabOutput, &tabAudio, &tabVideo, &tabCpu, &tabThreading, &tabAvisynth};
+        void *factoryCookiez=diaFactoryRunTabsPrepare(QT_TRANSLATE_NOOP("adm","Preferences"),7,tabs);
+#endif
 // Now we can disable stuff if needed
-#ifndef USE_VIDEOTOOLBOX
-    #ifndef USE_DXVA2
-       useDxva2.enable(false);
-    #endif
+#if defined(HW_ACCELERATED_DECODING) && !defined(USE_VIDEOTOOLBOX) && !defined(USE_DXVA2)
     #ifndef USE_VDPAU
         useVdpau.enable(false);
     #endif
-    #ifndef USE_XVBA
-        useXvba.enable(false);
-    #endif
     #ifndef USE_LIBVA
         useLibVA.enable(false);
     #endif
@@ -600,7 +612,8 @@
             prefs->set(UPDATE_ENABLED,doAutoUpdate);
             // Video render
             prefs->set(VIDEODEVICE,render);
-
+            // Video cache
+            prefs->set(FEATURES_CACHE_SIZE, editor_cache_size);
             // number of threads
             prefs->set(FEATURES_THREADING_LAVC, lavcThreads);
             // Encoding priority
@@ -616,21 +629,24 @@
             prefs->set(MESSAGE_LEVEL,msglevel);
             // Discard changes to output config on video load
             prefs->set(RESET_ENCODER_ON_VIDEO_LOAD, loadDefault);
-
+#ifdef USE_VDPAU
             // VDPAU
             prefs->set(FEATURES_VDPAU,bvdpau);
+#endif
+#ifdef USE_DXVA2
             // DXVA2
             prefs->set(FEATURES_DXVA2,bdxva2);
-            // XVBA
-            prefs->set(FEATURES_XVBA,bxvba);
+            prefs->set(FEATURES_DXVA2_OVERRIDE_BLACKLIST_VERSION,bdxva2_override_version);
+            prefs->set(FEATURES_DXVA2_OVERRIDE_BLACKLIST_PROFILE,bdxva2_override_profile);
+#endif
+#ifdef USE_LIBVA
             // LIBVA
             prefs->set(FEATURES_LIBVA,blibva);
-            // VideoToolbox
+#endif
 #ifdef USE_VIDEOTOOLBOX
+            // VideoToolbox
             prefs->set(FEATURES_VIDEOTOOLBOX,bvideotoolbox);
 #endif
-            // Alternate mp3 tag (haali)
-            prefs->set(FEATURES_ALTERNATE_MP3_TAG,balternate_mp3_tag);
             // 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.

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

@@ -27,123 +27,125 @@
 Action event;
 const char *icon;
 const char *shortCut;
+ bool translated; // If true, circumvent translator in buildMenu, the string is already translated.
+
 }MenuEntry;
 
 #ifdef MENU_DECLARE
 static const MenuEntry _myMenuFile[] = {
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Open"), NULL,ACT_OPEN_VIDEO, MKICON(fileopen), "Ctrl+O"},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Append"), NULL,ACT_APPEND_VIDEO ,NULL, "Ctrl+A"},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Save"), NULL,ACT_SAVE_VIDEO ,MKICON(filesaveas),"Ctrl+S"},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Queue"), NULL,ACT_SAVE_QUEUE ,NULL ,"Ctrl+U"},
- {MENU_SUBMENU,QT_TRANSLATE_NOOP("adm","Save as Image"), NULL,ACT_DUMMY ,NULL,NULL},
- {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Save as BMP"), NULL,ACT_SAVE_BMP ,NULL,"Ctrl+M"},
- {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Save as PNG"), NULL,ACT_SAVE_PNG ,NULL,"Ctrl+P"},
- {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Save as JPEG"), NULL,ACT_SAVE_JPG ,NULL,"Ctrl+E"},
- {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Save Selection as JPEG"),NULL,ACT_SAVE_BUNCH_OF_JPG,NULL,NULL},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Close"), NULL,ACT_CLOSE ,NULL, "Ctrl+W"},
- {MENU_SEPARATOR,QT_TRANSLATE_NOOP("adm","-"), NULL,ACT_DUMMY ,NULL,NULL},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Information"), NULL,ACT_VIDEO_PROPERTIES, MKICON(info),NULL},
- {MENU_SEPARATOR,QT_TRANSLATE_NOOP("adm","-"), NULL,ACT_DUMMY ,NULL,NULL},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Connect to avsproxy"),NULL,ACT_AVS_PROXY,NULL},
- {MENU_SEPARATOR,QT_TRANSLATE_NOOP("adm","-"), NULL,ACT_DUMMY ,NULL,NULL},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Quit"), NULL,ACT_EXIT ,NULL,"Ctrl+Q"}
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Open"), NULL,ACT_OPEN_VIDEO, MKICON(fileopen),"Ctrl+O",0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Append"), NULL,ACT_APPEND_VIDEO, NULL,"Ctrl+A",0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Save"), NULL,ACT_SAVE_VIDEO, MKICON(filesaveas),"Ctrl+S",0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Queue"), NULL,ACT_SAVE_QUEUE, NULL,"Ctrl+U",0},
+ {MENU_SUBMENU,QT_TRANSLATE_NOOP("adm","Save as Image"), NULL,ACT_DUMMY, NULL,NULL,0},
+ {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Save as BMP"), NULL,ACT_SAVE_BMP, NULL,"Ctrl+M",0},
+ {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Save as PNG"), NULL,ACT_SAVE_PNG, NULL,"Ctrl+P",0},
+ {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Save as JPEG"), NULL,ACT_SAVE_JPG, NULL,"Ctrl+E",0},
+ {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_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},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Quit"), NULL,ACT_EXIT, NULL,"Ctrl+Q",0}
 };
 
 std::vector<MenuEntry> myMenuFile(_myMenuFile, _myMenuFile + sizeof(_myMenuFile) / sizeof(_myMenuFile[0]));
 
 static const MenuEntry _myMenuRecent[] = {
- {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL},
+ {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
 #ifdef __APPLE__
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Clear recent items"), NULL,ACT_CLEAR_RECENT,NULL,"Ctrl+Shift+Backspace"}
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Clear recent items"), NULL,ACT_CLEAR_RECENT, NULL,"Ctrl+Shift+Backspace",0}
 #else
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Clear recent items"), NULL,ACT_CLEAR_RECENT,NULL,"Ctrl+Shift+Delete"}
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Clear recent items"), NULL,ACT_CLEAR_RECENT, NULL,"Ctrl+Shift+Delete",0}
 #endif
 };
 
 std::vector<MenuEntry> myMenuRecent(_myMenuRecent, _myMenuRecent + sizeof(_myMenuRecent) / sizeof(_myMenuRecent[0]));
 
 static const MenuEntry _myMenuEdit[] = {
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Undo"), NULL,ACT_Undo ,NULL,"Ctrl+Z"},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Redo"), NULL,ACT_Redo ,NULL,"Ctrl+Y"},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Reset Edit"), NULL,ACT_ResetSegments,NULL,NULL},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Cut"), NULL,ACT_Cut ,NULL,"Ctrl+X"},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Copy"), NULL,ACT_Copy ,NULL,"Ctrl+C"},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Paste"), NULL,ACT_Paste ,NULL,"Ctrl+V"},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Undo"), NULL,ACT_Undo, NULL,"Ctrl+Z",0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Redo"), NULL,ACT_Redo, NULL,"Ctrl+Y",0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Reset Edit"), NULL,ACT_ResetSegments, NULL,NULL,0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Cut"), NULL,ACT_Cut, NULL,"Ctrl+X",0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Copy"), NULL,ACT_Copy, NULL,"Ctrl+C",0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Paste"), NULL,ACT_Paste, NULL,"Ctrl+V",0},
 #ifdef __APPLE__
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Delete"), NULL,ACT_Delete ,NULL,"Backspace"},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Delete"), NULL,ACT_Delete, NULL,"Backspace",0},
 #else
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Delete"), NULL,ACT_Delete ,NULL,"Delete"},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Delete"), NULL,ACT_Delete, NULL,"Delete",0},
 #endif
- {MENU_SEPARATOR,"-",NULL,ACT_DUMMY ,NULL, NULL},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Set Marker A"), NULL,ACT_MarkA ,NULL,"Ctrl+PgUp"},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Set Marker B"), NULL,ACT_MarkB ,NULL,"Ctrl+PgDown"},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Reset Markers"), NULL,ACT_ResetMarkers,NULL,"Ctrl+Home"},
- {MENU_SEPARATOR,"-",NULL,ACT_DUMMY ,NULL, NULL},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Pr&eferences"), NULL,ACT_PREFERENCES,NULL,NULL},
- {MENU_SEPARATOR,"-",NULL,ACT_DUMMY ,NULL,NULL},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Save current settings as default"), NULL,ACT_SaveAsDefault,NULL,"Ctrl+Alt+D"},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Load saved settings"), NULL,ACT_LoadDefault, NULL,"Ctrl+R"}
+ {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Set Marker A"), NULL,ACT_MarkA, NULL,"Ctrl+PgUp",0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Set Marker B"), NULL,ACT_MarkB, NULL,"Ctrl+PgDown",0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Reset Markers"), NULL,ACT_ResetMarkers, NULL,"Ctrl+Home",0},
+ {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},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Save current settings as default"), NULL,ACT_SaveAsDefault,NULL,"Ctrl+Alt+D",0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Load saved settings"), NULL,ACT_LoadDefault, NULL,"Ctrl+R",0}
 };
 
 std::vector<MenuEntry> myMenuEdit(_myMenuEdit, _myMenuEdit + sizeof(_myMenuEdit) / sizeof(_myMenuEdit[0]));
 
 static const MenuEntry _myMenuVideo[] = {
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Decoder Option"), NULL,ACT_DecoderOption ,NULL,NULL},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","PostProcessing"), NULL,ACT_SetPostProcessing ,NULL,NULL},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Filters"), NULL,ACT_VIDEO_FILTERS ,NULL,"Ctrl+Alt+F"},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Play filtered"), NULL,ACT_PreviewChanged ,NULL,NULL}
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Decoder Option"), NULL,ACT_DecoderOption, NULL,NULL,0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","PostProcessing"), NULL,ACT_SetPostProcessing, NULL,NULL,0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Filters"), NULL,ACT_VIDEO_FILTERS, NULL,"Ctrl+Alt+F",0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Play filtered"), NULL,ACT_PreviewChanged, NULL,NULL,0}
 };
 
 std::vector<MenuEntry> myMenuVideo(_myMenuVideo, _myMenuVideo + sizeof(_myMenuVideo) / sizeof(_myMenuVideo[0]));
 
 static const MenuEntry _myMenuAudio[] = {
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Select Track"), NULL,ACT_AUDIO_SELECT_TRACK ,NULL,NULL},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Save audio"), NULL,ACT_SAVE_AUDIO ,NULL,NULL},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Filters"), NULL,ACT_AUDIO_FILTERS ,NULL,NULL},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Select Track"), NULL,ACT_AUDIO_SELECT_TRACK,NULL,NULL,0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Save audio"), NULL,ACT_SAVE_AUDIO, NULL,NULL,0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Filters"), NULL,ACT_AUDIO_FILTERS, NULL,NULL,0},
 };
 
 std::vector<MenuEntry> myMenuAudio(_myMenuAudio, _myMenuAudio + sizeof(_myMenuAudio) / sizeof(_myMenuAudio[0]));
 
 static const MenuEntry _myMenuHelp[] = {
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Build Option"), NULL,ACT_BUILT_IN ,NULL,NULL},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Plugins"), NULL,ACT_PLUGIN_INFO ,NULL,NULL},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Build Option"), NULL,ACT_BUILT_IN, NULL,NULL,0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Plugins"), NULL,ACT_PLUGIN_INFO, NULL,NULL,0},
 #ifdef _WIN32
-			{MENU_SEPARATOR,"-",NULL,ACT_DUMMY ,NULL,NULL},
-			{MENU_SUBMENU, QT_TRANSLATE_NOOP("adm","&Advanced"), NULL, ACT_DUMMY, NULL, NULL},
-			{MENU_SUBACTION, QT_TRANSLATE_NOOP("adm","Open Application &Log"), NULL, ACT_OPEN_APP_LOG, NULL, NULL},
-			{MENU_SUBACTION, QT_TRANSLATE_NOOP("adm","Open Application Data &Folder"), NULL, ACT_OPEN_APP_FOLDER, NULL, NULL},
+ {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
+ {MENU_SUBMENU,QT_TRANSLATE_NOOP("adm","&Advanced"), NULL,ACT_DUMMY, NULL,NULL,0},
+ {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Open Application &Log"),NULL,ACT_OPEN_APP_LOG, NULL, NULL,0},
+ {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Open Application Data &Folder"),NULL,ACT_OPEN_APP_FOLDER,NULL,NULL,0},
 #endif
- {MENU_SEPARATOR,"-", NULL,ACT_DUMMY ,NULL,NULL},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","About"), NULL,ACT_ABOUT ,NULL,NULL},
+ {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","About"), NULL,ACT_ABOUT, NULL,NULL,0}
 };
 
 std::vector<MenuEntry> myMenuHelp(_myMenuHelp, _myMenuHelp + sizeof(_myMenuHelp) / sizeof(_myMenuHelp[0]));
 std::vector<MenuEntry> myMenuTool;
 
 static const MenuEntry _myMenuGo[] = {
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Play/Stop"), NULL,ACT_PlayAvi ,MKICON(player_play), "Space"},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Previous Frame"), NULL,ACT_PreviousFrame ,MKICON(back), "Left"},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Next Frame"), NULL,ACT_NextFrame ,MKICON(forward), "Right"},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Previous Intra Frame"),NULL,ACT_PreviousKFrame ,MKICON(player_rew), "Down"},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Next Intra Frame"), NULL,ACT_NextKFrame ,MKICON(player_fwd), "Up"},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Previous Black Frame"),NULL,ACT_PrevBlackFrame ,MKICON(prev_black), NULL},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Next Black Frame"), NULL,ACT_NextBlackFrame ,MKICON(next_black), NULL},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","First Frame"), NULL,ACT_Begin ,MKICON(player_start), "Home"},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Last Frame"), NULL,ACT_End ,MKICON(player_end), "End"},
- {MENU_SEPARATOR,"-", NULL,ACT_DUMMY , NULL,NULL},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Marker A"), NULL,ACT_GotoMarkA ,MKICON(markA) ,"PgUp"},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Marker B"), NULL,ACT_GotoMarkB ,MKICON(markB) ,"PgDown"},
- {MENU_SEPARATOR,"-", NULL,ACT_DUMMY , NULL,NULL},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Time"), NULL,ACT_GotoTime ,NULL, "Ctrl+T" },
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Play/Stop"), NULL,ACT_PlayAvi, MKICON(player_play), "Space",0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Previous Frame"), NULL,ACT_PreviousFrame, MKICON(back), "Left",0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Next Frame"), NULL,ACT_NextFrame, MKICON(forward), "Right",0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Previous Intra Frame"),NULL,ACT_PreviousKFrame, MKICON(player_rew), "Down",0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Next Intra Frame"), NULL,ACT_NextKFrame, MKICON(player_fwd), "Up",0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Previous Black Frame"),NULL,ACT_PrevBlackFrame, MKICON(prev_black), NULL,0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Next Black Frame"), NULL,ACT_NextBlackFrame, MKICON(next_black), NULL,0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","First Frame"), NULL,ACT_Begin, MKICON(player_start), "Home",0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Last Frame"), NULL,ACT_End, MKICON(player_end), "End",0},
+ {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Marker A"), NULL,ACT_GotoMarkA, MKICON(markA), "PgUp",0},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Marker B"), NULL,ACT_GotoMarkB, MKICON(markB), "PgDown",0},
+ {MENU_SEPARATOR,"-",NULL,ACT_DUMMY, NULL,NULL,1},
+ {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Time"), NULL,ACT_GotoTime, NULL, "Ctrl+T",0}
 };
 
 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"},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 1:2"), NULL,ACT_ZOOM_1_2 ,NULL,"3"},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 1:1"), NULL,ACT_ZOOM_1_1 ,NULL,"2"},
- {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 2:1"), NULL,ACT_ZOOM_2_1 ,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}
 };
 
 std::vector<MenuEntry> myMenuView(_myMenuView, _myMenuView + sizeof(_myMenuView) / sizeof(_myMenuView[0]));

avidemux_2.7.3.tar.gz/avidemux/common/ADM_editor/include/ADM_edCache.h -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/include/ADM_edCache.h Changed

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

@@ -63,6 +63,19 @@
         ENV_EDITOR_LAST=   0x8000
 }_ENV_EDITOR_FLAGS;
 
+/**
+    \enum ADM_cutPointType
+    \brief keep track of potential problems when in copy mode
+*/
+typedef enum
+{
+    ADM_EDITOR_CUT_POINT_IDR,
+    ADM_EDITOR_CUT_POINT_NON_IDR,
+    ADM_EDITOR_CUT_POINT_RECOVERY,
+    ADM_EDITOR_CUT_POINT_MISMATCH,
+    ADM_EDITOR_CUT_POINT_UNCHECKED
+}ADM_cutPointType;
+
 class ADM_edAudioTrackFromVideo;
 class ADM_edAudioTrack;
 
@@ -116,7 +129,7 @@
                     void        recalibrateSigned(int64_t *time,_SEGMENT *seg);
                     bool        updateImageTiming(_SEGMENT *seg,ADMImage *image);
                     // Need to get the image just before targetPts
-                    bool        decodeTillPictureAtPts(uint64_t targetPts,ADMImage *image);
+                    uint8_t     decodeTillPictureAtPts(uint64_t targetPts,ADMImage *image);
                     bool        getFrameNumFromPtsOrBefore(_VIDEOS *v,uint64_t refTime,int &frameNumber);
 
 protected:
@@ -149,7 +162,7 @@
                     uint32_t    _currentSegment;    // Current video segment
                     int64_t     _nextFrameDts;      // COPYMODE Used in copy mode to fill the missing timestamp
                                                     // Warning, it is actually the DTS of the NEXT frame to fetch
-                    uint8_t     compBuffer[MAXIMUM_SIZE * MAXIMUM_SIZE * 3]; // Buffer used for decoding
+                    uint8_t     compBuffer[ADM_COMPRESSED_MAX_DATA_LENGTH]; // Buffer used for decoding
                     bool        endOfStream; // The decoder has been flushed and no more compressed images from demuxer
 //****************************** Audio **********************************
                     // _audiooffset points to the offset / the total segment
@@ -164,9 +177,7 @@
                     bool        checkSamplingFrequency(ADM_audioStreamTrack *trk); // detect implicit SBR in AAC
 
 //****************************** Audio **********************************
-                    void        deleteAllVideos(void );
                     uint8_t     getMagic(const char *name,uint32_t *magic);
-                    uint32_t    searchForwardSeg(uint32_t startframe);
                     bool        rederiveFrameType(vidHeader *demuxer);
 
   public:
@@ -211,7 +222,6 @@
 					int 		saveImageJpg(const char *filename);
                     int         saveImagePng(const char *filename);
                     uint8_t 	cleanup( void);
-                    bool        isMultiSeg( void);
 /************************************* Markers *****************************/
 private:
                     uint64_t    markerAPts,markerBPts;
@@ -233,7 +243,7 @@
 protected:
                     ListOfUndoQueueElements undoQueue;
                     static const uint8_t maxUndoSteps=50;
-                    uint32_t    _cnt; // track the nb of performed undo steps for redo
+                    uint32_t    _undo_counter; // track the nb of performed undo steps for redo
 public:
                     bool        addToUndoQueue(void);
                     bool        undo(void);
@@ -249,18 +259,20 @@
                     bool        goToTimeVideo(uint64_t time);
                     void		getCurrentFrameFlags(uint32_t *flags, uint32_t *quantiser);
                     bool        goToIntraTimeVideo(uint64_t time);
-                    bool        nextPicture(ADMImage *image,bool dontcross=false);
+                    bool        nextPicture(ADMImage *image, int flags=0); // 1 = don't cross segment, 2 = don't skip to next keyframe
                     bool        samePicture(ADMImage *image);
                     bool        previousPicture(ADMImage *image);
                     bool        rewind(void);
 // Used for stream copy
                     bool        GoToIntraTime_noDecoding(uint64_t time,uint32_t *toframe=NULL);
-                    bool        getCompressedPicture(uint64_t delay,bool sanitizeDts,ADMCompressedImage *img);     //COPYMODE
+                    bool        getCompressedPicture(uint64_t start,uint64_t delay,bool sanitizeDts,ADMCompressedImage *img); //COPYMODE
                     // Use only for debug purpose !!!
                     bool        getDirectImageForDebug(uint32_t frameNum,ADMCompressedImage *img);
-                    bool        checkCutsAreOnIntra(void);
-                    bool        checkCutIsOnIntra(uint64_t time);
+                    ADM_cutPointType checkCutsAreOnIntra(void);
+                    ADM_cutPointType checkCutsAreOnIntra(uint64_t start,uint64_t end);
+                    ADM_cutPointType checkCutIsOnIntra(uint64_t time);
 private:
+                    ADM_cutPointType checkSegmentStartsOnIntra(uint32_t seg);
                     uint64_t    totalExtraDelay;
                     int64_t     desyncScore;
 public:

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

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

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

@@ -209,7 +209,7 @@
 \fn NextPicture
 \brief decode & returns the next picture
 */
-bool ADM_Composer::nextPicture(ADMImage *image,bool dontcross)
+bool ADM_Composer::nextPicture(ADMImage *image, int flags)
 {
 uint64_t pts;
 uint64_t tail;
@@ -240,6 +240,10 @@
 maxPts=seg->_refStartTimeUs+seg->_durationUs;
 if(false== nextPictureInternal(seg->_reference,image,maxPts))
 {
+ if(flags & 2)
+ {
+ goto np_nextSeg;
+ }
 uint64_t nkfPts=maxPts;
 uint32_t frame=0;
 if(searchNextKeyFrameInRef(seg->_reference,refPts,&nkfPts) && nkfPts<maxPts)
@@ -278,7 +282,7 @@
 
 // Try to get an image for the following segment....
 np_nextSeg:
- if(true==dontcross)
+ if(flags & 1)
 {
 ADM_warning("Not allowed to cross segment\n");
 return false;
@@ -306,7 +310,7 @@
 dont want to decode the targetPts if it is a keyframe
 but have the frame before
 */
-bool ADM_Composer::decodeTillPictureAtPts(uint64_t targetPts,ADMImage *image)
+uint8_t ADM_Composer::decodeTillPictureAtPts(uint64_t targetPts,ADMImage *image)
 {
 // Go to the previous keyframe and decode forward...
 uint32_t thisSeg=_currentSegment;
@@ -328,22 +332,22 @@
 uint64_t previousKf;
 if(false==searchPreviousKeyFrameInRef(ref,refTime,&previousKf))
 {
- ADM_warning("Cannot find previous keyframe in ref %d, time=%" PRIu64" \n",ref,refTime);
+ ADM_warning("Cannot find previous keyframe in ref %d for ref time %s\n",ref,ADM_us2plain(refTime));
 return false;
 }
 // go to it...
 if(false==seektoTime(ref,previousKf,false))
 {
- ADM_warning("Cannot seek to time=%" PRIu64" \n",previousKf);
+ ADM_warning("Cannot seek to ref time %s\n",ADM_us2plain(previousKf));
 return false; 
 }
 // Now forward till we reach out frame
 while(1)
 {
- if(false==nextPicture(image,true))
+ if(false==nextPicture(image,3))
 {
 ADM_warning("Error in decoding forward\n");
- return false;
+ return ADM_IGN;
 }
 if(image->Pts>=targetPts)
 break;
@@ -352,10 +356,10 @@
 }
 if(image->Pts!=targetPts)
 {
- ADM_error("Could not retrieve our own frame at PTS=%" PRIu64" ms\n",targetPts/1000);
- return false;
+ ADM_warning("Could not retrieve our own frame at %s\n",ADM_us2plain(targetPts));
+ return ADM_IGN;
 }
- return true;
+ return 1;
 }
 /**
 \fn previousPicture
@@ -388,7 +392,7 @@
 }
 ADMImage *cached=vid->_videoCache->getBefore(refPts);
 
- if(cached)
+ if(cached && cached->Pts<refPts)
 {
 if(cached->Pts>=seg->_refStartTimeUs) // It might be in the cache but belonging to the previous seg
 {
@@ -419,12 +423,18 @@
 seg=_segments.getSegment(segNo);
 if(segNo==_currentSegment) // Still in the same segment..
 {
- if(false==decodeTillPictureAtPts(targetPts,image))
+ switch(decodeTillPictureAtPts(targetPts,image))
 {
- ADM_error("Cannot decode till our current pts\n");
- return false;
+ case 1:
+ cached=vid->_videoCache->getBefore(refPts);
+ break;
+ case ADM_IGN:
+ ADM_warning("Cannot decode till our current pts\n");
+ cached=vid->_videoCache->getLast();
+ break;
+ default:
+ return false;
 }
- cached=vid->_videoCache->getBefore(refPts);
 if(cached)
 {
 if(cached->Pts>=seg->_refStartTimeUs)
@@ -455,10 +465,13 @@
 vid=_segments.getRefVideo(seg->_reference);
 
 
- decodeTillPictureAtPts(targetPts,image);
+ if(false==decodeTillPictureAtPts(targetPts,image))
+ {
+ ADM_error("Cannot decode to get a candidate.\n");
+ return false;
+ }
 _currentSegment=segNo;
 // We may have overshot...
- uint64_t last=vid->lastDecodedPts;
 _segments.LinearToRefTime(_currentSegment,targetPts,&refPts);
 ADMImage *candidate=vid->_videoCache->getLast();
 if(!candidate)
@@ -639,10 +652,8 @@
 // If the refStartTime is 0, it is the first image
 // But the fist image might not be = 0
 _VIDEOS *vid=_segments.getRefVideo(seg->_reference);
- vidHeader 	*demuxer=vid->_aviheader; 
 ADM_assert(vid);
 uint64_t from=seg->_refStartTimeUs;
- uint64_t pts,dts;
 
 if(!from) from=vid->firstFramePts;

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

@@ -37,10 +37,9 @@
 */
 bool ADM_Composer::seektoTime(uint32_t ref,uint64_t timeToSeek,bool dontdecode)
 {
- _VIDEOS *vid=_segments.getRefVideo(ref);
- vidHeader *demuxer=vid->_aviheader;
-	EditorCache *cache =vid->_videoCache;
-	ADM_assert(cache);
+ _VIDEOS *vid=_segments.getRefVideo(ref);
+ EditorCache *cache =vid->_videoCache;
+ ADM_assert(cache);
 bool found=false;
 if(timeToSeek>vid->firstFramePts && !dontdecode)
 {
@@ -48,7 +47,7 @@
 if(image)
 {
 vid->lastDecodedPts=vid->lastReadPts=timeToSeek;
- ADM_info("Image found in cache, pts=%" PRIu64" ms\n",timeToSeek/1000);
+ ADM_info("Image found in cache, pts=%" PRIu64" ms, last sent frame: %" PRIu32"\n",timeToSeek/1000,vid->lastSentFrame);
 endOfStream=false;
 return true;
 }
@@ -96,7 +95,7 @@
 vid->lastReadPts=pts;
 if(pts==timeToSeek)
 {
- ADM_info("Image found, pts=%" PRIu64" ms\n",pts/1000);
+ ADM_info("Image found, pts=%" PRIu64" ms, last sent frame: %" PRIu32"\n",pts/1000,vid->lastSentFrame);
 return true;
 }
 if(pts>timeToSeek)
@@ -119,9 +118,8 @@
 bool ADM_Composer::samePictureInternal(uint32_t ref,ADMImage *out)
 {
 _VIDEOS *vid=_segments.getRefVideo(ref);
- vidHeader *demuxer=vid->_aviheader;
-	EditorCache *cache =vid->_videoCache;
-	ADM_assert(cache);
+ EditorCache *cache =vid->_videoCache;
+ ADM_assert(cache);
 
 ADMImage *in=cache->getByPts(vid->lastDecodedPts);
 if(!in)
@@ -177,7 +175,7 @@
 // Duplicate
 if(out)
 {
- aprintf("[getNextPicture] Looking for after> %" PRIu64", got %" PRIu64" delta=%" PRIi32" ms\n",vid->lastReadPts,img->Pts,(img->Pts-vid->lastReadPts)/1000);
+ aprintf("[getNextPicture] Looking for after> %" PRIu64", got %" PRIu64" delta=%" PRId64" ms\n",vid->lastReadPts,img->Pts,((int64_t)img->Pts-(int64_t)vid->lastReadPts)/1000);
 out->duplicate(img);
 vid->lastReadPts=img->Pts;
 currentFrame++;
@@ -209,11 +207,11 @@
 */
 bool ADM_Composer::DecodeNextPicture(uint32_t ref)
 {
- EditorCache *cache;
- ADMImage	*result;
- bool drain=false;
- uint32_t flags;
- _VIDEOS *vid=_segments.getRefVideo(ref);
+ EditorCache *cache;
+ ADMImage *result,*last;
+ bool drain=false;
+
+ _VIDEOS *vid=_segments.getRefVideo(ref);
 vidHeader *demuxer=vid->_aviheader;
 ADM_assert(vid->decoder);
 if(vid->decoder->endOfStreamReached())
@@ -236,7 +234,7 @@
 {
 if(!demuxer->getFrame(frame,&img))
 {
- ADM_warning("getFrame failed for frame %" PRIu32"\n",vid->lastSentFrame);
+ ADM_warning("getFrame failed for frame %" PRIu32"\n",frame);
 drain=true;
 vid->decoder->setDrainingState(true);
 }else
@@ -244,11 +242,14 @@
 endOfStream=false;
 }
 }
+ // Be prepared for the case that the decoder doesn't output a picture
+ // but tells us to repeat the previous one.
+ last=cache->getLast();
 // Now uncompress it...
 result=cache->getFreeImage();
 if(!result)
 {
- ADM_warning(" Cache full for frame %" PRIu32"\n",vid->lastSentFrame);
+ ADM_warning(" Cache full for frame %" PRIu32"\n",frame);
 return false;
 }
 if(!drain)
@@ -260,41 +261,59 @@
 }
 if(!decompressImage(result,&img,ref))
 {
- ADM_info("Decoding error for frame %" PRIu32", not necessarily a problem\n",vid->lastSentFrame);
+ if(false==vid->decoder->keepFeeding())
+ ADM_info("Error decoding frame %" PRIu32"\n",frame);
 stats.nbNoImage++;
 cache->invalidate(result);
 if(drain)
 endOfStream=true;
 return true; // Not an error in itself
 }
- aprintf("Got image with PTS=%s\n",ADM_us2plain(result->Pts));
- uint64_t pts=result->Pts;
- uint64_t old=vid->lastDecodedPts;
- if(pts==ADM_COMPRESSED_NO_PTS || vid->dontTrustBFramePts) // No PTS available ?
+ if(result->_noPicture) // Handle N-VOP in mpeg4
+ {
+ if(last && !last->_noPicture)
+ result->duplicate(last);
+ else if(result->isWrittable())
+ result->blacken();
+ result->_noPicture=0;
+ result->flags=AVI_P_FRAME;
+ result->Pts=ADM_NO_PTS;
+ }
+ // else aprintf("Got a fresh image with PTS=%s\n",ADM_us2plain(result->Pts));
+ uint64_t pts=result->Pts;
+ uint64_t old=vid->lastDecodedPts;
+ if(pts==ADM_COMPRESSED_NO_PTS || vid->dontTrustBFramePts) // No PTS available ?
+ {
+ aprintf("[Editor] No PTS, guessing value\n");
+ aprintf("Image Pts : %s\n",ADM_us2plain(img.demuxerPts));
+ aprintf("Image Dts : %s\n",ADM_us2plain(img.demuxerDts));
+ vid->lastDecodedPts+=vid->timeIncrementInUs;
+ uint64_t pts=img.demuxerPts;
+ uint64_t dts=img.demuxerDts;
+ uint32_t origin=0;
+ if(frame>=vid->decoderDelay)
+ origin=frame-vid->decoderDelay;
+ demuxer->getPtsDts(origin,&pts,&dts);
+ if(dts!=ADM_NO_PTS && (vid->dontTrustBFramePts || vid->_aviheader->providePts()==false))
 {
- aprintf("[Editor] No PTS, guessing value\n");
- aprintf("Image Pts : %s\n",ADM_us2plain(img.demuxerPts));
- aprintf("Image Dts : %s\n",ADM_us2plain(img.demuxerDts));
- vid->lastDecodedPts+=vid->timeIncrementInUs;
- if(img.demuxerDts!=ADM_NO_PTS && (vid->dontTrustBFramePts || vid->_aviheader->providePts()==false))
- {
- if(img.demuxerDts>vid->lastDecodedPts)
- {
- aprintf("Dts > Guessed Pts, cranking pts\n");
- vid->lastDecodedPts=img.demuxerDts;
- }
- }
- result->Pts=vid->lastDecodedPts;
- }else
- {
- aprintf("[Editor] got PTS\n");
- vid->lastDecodedPts=pts;
+ aprintf("Checking guessed PTS against DTS from frame %u, decoder delay: %u frames.\n",origin,vid->decoderDelay);
+ if(dts>vid->lastDecodedPts)
+ {
+ ADM_warning("Dts > Guessed Pts, cranking pts by %" PRIu64" us.\n",dts-vid->lastDecodedPts);
+ vid->lastDecodedPts=dts;
 }
+ }
+ result->Pts=vid->lastDecodedPts;
+ }else
+ {
+ aprintf("[Editor] got PTS\n");
+ vid->lastDecodedPts=pts;
+ }
 aprintf(">>Decoded frame %" PRIu32" with pts=%" PRId64" us, %" PRId64" ms, ptsdelta=%" PRId64" ms \n",
 frame,
 vid->lastDecodedPts,
 vid->lastDecodedPts/1000,
- (vid->lastDecodedPts-old)/1000);
+ ((int64_t)vid->lastDecodedPts-(int64_t)old)/1000);
 
 if(old>vid->lastDecodedPts) 
 {
@@ -320,89 +339,84 @@
 
 bool ADM_Composer::decompressImage(ADMImage *out,ADMCompressedImage *in,uint32_t ref)
 {
- ADMImage *tmpImage=NULL;
- _VIDEOS *v=_segments.getRefVideo(ref);
- uint32_t refOnly=v->decoder->dontcopy(); // can we skip one memcpy ?
- // get settings from pref...
- 
-// This is only an empty Shell
+ ADMImage *tmpImage=NULL;
+ _VIDEOS *v=_segments.getRefVideo(ref);
+ bool refOnly=v->decoder->dontcopy(); // can we skip one memcpy ?
+ // This is only an empty Shell
 if(refOnly)
 {
- uint32_t w,h;
- if(_scratch) // Can we reuse the old scratch memory ?
- {
- _scratch->getWidthHeight(&w,&h);
- if(w!=_imageBuffer->_width || _imageBuffer->_height!=h)
- {
- delete _scratch;
- _scratch=NULL;
- }
- }
- if(!_scratch)
- {
- _scratch=new ADMImageRef(_imageBuffer->_width,_imageBuffer->_height);
- }
- tmpImage=_scratch;
- }
- else
- {
- tmpImage=_imageBuffer;
- }
- //
- tmpImage->_colorspace=ADM_COLOR_YV12;
-	// Decode it
- if (!v->decoder->uncompress (in, tmpImage))
-	 {
- printf("[decompressImage] uncompress failed\n");
- return false;
- }
- //
- if(tmpImage->_noPicture && refOnly)
+ if(_scratch) // Can we reuse the old scratch memory ?
 {
- printf("[decompressImage] NoPicture\n");
- // Fill in with black
- return false;
+ uint32_t w,h;
+ _scratch->getWidthHeight(&w,&h);
+ if(w!=_imageBuffer->_width || _imageBuffer->_height!=h)
+ {
+ delete _scratch;
+ _scratch=NULL;
+ }
 }
- aprintf("[::Decompress] in:%" PRIu32" out:%" PRIu32" flags:%x\n",in->demuxerPts,out->Pts,out->flags);
-	// If not quant and it is already YV12, we can stop here
+ if(!_scratch)
+ _scratch=new ADMImageRef(_imageBuffer->_width,_imageBuffer->_height);
+ tmpImage=_scratch;
+ }else
+ {
+ tmpImage=_imageBuffer;
+ }
+
+ tmpImage->_colorspace=ADM_COLOR_YV12;
+ // Decode it
+ if (!v->decoder->uncompress (in, tmpImage))
+ {
+ //printf("[decompressImage] uncompress failed\n");
+ return false;
+ }
+
+ if(tmpImage->_noPicture)
+ {
+ printf("[decompressImage] NoPicture\n");
+ // No picture and no error from decoder means repeat the previous one
+ out->_noPicture=1;
+ return true;
+ }
+ aprintf("[::Decompress] in:%" PRIu64" out:%" PRIu64" flags:%x\n",in->demuxerPts,out->Pts,out->flags);
+ // If not quant and it is already YV12, we can stop here
 // Also, if the image is decoded through hw, dont do post proc
-	if(tmpImage->refType!=ADM_HW_NONE || 
- ((!tmpImage->quant || !tmpImage->_qStride) && tmpImage->_colorspace==ADM_COLOR_YV12))
-	{
-		out->_Qp=2;
-		out->duplicate(tmpImage);
-		aprintf("[decompressImage] : No quant avail\n");
-		return true;
-	}
-	// We got everything, let's go
-	// 1 compute average quant
-	int qz;
-	uint32_t sumit=0;
+ if(tmpImage->refType!=ADM_HW_NONE || ((!tmpImage->quant || !tmpImage->_qStride) && tmpImage->_colorspace==ADM_COLOR_YV12))
+ {
+ out->_Qp=2;
+ out->duplicate(tmpImage);
+ aprintf("[decompressImage] : No quant avail\n");
+ return true;
+ }
+ // We got everything, let's go
+ // 1 compute average quant
+ int qz;
+ uint32_t sumit=0;
 // Dupe infos
 out->copyInfo(tmpImage);
 
 
 // Do postprocessing if any
-	for(uint32_t z=0;z<tmpImage->_qSize;z++)
-	{
- qz=(int)tmpImage->quant[z];
-			sumit+=qz;
-	}
-	sumit+=(tmpImage->_qSize-1);
-	float sum=(float)sumit;
-	sum/=tmpImage->_qSize;
-	if(sum>31) sum=31;
-	if(sum<1) sum=1;
+ for(uint32_t z=0;z<tmpImage->_qSize;z++)
+ {
+ qz=(int)tmpImage->quant[z];
+ sumit+=qz;
+ }
+ sumit+=(tmpImage->_qSize-1);
+ float sum=(float)sumit;
+ sum/=tmpImage->_qSize;
+ if(sum>31) sum=31;
+ if(sum<1) sum=1;
 
 // update average Q
-	tmpImage->_Qp=out->_Qp=(uint32_t)floor(sum);
-	// Pp deactivated ?
-	if(!_pp->postProcType || !_pp->postProcStrength || tmpImage->_colorspace!=ADM_COLOR_YV12)
- {
- dupe(tmpImage,out,v);
- aprintf("EdCache: Postproc disabled\n");
-		return 1;
-	}
+ tmpImage->_Qp=out->_Qp=(uint32_t)floor(sum);
+ // Pp deactivated ?
+ if(!_pp->postProcType || !_pp->postProcStrength || tmpImage->_colorspace!=ADM_COLOR_YV12)
+ {
+ dupe(tmpImage,out,v);
+ aprintf("EdCache: Postproc disabled\n");
+ return true;
+ }
 /* Do it!*/
 _pp->process(tmpImage,out);
 return true;
@@ -455,6 +469,7 @@
 cache->flush();
 vid->decoder->flush();
 vid->decoder->setEndOfStream(false);
+ vid->decoderDelay=0;
 endOfStream=false;
 // The PTS associated with our frame is the one we are looking for
 uint64_t wantedPts=demuxer->estimatePts(frame);
@@ -470,76 +485,80 @@
 // Last frame ? if so repeat
 if(vid->lastSentFrame>=nbFrames-1) vid->lastSentFrame=nbFrames-1;
 // Fetch frame
- aprintf("[Editor] Decoding frame %u\n",vid->lastSentFrame);
- 
- if (!demuxer->getFrame (vid->lastSentFrame,&img))
- {
- ADM_warning(" getFrame failed for frame %" PRIu32"\n",vid->lastSentFrame);
- //cache->flush();
- vid->decoder->setDrainingState(true);
- }
- // Now uncompress it...
- result=cache->getFreeImage();
- if(frame==0) // out first frame, make sure it starts black to avoid the all green effect
- {
- result->blacken();
- }
- if(!result)
- {
- ADM_warning(" Cache full for frame %" PRIu32"\n",vid->lastSentFrame);
- return false;
- }
- aprintf("[Decoder] Demuxer Frame %" PRIu32" pts=%" PRIu64" ms, %" PRIu64" us\n",vid->lastSentFrame,img.demuxerPts/1000,
+ aprintf("[Editor] Decoding frame %u\n",vid->lastSentFrame);
+
+ if (!demuxer->getFrame (vid->lastSentFrame,&img))
+ {
+ ADM_warning("getFrame failed for frame %" PRIu32"\n",vid->lastSentFrame);
+ //cache->flush();
+ vid->decoder->setDrainingState(true);
+ }
+ if(!img.dataLength)
+ {
+ aprintf("Skipping zero-length frame %u\n",vid->lastSentFrame);
+ vid->lastSentFrame++;
+ vid->decoderDelay++;
+ continue;
+ }
+ // Now uncompress it...
+ result=cache->getFreeImage();
+ if(!result)
+ {
+ ADM_warning("Cache full for frame %" PRIu32"\n",vid->lastSentFrame);
+ return false;
+ }
+ aprintf("[Decoder] Demuxer Frame %" PRIu32" pts=%" PRIu64" ms, %" PRIu64" us\n",vid->lastSentFrame,img.demuxerPts/1000,
 img.demuxerPts);
- if(!decompressImage(result,&img,ref))
- {
- ADM_info(" decode error for frame %" PRIu32", not necessarily a problem\n",vid->lastSentFrame);
- //cache->dump();
- cache->invalidate(result);
- //cache->dump();
- vid->lastSentFrame++;
- continue;
- }else
- {
- 
- uint64_t pts=result->Pts;
- aprintf("[Decoder] Decoder Frame %" PRIu32" pts=%" PRIu64" ms, %" PRIu64" us\n",vid->lastSentFrame,
+ if(!decompressImage(result,&img,ref))
+ {
+ if(false==vid->decoder->keepFeeding())
+ ADM_info("Error decoding frame %" PRIu32"\n",vid->lastSentFrame);
+ //cache->dump();
+ cache->invalidate(result);
+ //cache->dump();
+ vid->lastSentFrame++;
+ vid->decoderDelay++;
+ continue;
+ }else
+ {
+ uint64_t pts=result->Pts;
+ aprintf("[Decoder] Decoder Frame %" PRIu32" pts=%" PRIu64" ms, %" PRIu64" us\n",vid->lastSentFrame,
 result->Pts/1000,result->Pts);
- if(pts==ADM_COMPRESSED_NO_PTS) // No PTS available ?
+ if(pts==ADM_COMPRESSED_NO_PTS) // No PTS available ?
+ {
+ if(false==syncFound)
 {
- 
- if(false==syncFound)
- {
- aprintf("[DecodePictureUpToIntra] No time stamp yet, dropping picture\n");
- cache->invalidate(result);
- }else
- {
- // increment it using average fps
- vid->lastDecodedPts+=vid->timeIncrementInUs;
- result->Pts=vid->lastDecodedPts;
- }
+ aprintf("[DecodePictureUpToIntra] No time stamp yet, dropping picture\n");
+ cache->invalidate(result);
 }else
 {
- if(false==syncFound)
- {
- aprintf("[DecodePictureUpToIntra] Sync found\n");
- syncFound=true;
- }
- vid->lastDecodedPts=pts;
+ // increment it using average fps
+ vid->lastDecodedPts+=vid->timeIncrementInUs;
+ result->Pts=vid->lastDecodedPts;
+ }
+ }else
+ {
+ if(false==syncFound)
+ {
+ aprintf("[DecodePictureUpToIntra] Sync found\n");
+ syncFound=true;
 }
- cache->validate(result);
+ vid->lastDecodedPts=pts;
 }
+ cache->validate(result);
+ }
 
- // Found our image ?
- if(result->Pts==wantedPts)
- found=true;
- else
- vid->lastSentFrame++;
+ // Found our image ?
+ if(result->Pts==wantedPts)
+ found=true;
+ else
+ vid->lastSentFrame++;
 }
 if(found==false)
 {
 ADM_warning(" Could not find decoded frame, wanted PTS :%" PRIu32" PTS=%" PRIu64" ms, %" PRIu64" us\n",frame,wantedPts/1000,wantedPts);
 cache->dump();
+ vid->decoderDelay=0;
 return false;
 }
 vid->lastReadPts=wantedPts;

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

@@ -21,7 +21,11 @@
 #include "ADM_edit.hxx"
 #include "ADM_vidMisc.h"
 
+#if 1
 #define pivotPrintf(...) {}
+#else
+#define pivotPrintf printf
+#endif
 
 /**
 \fn getNKFramePTS
@@ -96,7 +100,6 @@
 bool			ADM_Composer::getPKFramePTS(uint64_t *frameTime)
 {
 uint64_t refTime,nkTime,segTime;
-int lastSeg=_segments.getNbSegments();
 uint32_t seg;
 bool r;
 // 1- Convert frameTime to segments
@@ -164,10 +167,8 @@
 
 bool			ADM_Composer::getPtsDtsDelta(uint64_t frameTime, uint64_t *outDelta)
 {
-uint64_t refTime,nkTime,segTime;
-int lastSeg=_segments.getNbSegments();
+uint64_t refTime,segTime;
 uint32_t seg;
-bool r;
 // 1- Convert frameTime to segments
 if(false== _segments.convertLinearTimeToSeg( frameTime, &seg, &segTime))
 {
@@ -208,13 +209,19 @@
 */
 bool ADM_Composer::searchNextKeyFrameInRef(int ref,uint64_t refTime,uint64_t *nkTime)
 {
- // Search from the end till we get a keyframe
+ int curFrame=0;
 _VIDEOS *v=_segments.getRefVideo(ref);
+ // look up the frame we are starting from...
+ if(!getFrameNumFromPtsOrBefore(v,refTime,curFrame))
+ {
+ ADM_warning("Cannot identify the frame for time %s in reference.\n",ADM_us2plain(refTime));
+ }
 uint32_t nbFrame=v->_nb_video_frames;
 uint64_t pts,dts;
- for(int i=0;i<nbFrame;i++)
+ curFrame -= 16; // safety margin to deal with early B-frames
+ if(curFrame < 0) curFrame = 0;
+ for(int i=curFrame;i<nbFrame;i++)
 {
- uint64_t p;
 uint32_t flags;
 v->_aviheader->getFlags(i,&flags);
 if(!(flags & AVI_KEY_FRAME)) continue;
@@ -243,18 +250,27 @@
 */
 bool ADM_Composer::getFrameNumFromPtsOrBefore(_VIDEOS *v,uint64_t refTime,int &frameNumber)
 {
+ if(refTime == ADM_NO_PTS)
+ return false;
+ if(refTime <= v->firstFramePts)
+ {
+ frameNumber = 0;
+ return true;
+ }
+
 uint32_t nbFrame = v->_nb_video_frames;
- uint64_t pts, dts;
+ uint64_t pts, dts, margin = v->timeIncrementInUs * 16;
+ const uint64_t rangeBegin = (refTime < margin)? 0 : (refTime - margin);
+ const uint64_t rangeEnd = refTime + margin;
 uint32_t curFrame = nbFrame >> 1;
 uint32_t splitMoval = (curFrame + 1) >> 1;
 uint32_t minFrame = 0;
+ bool worked = false;
 pivotPrintf("Looking for frame with pts %" PRIu64" us (%s)\n",refTime,ADM_us2plain(refTime));
 // Try to find the frame that as the timestamp close enough to refTime, while being smaller
 do 
 {
 // seems like the pts determination, not always works -> retry if necessary
- bool worked;
- uint32_t skipped = 0;
 uint32_t tmpFrame = curFrame;
 do
 {
@@ -262,54 +278,47 @@
 worked = v->_aviheader->getPtsDts(tmpFrame,&pts,&dts);
 if(worked && pts != ADM_NO_PTS)
 break; // found
- if(!tmpFrame)
+ if(tmpFrame <= minFrame)
 {
- ADM_warning("The whole segment is corrupted. Aborting the search\n");
- return false;
+ ADM_warning("Frames between %" PRIu32" and %" PRIu32" have no PTS.\n",minFrame,curFrame);
+ break;
 }
 tmpFrame--;
- skipped++;
 } while(true);
- if(pts == refTime)
- break;
- if(skipped && pts < refTime)
- { // if we slid past the target frame...
- pivotPrintf("skipped %" PRIu32" frames seeking back\n",skipped);
- skipped = 0;
- tmpFrame = curFrame + 1; // ...go back to the frame where we first encountered corrupted video...
+ if(pts == ADM_NO_PTS)
+ {
+ tmpFrame = curFrame + 1;
 do
- { // ...and seek forward until we get a valid pts
- pts = ADM_NO_PTS;
- worked = v->_aviheader->getPtsDts(tmpFrame,&pts,&dts);
- if(worked && pts != ADM_NO_PTS)
- break; // found 
- tmpFrame++;
- if(tmpFrame == nbFrame)
- {
- ADM_warning("The whole segment is corrupted. Aborting the search\n");
- return false;
- }
- skipped++;
- } while(true);
- if(skipped)
 {
- pivotPrintf("skipped %" PRIu32" frames seeking forward\n",skipped);
- if(pts > refTime)
+ if(tmpFrame >= nbFrame)
 {
- ADM_warning("The video at the specified time in ref is corrupted. Aborting seek\n");
+ ADM_warning("The whole segment is corrupted, aborting seek.\n");
 return false;
- }else
- {
- minFrame = tmpFrame;
 }
- }
- curFrame = tmpFrame;
+ minFrame = tmpFrame;
+ worked = v->_aviheader->getPtsDts(tmpFrame,&pts,&dts);
+ if(worked && pts != ADM_NO_PTS)
+ break; // found
+ tmpFrame++;
+ } while(true);
+ }
+ curFrame = tmpFrame; // resync
+ // are we lucky?
+ if(pts == refTime)
+ {
+ pivotPrintf("Perfect match for frame %" PRIu32"\n",curFrame);
+ frameNumber = curFrame;
+ return true;
 }
+ // nope, are we at least close enough?
+ if(pts != ADM_NO_PTS && pts >= rangeBegin && pts <= rangeEnd)
+ break; // switch to linear search
+ // nope, continue to bisect
 pivotPrintf("SplitMoval=%d\n",splitMoval);
- if(!splitMoval)
- break; 
+ if(splitMoval < 16)
+ break;
 pivotPrintf("Pivot frame is %" PRIu32" at %s\n",curFrame,ADM_us2plain(pts));
- if (pts >= refTime)
+ if (pts > refTime)
 {
 if (curFrame <= splitMoval + minFrame)
 {
@@ -324,18 +333,47 @@
 if(curFrame >= nbFrame)
 curFrame = nbFrame - 1;
 }
- if(splitMoval > 1)
- splitMoval++;
+ splitMoval++;
 splitMoval >>= 1;
- pivotPrintf("Split=%d\n",splitMoval); 
 } while(refTime != pts);
 
- pivotPrintf("Matching frame is %" PRIu32" at %s\n",curFrame,ADM_us2plain(pts));
- if(pts > refTime && curFrame)
- curFrame--;
- pivotPrintf("Our target frame is %" PRIu32"\n",curFrame);
- frameNumber = curFrame;
- return true;
+ // linear search with a generous safety margin
+ curFrame = (curFrame < 32)? 0 : curFrame - 32;
+ pivotPrintf("Starting linear search at frame %" PRIu32", total frames: %" PRIu32"\n",curFrame,nbFrame);
+ int candidate = -1;
+ uint64_t last = 0;
+ for(int i = 0; i < 65; i++)
+ {
+ if(curFrame >= nbFrame) break;
+ pts = ADM_NO_PTS;
+ worked = v->_aviheader->getPtsDts(curFrame,&pts,&dts);
+ if(!worked || pts == ADM_NO_PTS)
+ {
+ pivotPrintf("Linear search, skipping frame %" PRIu32"\n",curFrame);
+ curFrame++;
+ continue;
+ }
+ if(pts == refTime)
+ {
+ pivotPrintf("Perfect match for frame %" PRIu32"\n",curFrame);
+ frameNumber = curFrame;
+ return true;
+ }
+ if(pts >= rangeBegin && (last? pts > last : true) && pts < refTime)
+ {
+ candidate = curFrame;
+ last = pts;
+ }
+ curFrame++;
+ }
+ if(candidate >= 0)
+ {
+ ADM_info("Best candidate for time %s in reference is frame %" PRIu32"\n",ADM_us2plain(refTime),candidate);
+ frameNumber = candidate;
+ return true;
+ }
+ ADM_warning("Search for frame matching time %s in reference failed.\n",ADM_us2plain(refTime));
+ return false;
 }
 /**
 \fn searchPreviousKeyFrameInRef
@@ -352,7 +390,6 @@
 return false;
 // Search for the current frame with quick search
 _VIDEOS *v = _segments.getRefVideo(ref);
- uint32_t nbFrame = v->_nb_video_frames;
 uint64_t pts, dts;
 int curFrame;
 
@@ -365,7 +402,6 @@
 // rewind until we find a keyframe
 for (int i=curFrame; i>=0; i--) 
 {
- uint64_t p;
 uint32_t flags;
 v->_aviheader->getFlags(i,&flags);
 if(!(flags & AVI_KEY_FRAME)) 
@@ -400,8 +436,7 @@
 */
 bool ADM_Composer::getDtsFromPts(uint64_t *time)
 {
-uint64_t refTime,nkTime,segTime;
-int lastSeg=_segments.getNbSegments();
+uint64_t segTime;
 uint32_t seg;
 // 1- Convert frameTime to segments
 if(false== _segments.convertLinearTimeToSeg( *time, &seg, &segTime))
@@ -478,6 +513,7 @@
 }
 if(pts!=ADM_NO_PTS)
 {
+ if(pts<s->_refStartTimeUs) continue; // no keyframe in the last segment, retry with the previous one
 pts+=s->_startTimeUs-s->_refStartTimeUs;
 ADM_info("found last keyframe at %s\n",ADM_us2plain(pts));
 return pts;

avidemux_2.7.3.tar.gz/avidemux/common/ADM_editor/src/ADM_edStub.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/ADM_edStub.cpp Changed

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

@@ -20,6 +20,9 @@
 #include "ADM_default.h"
 #include "ADM_edit.hxx"
 #include "ADM_vidMisc.h"
+#include "ADM_videoInfoExtractor.h"
+#include "ADM_h264_tag.h"
+
 #if 0
 #define aprintf printf
 #else
@@ -28,132 +31,471 @@
 
 static int warn_cnt=0;
 
+static bool checkCodec(aviInfo *first,aviInfo *second)
+{
+ bool match=false;
+#define XCHECK(x) if(!match && x(first->fcc) && x(second->fcc)) { ADM_info("Codecs identified by %s() as matching\n",#x); match=true; }
+ XCHECK(isH264Compatible)
+ XCHECK(isH265Compatible)
+ XCHECK(isMpeg4Compatible)
+ XCHECK(isMpeg12Compatible)
+ XCHECK(isVC1Compatible)
+ XCHECK(isVP9Compatible)
+ XCHECK(isVP6Compatible)
+ XCHECK(isMSMpeg4Compatible)
+ XCHECK(isDVCompatible)
+ // catch fourcc values not covered by above
+ if(!match && first->fcc == second->fcc)
+ match=true;
+ return match;
+}
+
 /**
- \fn checkCutsAreOnIntra
+ \fn checkSegmentStartsOnIntra
 \brief In copy mode, if the cuts are not on intra we will run into trouble :
 * We include skipped ref frames: we will have DTS going back error
- * We skip them, we have borked video at cut points due to missing ref framesz
- \return true if everything ok
+ * We skip them, we have borked video at cut points due to missing ref frames
 */
-bool ADM_Composer::checkCutsAreOnIntra(void)
+ADM_cutPointType ADM_Composer::checkSegmentStartsOnIntra(uint32_t segNo)
 {
- bool fail=false;
- int nbSeg=_segments.getNbSegments();
+ if(segNo>=_segments.getNbSegments())
+ {
+ ADM_error("Requested segment number %d out of range!\n",segNo);
+ return ADM_EDITOR_CUT_POINT_IDR;
+ }
 
- ADMCompressedImage img;
- uint8_t *buffer=new uint8_t[1920*1080*3];
- img.data=buffer;
- ADM_info("Checking cuts start on keyframe..\n");
- for(int i=0;i<nbSeg;i++)
+ _SEGMENT *seg=_segments.getSegment(segNo);
+ _VIDEOS *vid=_segments.getRefVideo(seg->_reference);
+ vidHeader *demuxer=vid->_aviheader;
+
+ uint32_t oldSeg=_currentSegment;
+ uint32_t oldFrame=vid->lastSentFrame;
+ uint32_t refNo=seg->_reference;
+ uint64_t refstart=(seg->_refStartTimeUs > vid->firstFramePts)? seg->_refStartTimeUs : vid->firstFramePts;
+ int frame=0;
+ uint8_t *buffer=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(false==switchToSegment(segNo,true))
 {
- _SEGMENT *seg=_segments.getSegment(i);
- _VIDEOS *vid=_segments.getRefVideo(seg->_reference);
- vidHeader *demuxer=vid->_aviheader;
+ BOWOUT
+ }
+ if(false==getFrameNumFromPtsOrBefore(vid,refstart,frame))
+ {
+ BOWOUT
+ }
+ // Cursorily check that codec matches if the ref video is not the first one.
+ aviInfo info;
+ demuxer->getVideoInfo(&info);
+ if(refNo)
+ {
+ aviInfo inf0;
+ getVideoInfo(&inf0);
+ if(!checkCodec(&info,&inf0))
+ {
+ ADM_error("Codec doesn't match the one of the first ref video. This is currently unsupported.\n");
+ cut=ADM_EDITOR_CUT_POINT_MISMATCH;
+ BOWOUT
+ }
+ }
 
- if(false==switchToSegment(i,true))
+ uint32_t flags=0;
+ uint64_t pts,dts;
+ demuxer->getPtsDts(frame,&pts,&dts);
+
+ // After a seg switch we are at the keyframe before or equal to where we want to go
+ // if the dts do not match, it means we went back too much
+ // When re-encoding, it's not a problem, it is when copying.
+ ADM_info("seg %d: ref %d, refDTS=%" PRIu64"\n",segNo,seg->_reference,seg->_refStartDts);
+ ADM_info("seg %d: ref %d, imgDTS=%" PRIu64"\n",segNo,seg->_reference,dts);
+ if(!seg->_refStartDts && !seg->_reference)
+ {
+ ADM_info("Ignoring first seg (unreliable DTS)\n");
+ }else if(dts!=ADM_NO_PTS && seg->_refStartDts!=ADM_NO_PTS && dts!=seg->_refStartDts)
+ {
+ 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; // ??
+ BOWOUT
+ }
+ // DTS check passed, now check flags
+ demuxer->getFlags(frame,&flags);
+ 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;
+ BOWOUT
+ }
+ // The frame is marked as keyframe
+ if(!segNo) // Not a cut point
+ {
+ cut=ADM_EDITOR_CUT_POINT_IDR;
+ 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))
+ {
+ // 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
+ bool AnnexB=false;
+ uint8_t *extra;
+ uint32_t extraLen=0;
+ demuxer->getExtraHeaderData(&extraLen,&extra);
+ if(!extraLen)
+ AnnexB=true;
+ // 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)
 {
- fail=true;
- break;
+ 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));
 }
- if(false==demuxer->getFrame (vid->lastSentFrame,&img))
+ // We have SPS, now get the frame we are interested in.
+ if(!demuxer->getFrame(frame,&img))
 {
- ADM_info("Cannot get 1st frame of segment %d\n",i);
- fail=true;
- break;
+ ADM_warning("Unable to get frame %d in ref %d, segment %d\n",frame,seg->_reference,segNo);
+ BOWOUT
 }
- if(!(img.flags & AVI_KEY_FRAME))
+ int poc=-1;
+#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);
+ else
+ outcome=extractH264FrameType(img.data, img.dataLength, &(img.flags), &poc, &sps, &recoveryDistance);
+ if(!outcome)
 {
- ADM_warning("Segment %d does not start on a keyframe (%s)\n",i,ADM_us2plain(img.demuxerPts));
- fail=true;
- break;
+ ADM_warning("Cannot get H.264 frame type and Picture Order Count Least Significant Bits value.\n");
+ BOWOUT
 }
- // After a seg switch we are at the keyframe before or equal to where we want to go
- // if the dts do not match, it means we went back too much
- // When re-encoding, it's not a problem, it is when copying.
- ADM_info("seg %d: ref %d, refDTS=%" PRIu64"\n",i,seg->_reference,seg->_refStartDts);
- ADM_info("seg %d: ref %d, imgDTS=%" PRIu64"\n",i,seg->_reference,img.demuxerDts);
- if(!seg->_refStartDts && !seg->_reference)
+ // We are done with this segment, restore the last sent frame
+ vid->lastSentFrame=oldFrame;
+
+ // Check the preceding segment
+ 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;
+
+ if(false==switchToSegment(segNo,true))
+ {
+ ADM_warning("Cannot check the previous segment %d\n",segNo);
+ BOWOUT
+ }
+ // Same ref video?
+ if(seg->_reference==refNo)
 {
- ADM_info("Ignoring first seg (unreliable DTS)\n");
- 
+ // 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 and same ref video, the cut point is fine.\n");
+ cut=ADM_EDITOR_CUT_POINT_IDR;
+ BOWOUT
+ }
+ // Recovery point and no POC? Don't bother to perform further checks.
+ if(!recoveryDistance && poc==-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; // ??
+ BOWOUT
+ }
 }else
- if(img.demuxerDts!=ADM_NO_PTS && seg->_refStartDts!=ADM_NO_PTS && 
- img.demuxerDts!=seg->_refStartDts)
 {
- ADM_warning("Segment %d does not start on a known DTS (%s)\n",i,ADM_us2plain(img.demuxerDts));
- ADM_warning("expected (%s)\n",ADM_us2plain(seg->_refStartDts));
- fail=true;
- break;
+ // Not the same video. Does the codec match?
+ demuxer->getVideoInfo(&info);
+ if(!isH264Compatible(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 H.264 streams is currently not supported.\n");
+ 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
+ {
+ 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
+ {
+ gotSps=extractSPSInfo(extra,extraLen,&sps2);
+ }
+ if(!gotSps)
+ {
+ ADM_warning("Cannot retrieve SPS info for H.264 ref video in segment %d\n",segNo);
+ 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));
+ }
+ // We have SPS, does it match the one from the next segment?
+ // Check at least the fields we use here.
+#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)
+ 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("Segment %d ok\n",i);
- } 
- delete [] buffer;
- buffer=NULL;
- if(fail) return false;
- return true;
+
+ ADM_info("Recovery distance: %u\n",recoveryDistance);
+ if(!recoveryDistance) // recovery point, check POC
+ {
+ 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("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
+ int poc2 = -1;
+ outcome=false;
+ if(AnnexB)
+ outcome=extractH264FrameType_startCode(img.data, img.dataLength, &(img.flags), &poc2, &sps, NULL);
+ else
+ outcome=extractH264FrameType(img.data, img.dataLength, &(img.flags), &poc2, &sps, NULL);
+ if(!outcome)
+ {
+ ADM_warning("Cannot get H.264 frame type and Picture Order Count Least Significant Bits value.\n");
+ BOWOUT
+ }
+
+ cut=ADM_EDITOR_CUT_POINT_IDR;
+
+ 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)
+ {
+ 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
+ }
+ }
+ }
+ // TODO: check HEVC
+ cut=ADM_EDITOR_CUT_POINT_IDR;
+ BOWOUT
+}
+/**
+ \fn checkCutsAreOnIntra
+ \brief Check all segments
+*/
+ADM_cutPointType ADM_Composer::checkCutsAreOnIntra(void)
+{
+ ADM_cutPointType success=ADM_EDITOR_CUT_POINT_UNCHECKED;
+ int nbSeg=_segments.getNbSegments();
+ ADM_info("Checking cuts start on keyframe..\n");
+ for(int i=0;i<nbSeg;i++)
+ {
+ success=checkSegmentStartsOnIntra(i);
+ if(success!=ADM_EDITOR_CUT_POINT_IDR)
+ break;
+ }
+ return success;
 }
+
+/**
+ \fn checkCutsAreOnIntra
+ \brief Check a span
+*/
+ADM_cutPointType ADM_Composer::checkCutsAreOnIntra(uint64_t startTime,uint64_t endTime)
+{
+ ADM_cutPointType success=ADM_EDITOR_CUT_POINT_UNCHECKED;
+ int nbSeg=_segments.getNbSegments();
+ ADM_info("Checking cuts start on keyframe..\n");
+ uint32_t segNo;
+ uint64_t segTime;
+
+ if(false==_segments.convertLinearTimeToSeg(startTime,&segNo,&segTime))
+ return ADM_EDITOR_CUT_POINT_UNCHECKED; // we can't do anything meaningful if we fail to convert time to segment
+
+ ADM_assert(segNo<nbSeg);
+ int startSeg=segNo;
+ if(false==_segments.convertLinearTimeToSeg(endTime,&segNo,&segTime))
+ return ADM_EDITOR_CUT_POINT_UNCHECKED;
+
+ if(segNo==startSeg) // within one and the same segment, check only that codec matches
+ {
+ aviInfo here,first;
+ getVideoInfo(&first);
+ _SEGMENT *seg=_segments.getSegment(segNo);
+ _VIDEOS *vid=_segments.getRefVideo(seg->_reference);
+ vid->_aviheader->getVideoInfo(&here);
+ if(!checkCodec(&here,&first))
+ return ADM_EDITOR_CUT_POINT_MISMATCH;
+ return ADM_EDITOR_CUT_POINT_IDR;
+ }
+ for(int i=startSeg;i<segNo;i++)
+ {
+ success=checkSegmentStartsOnIntra(i+1);
+ if(success!=ADM_EDITOR_CUT_POINT_IDR)
+ break;
+ }
+ return success;
+}
+
 /**
 \fn checkCutIsOnIntra
 \brief Allow to check if a particular delete operation results in a cut being not on an intra
 */
-bool ADM_Composer::checkCutIsOnIntra(uint64_t time)
+ADM_cutPointType ADM_Composer::checkCutIsOnIntra(uint64_t time)
 {
- bool fail=false;
 uint32_t segNo;
 uint64_t segTime;
- fail=!_segments.convertLinearTimeToSeg(time,&segNo,&segTime);
- if(fail)
- return true; // we can't do anything meaningful if we fail to convert time to segment
+ if(false==_segments.convertLinearTimeToSeg(time,&segNo,&segTime))
+ return ADM_EDITOR_CUT_POINT_UNCHECKED; // we can't do anything meaningful if we fail to convert time to segment
 
- ADMCompressedImage img;
- uint8_t *buffer=new uint8_t[1920*1080*3];
- img.data=buffer;
 ADM_info("Checking whether cut at %s is on a keyframe...\n",ADM_us2plain(time));
 
- _SEGMENT *seg=_segments.getSegment(segNo);
- _VIDEOS *vid=_segments.getRefVideo(seg->_reference);
- vidHeader *demuxer=vid->_aviheader;
- uint32_t oldSeg=_currentSegment;
- uint32_t oldFrame=vid->lastSentFrame;
+ return checkSegmentStartsOnIntra(segNo);
+}
 
- if(switchToSegment(segNo,true))
+/**
+ \fn bFrameDroppable
+*/
+static bool bFrameDroppable(uint32_t fcc,vidHeader *hdr,ADMCompressedImage *img=NULL)
+{
+ if(isH264Compatible(fcc))
 {
- if(demuxer->getFrame(vid->lastSentFrame,&img))
- {
- if(!(img.flags & AVI_KEY_FRAME)) // always evaluates to false, img we've got is not the first frame of the segment
- {
- ADM_warning("Segment %d does not start on a keyframe (time in ref %s)\n",segNo,ADM_us2plain(img.demuxerPts));
- fail=true;
- }
- }else
+ if(!img)
+ return false;
+ 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;
+ notStackAllocator buf(maxSize);
+ bool AnnexB=false;
+ if(hdr)
 {
- ADM_info("Cannot get the 1st frame of segment %d\n",segNo);
+ uint8_t *extra;
+ uint32_t extraLen=0;
+ hdr->getExtraHeaderData(&extraLen,&extra);
+ if(!extraLen)
+ AnnexB=true;
 }
- if(!seg->_refStartDts && !seg->_reference)
- {
- ADM_info("Ignoring first seg (unreliable DTS)\n");
- }else if(img.demuxerDts!=ADM_NO_PTS && seg->_refStartDts!=ADM_NO_PTS && img.demuxerDts!=seg->_refStartDts)
+ if(AnnexB)
+ size=ADM_convertFromAnnexBToMP4(img->data,img->dataLength,buf.data,maxSize);
+ else
+ memcpy(buf.data,img->data,img->dataLength);
+ if(size)
 {
- ADM_warning("Segment %d does not start on a known DTS (%" PRIu64" us = %s)\n",segNo,img.demuxerDts,ADM_us2plain(img.demuxerDts));
- ADM_warning("expected: %" PRIu64" us = %s\n",seg->_refStartDts,ADM_us2plain(seg->_refStartDts));
- fail=true;
+ if(extractH264FrameType(buf.data,size,&(img->flags),NULL,NULL) && (img->flags & AVI_NON_REF_FRAME))
+ return true;
 }
- if(!fail)
- ADM_info("Segment %d is OK\n",segNo);
- }
- delete [] buffer;
- buffer=NULL;
- _currentSegment=oldSeg;
- vid->lastSentFrame=oldFrame;
- return !fail;
-}
-/**
- \fn bFrameDroppable
-*/
-static bool bFrameDroppable(uint32_t fcc)
-{
- if(isH264Compatible(fcc)) 
- return false;
+ return false;
+ }
 if(isH265Compatible(fcc)) 
 return false; 
 return true;
@@ -175,7 +517,7 @@
 bool ADM_Composer::getNonClosedGopDelay(uint64_t time,uint32_t *delay)
 {
 aviInfo info;
- int found;
+ int found=-1;
 uint32_t startSegNo;
 uint64_t segTime;
 *delay=0;
@@ -193,7 +535,7 @@
 uint64_t pts,dts;
 
 vid->_aviheader->getVideoInfo (&info);
- if(bFrameDroppable(info.fcc))
+ if(bFrameDroppable(info.fcc,NULL))
 {
 return true; // no need to add extra delay
 }
@@ -237,6 +579,20 @@
 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
@@ -262,7 +618,7 @@
 
 
 */
-bool ADM_Composer::getCompressedPicture(uint64_t videoDelay,bool sanitize,ADMCompressedImage *img)
+bool ADM_Composer::getCompressedPicture(uint64_t start,uint64_t videoDelay,bool sanitize,ADMCompressedImage *img)
 {
 uint64_t tail;
 //
@@ -288,6 +644,13 @@
 vidHeader *demuxer=vid->_aviheader;
 ADM_assert(demuxer);
 
+ uint32_t segNo=0;
+ uint64_t segTme,startFromPtsInRef=ADM_NO_PTS;
+ if(_segments.convertLinearTimeToSeg(start,&segNo,&segTme))
+ {
+ startFromPtsInRef=segTme+seg->_refStartTimeUs;
+ }
+
 // Prepare to deal with field-encoded streams
 uint64_t timeIncrement=vid->timeIncrementInUs;
 // Get next pic?
@@ -305,8 +668,7 @@
 //
 // after a segment switch, we may have some frames from "the past"
 // if the cut point is not a keyframe, drop them
- 
- if(bFrameDroppable(info.fcc))
+ if(bFrameDroppable(info.fcc,NULL))
 {
 if(img->flags & AVI_B_FRAME)
 {
@@ -326,31 +688,32 @@
 }
 }
 }
- if( img->demuxerDts!=ADM_NO_PTS)
+ if(img->demuxerDts!=ADM_NO_PTS)
 {
- bool drop=false;
- if(_currentSegment && img->demuxerDts<seg->_refStartDts)
+ if(img->demuxerDts<seg->_refStartDts)
 {
- ADM_info("Frame %d is in the past for this segment (%s)",vid->lastSentFrame,ADM_us2plain(img->demuxerDts));
- ADM_info("vs refstartdts %s\n",ADM_us2plain(seg->_refStartDts));
- ADM_info(" dts=%llu, ref=%llu\n",img->demuxerDts,seg->_refStartDts);
- drop=true;
+ printf("[getCompressedPicture] Frame %d DTS is in the past vs segment start: %s /",vid->lastSentFrame,ADM_us2plain(img->demuxerDts));
+ printf(" %s\n",ADM_us2plain(seg->_refStartDts));
+ goto againGet;
 }
+ }
+ if(img->demuxerPts!=ADM_NO_PTS)
+ {
 // Seeking is not accurate when cutting on non intra
 // we might have some frames that are clearly too early , even in seg0
- if(img->demuxerPts!=ADM_NO_PTS && bFrameDroppable(info.fcc))
+ uint64_t reftime=(seg->_refStartTimeUs > vid->firstFramePts)? seg->_refStartTimeUs : vid->firstFramePts;
+ if(startFromPtsInRef!=ADM_NO_PTS && segNo==_currentSegment && startFromPtsInRef>reftime)
+ reftime=startFromPtsInRef;
+ if(img->demuxerPts<reftime)
 {
- if(img->demuxerPts+seg->_startTimeUs<seg->_refStartTimeUs)
+ 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))
 {
- ADM_info("Frame %d is in the past for this segment -bis (%s)",vid->lastSentFrame,ADM_us2plain(img->demuxerPts));
- ADM_info("vs refstartdts %s\n",ADM_us2plain(seg->_refStartTimeUs));
- ADM_info(" pts=%llu, startTime=%llu, _refStartTimeUs=%llu\n",img->demuxerPts,seg->_startTimeUs,seg->_refStartTimeUs);
- drop=true;
+ ADM_warning("Dropping frame %d\n",vid->lastSentFrame);
+ goto againGet;
 }
 }
- if(drop)
- goto againGet;
- 
 }
 
 // Need to switch seg ?
@@ -576,7 +939,7 @@
 _SEGMENT *thisseg=_segments.getSegment(_currentSegment);
 thisseg->_dropBframes=_SEGMENT::ADM_DROP_MAYBE_AFER_SWITCH;
 ADM_info("Retrying for next segment\n");
- return getCompressedPicture(videoDelay,sanitize,img);
+ return getCompressedPicture(start,videoDelay,sanitize,img);
 }
 
 /**

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

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

@@ -27,6 +27,7 @@
 #include "ADM_codec.h"
 #include "DIA_coreToolkit.h"
 #include "ADM_vidMisc.h"
+#include "prefs.h"
 
 #if 1
 #define aprintf printf
@@ -101,12 +102,18 @@
 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(16,info.width,info.height);
+ ref->_videoCache = new EditorCache(cacheSize,info.width,info.height);
 
 // discard implausibly high fps, hardcode the value to 25 fps
 if (info.fps1000 > 2000 * 1000)
@@ -242,11 +249,13 @@
 v->_aviheader->close ();
 delete v->_aviheader;
 }
- 
+ if(v->paramCache)
+ delete [] v->paramCache;
 v->_videoCache=NULL;
 v->color=NULL;
 v->decoder=NULL;
 v->_aviheader=NULL;
+ v->paramCache=NULL;
 // Delete audio codec too
 // audioStream will be deleted by the demuxer
 
@@ -481,7 +490,7 @@
 {
 if(!frameTime && segments.size()) // pick the first one
 {
- ADM_info("Frame time=0, taking first segment \n");
+ //ADM_info("Frame time=0, taking first segment \n");
 *seg=0;
 *segTime=0; // ??
 return true;

avidemux_2.7.3.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioPcm.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioPcm.cpp Changed

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

@@ -71,7 +71,36 @@
 bool ADM_edAudioTrackExternal::create(uint32_t extraLen, uint8_t *extraData)
 {
 ADM_info("Initializing audio track from external %s \n",sourceFile.c_str());
- codec=getAudioCodec(wavHeader.encoding,&wavHeader,extraLen,extraData);;
+ codec=getAudioCodec(wavHeader.encoding,&wavHeader,extraLen,extraData);
+ if(!codec || codec->isDummy())
+ {
+ ADM_warning("No decoder for %s.\n",getStrFromAudioCodec(wavHeader.encoding));
+ return false;
+ }
+ // Check AAC for SBR
+ if(wavHeader.encoding==WAV_AAC)
+ {
+ uint32_t inlen,max=ADM_EDITOR_PACKET_BUFFER_SIZE;
+ notStackAllocator inbuf(max);
+ uint8_t *in=inbuf.data;
+ uint64_t dts;
+ if(false==internalAccess->getPacket(in,&inlen,max,&dts))
+ {
+ ADM_warning("Cannot get packets.\n");
+ return false;
+ }
+
+ notStackAllocator outbuf(wavHeader.frequency*wavHeader.channels*sizeof(float));
+ float *out=(float *)outbuf.data;
+ uint32_t nbOut,fq=0;
+ if(codec->run(in,inlen,out,&nbOut))
+ fq=codec->getOutputFrequency();
+ if(fq && fq!=wavHeader.frequency)
+ {
+ ADM_warning("Updating sampling frequency from %u to %u\n",wavHeader.frequency,fq);
+ wavHeader.frequency=fq;
+ }
+ }
 size=internalAccess->getLength();
 internalAudioStream=ADM_audioCreateStream(&wavHeader,internalAccess,true);
 return true;
@@ -143,9 +172,14 @@
 ADM_warning("Cannot identify external audio track\n");
 return NULL;
 }
- if(!hdr.channels)
+ if(!hdr.channels || hdr.channels > MAX_CHANNELS)
+ {
+ ADM_error("Number of channels out of bounds, the audio file must have been misidentified!\n");
+ return NULL;
+ }
+ if(hdr.frequency < MIN_SAMPLING_RATE || hdr.frequency > MAX_SAMPLING_RATE)
 {
- ADM_error("Got zero channels, the audio file must have been misidentified!\n");
+ ADM_error("Sampling frequency out of bounds, the audio file must have been misidentified!\n");
 return NULL;
 }
 // Try to create an access for the file...
@@ -197,8 +231,6 @@
 bool ADM_edAudioTrackExternal::getPCMPacket(float *dest, uint32_t sizeMax, uint32_t *samples,uint64_t *odts)
 {
 uint32_t fillerSample=0; // FIXME : Store & fix the DTS error correctly!!!!
-uint32_t inSize;
-bool drop=false;
 uint32_t outFrequency=getOutputFrequency();
 uint32_t outChannels=getOutputChannels();

avidemux_2.7.3.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edCache.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edCache.cpp Changed

@@ -32,13 +32,14 @@
 
 EditorCache::EditorCache(uint32_t size,uint32_t w, uint32_t h)
 {
-	_elem=new cacheElem[size];
-	for(uint32_t i=0;i<size;i++)
-	{
-		_elem[i].image=new ADMImageDefault(w,h);
-		_elem[i].pts=ADM_NO_PTS;
-	}
-	_nbImage=size;
+ _elem=new cacheElem[size];
+ for(uint32_t i=0;i<size;i++)
+ {
+ _elem[i].image=new ADMImageDefault(w,h);
+ _elem[i].pts=ADM_NO_PTS;
+ }
+ _nbImage=size;
+ ADM_info("Video cache created for %u decoded images.\n",_nbImage);
 }
 /**
 \fn EditorCache
@@ -46,11 +47,11 @@
 */
 EditorCache::~EditorCache(void)
 {
-	for(uint32_t i=0;i<_nbImage;i++)
-	{
-		delete _elem[i].image;
-	}
-	delete[] _elem;
+ for(uint32_t i=0;i<_nbImage;i++)
+ {
+ delete _elem[i].image;
+ }
+ delete[] _elem;
 }
 /**
 
@@ -78,10 +79,8 @@
 the cache is big enough to be immune
 to reuse in the same go
 */
-ADMImage	*EditorCache::getFreeImage(void)
+ADMImage *EditorCache::getFreeImage(void)
 {
-	uint32_t min=0;
-	uint64_t delta=0;
 int found=-1;
 check();
 // next!
@@ -98,10 +97,10 @@
 
 // Mark it as used
 if(found==-1) ADM_assert(0);
-	_elem[found].pts=ADM_NO_PTS;;
+ _elem[found].pts=ADM_NO_PTS;;
 writeIndex++;
 aprintf("Using free image at index %d\n",found);
-	return _elem[found].image;
+ return _elem[found].image;
 
 }
 /**
@@ -115,6 +114,7 @@
 for(int i=0;i<_nbImage;i++)
 {
 _elem[i].pts=ADM_NO_PTS;
+ _elem[i].image->hwDecRefCount();
 }
 writeIndex=readIndex=0;
 }
@@ -127,14 +127,14 @@
 for(int i=0;i<_nbImage;i++)
 {
 if(_elem[i].image==image)
- {
- uint32_t prev=(writeIndex+_nbImage-1)%_nbImage;
- ADM_assert(i==prev);
- ADM_assert(_elem[i].pts==ADM_NO_PTS);
- aprintf("Invalidate writeIndex %" PRIu32"\n",writeIndex);
- writeIndex--;
- return;
- }
+ {
+ uint32_t prev=(writeIndex+_nbImage-1)%_nbImage;
+ ADM_assert(i==prev);
+ ADM_assert(_elem[i].pts==ADM_NO_PTS);
+ aprintf("Invalidate writeIndex %" PRIu32"\n",writeIndex);
+ writeIndex--;
+ return;
+ }
 }
 printf("[edCache]Image not in cache\n");
 ADM_assert(0);
@@ -144,20 +144,19 @@
 \brief update the frameNo associated to a cache line (obsolete)
 Only used to mark it as valid
 */
-bool		EditorCache::validate(ADMImage *image)
+bool EditorCache::validate(ADMImage *image)
 {
-	for(uint32_t i=0;i<_nbImage;i++)
-	{
-		if(_elem[i].image==image)
-		{
+ for(uint32_t i=0;i<_nbImage;i++)
+ {
+ if(_elem[i].image==image)
+ {
 ADM_assert(_elem[i].pts==ADM_NO_PTS);
-			_elem[i].pts=image->Pts;
+ _elem[i].pts=image->Pts;
 aprintf("validate Index %" PRIu32" with pts=%" PRIu64"ms\n",i,image->Pts);
-			return true;
-		}
-
-	}
-	ADM_assert(0);
+ return true;
+ }
+ }
+ ADM_assert(0);
 return false;
 }
 /**
@@ -172,9 +171,9 @@
 cacheElem *e=&(_elem[i]);
 switch(e->pts)
 {
- case ADM_NO_PTS: printf("Not used %d\n",i);break;
+ case ADM_NO_PTS: printf("Not used %02d\n",i);break;
 default:
- printf("Edcache content[%d]: PTS : %s %" PRIu64" ms\n",i,
+ printf("Edcache content[%02d]: PTS : %s %" PRIu64" ms\n",i,
 ADM_us2plain(e->image->Pts),e->image->Pts/1000);
 break;
 }
@@ -189,7 +188,7 @@
 {
 if(!writeIndex) return NULL;
 for(uint32_t i=readIndex;i<writeIndex-1;i++)
-	{
+ {
 int index=i%_nbImage;
 ADM_assert(_elem[index].pts!=ADM_NO_PTS);
 if(_elem[index].pts==pts)
@@ -227,7 +226,7 @@
 ADMImage *EditorCache::getBefore(uint64_t pts)
 {
 for(int i=readIndex+1;i<writeIndex;i++)
-	{
+ {
 int index=i%_nbImage;
 ADM_assert(_elem[index].pts!=ADM_NO_PTS);
 if(_elem[index].pts==pts)
@@ -249,9 +248,9 @@
 ADMImage *EditorCache::getByPts(uint64_t Pts)
 {
 for(int i=readIndex;i<writeIndex;i++)
-	{
+ {
 int index=i%_nbImage;
-		if(_elem[index].image->Pts==Pts)
+ if(_elem[index].image->Pts==Pts)
 {
 return _elem[index].image;
 }

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

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

@@ -35,7 +35,6 @@
 */
 bool ADM_verifyDts(vidHeader *hdr,uint64_t timeIncrementUs)
 {
- int nbMissing=0;
 aviInfo info;
 hdr->getVideoInfo(&info);
 uint32_t nbFrames=0;
@@ -556,10 +555,7 @@
 *delay=0;
 int last=0;
 int nbFrames;
- int nbBframe=0;
- int maxBframe=0;
 uint32_t flags;
- int nbB=0;
 uint64_t pts,dts;
 
 ADM_info("computing dts...\n");
@@ -577,19 +573,15 @@
 }
 if(flags & AVI_B_FRAME)
 {
- 
- nbB++;
 dts=pts;
 hdr->setPtsDts(i,pts,dts);
 continue;
 }
 
 uint64_t oldPts,oldDts;
- uint64_t fwdPts,fwdDts;
 hdr->getPtsDts(last,&oldPts,&oldDts);
 dts=oldPts;
 hdr->setPtsDts(i,pts,dts);
- nbBframe=0;
 last=i;
 }
 return 1;
@@ -602,7 +594,7 @@
 bool updatePtsAndDts(vidHeader *hdr,uint64_t timeIncrementUs,uint64_t *delay)
 {
 aviInfo info;
- uint64_t offset,pts,dts;
+ uint64_t pts,dts;
 uint32_t nbFrames;
 uint64_t myDelay=0;
 *delay=0;
@@ -655,7 +647,7 @@
 {
 double deltaTime=dts-backDts;
 deltaTime=deltaTime/(deltaFrame);
- if(deltaTime>41700 & deltaTime<41800)
+ if(deltaTime>41700 && deltaTime<41800)
 {
 for(int j=backIndex+1;j<i;j++)
 {

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

@@ -24,14 +24,14 @@
 
 bool ADM_Composer::addToUndoQueue(void)
 {
- // truncate the dead branch first if we add a new element to the undo queue after _cnt-1 undo steps
- if(_cnt>1 && undoQueue.size()>1)
+ // truncate the dead branch first if we add a new element to the undo queue after _undo_counter-1 undo steps
+ if(_undo_counter>1 && undoQueue.size()>1)
 {
- for(uint32_t i=0;i<_cnt;i++)
+ for(uint32_t i=0;i<_undo_counter;i++)
 {
 undoQueue.pop_back();
 }
- ADM_info("Deleted last %d elements from the undo queue\n",_cnt);
+ ADM_info("Deleted last %d elements from the undo queue\n",_undo_counter);
 }
 // now populate the new element...
 undoQueueElem rec;
@@ -52,7 +52,7 @@
 // ...and store the new element in the queue
 undoQueue.push_back(rec);
 ADM_info("The undo queue has now %d element(s)\n",undoQueue.size());
- _cnt=0; // redo should not be available after a new undo-able action has been performed
+ _undo_counter=0; // redo should not be available after a new undo-able action has been performed
 return true;
 }
 
@@ -68,19 +68,19 @@
 ADM_info("The undo queue is empty, nothing to do\n");
 return false;
 }
- if(!_cnt) // no undo steps performed yet, thus we don't have the current state in the undo queue
+ if(!_undo_counter) // no undo steps performed yet, thus we don't have the current state in the undo queue
 {
 // store the current state in the queue and bump the tracker
 // to account for the queue becoming one element longer
 addToUndoQueue();
- _cnt=1;
+ _undo_counter=1;
 }
- undoQueueElem rec=undoQueue.at(undoQueue.size()-_cnt-1);
- ADM_info("Restoring the state recorded in the element %d starting with 1 of %d\n",undoQueue.size()-_cnt,undoQueue.size());
+ undoQueueElem rec=undoQueue.at(undoQueue.size()-_undo_counter-1);
+ ADM_info("Restoring the state recorded in the element %d starting with 1 of %d\n",undoQueue.size()-_undo_counter,undoQueue.size());
 _segments.setSegments(rec.segm);
 setMarkerAPts(rec.markerA);
 setMarkerBPts(rec.markerB);
- _cnt++;
+ _undo_counter++;
 return true;
 }
 
@@ -96,12 +96,12 @@
 ADM_info("The redo queue is empty, cannot perform redo\n");
 return false;
 }
- undoQueueElem rec=undoQueue.at(undoQueue.size()-_cnt+1);
- ADM_info("Restoring the state recorded in the element %d starting with 1 of %d\n",undoQueue.size()-_cnt+2,undoQueue.size());
+ undoQueueElem rec=undoQueue.at(undoQueue.size()-_undo_counter+1);
+ ADM_info("Restoring the state recorded in the element %d starting with 1 of %d\n",undoQueue.size()-_undo_counter+2,undoQueue.size());
 _segments.setSegments(rec.segm);
 setMarkerAPts(rec.markerA);
 setMarkerBPts(rec.markerB);
- _cnt--;
+ _undo_counter--;
 return true;
 }
 
@@ -121,7 +121,7 @@
 
 bool ADM_Composer::canUndo(void)
 {
- if(undoQueue.empty() || undoQueue.size()<_cnt+1)
+ if(undoQueue.empty() || undoQueue.size()<_undo_counter+1)
 return false;
 return true;
 }
@@ -132,7 +132,7 @@
 
 bool ADM_Composer::canRedo(void)
 {
- if(_cnt<2 || undoQueue.size()<_cnt) // _cnt=2 once the first undo operation has been performed
+ if(_undo_counter<2 || undoQueue.size()<_undo_counter) // _undo_counter=2 once the first undo operation has been performed
 return false;
 return true;
 }

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

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

avidemux_2.7.3.tar.gz/avidemux/common/ADM_osSupport/ADM_crashHook.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_osSupport/ADM_crashHook.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_preview.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_preview.cpp Changed

@@ -39,21 +39,14 @@
 #include "ADM_render/GUI_render.h"
 #include "ADM_commonUI/GUI_ui.h"
 #include "ADM_preview.h"
-#include "ADM_imageResizer.h"
 #include "DIA_coreToolkit.h"
 
 extern uint8_t UI_getPhysicalScreenSize(void* window, uint32_t *w,uint32_t *h);
-static void previewBlit(ADMImage *from,ADMImage *to,uint32_t startx,uint32_t starty);
+//static void previewBlit(ADMImage *from,ADMImage *to,uint32_t startx,uint32_t starty);
 static ADM_PREVIEW_MODE previewMode=ADM_PREVIEW_NONE;
 
 static bool defered_display=false; /* When 1, it means we are in playback mode */
 static float zoom=ZOOM_1_1;
-static ADMImage *resized=NULL;
-static ADMImageResizer *resizer=NULL;
-
-
-extern bool GUI_GoToTime(uint64_t time); // hack, might be a circular dep
-
 
 /*************************************/
 ADMImage *admPreview::rdrImage=NULL; /* Unprocessed image */
@@ -105,7 +98,7 @@
 UI_getPhysicalScreenSize(NULL, &phyW,&phyH);
 if(3*phyW<4*w || 3*phyH<4*h)
 {
- if(phyW<w/2 || phyH<h/2)
+ if(5*phyW<4*w || 5*phyH<4*h)
 {
 nzoom=ZOOM_1_4;
 }else
@@ -215,7 +208,6 @@
 /**
 \fn previewBlit(ADMImage *from,ADMImage *to,uint32_t startx,uint32_t starty)
 \brief Blit "from" to "to" at position startx,starty
-*/
 
 void previewBlit(ADMImage *from,ADMImage *to,uint32_t startx,uint32_t starty)
 {
@@ -230,9 +222,6 @@
 
 void admPreview::displayNow(void)
 {
-
- uint32_t fl,len;	
- 
 switch(previewMode)
 {
 case ADM_PREVIEW_NONE:

avidemux_2.7.3.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreD3D.h -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreD3D.h Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreD3D.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreD3D.cpp Changed

@@ -51,6 +51,7 @@
 static IDirect3DDevice9      *d3d9device   = NULL;
 static IDirect3DDevice9Ex    *d3d9deviceex = NULL;
 static admD3D::ADM_vendorID  d3dVendorId  =  admD3D::VENDOR_UNKNOWN;
+static int64_t               d3dDriverVersion = 0;
 
 static bool isD3D9Ex=false;
 
@@ -125,9 +126,12 @@
     {
         ADM_warning("GetAdapterIdentifier failed\n");
         d3dVendorId=admD3D::VENDOR_UNKNOWN;
+        d3dDriverVersion=0;
     }else
     {
-        ADM_info("D3D Device: %s Vendor: %x Device:%x Rev:%x\n", id.Description,id.VendorId, id.DeviceId, id.Revision );
+        ADM_info("D3D Device: %s, Vendor: %x, Device: %x, Rev: %x, Driver Version: %" PRId64"\n",
+                id.Description, id.VendorId, id.DeviceId, id.Revision, id.DriverVersion.QuadPart);
+        d3dDriverVersion=id.DriverVersion.QuadPart;
         switch(id.VendorId)
         {
         case  0x1002: d3dVendorId=admD3D::VENDOR_AMD;break;
@@ -269,6 +273,14 @@
 }
 
 /**
+    \fn getDriverVersion
+*/
+int64_t admD3D::getDriverVersion(void)
+{
+    return d3dDriverVersion;
+}
+
+/**
  */
 bool admD3D::cleanup(void)
 {

avidemux_2.7.3.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2.cpp Changed

@@ -20,9 +20,9 @@
 #include "ADM_coreD3D.h"
 #ifdef USE_DXVA2
 
-#if 1
-#define aprintf printf
 #define DUMP_GUID
+#if 0
+#define aprintf printf
 #else
 #define aprintf(...) {}
 #endif
@@ -73,10 +73,11 @@
 } dxva2_mode;
 /**
  */
-static int ALIGN(int x,int align)
+static int ALIGN(int x,int align,bool verbose=false)
 {
     int y= ((x+(align-1)) &(~(align-1)));
-    aprintf("Align %d,%d => %d\n",x,align,y);
+    if(verbose)
+        printf("Align %d,%d => %d\n",x,align,y);
     return y;
 }
 
@@ -423,17 +424,25 @@
     D3DFORMAT fmt;
     fmt=dxvaBitsToFormat(bits);
 
-    if(!admD3D::isDirect9Ex())
+    bool share=admD3D::isDirect9Ex();
+    if(share)
     {
-    
      hr = D3DCall(IDirectXVideoDecoderService,CreateSurface,decoder_service,
                                                    width,
                                                    height,
                                                    num-1,
                                                    fmt, D3DPOOL_DEFAULT, 0,
                                                    DXVA2_VideoDecoderRenderTarget,
-                                                   surfaces, NULL);
-    }else
+                                                   surfaces, &sh);
+        if(ADM_FAILED(hr))
+        {
+            // Requesting resource sharing on Windows 7 may result in a failure to allocate surfaces.
+            // On Windows 10, not requesting a shared handle seems to impact energy efficiency.
+            ADM_warning("Cannot allocate D3D9 surfaces with resource sharing, retrying without.\n");
+            share=false;
+        }
+    }
+    if(!share)
     {
      hr = D3DCall(IDirectXVideoDecoderService,CreateSurface,decoder_service,
                                                    width,
@@ -441,8 +450,7 @@
                                                    num-1,
                                                    fmt, D3DPOOL_DEFAULT, 0,
                                                    DXVA2_VideoDecoderRenderTarget,
-                                                   surfaces, &sh);
-        
+                                                   surfaces, NULL);
     }
      if(ADM_FAILED(hr))
      {
@@ -566,8 +574,8 @@
 IDirectXVideoDecoder  *admDxva2::createDecoder(AVCodecID codec, int with, int height, int numSurface, LPDIRECT3DSURFACE9 *surface,int align,int bits)
 {
     Dxv2SupportMap *cmap;
-    int paddedWidth=ALIGN(with,align);
-    int paddedHeight=ALIGN(height,align);
+    int paddedWidth=ALIGN(with,align,true);
+    int paddedHeight=ALIGN(height,align,true);
     switch(codec)
     {
         case AV_CODEC_ID_H264:

avidemux_2.7.3.tar.gz/avidemux/common/ADM_render/CMakeLists.txt -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_render/CMakeLists.txt Changed

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

@@ -30,7 +30,7 @@
 
 
 
-#if 1
+#if 0
 #define aprintf printf
 #else
 #define aprintf(...) {}
@@ -77,6 +77,7 @@
 
   protected:
                         admMutex        lock;
+                        bool            failure;
                         GUI_WindowInfo  info;
                         IDirect3DSurface9 *mySurface;
                         IDirect3DSurface9 *myYV12Surface;
@@ -115,7 +116,7 @@
     videoBuffer=NULL;
     videoWidget=NULL;
     d3dHandle=admD3D::getHandle();
-
+    failure=false;
 }
 /**
     \fn dxvaRender
@@ -571,47 +572,52 @@
 {
   // this does not work, both surfaces are coming from different device
 
-  IDirect3DSurface9 *bBuffer;
-  POINT point={0,0};
-  // OK
-  ADM_info("surface duplicated\n");
-  if( ADM_FAILED(D3DCall(IDirect3DDevice9,GetBackBuffer,d3dDevice, 0, 0,
-                                              D3DBACKBUFFER_TYPE_MONO,
-                                              &bBuffer)))
-  {
-      ADM_warning("D3D Cannot create backBuffer\n");
-      return false;
-  }
-
-  // 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");
-    // go to indirect route
-    if(!pic->hwDownloadFromRef())
+    if(!failure)
     {
-        ADM_warning("Failed to download yv12 from dxva\n");
-        return false;
+        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");
+
+        // 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;
+        }
+    }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)
+        {
+            return displayImage_yv12(pic);
+        }
+        return displayImage_argb(pic);
     }
-    // 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);
-  }
-  IDirect3DDevice9_BeginScene(d3dDevice);
-  IDirect3DDevice9_EndScene(d3dDevice);
-  if( ADM_FAILED(IDirect3DDevice9_Present(d3dDevice, &targetRect, 0, 0, 0)))
-  {
-    ADM_warning("D3D Present failed\n");
-  }
-  return true;
+    return true;
 }
 
 /**

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

@@ -49,7 +49,6 @@
 static void saveCB(char*name);
 static void loadCB(char *name);
 static int set_output_format(const char *str);
-static void set_reuse_2pass_log(char *p);
 static void setVar(char *in);
 extern void UI_closeGui();
 //_________________________________________________________________________
@@ -77,27 +76,25 @@
 #define avs_port_change "avisynth-port"
 AUTOMATON reaction_table[]=
 {
-    
     {"append",                 1, "append video",                                                              (one_arg_type)A_appendVideo},
-    {"audio-codec",            1, "set audio codec (MP2/MP3/AC3/NONE (WAV PCM)/TWOLAME/COPY)",                 (one_arg_type)call_audiocodec},
-    {avs_port_change,          1, "set avsproxy port accordingly",                                             (one_arg_type)A_set_avisynth_port},    
-    {"help",                   0, "print this",                                                                (one_arg_type)call_help},    
-    {"info",                   0, "show information about loaded video and audio streams",                     (one_arg_type)show_info},    
-    {"list-audio-languages",   0, "list all available audio langues",                                          (one_arg_type)list_audio_languages},        
+    {"audio-codec",            1, "set audio codec (copy|Lame|FDK_AAC|LavAC3|Opus|TwoLame|...)",               (one_arg_type)call_audiocodec},
+    {avs_port_change,          1, "set avsproxy port accordingly",                                             (one_arg_type)A_set_avisynth_port},
+    {"help",                   0, "print this",                                                                (one_arg_type)call_help},
+    {"info",                   0, "show information about loaded video and audio streams",                     (one_arg_type)show_info},
+    {"list-audio-languages",   0, "list all available audio langues",                                          (one_arg_type)list_audio_languages},
     {"load",                   1, "load video or workbench",                                                   (one_arg_type)loadCB},
     {"nogui",                  0, "Run in silent mode",                                                        (one_arg_type)GUI_Quiet},
-    {"output-format",          1, "set output format (AVI|OGM|ES|PS|AVI_DUAL|AVI_UNP|...)",                    (one_arg_type)set_output_format},
+    {"output-format",          1, "set output format (MKV|MP4|ffTS|ffPS|AVI|RAW|...)",                         (one_arg_type)set_output_format},
     {"quit",                   0, "exit avidemux",                                                             (one_arg_type)call_quit},
-    {"slave",                  1, "run as slave, master is on port arg",                                       (one_arg_type)call_slave},    
-    {"reuse-2pass-log",        0, "reuse 2pass logfile if it exists",                                          (one_arg_type)set_reuse_2pass_log},        
+    {"slave",                  1, "run as slave, master is on port arg",                                       (one_arg_type)call_slave},
     {"run",                    1, "load and run a script",                                                     (one_arg_type)call_scriptEngine},
     {"save",                   1, "save video",                                                                (one_arg_type)saveCB},
     {"save-jpg",               1, "save a jpeg",                                                               (one_arg_type)A_saveJpg},
     {"save-raw-audio",         1, "save audio as-is ",                                                         (one_arg_type)A_saveAudioCopy},
     {"save-uncompressed-audio",1, "save uncompressed audio",                                                   (one_arg_type)A_saveAudioProcessed},
-    {"set-audio-language",     2, "Set language of an active audio track {track_index} {language_short_name}", (one_arg_type)A_setAudioLang},    
-    {"var",                    1, "set var (--var myvar=3)",                                                   (one_arg_type)setVar},    
-    {"video-codec",            1, "set video codec (x264/...)",                                                (one_arg_type)call_videocodec},    
+    {"set-audio-language",     2, "Set language of an active audio track {track_index} {language_short_name}", (one_arg_type)A_setAudioLang},
+    {"var",                    1, "set var (--var myvar=3)",                                                   (one_arg_type)setVar},
+    {"video-codec",            1, "set video codec (Copy|x264|x265|xvid4|ffMpeg2|ffNvEnc|...)",                (one_arg_type)call_videocodec},
 };
 #define NB_AUTO (sizeof(reaction_table)/sizeof(AUTOMATON))
 
@@ -204,7 +201,6 @@
                     myargc-=1+reaction_table[index].have_arg;
                 }
     } // end while
-    GUI_Verbose();
     printf("\n ********** Automation ended***********\n");
     return 0; // Do not call me anymore
 }
@@ -498,15 +494,6 @@
 
 /**
  * 
- * @param p
- */
-void set_reuse_2pass_log(char *p)
-{
-   prefs->set(FEATURES_REUSE_2PASS_LOG,true);
-}
-
-/**
- * 
  * @param name
  */
 void  loadCB(char *name)

avidemux_2.7.3.tar.gz/avidemux/common/ADM_videoCodec/private_inc/ADM_codecDxva2.h -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_videoCodec/private_inc/ADM_codecDxva2.h Changed

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

@@ -37,11 +37,10 @@
 #include "prefs.h"
 #include "ADM_coreDxva2.h"
 #include "../private_inc/ADM_codecDxva2.h"
-#include "ADM_threads.h"
 #include "ADM_vidMisc.h"
-#include "prefs.h"
 
 static bool dxva2Working=false;
+static int totalSurfaces=0;
 static int ADM_DXVA2getBuffer(AVCodecContext *avctx, AVFrame *pic,int flags);
 static void ADM_DXVA2releaseBuffer(void *s, uint8_t *d);
 static admMutex imageMutex;
@@ -194,9 +193,13 @@
 }
 
 
-
-
-
+static const char *humanReadable(int64_t version)
+{
+ char str[49];
+ snprintf(str,48,"%u.%u.%u.%u", (version>>48) & 0xFFFF, (version>>32) & 0xFFFF, (version>>16) & 0xFFFF, version & 0xFFFF);
+ str[48]=0;
+ return ADM_strdup(str);
+}
 
 extern "C"
 {
@@ -204,10 +207,12 @@
 static enum AVPixelFormat ADM_DXVA2_getFormat(struct AVCodecContext *avctx, const enum AVPixelFormat *fmt)
 {
 int i;
+ bool ignore_version, ignore_profile;
 ADM_info("[DXVA2]: GetFormat\n");
 AVCodecID id=AV_CODEC_ID_NONE;
 AVPixelFormat c;
 AVPixelFormat outPix;
+ ignore_version=ignore_profile=false;
 for(i=0;fmt[i]!=AV_PIX_FMT_NONE;i++)
 {
 c=fmt[i];
@@ -219,25 +224,39 @@
 
 if(c!=AV_PIX_FMT_DXVA2_VLD) continue;
 #define FMT_V_CHECK(x,y) case AV_CODEC_ID_##x: outPix=AV_PIX_FMT_DXVA2_VLD;id=avctx->codec_id;break;
-
+#define INTEL_MIN_DRIVER_VERSION_FOR_HEVC 7036960323672538 // 25.20.100.6618
 
 switch(avctx->codec_id) //AV_CODEC_ID_H265
 {
 FMT_V_CHECK(H264,H264)
 case AV_CODEC_ID_H265:
- {
- admD3D::ADM_vendorID vid=admD3D::getVendorID();
- if(vid==admD3D::VENDOR_INTEL)
+ {
+ admD3D::ADM_vendorID vid=admD3D::getVendorID();
+ int64_t drv=admD3D::getDriverVersion();
+ if(vid==admD3D::VENDOR_INTEL && drv<INTEL_MIN_DRIVER_VERSION_FOR_HEVC)
+ {
+ prefs->get(FEATURES_DXVA2_OVERRIDE_BLACKLIST_VERSION,&ignore_version);
+ const char *minversion=humanReadable(INTEL_MIN_DRIVER_VERSION_FOR_HEVC);
+ if(!ignore_version)
 {
- ADM_warning("Intel blacklisted for H265 decoding \n");
+ ADM_warning("Intel driver version %s < %s is blacklisted for HEVC decoding.\n",humanReadable(drv),minversion);
+ continue;
 }
- else
+ ADM_warning("Overriding Intel driver version blacklist for %s\n",humanReadable(drv));
+ }else if(vid==admD3D::VENDOR_INTEL && dxvaBitDepthFromContext(avctx)==10)
+ {
+ prefs->get(FEATURES_DXVA2_OVERRIDE_BLACKLIST_PROFILE,&ignore_profile);
+ if(!ignore_profile)
 {
- outPix=AV_PIX_FMT_DXVA2_VLD;
- id=avctx->codec_id;
+ ADM_warning("Intel is blacklisted for 10bit HEVC.\n");
+ continue;
 }
- }
- break;
+ ADM_warning("Overriding blacklist for 10bit HEVC on Intel.\n");
+ }
+ outPix=AV_PIX_FMT_DXVA2_VLD;
+ id=avctx->codec_id;
+ }
+ break;
 //FMT_V_CHECK(H265,H265)
 default:
 ADM_info("DXVA2 No hw support for format %d\n",avctx->codec_id);
@@ -308,7 +327,14 @@
 memset(dx_context,0,sizeof(*dx_context)); // dangerous...
 
 // Allocate temp buffer
- num_surfaces=4;
+ uint32_t cacheSize;
+ if(!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;
+ num_surfaces = cacheSize;
+ if(!totalSurfaces)
+ num_surfaces+=ADM_THREAD_QUEUE_SIZE;
 
 switch(avctx->codec_id)
 {
@@ -367,8 +393,9 @@
 dx_context->surface_count = num_surfaces;
 dx_context->cfg = admDxva2::getDecoderConfig(avctx->codec_id,bits);
 
- ADM_info("Ctor Successfully setup DXVA2 hw accel (%d surface created, ffdxva=%p,parent=%p,context=%p)\n",num_surfaces,this,parent,avctx);
 alive=true;
+ totalSurfaces+=num_surfaces;
+ ADM_info("Successfully setup DXVA2 hw accel (%d surface created, %d total, ffdxva=%p,parent=%p,context=%p)\n",num_surfaces,totalSurfaces,this,parent,avctx);
 }
 
 /**
@@ -379,6 +406,7 @@
 if(alive)
 {
 admDxva2::destroyD3DSurface(num_surfaces,surfaces);
+ totalSurfaces-=num_surfaces;
 // TODO : flush pool
 }
 if(_context->hwaccel_context)
@@ -414,8 +442,9 @@
 {
 
 imageMutex.lock();
- surface->refCount--;
- aprintf("Surface %x, Ref count is now %d\n",surface->surface,surface->refCount);
+ if(surface->refCount>0)
+ surface->refCount--;
+ aprintf("Surface 0x%p, Ref count is now %d\n",surface->surface,surface->refCount);
 if(!surface->refCount)
 {
 surface->removeRef();
@@ -482,8 +511,6 @@
 
 int ret = avcodec_receive_frame(_context, frame);
 
- if(!ret)
- _parent->setEndOfStream(false);
 if(!_parent->decodeErrorHandler(ret))
 return false;

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

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

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

avidemux_2.7.3.tar.gz/avidemux/common/ADM_videoFilter2/include/ADM_filterThread.h -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_videoFilter2/include/ADM_filterThread.h Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_filterThread.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_filterThread.cpp Changed

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

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

@@ -52,7 +52,7 @@
 admMutex singleThread;
 
 float currentZoom=ZOOM_1_1;
-static bool cutsNotOnIntraWarned;
+static int cutsNotOnIntraWarned;
 #include "DIA_audioTracks.h"
 //***********************************
 //******** A Function ***************
@@ -142,9 +142,6 @@
 }
 void HandleAction (Action action)
 {
- uint32_t nf = 0;
- uint32_t old;
-
 admScopedMutex autolock(&singleThread); // make sure only one thread at a time calls this
 
 ADM_warning("************ %s **************\n",getActionName(action));
@@ -264,9 +261,8 @@
 std::string f=LAST_SESSION_FILE;
 if(ADM_fileExist(f.c_str()))
 {
- int err=remove(f.c_str());
- if(err)
- ADM_warning("Error %d deleting last editing state %s\n",err,f.c_str());
+ if(!ADM_eraseFile(f.c_str()))
+ ADM_warning("Could not delete last editing state %s\n",f.c_str());
 }
 }
 return;
@@ -564,17 +560,47 @@
 {
 video_body->pasteFromClipBoard(currentPts);
 }
- if(!UI_getCurrentVCodec() && !video_body->checkCutsAreOnIntra())
+ ADM_cutPointType chk=ADM_EDITOR_CUT_POINT_IDR;
+ if(!UI_getCurrentVCodec())
+ chk=video_body->checkCutsAreOnIntra();
+ if(cutsNotOnIntraWarned!=(int)chk && chk!=ADM_EDITOR_CUT_POINT_IDR)
 {
- if(!GUI_Question(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?")))
+ const char *alert;
+ bool ask=true;
+ switch(chk)
+ {
+ case ADM_EDITOR_CUT_POINT_NON_IDR:
+ 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:
+ 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 "
+ "due to reversed display order of frames if saved in copy mode.\n"
+ "Proceed anyway?");
+ break;
+ case ADM_EDITOR_CUT_POINT_MISMATCH:
+ alert=QT_TRANSLATE_NOOP("adm","Codec or codec settings across a cut point of the pasted video do not match.\n"
+ "Playback of the video saved in copy mode may stop at this point.\n"
+ "Proceed anyway?");
+ break;
+ case ADM_EDITOR_CUT_POINT_UNCHECKED:
+ alert=QT_TRANSLATE_NOOP("adm","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.\n"
+ "Try anyway?");
+ default:
+ ask=false; break;
+ }
+ if(ask && !GUI_Question(alert))
 {
 video_body->undo();
- cutsNotOnIntraWarned=false;
+ cutsNotOnIntraWarned=-1;
 break;
 }
- cutsNotOnIntraWarned=true;
+ cutsNotOnIntraWarned=(int)chk;
 }
 video_body->getVideoInfo (avifileinfo);
 d=video_body->getVideoDuration()-d;
@@ -692,27 +718,64 @@
 GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Cutting"),QT_TRANSLATE_NOOP("adm","Error while cutting out."));
 break;
 }
- if(!cutsNotOnIntraWarned && !lastFrame && !UI_getCurrentVCodec() && !video_body->checkCutIsOnIntra(a))
+ ADM_cutPointType chk=ADM_EDITOR_CUT_POINT_IDR;
+ if(!lastFrame && !UI_getCurrentVCodec())
+ chk=video_body->checkCutIsOnIntra(a);
+ if(cutsNotOnIntraWarned!=(int)chk && chk!=ADM_EDITOR_CUT_POINT_IDR)
 {
 const char *alert;
- if(action==ACT_Cut)
+ bool ask=true;
+ switch(chk)
 {
- 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"
- "Proceed anyway?");
- }else
- {
- alert=QT_TRANSLATE_NOOP("adm","The end point of the deletion is not on a keyframe.\n"
- "Video saved in copy mode will be corrupted at this point.\n"
- "Proceed anyway?");
+ case ADM_EDITOR_CUT_POINT_NON_IDR:
+ 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"
+ "Proceed anyway?");
+ else
+ alert=QT_TRANSLATE_NOOP("adm","The end point of the deletion is not on a keyframe.\n"
+ "Video saved in copy mode will be corrupted at this point.\n"
+ "Proceed anyway?");
+ break;
+ case ADM_EDITOR_CUT_POINT_RECOVERY:
+ 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. "
+ "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.\n"
+ "Proceed anyway?");
+ else
+ 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 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.\n"
+ "Proceed anyway?");
+ break;
+ case ADM_EDITOR_CUT_POINT_MISMATCH:
+ if(action==ACT_Cut)
+ alert=QT_TRANSLATE_NOOP("adm","Codec or codec settings across the cut do not match. "
+ "Playback of the video saved in copy mode may stop at this point.\n"
+ "Proceed anyway?");
+ else
+ alert=QT_TRANSLATE_NOOP("adm","Codec or codec settings across the deletion do not match. "
+ "Playback of the video saved in copy mode may stop at this point.\n"
+ "Proceed anyway?");
+ break;
+ case ADM_EDITOR_CUT_POINT_UNCHECKED:
+ alert=QT_TRANSLATE_NOOP("adm","Cut points could not be checked.\n"
+ "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.\n"
+ "Proceed anyway?");
+ break;
+ default: ask=false; break;
 }
- if(!GUI_Question(alert))
+ if(ask && !GUI_Question(alert))
 {
 video_body->undo();
- cutsNotOnIntraWarned=false;
+ cutsNotOnIntraWarned=-1;
 break;
 }
- cutsNotOnIntraWarned=true;
+ cutsNotOnIntraWarned=(int)chk;
 }
 A_ResetMarkers();
 A_Resync(); // total duration & stuff
@@ -854,6 +917,7 @@
 
 {
 int i;
+#if 0
 FILE *fd = NULL;
 char magic[4];
 
@@ -861,7 +925,6 @@
 ** by video_body->addFile (name);
 */
 //#warning FIXME
-#if 0
 if ((fd = ADM_fopen(longname, "rb")))
 {
 if (fread(magic, 4, 1, fd) == 4)
@@ -1036,8 +1099,6 @@
 
 void ReSync (void)
 {
- uint8_t isaviaud;
-
 // update audio stream
 // If we were on avi , mark it...
 GUI_setAllFrameAndTime ();
@@ -1192,8 +1253,9 @@
 delete writer;
 
 std::string script = stream.str();
- ADM_info("Generated settings=%s\n",script.c_str());
- 
+ ADM_info("Generated settings:\n");
+ printf("%s\n",script.c_str());
+
 FILE *file = ADM_fopen(fileName.c_str(), "wt");
 ADM_fwrite(script.c_str(), script.length(), 1, file);
 ADM_fclose(file);
@@ -1229,10 +1291,11 @@
 {
 std::string tmp=ADM_getBaseDir()+std::string("lastEdit.tmp");
 A_saveScript(engine, tmp.c_str());
- if(remove(where.c_str()))
+ if(!ADM_eraseFile(where.c_str()))
 {
 ADM_warning("Could not delete the old saved session (%s)\n",where.c_str());
- remove(tmp.c_str());
+ if(!ADM_eraseFile(tmp.c_str()))
+ ADM_warning("Could not delete temporary file (%s)\n",tmp.c_str());
 return false;
 }
 return !!rename(tmp.c_str(), where.c_str());
@@ -1258,7 +1321,8 @@
 ADM_info("Restoring the last editing state from %s\n",where.c_str());
 r=A_parseScript(engine,where.c_str());
 A_Resync();
- remove(where.c_str());
+ if(!ADM_eraseFile(where.c_str()))
+ ADM_warning("Could not delete %s\n",where.c_str());
 }
 }
 return r;
@@ -1695,13 +1759,14 @@
 
 void GUI_showCurrentFrameHex(void)
 {
+#if 0
 uint8_t *buffer;
 uint32_t fullLen,flags;
 char sType[5];
 char sSize[15];
 ADMCompressedImage image;
 uint8_t seq;
-#if 0
+
 if (!avifileinfo) return;
 
 buffer=new uint8_t [avifileinfo->width*avifileinfo->height*3];
@@ -1735,6 +1800,7 @@
 #define DUMP_SIZE 30
 void GUI_showSize(void)
 {
+#if 0
 uint8_t *buffer;
 uint32_t fullLen,flags;
 ADMCompressedImage image;
@@ -1742,7 +1808,7 @@
 char text[DUMP_SIZE][100];
 
 if (!avifileinfo) return;
-#if 0
+
 buffer=new uint8_t [avifileinfo->width*avifileinfo->height*3];
 image.data=buffer;
 for(int i=0;i<DUMP_SIZE;i++)

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

avidemux_2.7.3.tar.gz/avidemux/common/gui_play.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/gui_play.cpp Changed

@@ -118,8 +118,6 @@
 return;
 }
 
- uint32_t framelen,flags;
- uint32_t max,err;
 uint64_t oldTimeFrame,newTimeFrame;
 aviInfo info;
 float oldZoom=admPreview::getCurrentZoom();
@@ -342,11 +340,9 @@
 delta=(int32_t)movieTime-(int32_t)systemTime;
 }
 }
- }
+ }
 while (!stop_req);
-
-abort_play:
- return true;
+ return true;
 };
 
 /**
@@ -456,13 +452,13 @@
 }
 fill+=small_;
 }
- AVDM_AudioPlay(wavbuf, fill);
 // Let audio latency sets in...
 ticktock.reset();
+ AVDM_AudioPlay(wavbuf, fill);
+ updateVu();
+#if 0
 uint32_t slice=(frequency * channels)/100; // 10 ms
 // pump data until latency is over
- updateVu();
- #if 0
 while(ticktock.getElapsedMS()<latency)
 {
 if(AVDM_getMsFullness()<AUDIO_PRELOAD)
@@ -477,8 +473,8 @@
 ADM_usleep(10*1000);
 updateVu();
 }
- #endif
 printf("[Playback] Latency is now %u\n",ticktock.getElapsedMS());
+#endif
 return true;
 }
 /**

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

@@ -118,8 +118,8 @@
                 }else
                 {
                     std::string oFile;
-                    char *oText=NULL;
-                    
+                    std::string prefilled=std::string("Job ")+ADM_getTimeDateAsString();
+                    char *oText=ADM_strdup(prefilled.c_str());
                     diaElemFile wFile(1,oFile,QT_TRANSLATE_NOOP("adm","Output file"),"");
                     diaElemText wText(&oText,QT_TRANSLATE_NOOP("adm","Job name"));
                     diaElem *elems[2]={&wText,&wFile};
@@ -147,7 +147,7 @@
 #endif
     case ACT_SAVE_AUDIO:
     {
-        std:string ext;
+        std::string ext;
         if(false==audioSavePrepare(&ext))
             break;
         if(ext.size())
@@ -226,7 +226,7 @@
 */
 static bool A_saveAudioCommon (const char *name,ADM_audioStream *stream,double duration)
 {
-  uint32_t written, max;
+  uint32_t written;
   uint64_t dts;
   DIA_workingBase *work;
 #define ONE_STRIKE (64*1024)
@@ -248,7 +248,6 @@
 
   work=createWorking(QT_TRANSLATE_NOOP("adm","Saving audio"));
 
-  uint64_t timeEnd,timeStart;
   uint32_t hold,len,sample;
   uint64_t tgt_sample,cur_sample;
 
@@ -666,21 +665,36 @@
     IScriptEngine *engine=getPythonScriptEngine();
             if(!engine)
             {
-                GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Queue"),QT_TRANSLATE_NOOP("adm","Cannot get tinyPÿ script engine"));
+                GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Error"),QT_TRANSLATE_NOOP("adm","Cannot get tinyPy script engine"));
                 return;
             }
 
             job.outputFileName=string(outputFile);
+            if(job.outputFileName.empty())
+            {
+                GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Error"),QT_TRANSLATE_NOOP("adm","Output file not specified"));
+                return;
+            }
             job.jobName=string(jobName);
 //#warning make sure it is unique
             job.scriptName=string(jobName)+string(".")+engine->defaultFileExtension();
-            if(false==ADMJob::jobAdd(job))
+            string completePath=string(ADM_getJobDir());
+            completePath+=job.scriptName;
+            bool collision=false;
+            if(ADM_fileExist(completePath.c_str()))
+            {
+                char str[4096+512+1];
+                str[0]='\0';
+                snprintf(str,4096+512+1,QT_TRANSLATE_NOOP("adm","Job script %s already exists. Overwrite?"),completePath.c_str());
+                str[4096+512]='\0';
+                if(false==GUI_Question(str))
+                    collision=true;
+            }
+            if(collision || false==ADMJob::jobAdd(job))
             {
-                GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Queue"),QT_TRANSLATE_NOOP("adm","Cannot add job %s"),jobName);
+                GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Error"),QT_TRANSLATE_NOOP("adm","Cannot add job %s"),jobName);
                 return;
             }
-            string completePath=string(ADM_getJobDir());
-            completePath=completePath+string("/")+job.scriptName;
             // Save the script...
 
             A_saveScript(engine, completePath.c_str());

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

@@ -174,7 +174,7 @@
 if(videoDuration<5000) videoDuration=5000;
 printf("[Save] Performing Pass one,using %s as log file\n",logFileName.c_str());
 
- if(ADM_fileExist(logFileName.c_str()))
+ if(false==GUI_isQuiet() && ADM_fileExist(logFileName.c_str()))
 {
 if(GUI_Question(QT_TRANSLATE_NOOP("adm","Reuse previous first pass data ?\nWarning, the settings must be close.")))
 {
@@ -435,27 +435,47 @@
 
 bool admSaver::save(void)
 {
-
-
 int ret=false;
- 
- 
+
 ADM_info("Audio starting time %s\n",ADM_us2plain(startAudioTime));
 ADM_info("[A_Save] Saving..\n");
- 
- 
- EditableAudioTrack *ed=NULL;
- 
+
 if(!videoEncoderIndex) 
 {
- if(false==video_body-> checkCutsAreOnIntra())
+ ADM_cutPointType chk=video_body->checkCutsAreOnIntra(startAudioTime,markerB);
+ const char *alert;
+ bool ask=true;
+ switch(chk)
 {
- if(!GUI_Question(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 ?")))
- {
- return false;
- }
+ case ADM_EDITOR_CUT_POINT_NON_IDR:
+ 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:
+ 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 "
+ "due to reversed display order of frames if saved in copy mode.\n"
+ "Do you want to continue anyway?");
+ break;
+ case ADM_EDITOR_CUT_POINT_MISMATCH:
+ alert=QT_TRANSLATE_NOOP("adm","Codec or codec settings across a cut point do not match. "
+ "Playback of the video saved in copy mode may stop at this point.\n"
+ "Do you want to continue anyway?");
+ break;
+ case ADM_EDITOR_CUT_POINT_UNCHECKED:
+ alert=QT_TRANSLATE_NOOP("adm","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.\n"
+ "Try anyway?");
+ break;
+ default:
+ ask=false; break;
+ }
+ if(ask && !GUI_Question(alert))
+ {
+ return false;
 }
 }
 
@@ -493,7 +513,7 @@
 ret=muxer->save();
 muxer->close();
 }
-abort123:
+
 if(video)
 delete video;
 video=NULL;

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

@@ -33,14 +33,15 @@
 #include "audio_out.h"
 #include "ADM_assert.h"
 #include "adm_main.h"
+#include "ADM_render/GUI_render.h"
 
 void abortExitHandler(void);
 
-typedef struct flavors
+typedef struct
 {
         const char *qt4;
         const char *qt5;
-};
+}flavors;
 
 static flavors myFlavors={"qt4","qt5"};
 
@@ -57,7 +58,7 @@
 
 #if defined(_WIN32) && (ADM_UI_TYPE_BUILD == ADM_UI_GTK || ADM_UI_TYPE_BUILD == ADM_UI_QT4) 
 	// redirect output before registering exception handler so error dumps are captured
-	redirectStdoutToFile();
+	redirectStdoutToFile("admlog.txt");
 #endif
 
 	installSigHandler();
@@ -427,25 +428,25 @@
 */
 bool setPrefsDefault(void)
 {
-#ifdef __MINGW32__
+#ifdef _WIN32
         prefs->set(AUDIO_DEVICE_AUDIODEVICE,std::string("Win32"));
-    #ifdef USE_OPENGL
-        prefs->set(VIDEODEVICE,(uint32_t)5); // QTGL
+    #ifdef USE_DXVA2
+        prefs->set(VIDEODEVICE,(uint32_t)RENDER_DXVA2);
     #endif
 #endif
 #ifdef __linux__
-            prefs->set(AUDIO_DEVICE_AUDIODEVICE,std::string("PulseAudioS"));
+        prefs->set(AUDIO_DEVICE_AUDIODEVICE,std::string("PulseAudioS"));
     #ifdef USE_VDPAU
-            prefs->set(VIDEODEVICE,(uint32_t)4); // VDPAU
-    #else
-            prefs->set(VIDEODEVICE,(uint32_t)1); // XV
+        prefs->set(VIDEODEVICE,(uint32_t)RENDER_VDPAU);
+    #elif defined(USE_XV)
+        prefs->set(VIDEODEVICE,(uint32_t)RENDER_XV);
     #endif
 #endif
 #ifdef __APPLE__
         prefs->set(AUDIO_DEVICE_AUDIODEVICE,std::string("CoreAudio"));
     #ifdef USE_OPENGL
         prefs->set(FEATURES_ENABLE_OPENGL,true);
-        prefs->set(VIDEODEVICE,(uint32_t)5); // QTGL
+        prefs->set(VIDEODEVICE,(uint32_t)RENDER_QTOPENGL);
     #endif
 #endif
     return true;

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_UIs/src/FAC_frame.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_UIs/src/FAC_frame.cpp Changed

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

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

@@ -45,22 +45,19 @@
 factoryCookie(const char *title)
 {
 dialog=new QDialog(qtLastRegisteredDialog());
- qtRegisterDialog(dialog);
 dialog->setWindowTitle(QString::fromUtf8(title));
- vboxlayout = new QVBoxLayout();
- 
+ vboxlayout = new QVBoxLayout(dialog);
 tabWidget=NULL;
 layout=NULL;
- 
 }
 virtual ~factoryCookie()
 {
+ if(vboxlayout)
+ delete vboxlayout;
 if(dialog)
- {
- qtUnregisterDialog(dialog);
 delete dialog;
- }
 dialog=NULL;
+ vboxlayout=NULL;
 }
 public:
 QDialog *dialog;
@@ -146,6 +143,8 @@
 
 cookie->dialog->setLayout(cookie->vboxlayout);
 
+ qtRegisterDialog(cookie->dialog);
+
 if(cookie->dialog->exec()==QDialog::Accepted)
 {
 int nb=cookie->items.size();
@@ -156,6 +155,9 @@
 }
 r=true;
 }
+
+ qtUnregisterDialog(cookie->dialog);
+
 delete cookie;
 return r;
 }
@@ -226,6 +228,8 @@
 cookie->dialog->adjustSize();
 cookie->tabWidget->setUsesScrollButtons(true);
 
+ qtRegisterDialog(cookie->dialog);
+
 if(cookie->dialog->exec()==QDialog::Accepted)
 {
 // Read tabs
@@ -233,7 +237,8 @@
 for(int i=0;i<n;i++)
 cookie->items[i]->getMe();
 r=true;
- } 
+ }
+ qtUnregisterDialog(cookie->dialog);
 delete cookie;
 return r;
 }

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_UIs/src/toolkit.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_UIs/src/toolkit.cpp Changed

@@ -13,27 +13,29 @@
     if (widgetStack.count())
     {
         Qt::WindowFlags flags = dialog->windowFlags();
+#if defined(__APPLE__) // && QT_VERSION == QT_VERSION_CHECK(5,10,1)
+        //ADM_info("Working around Qt bug introduced in 5.10.1 resulting in non-resizable dialogs with Cocoa\n");
+
+        // Work around a presumable Qt bug which allows application-modal parents of application-modal dialogs to receive focus.
+        dialog->setWindowFlag(Qt::Dialog, false);
+        dialog->setParent(widgetStack.top(), Qt::Window);
+        flags = dialog->windowFlags();
+        flags |= Qt::CustomizeWindowHint;
+        flags &= ~Qt::WindowMinimizeButtonHint;
+        flags &= ~Qt::WindowFullscreenButtonHint;
+        dialog->setWindowFlags(flags);
+        dialog->setWindowModality(Qt::ApplicationModal);
+#else
         bool reparent = false;
         bool isDialog = false;
         if (dialog->parentWidget() != widgetStack.top())
             reparent = true;
         if (flags & Qt::Dialog)
             isDialog = true;
-#if defined(__APPLE__) && QT_VERSION == QT_VERSION_CHECK(5,10,1)
-        if (reparent || isDialog)
-        {
-            ADM_info("Working around Qt bug introduced in 5.10.1 resulting in non-resizable dialogs with Cocoa\n");
-            dialog->setWindowFlag(Qt::Dialog, false);
-            dialog->setParent(widgetStack.top(), Qt::Window);
-            dialog->setWindowModality(Qt::ApplicationModal);
-            dialog->show();
-        }
-#else
         if (reparent || !isDialog)
         {
             ADM_info("reparenting widget %s\n",dialog->objectName().toUtf8().constData());
             dialog->setParent(widgetStack.top(), Qt::Dialog);
-            dialog->show(); // reparenting makes the widget invisible
         }
 #endif
     }

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

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

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_openGL/src/ADM_openGlDownload_asm.asm -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_openGL/src/ADM_openGlDownload_asm.asm Changed

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

@@ -73,8 +73,6 @@
 this,SLOT(languagesClicked(int))); 
 * */ 
 }
- // set the parent and show the window
- qtRegisterDialog(window);
 };
 /**
 * \fn setLanguageFromPool
@@ -172,14 +170,22 @@
 _pool->addInternalTrack(ext);
 for(int i=0;i<NB_MENU;i++)
 {
- int forced=-1;
- if(i==dex) forced=poolIndex;
+ bool checked=window->enabled[i]->isChecked();
+ int forced=window->inputs[i]->currentIndex();
+ if(i==dex)
+ {
+ checked=true;
+ forced=poolIndex;
+ }
 setupMenu(i,forced);
+ // restore enabled / disabled state
+ window->enabled[i]->blockSignals(true);
+ if(checked)
+ enable(i);
+ else
+ disable(i);
+ window->enabled[i]->blockSignals(false);
 }
- // set enabled if needed
- window->enabled[dex]->blockSignals(true);
- enable(dex);
- window->enabled[dex]->blockSignals(false);
 return;
 }
 
@@ -273,6 +279,7 @@
 {
 ADM_info("Running QT4 audioTrack GUI\n");
 bool r=false;
+ qtRegisterDialog(window);
 again:
 if(window->exec()==QDialog::Accepted)
 {

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

@@ -31,7 +31,7 @@
 
 //*******************************************
 #define WIDGET(x) (ui->x)
-#define WRITEM(x,y) ui->x->setText(y)
+#define WRITEM(x,y) ui->x->setText(QString::fromUtf8(y))
 #define WRITE(x) WRITEM(x,stringMe)
 /*************************************/
 
@@ -182,11 +182,11 @@
     {
         ui->tabWidget->setTabEnabled(1, false); // disable the "Advanced" tab
         ui->checkBoxShutdown->setVisible(false); // hide the shutdown checkbox
-        this->setWindowTitle(QT_TRANSLATE_NOOP("qencoding","First Pass"));
+        this->setWindowTitle(QString::fromUtf8(QT_TRANSLATE_NOOP("qencoding","First Pass")));
         WRITEM(labelPhasis,QT_TRANSLATE_NOOP("qencoding","Pass 1"));
     }else
     {
-        this->setWindowTitle(QT_TRANSLATE_NOOP("qencoding","Encoding..."));
+        this->setWindowTitle(QString::fromUtf8(QT_TRANSLATE_NOOP("qencoding","Encoding...")));
         ui->tabWidget->setTabEnabled(1, true);
 #if 0
         ui->checkBoxShutdown->setVisible(true);
@@ -362,7 +362,7 @@
           ADM_assert(ui);
           std::string s;
           ADM_durationToString(milliseconds,s);
-          ui->labelETA->setText(QString(s.c_str()));
+          ui->labelETA->setText(QString::fromUtf8(s.c_str()));
 }
 
 /**

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_jobs.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_jobs.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_processing.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_processing.cpp Changed

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

@@ -38,11 +38,11 @@
     if (!avifileinfo)
         return;
 
-#define FILLTEXT(a,b,c) {snprintf(text,79,b,c); listOfValues.push_back(text); ui.a->setText(text);}
-#define FILLTEXT4(a,b,c,d) {snprintf(text,79,b,c,d); listOfValues.push_back(text); ui.a->setText(text);}
-#define FILLTEXT5(a,b,c,d,e) {snprintf(text,79,b,c,d,e); listOfValues.push_back(text); ui.a->setText(text);}
-#define SET_YES(a,b) ui.a->setText(yesno[b])
-#define FILLQT_TRANSLATE_NOOP(a,q) listOfValues.push_back(text); ui.q->setText(text);
+#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 FILLQT_TRANSLATE_NOOP(a,q) listOfValues.push_back(QString::fromUtf8(text)); ui.q->setText(QString::fromUtf8(text));
 
     //------------------------------------
 
@@ -154,9 +154,9 @@
 }
 
 #define ADDCATEGORY(a) props += QString("\n=====================================================\n")\
-                               +QString(a)\
+                               +QString::fromUtf8(a)\
                                +QString("\n=====================================================\n");
-#define ADDNAMEVALUE(a,b) props += QString(a)+QString("\t")+QString(b)+QString("\n");
+#define ADDNAMEVALUE(a,b) props += QString::fromUtf8(a)+QString("\t")+QString(b)+QString("\n");
 
 /**
     \fn propsCopyToClipboard

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

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/alert_qt4.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/alert_qt4.cpp Changed

@@ -27,234 +27,248 @@
 
 namespace ADM_Qt4CoreUIToolkit
 {
-	void GUI_Alert(const char *alertstring)
-	{
-		QMessageBox::critical(qtLastRegisteredDialog(), QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Alert")),
-			QString::fromUtf8(alertstring), QMessageBox::Ok );
-	}
-
-	void GUI_Info(const char *alertstring)
-	{
-		QMessageBox::information(qtLastRegisteredDialog(), QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Info")),
-			QString::fromUtf8(alertstring), QMessageBox::Ok );
-	}
-
-	void GUI_Info_HIG(const ADM_LOG_LEVEL level,const char *primary, const char *secondary_format)
-	{
-		uint32_t msglvl=2;
-		QString alertString;
-
-		prefs->get(MESSAGE_LEVEL,&msglvl);
-
-		if(msglvl<level)
-		{
-			printf("Info : %s \n",primary);
-			return;
-		}
-
-		if(! secondary_format)
-			alertString = "<big>" + QString::fromUtf8(primary) + "</big>";
-		else
-		{
-			alertString = "<big>" + QString::fromUtf8(primary) + "</big> " + QString::fromUtf8(secondary_format);
-			alertString.replace("\n", " ");
-		}
-
-		QMessageBox::information(qtLastRegisteredDialog(), QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Info")),
-			alertString, QMessageBox::Ok);
-	}
-
-	void GUI_Error_HIG(const char *primary, const char *secondary_format)
-	{
-		uint32_t msglvl=2;
-		QString alertString;
-
-		prefs->get(MESSAGE_LEVEL,&msglvl);
-
-		if(msglvl==ADM_LOG_NONE) 
-		{
-			printf("Error :%s\n",primary);
-			return;
-		}
-
-		if(! secondary_format)
-			alertString = "<big>" + QString::fromUtf8(primary) + "</big>";
-		else
-		{
-			alertString = "<big>" + QString::fromUtf8(primary) + "</big> " + QString::fromUtf8(secondary_format);
-			alertString.replace("\n", " ");
-		}
-
-		QMessageBox::critical(qtLastRegisteredDialog(), QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Info")),
-			alertString, QMessageBox::Ok);
-	}
-
-	int GUI_Confirmation_HIG(const char *button_confirm, const char *primary, const char *secondary_format)
-	{
-		QString alertString;
-
-		if (beQuiet)
-		{
-			printf("Info: %s\n", primary);
-			return 0;
-		}
-
-		if (!secondary_format)
-			alertString = "<big>" + QString::fromUtf8(primary) + "</big>";
-		else
-		{	
-			alertString = "<big>" + QString::fromUtf8(primary) + "</big> " + QString::fromUtf8(secondary_format);
-			alertString.replace("\n", " ");
-		}
-
-		QMessageBox::StandardButton reply;
-
-		reply = QMessageBox::question(qtLastRegisteredDialog(), QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Confirmation")),
-			alertString, QMessageBox::Yes | QMessageBox::No);
-
-		if (reply == QMessageBox::Yes)
-			return 1;
-
-		return 0; 
-	}
-
-	int GUI_YesNo(const char *primary, const char *secondary_format)
-	{
-		uint32_t msglvl=2;
-		QString alertString;
-
-		if (beQuiet)
-		{
-			printf("Info: %s\n", primary);
-			return 0;
-		}
-
-		if (!secondary_format)
-			alertString = "<big>" + QString::fromUtf8(primary) + "</big>";
-		else
-		{	
-			alertString = "<big>" + QString::fromUtf8(primary) + "</big> " + QString::fromUtf8(secondary_format);
-			alertString.replace("\n", " ");
-		}
-
-		QMessageBox::StandardButton reply;
-
-		reply = QMessageBox::question(qtLastRegisteredDialog(), QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Confirmation")),
-			alertString, QMessageBox::Yes | QMessageBox::No );
-
-		if (reply == QMessageBox::Yes)
-			return 1;
-
-		return 0; 
-	}
-
-	int GUI_Question(const char *alertstring)
-	{
-		QMessageBox::StandardButton reply;
-
-		if (beQuiet)
-		{
-			printf("Question: %s\n", alertstring);
-			return 0;
-		}
-
-		reply = QMessageBox::question(qtLastRegisteredDialog(), QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Question")),
-			QString::fromUtf8(alertstring), QMessageBox::Yes | QMessageBox::No);
-
-		if (reply==QMessageBox::Yes)
-			return 1;
-
-		return 0;
-	}
-	/**
-	\fn GUI_Alternate(char *title,char *choice1,char *choice2)
-	\brief Popup a dialog box name title with 2 buttons (choice1/choice2)
-	\return 0 if first is selected, 1 if second
-	*/
-int GUI_Alternate(const char *title,const char *choice1,const char *choice2)
-	{
-		if (beQuiet)
-		{
-			printf("Alternate<%s>: %s or %s\n", title,choice1,choice2);
-			return 0;
-		}
-
-		QMessageBox box(qtLastRegisteredDialog());
-
-		box.setWindowTitle(QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Question?")));
-		box.addButton(QString::fromUtf8(choice1),QMessageBox::YesRole);
-		box.addButton(QString::fromUtf8(choice2),QMessageBox::NoRole);
-
-		if (title)
-			box.setText(QString::fromUtf8(title));
-		else
-			box.setText(QT_TRANSLATE_NOOP("qtalert","Question"));
-
-		box.setIcon(QMessageBox::Question);
-
-		if (box.exec() == 0)
-			return 1;
-		else
-			return 0;
-	}
-
-	uint8_t GUI_getDoubleValue(double *valye, float min, float max, const char *title)
-	{
-		return 0; 
-	}
-
-	uint8_t	GUI_isQuiet(void)
-	{
-		return beQuiet;
-	}
-
-	void GUI_Verbose(void)
-	{
-		beQuiet=0;
-	}
-
-	void GUI_Quiet(void)
-	{
-		beQuiet=1;
-	}
-
-	extern DIA_workingBase *createWorking(const char *title);
- extern DIA_processingBase *createProcessing(const char *title, uint64_t totalToProcess);
-	extern DIA_encodingBase *createEncoding(uint64_t duration);
- extern DIA_audioTrackBase *createAudioTrack( PoolOfAudioTracks *pool, ActiveAudioTracks *active );
-	void getVersion(uint32_t *maj,uint32_t *minor)
-	{
-		*maj=ADM_CORE_TOOLKIT_MAJOR;
-		*minor=ADM_CORE_TOOLKIT_MINOR;
-	}
-
-	void UI_purge( void )
-	{
-		QCoreApplication::processEvents ();
-	}
+
+void GUI_Alert(const char *alertstring)
+{
+ QMessageBox::critical(qtLastRegisteredDialog(), QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Alert")),
+ QString::fromUtf8(alertstring), QMessageBox::Ok );
+}
+
+void GUI_Info(const char *alertstring)
+{
+ QMessageBox::information(qtLastRegisteredDialog(), QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Info")),
+ QString::fromUtf8(alertstring), QMessageBox::Ok );
 }
 
+void GUI_Info_HIG(const ADM_LOG_LEVEL level,const char *primary, const char *secondary_format)
+{
+ uint32_t msglvl=2;
+ QString alertString;
+
+ prefs->get(MESSAGE_LEVEL,&msglvl);
+
+ if(msglvl<level)
+ {
+ printf("Info : %s \n",primary);
+ return;
+ }
+
+ if(! secondary_format)
+ alertString = "<big>" + QString::fromUtf8(primary) + "</big>";
+ else
+ {
+ alertString = "<big>" + QString::fromUtf8(primary) + "</big> " + QString::fromUtf8(secondary_format);
+ alertString.replace("\n", " ");
+ }
+
+ QMessageBox::information(qtLastRegisteredDialog(), QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Info")),
+ alertString, QMessageBox::Ok);
+}
+
+void GUI_Error_HIG(const char *primary, const char *secondary_format)
+{
+ uint32_t msglvl=2;
+ QString alertString;
+
+ prefs->get(MESSAGE_LEVEL,&msglvl);
+
+ if(msglvl==ADM_LOG_NONE)
+ {
+ printf("Error :%s\n",primary);
+ return;
+ }
+
+ if(! secondary_format)
+ alertString = "<big>" + QString::fromUtf8(primary) + "</big>";
+ else
+ {
+ alertString = "<big>" + QString::fromUtf8(primary) + "</big> " + QString::fromUtf8(secondary_format);
+ alertString.replace("\n", " ");
+ }
+
+ QMessageBox::critical(qtLastRegisteredDialog(), QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Info")),
+ alertString, QMessageBox::Ok);
+}
+
+int GUI_Confirmation_HIG(const char *button_confirm, const char *primary, const char *secondary_format)
+{
+ uint32_t msglvl=2;
+ prefs->get(MESSAGE_LEVEL,&msglvl);
+ QString alertString;
+
+ if (beQuiet || msglvl==ADM_LOG_NONE)
+ {
+ printf("Info: %s\n", primary);
+ return 1;
+ }
+
+ if (!secondary_format)
+ alertString = "<big>" + QString::fromUtf8(primary) + "</big>";
+ else
+ {
+ alertString = "<big>" + QString::fromUtf8(primary) + "</big> " + QString::fromUtf8(secondary_format);
+ alertString.replace("\n", " ");
+ }
+
+ QMessageBox::StandardButton reply;
+
+ reply = QMessageBox::question(qtLastRegisteredDialog(), QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Confirmation")),
+ alertString, QMessageBox::Yes | QMessageBox::No);
+
+ if (reply == QMessageBox::Yes)
+ return 1;
+
+ return 0;
+}
+
+int GUI_YesNo(const char *primary, const char *secondary_format)
+{
+ uint32_t msglvl=2;
+ prefs->get(MESSAGE_LEVEL,&msglvl);
+ QString alertString;
+
+ if (beQuiet || msglvl==ADM_LOG_NONE)
+ {
+ printf("Info: %s\n", primary);
+ return 1;
+ }
+
+ if (!secondary_format)
+ alertString = "<big>" + QString::fromUtf8(primary) + "</big>";
+ else
+ {
+ alertString = "<big>" + QString::fromUtf8(primary) + "</big> " + QString::fromUtf8(secondary_format);
+ alertString.replace("\n", " ");
+ }
+
+ QMessageBox::StandardButton reply;
+
+ reply = QMessageBox::question(qtLastRegisteredDialog(), QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Confirmation")),
+ alertString, QMessageBox::Yes | QMessageBox::No );
+
+ if (reply == QMessageBox::Yes)
+ return 1;
+
+ return 0;
+}
+
+int GUI_Question(const char *alertstring, bool insuppressible)
+{
+ uint32_t msglvl=2;
+ prefs->get(MESSAGE_LEVEL,&msglvl);
+ QMessageBox::StandardButton reply;
+
+ if ((beQuiet || msglvl == ADM_LOG_NONE) && !insuppressible)
+ {
+ printf("Question: %s => Yes\n", alertstring);
+ return 1;
+ }
+
+ reply = QMessageBox::question(qtLastRegisteredDialog(), QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Question")),
+ QString::fromUtf8(alertstring), QMessageBox::Yes | QMessageBox::No);
+
+ if (reply==QMessageBox::Yes)
+ return 1;
+
+ return 0;
+}
+/**
+ \fn GUI_Alternate(char *title,char *choice1,char *choice2)
+ \brief Popup a dialog box name title with 2 buttons (choice1/choice2)
+ \return 0 if first is selected, 1 if second
+*/
+int GUI_Alternate(const char *title,const char *choice1,const char *choice2)
+{
+ uint32_t msglvl=2;
+ prefs->get(MESSAGE_LEVEL,&msglvl);
+
+ if (beQuiet || msglvl==ADM_LOG_NONE)
+ {
+ printf("Alternate<%s>: %s or %s\n", title,choice1,choice2);
+ return 0;
+ }
+
+ QMessageBox box(qtLastRegisteredDialog());
+
+ box.setWindowTitle(QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Question?")));
+ box.addButton(QString::fromUtf8(choice1),QMessageBox::YesRole);
+ box.addButton(QString::fromUtf8(choice2),QMessageBox::NoRole);
+
+ if (title)
+ box.setText(QString::fromUtf8(title));
+ else
+ box.setText(QT_TRANSLATE_NOOP("qtalert","Question"));
+
+ box.setIcon(QMessageBox::Question);
+
+ if (box.exec() == 0)
+ return 1;
+ else
+ return 0;
+}
+
+uint8_t GUI_getDoubleValue(double *valye, float min, float max, const char *title)
+{
+ return 0;
+}
+
+uint8_t GUI_isQuiet(void)
+{
+ return beQuiet;
+}
+
+void GUI_Verbose(void)
+{
+ beQuiet=0;
+}
+
+void GUI_Quiet(void)
+{
+ beQuiet=1;
+}
+
+extern DIA_workingBase *createWorking(const char *title);
+extern DIA_processingBase *createProcessing(const char *title, uint64_t totalToProcess);
+extern DIA_encodingBase *createEncoding(uint64_t duration);
+extern DIA_audioTrackBase *createAudioTrack( PoolOfAudioTracks *pool, ActiveAudioTracks *active );
+
+void getVersion(uint32_t *maj,uint32_t *minor)
+{
+ *maj=ADM_CORE_TOOLKIT_MAJOR;
+ *minor=ADM_CORE_TOOLKIT_MINOR;
+}
+
+void UI_purge( void )
+{
+ QCoreApplication::processEvents ();
+}
+
+} // namespace
+
 static CoreToolkitDescriptor Qt4CoreToolkitDescriptor=
 {
-		&ADM_Qt4CoreUIToolkit::getVersion,
-		&ADM_Qt4CoreUIToolkit::GUI_Info_HIG,
-		&ADM_Qt4CoreUIToolkit::GUI_Error_HIG,
-		&ADM_Qt4CoreUIToolkit::GUI_Confirmation_HIG,
-		&ADM_Qt4CoreUIToolkit::GUI_YesNo,
-		&ADM_Qt4CoreUIToolkit::GUI_Question,
-		&ADM_Qt4CoreUIToolkit::GUI_Alternate,
-		&ADM_Qt4CoreUIToolkit::GUI_Verbose,
-		&ADM_Qt4CoreUIToolkit::GUI_Quiet,
-		&ADM_Qt4CoreUIToolkit::GUI_isQuiet,
- &ADM_Qt4CoreUIToolkit::createWorking,
- &ADM_Qt4CoreUIToolkit::createEncoding,
- &ADM_Qt4CoreUIToolkit::createAudioTrack,
- &ADM_Qt4CoreUIToolkit::UI_purge,
- &ADM_Qt4CoreUIToolkit::createProcessing,
+ &ADM_Qt4CoreUIToolkit::getVersion,
+ &ADM_Qt4CoreUIToolkit::GUI_Info_HIG,
+ &ADM_Qt4CoreUIToolkit::GUI_Error_HIG,
+ &ADM_Qt4CoreUIToolkit::GUI_Confirmation_HIG,
+
+ &ADM_Qt4CoreUIToolkit::GUI_YesNo,
+ &ADM_Qt4CoreUIToolkit::GUI_Question,
+ &ADM_Qt4CoreUIToolkit::GUI_Alternate,
+ &ADM_Qt4CoreUIToolkit::GUI_Verbose,
+
+ &ADM_Qt4CoreUIToolkit::GUI_Quiet,
+ &ADM_Qt4CoreUIToolkit::GUI_isQuiet,
+ &ADM_Qt4CoreUIToolkit::createWorking,
+ &ADM_Qt4CoreUIToolkit::createEncoding,
+
+ &ADM_Qt4CoreUIToolkit::createAudioTrack,
+ &ADM_Qt4CoreUIToolkit::UI_purge,
+ &ADM_Qt4CoreUIToolkit::createProcessing,
 };
 
 void InitCoreToolkit(void )
 {
-	DIA_toolkitInit(&Qt4CoreToolkitDescriptor);
+ DIA_toolkitInit(&Qt4CoreToolkitDescriptor);
 }
 //EOF

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp Changed

@@ -288,11 +288,7 @@
 void filtermainWindow::closePreview()
 {
     if (previewDialog)
-    {
         qtUnregisterDialog(previewDialog);
-        delete previewDialog;
-        previewDialog = NULL;
-    }
 }
 
 /**
@@ -502,8 +498,8 @@
         uint32_t major,minor,patch;
         ADM_vf_getFilterInfo((VF_CATEGORY)family,i,&name, &desc,&major,&minor,&patch);
 
-        QString s1 = QString(name);
-        QString s2 = QString(desc);
+        QString s1 = QString::fromUtf8(name);
+        QString s2 = QString::fromUtf8(desc);
 
         QListWidgetItem *item;
         item=new QListWidgetItem(NULL,availableList,ALL_FILTER_BASE+i+family*100);
@@ -559,8 +555,8 @@
         const char *conf=instance->getConfiguration();
         printf("%d %s\n",i,name);
 
-        QString s1 = QString(name);
-        QString s2 = QString(conf);
+        QString s1 = QString::fromUtf8(name);
+        QString s2 = QString::fromUtf8(conf);
 
         QListWidgetItem *item=new QListWidgetItem(NULL,activeList,ACTIVE_FILTER_BASE+i);
         item->setData(FilterItemDelegate::FilterNameRole, s1);

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp Changed

@@ -25,24 +25,24 @@
  */
 Ui_seekablePreviewWindow::Ui_seekablePreviewWindow(QWidget *parent, ADM_coreVideoFilter *videoStream, uint32_t defaultFrame) : QDialog(parent)
 {
-	ui.setupUi(this);
+    ui.setupUi(this);
 
-	seekablePreview = NULL;
-	canvas = NULL;
+    seekablePreview = NULL;
+    canvas = NULL;
 
-	resetVideoStream(videoStream);
-        
-        seekablePreview->addControl(ui.toolLayout);
-	seekablePreview->sliderSet(defaultFrame);
-	seekablePreview->sliderChanged();
+    resetVideoStream(videoStream);
 
-	connect(ui.horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(sliderChanged(int)));
+    seekablePreview->addControl(ui.toolLayout);
+    seekablePreview->sliderSet(defaultFrame);
+    seekablePreview->sliderChanged();
+
+    connect(ui.horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(sliderChanged(int)));
 }
 
 Ui_seekablePreviewWindow::~Ui_seekablePreviewWindow()
 {
-	delete seekablePreview;
-	delete canvas;
+    delete seekablePreview;
+    delete canvas;
 }
 
 /**
@@ -51,20 +51,19 @@
  */
 void Ui_seekablePreviewWindow::resetVideoStream(ADM_coreVideoFilter *videoStream)
 {
-	if (seekablePreview)
-		delete seekablePreview;
-        seekablePreview=NULL;
-	if (canvas)
-		delete canvas;
-        canvas=NULL;
+    if (seekablePreview)
+        delete seekablePreview;
+    seekablePreview=NULL;
+    if (canvas)
+        delete canvas;
+    canvas=NULL;
 
-	uint32_t canvasWidth = videoStream->getInfo()->width;
-	uint32_t canvasHeight = videoStream->getInfo()->height;
+    uint32_t canvasWidth = videoStream->getInfo()->width;
+    uint32_t canvasHeight = videoStream->getInfo()->height;
 
-	canvas = new ADM_QCanvas(ui.graphicsView, canvasWidth, canvasHeight);
-	canvas->show();
-	seekablePreview = new flySeekablePreview(this,canvasWidth, canvasHeight, videoStream, canvas, ui.horizontalSlider);	
-	seekablePreview->sliderChanged();
+    canvas = new ADM_QCanvas(ui.graphicsView, canvasWidth, canvasHeight);
+    seekablePreview = new flySeekablePreview(this,canvasWidth, canvasHeight, videoStream, canvas, ui.horizontalSlider);
+    seekablePreview->sliderChanged();
 }
 /**
  * 
@@ -72,7 +71,7 @@
  */
 uint32_t Ui_seekablePreviewWindow::frameIndex()
 {
-	return seekablePreview->sliderGet();
+    return seekablePreview->sliderGet();
 }
 
 /**
@@ -81,7 +80,7 @@
  */
 void Ui_seekablePreviewWindow::sliderChanged(int value)
 {
-	seekablePreview->sliderChanged();
+    seekablePreview->sliderChanged();
 }

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

@@ -469,6 +469,13 @@
 buildMyMenu();
 buildCustomMenu(); // action lists are populated (i.e. buildActionLists() called) within buildCustomMenu()
 buildButtonLists();
+
+#define AUTOREPEAT_TOOLBUTTON(x) ui.x->setAutoRepeat(true); ui.x->setAutoRepeatDelay(500); ui.x->setAutoRepeatInterval(100);
+ AUTOREPEAT_TOOLBUTTON(toolButtonPreviousFrame)
+ AUTOREPEAT_TOOLBUTTON(toolButtonNextFrame)
+ AUTOREPEAT_TOOLBUTTON(toolButtonPreviousIntraFrame)
+ AUTOREPEAT_TOOLBUTTON(toolButtonNextIntraFrame)
+
 // Crash in some cases addScriptReferencesToHelpMenu();
 connect(ui.menuVideo->actions().at(3),SIGNAL(toggled(bool)),this,SLOT(previewModeChangedFromMenu(bool)));
 connect(ui.toolBar->actions().at(5),SIGNAL(toggled(bool)),this,SLOT(previewModeChangedFromToolbar(bool)));
@@ -509,7 +516,7 @@
 
 threshold = RESIZE_THRESHOLD;
 actZoomCalled = false;
- ignoreResizeEvent = true;
+ ignoreResizeEvent = false;
 blockResizing = false;
 blockZoomChanges = true;
 
@@ -568,7 +575,11 @@
 for(int i=0;i<nb;i++)
 {
 MenuEntry *m=menu+i;
- QString qs=QString::fromUtf8(QT_TRANSLATE_NOOP("adm",m->text.c_str()));
+ QString qs;
+ if(m->translated)
+ qs=QString::fromUtf8(m->text.c_str());
+ else
+ qs=QString::fromUtf8(QT_TRANSLATE_NOOP("adm",m->text.c_str()));
 switch(m->type)
 {
 case MENU_SEPARATOR:
@@ -1637,13 +1648,21 @@
 */
 int UI_Init(int nargc, char **nargv)
 {
- ADM_info("Starting QT4 GUI...\n");
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+ ADM_info("Starting Qt5 GUI...\n");
+#else
+ ADM_info("Starting Qt4 GUI...\n");
+#endif
 initTranslator();
 
 global_argc=nargc;
 global_argv=nargv;
 ADM_renderLibInit(&UI_Hooks);
-
+#if defined(_WIN32) && QT_VERSION >= QT_VERSION_CHECK(5,11,0)
+ // Despite HiDPI scaling being supported from Qt 5.6 on, important aspects
+ // like OpenGL support were fixed only in much later versions.
+ QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+#endif
 myApplication=new myQApplication (global_argc, global_argv);
 myApplication->connect(myApplication, SIGNAL(lastWindowClosed()), myApplication, SLOT(quit()));
 myApplication->connect(myApplication, SIGNAL(aboutToQuit()), myApplication, SLOT(cleanup()));
@@ -1673,10 +1692,13 @@
 UI_getPhysicalScreenSize(QuiMainWindows, &w,&h);
 printf("The screen seems to be %u x %u px\n",w,h);
 mw->ui.frame_video->setAttribute(Qt::WA_OpaquePaintEvent);
- 
 
 UI_QT4VideoWidget(mw->ui.frame_video); // Add the widget that will handle video display
+#if QT_VERSION < QT_VERSION_CHECK(5,11,0) // not sure about the version
 mw->ui.frame_video->setAcceptDrops(true); // needed for drag and drop to work on windows
+#endif
+ admPreview::setMainDimension(0,0,ZOOM_1_1);
+
 UI_updateRecentMenu();
 UI_updateRecentProjectMenu();
 
@@ -1702,8 +1724,6 @@
 ADM_info("OpenGL: Not enabled at built time.\n");
 #endif
 
- admPreview::setMainDimension(0,0,ZOOM_1_1);
-
 return 1;
 }
 /**
@@ -2382,8 +2402,7 @@
 {
 char txt[50];
 sprintf(txt,QT_TRANSLATE_NOOP("qgui2"," (%d track(s))"),nb);
- WIDGET(TrackCountLabel)->setText(QString(txt));
-
+ WIDGET(TrackCountLabel)->setText(QString::fromUtf8(txt));
 }
 /**
 * \fn dtor

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

@@ -34,7 +34,7 @@
 {
 if (this->_scriptEngines.size() > 0)
 {
- MenuEntry separatorEntry = {MENU_SEPARATOR, "-", NULL, ACT_DUMMY, NULL, NULL};
+ MenuEntry separatorEntry = {MENU_SEPARATOR, "-", NULL, ACT_DUMMY, NULL, NULL, true};
 
 fileMenu.insert(fileMenu.begin() + i, separatorEntry);
 i++;
@@ -55,20 +55,20 @@
 itemName = this->_scriptEngines[engineIndex]->name() + QT_TRANSLATE_NOOP("qgui2menu"," Project");
 }
 
- MenuEntry dummyEntry = {MENU_SUBMENU, itemName, NULL, ACT_DUMMY, NULL, NULL};
+ MenuEntry dummyEntry = {MENU_SUBMENU, itemName, NULL, ACT_DUMMY, NULL, NULL, true};
 it = fileMenu.insert(it, dummyEntry);
 
- MenuEntry runProjectEntry = {MENU_SUBACTION, QT_TRANSLATE_NOOP("qgui2menu","&Run Project..."), NULL, firstMenuId, NULL, NULL};
+ MenuEntry runProjectEntry = {MENU_SUBACTION, QT_TRANSLATE_NOOP("qgui2menu","&Run Project..."), NULL, firstMenuId, NULL, NULL, true};
 it = fileMenu.insert(it + 1, runProjectEntry);
 
 if ((this->_scriptEngines[engineIndex]->capabilities() & IScriptEngine::Debugger) == IScriptEngine::Debugger)
 {
- MenuEntry debugEntry = {MENU_SUBACTION, QT_TRANSLATE_NOOP("qgui2menu","&Debug Project..."), NULL, (Action)(firstMenuId + 1), NULL, NULL};
+ MenuEntry debugEntry = {MENU_SUBACTION, QT_TRANSLATE_NOOP("qgui2menu","&Debug Project..."), NULL, (Action)(firstMenuId + 1), NULL, NULL, true};
 it = fileMenu.insert(it + 1, debugEntry);
 i++;
 }
 
- MenuEntry saveAsProjectEntry = {MENU_SUBACTION, QT_TRANSLATE_NOOP("qgui2menu","Save &As Project..."), NULL, (Action)(firstMenuId + 2), NULL, NULL};
+ MenuEntry saveAsProjectEntry = {MENU_SUBACTION, QT_TRANSLATE_NOOP("qgui2menu","Save &As Project..."), NULL, (Action)(firstMenuId + 2), NULL, NULL, true};
 it = fileMenu.insert(it + 1, saveAsProjectEntry);
 i += 3;
 }
@@ -95,7 +95,7 @@
 itemName = this->_scriptEngines[engineIndex]->name() + QT_TRANSLATE_NOOP("qgui2menu"," Shell");
 }
 
- MenuEntry entry = {MENU_ACTION, itemName, NULL, (Action)(ACT_SCRIPT_ENGINE_SHELL_FIRST + engineIndex), NULL, NULL};
+ MenuEntry entry = {MENU_ACTION, itemName, NULL, (Action)(ACT_SCRIPT_ENGINE_SHELL_FIRST + engineIndex), NULL, NULL, true};
 
 it = toolMenu.insert(it, entry) + 1;
 }
@@ -291,10 +291,10 @@
 vector<MenuEntry>::iterator it = menu.begin() + i;
 // add session restore menu entry
 string restoreSessionEntryName = QT_TRANSLATE_NOOP("qgui2menu","Restore previous session");
- MenuEntry restoreSessionEntry = {MENU_ACTION, restoreSessionEntryName, NULL, ACT_RESTORE_SESSION, NULL, NULL};
+ MenuEntry restoreSessionEntry = {MENU_ACTION, restoreSessionEntryName, NULL, ACT_RESTORE_SESSION, NULL, NULL, true};
 it = menu.insert(it + 1, restoreSessionEntry);
 // add separator
- MenuEntry separatorEntry = {MENU_SEPARATOR, "-", NULL, ACT_DUMMY, NULL, NULL};
+ MenuEntry separatorEntry = {MENU_SEPARATOR, "-", NULL, ACT_DUMMY, NULL, NULL, true};
 menu.insert(it + 1, separatorEntry);
 }
 break;

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/file_qt4.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/file_qt4.cpp Changed

@@ -42,7 +42,7 @@
     QString str,outputPath,outputExt=QString("");
     QString fileName,dot=QString(".");
     QString separator = QString("/");
-    QString filterFile=QString(QT_TRANSLATE_NOOP("qfile","All files (*.*)"));
+    QString filterFile=QString::fromUtf8(QT_TRANSLATE_NOOP("qfile","All files (*.*)"));
     bool doFilter = !!(ext && strlen(ext));
     bool isProject=false;
     QFileDialog::Options opts;
@@ -125,10 +125,10 @@
 
     if(doFilter)
     {
-        filterFile=QString(ext)+QString(QT_TRANSLATE_NOOP("qfile"," files (*."))+QString(ext)+QString(");;")+filterFile;
+        filterFile=QString(ext)+QString::fromUtf8(QT_TRANSLATE_NOOP("qfile"," files (*."))+QString(ext)+QString(");;")+filterFile;
     }
     fileName = QFileDialog::getSaveFileName(fileSelGetParent(),
-                    label,  // caption
+                    QString::fromUtf8(label),  // caption
                     str,    // folder
                     filterFile,   // filter
                     NULL,QFileDialog::DontConfirmOverwrite);   // selected filter
@@ -149,8 +149,9 @@
     if(newFile.exists())
     {
         QFileInfo fileInfo(newFile);
-        QString q=QString(QT_TRANSLATE_NOOP("qfile","Overwrite file "))+fileInfo.fileName()+QString("?");
-        if(!GUI_Question(q.toUtf8().constData()))
+        QString q=QString::fromUtf8(QT_TRANSLATE_NOOP("qfile","Overwrite file "))+fileInfo.fileName()+QString("?");
+        // Show the dialog even in silent mode or if the user has disabled alerts.
+        if(!GUI_Question(q.toUtf8().constData(),true))
         {
             return 0;
         }
@@ -183,7 +184,7 @@
 {
     QString str;
     QString fileName,dot=QString(".");
-    QString filterFile=QString(QT_TRANSLATE_NOOP("qfile","All files (*.*)"));
+    QString filterFile=QString::fromUtf8(QT_TRANSLATE_NOOP("qfile","All files (*.*)"));
     bool doFilter = !!(ext && strlen(ext));
     bool isProject=false;
     QFileDialog::Options opts;
@@ -230,10 +231,10 @@
 
     if(doFilter)
     {
-        filterFile=QString(ext)+QString(QT_TRANSLATE_NOOP("qfile"," files (*."))+QString(ext)+QString(");;")+filterFile;
+        filterFile=QString(ext)+QString::fromUtf8(QT_TRANSLATE_NOOP("qfile"," files (*."))+QString(ext)+QString(");;")+filterFile;
     }
     fileName = QFileDialog::getOpenFileName(fileSelGetParent(),
-                                label,  // caption
+                                QString::fromUtf8(label),  // caption
                                 str,    // folder
                                 filterFile,   // filter
                                 NULL,   // selected filter

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

@@ -37,6 +37,7 @@
 ../../../avidemux_core/ADM_core/include/ADM_byteBuffer.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_crashdump_apple.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_ptrQueue.h \ 
+../../../avidemux_core/ADM_core/include/ADM_crashdump_vs.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_prettyPrint.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_crashdump_unix.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_queue.h \ 
@@ -234,6 +235,7 @@
 ../../../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 \ 
@@ -407,6 +409,7 @@
 ../../../avidemux_plugins/ADM_demuxers/NativeAvisynth/avs/cpuid.h \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.h \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudioProbe.h \ 
+../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsInternal.h \ 
 ../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vs.h \ 
 ../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.h \ 
 ../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsProxy.h \ 
@@ -842,8 +845,8 @@
 ../../../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_h263dec.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 \ 
@@ -956,6 +959,7 @@
 ../../../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 \ 
@@ -1368,9 +1372,10 @@
 ../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/yadif/yadif_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif_asm.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/yadif/yadif_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/yadif/yadif.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif_body.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/admIvtc/admIvtc_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc_util.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/admIvtc/admIvtc_json.cpp \ 
@@ -1445,7 +1450,6 @@
 ../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_font.c \ 
 ../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_utils.c \ 
 ../../../avidemux_plugins/ADM_videoFilters6/ass/ass_ssa_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ass_ssa_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/ass/ass_ssa.conf \ 
 ../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/changeFps/confChangeFps_desc.cpp \

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

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_cs.ts -> avidemux_2.7.4.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="+232"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
 <source>Attempt to open %s failed!</source>
 <translation type="unfinished">Selhalo otevření %s!</translation>
 </message>
@@ -56,7 +56,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="+43"/>
 <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>
@@ -1050,11 +1050,21 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Ignore driver blacklist (Intel)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation type="unfinished">P_ovolit nestandardní frekvenci zvuku pro DVD</translation>
@@ -1170,17 +1180,16 @@
 <translation type="unfinished">Priority</translation>
 </message>
 <message>
- <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
- <translation type="unfinished">_Používat alternativní značku pro MP3 v .mp4</translation>
+ <translation type="obsolete">_Používat alternativní značku pro MP3 v .mp4</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+5"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+6"/>
+ <location line="+10"/>
 <source>XVideo (best)</source>
 <translation type="unfinished">XVideo (nejlepší)</translation>
 </message>
@@ -1190,7 +1199,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+15"/>
+ <location line="+11"/>
 <source>SDL (good)</source>
 <translation type="unfinished">SDL (dobré)</translation>
 </message>
@@ -1314,7 +1323,7 @@
 <location line="+5"/>
 <location filename="../../common/gui_save.cpp" line="+57"/>
 <location line="+10"/>
- <location line="+278"/>
+ <location line="+277"/>
 <location line="+19"/>
 <location line="+7"/>
 <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1331,7 +1340,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
 <source>CPU</source>
 <translation type="unfinished">CPU</translation>
 </message>
@@ -1341,12 +1350,13 @@
 <translation type="unfinished">Vlákna</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+11"/>
+ <location line="+3"/>
 <source>Preferences</source>
 <translation type="unfinished">Předvolby</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+36"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+38"/>
 <source>Save</source>
 <translation type="unfinished">Uložit</translation>
 </message>
@@ -1356,14 +1366,11 @@
 <translation type="unfinished">Zavřít</translation>
 </message>
 <message>
- <location line="+1"/>
- <location line="+2"/>
- <location line="+2"/>
 <source>-</source>
- <translation type="unfinished">-</translation>
+ <translation type="obsolete">-</translation>
 </message>
 <message>
- <location line="-1"/>
+ <location line="+4"/>
 <source>Connect to avsproxy</source>
 <translation type="unfinished">Připojit se k avsproxy</translation>
 </message>
@@ -1615,7 +1622,7 @@
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="+48"/>
- <location filename="../../common/gui_save.cpp" line="-314"/>
+ <location filename="../../common/gui_save.cpp" line="-313"/>
 <source>No audio track</source>
 <translation type="unfinished">Chybí zvuková stopa</translation>
 </message>
@@ -1660,12 +1667,31 @@
 To je potřeba k vytvoření PSP kompatibilního videa.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+373"/>
+ <location filename="../../common/gui_main.cpp" line="+369"/>
 <source>Not coded in this version</source>
 <translation type="unfinished">Nepodporováno v této verzi</translation>
 </message>
 <message>
- <location line="+251"/>
+ <location line="+209"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+60"/>
 <source>Are you sure?</source>
 <translation type="unfinished">Určitě?</translation>
 </message>
@@ -1685,21 +1711,52 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+30"/>
 <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+103"/>
 <source>Permission error</source>
 <translation type="unfinished">Chyba oprávnění</translation>
 </message>
@@ -1737,19 +1794,19 @@
 </message>
 <message>
 <location line="+5"/>
- <location line="+320"/>
+ <location line="+321"/>
 <source>Something bad happened (II)</source>
 <translation type="unfinished">Přihodilo se něco zlého (II)</translation>
 </message>
 <message>
- <location line="-199"/>
+ <location line="-202"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <location line="+103"/>
 <source>Checking video</source>
 <translation type="unfinished">Kontroluji video</translation>
 </message>
@@ -1812,7 +1869,7 @@
 <translation type="unfinished">avsproxy</translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+35"/>
 <source>Frame type:</source>
 <translation type="unfinished">Typ snímku:</translation>
 </message>
@@ -1878,7 +1935,7 @@
 <translation type="unfinished">Ukládá se zvuk</translation>
 </message>
 <message>
- <location line="+309"/>
+ <location line="+318"/>
 <location line="+83"/>
 <source>Done</source>
 <translation type="unfinished">Hotovo</translation>
@@ -1889,24 +1946,27 @@
 <translation type="unfinished">Počet uložených obrázků: %d.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
 <location line="+44"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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="-249"/>
+ <location filename="../../common/gui_main.cpp" line="-250"/>
 <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="+7"/>
+ <location line="+20"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation type="unfinished">Chyba</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+61"/>
+ <location filename="../../common/gui_save.cpp" line="-65"/>
 <source>BMP op failed</source>
 <translation type="unfinished">BMP operace selhala</translation>
 </message>
@@ -2146,7 +2206,7 @@
 <translation type="unfinished">Ukládání</translation>
 </message>
 <message>
- <location line="+165"/>
+ <location line="+164"/>
 <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>
@@ -2159,7 +2219,7 @@
 </message>
 <message>
 <location line="-14"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-144"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-147"/>
 <source>Stereo</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2249,37 +2309,32 @@
 <translation>Multiplexery</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-147"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-143"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Decode video using XVBA (AMD)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
 <source>Decode video using LIBVA (INTEL)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>Decode video using VideoToolbox (macOS)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+9"/>
 <source>Enable openGl support</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+8"/>
 <source>_Check for new release</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2296,17 +2351,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+13"/>
+ <location line="+12"/>
 <source>_Sanitize decode time stamps (DTS) in copy mode</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+8"/>
+ <location line="+2"/>
+ <source>Caching of decoded pictures</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Cache size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>VDPAU (best)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+6"/>
 <source>OpenGL (best)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2354,6 +2419,7 @@
 <message>
 <location line="+4"/>
 <location line="+3"/>
+ <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2379,8 +2445,6 @@
 </message>
 <message>
 <location line="+2"/>
- <location filename="../../common/gui_save.cpp" line="+14"/>
- <location line="+10"/>
 <source>Queue</source>
 <translation>Fronta</translation>
 </message>
@@ -2633,7 +2697,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1382"/>
+ <location filename="../../common/gui_main.cpp" line="-1449"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2658,7 +2722,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+128"/>
+ <location line="+127"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation>Vybrat video soubor...</translation>
@@ -2679,14 +2743,14 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+114"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+102"/>
+ <location line="+124"/>
 <location line="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
@@ -2697,7 +2761,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+113"/>
+ <location line="+150"/>
 <source>Cannot open &quot;%s&quot;.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2712,7 +2776,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+603"/>
+ <location line="+604"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation type="unfinished"></translation>
@@ -2743,7 +2807,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+295"/>
+ <location line="+297"/>
 <source>Oops</source>
 <translation type="unfinished">Ouha</translation>
 </message>
@@ -2753,12 +2817,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+446"/>
+ <location filename="../../common/gui_play.cpp" line="+442"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished">Chyba inicializace zvukového zařízení</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-602"/>
+ <location filename="../../common/gui_save.cpp" line="-587"/>
 <source>Audio encoder index out of bounds</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2803,7 +2867,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+167"/>
+ <location line="+166"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -2829,7 +2893,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+87"/>
 <source>Saving selection as set of JPEG images</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2860,11 +2924,21 @@
 </message>
 <message>
 <location line="+67"/>
- <source>Cannot get tinyPÿ script engine</source>
+ <source>Cannot get tinyPy script engine</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Output file not specified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Job script %s already exists. Overwrite?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>Cannot add job %s</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2896,27 +2970,45 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+30"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="-255"/>
- <location line="+266"/>
+ <location line="-253"/>
+ <location line="+286"/>
 <location line="+26"/>
 <source>Muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-292"/>
- <location line="+266"/>
+ <location line="-312"/>
+ <location line="+286"/>
 <source>Cannot instantiate muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="-28"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+42"/>
 <source>Cannot open </source>
 <translation type="unfinished"></translation>
 </message>
@@ -3193,7 +3285,7 @@
 <translation type="unfinished">1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+ <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"/>
@@ -3222,7 +3314,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <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>
@@ -3246,7 +3338,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_toolkit/automation.cpp" line="+238"/>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
 <source>Permission Error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3295,7 +3387,7 @@
 <context>
 <name>asciiView</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
 <source>Ascii View</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3968,13 +4060,13 @@
 <message>
 <location line="-1"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
- <location line="+90"/>
+ <location line="+87"/>
 <source>Contrast</source>
 <translation>Kontrast</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
- <location line="+90"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
+ <location line="+87"/>
 <source>Brightness</source>
 <translation>Jas</translation>
 </message>
@@ -4098,7 +4190,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
 <source>Size: </source>
 <translation type="unfinished"></translation>
 </message>
@@ -6470,7 +6562,7 @@
 <context>
 <name>lavcodec</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
 <source>_Bitrate:</source>
 <translation type="unfinished">_Datový tok:</translation>
 </message>
@@ -6710,12 +6802,12 @@
 <context>
 <name>matroskademuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
 <source>Matroska Images</source>
 <translation>Matroska obrázky</translation>
 </message>
 <message>
- <location line="+433"/>
+ <location line="+431"/>
 <source>Matroska clusters</source>
 <translation>Matroska klastry</translation>
 </message>
@@ -6914,7 +7006,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+827"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">Chyba čtení hlavičky SVQ3</translation>
 </message>
@@ -6938,7 +7030,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+146"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6953,9 +7045,28 @@
 <translation>Formát multiplexeru</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Use alternate MP3 tag</source>
- <translation>Použít alternativní MP3 značky</translation>
+ <translation type="vanished">Použít alternativní MP3 značky</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>No optimization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Move index to the beginning of the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use fragmentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Optimize for Streaming</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
@@ -7165,12 +7276,12 @@
 <context>
 <name>navigate</name>
 <message>
- <location filename="../../common/gui_navigate.cpp" line="+244"/>
+ <location filename="../../common/gui_navigate.cpp" line="+242"/>
 <source>Cannot go to next keyframe</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+69"/>
+ <location line="+64"/>
 <source>Cannot go to previous keyframe</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7248,7 +7359,7 @@
 <translation type="unfinished">Špatná hlavička</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
 <source>Unpacking bitstream</source>
 <translation type="unfinished">Rozbaluji bitstream</translation>
 </message>
@@ -7395,15 +7506,8 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+80"/>
 <source>Error</source>
- <translation type="unfinished">Chyba</translation>
- </message>
- <message>
- <location line="+0"/>
- <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="unfinished"></translation>
+ <translation type="obsolete">Chyba</translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
@@ -7415,27 +7519,33 @@
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>qaudiotracks</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
 <source>Select audio file</source>
 <translation>Vybrat zvukový soubor</translation>
 </message>
 <message>
 <location line="+22"/>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Error</source>
 <translation type="unfinished">Chyba</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-161"/>
 <source>Cannot use that file as audio track</source>
 <translation>Tento soubor nelze použít jako zvuková stopa</translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Some tracks are used multiple times</source>
 <translation>Některé stopy jsou použity vícekrát</translation>
 </message>
@@ -7514,18 +7624,18 @@
 <name>qfile</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+45"/>
- <location line="+141"/>
+ <location line="+142"/>
 <source>All files (*.*)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-58"/>
- <location line="+105"/>
+ <location line="-59"/>
+ <location line="+106"/>
 <source> files (*.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-81"/>
+ <location line="-82"/>
 <source>Overwrite file </source>
 <translation>Přepsat soubor </translation>
 </message>
@@ -7548,7 +7658,7 @@
 <translation type="unfinished">Nedávné projekty</translation>
 </message>
 <message>
- <location line="+660"/>
+ <location line="+671"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7613,7 +7723,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+619"/>
+ <location line="+626"/>
 <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>
@@ -7731,12 +7841,12 @@
 </message>
 <message>
 <location line="+64"/>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Sure!</source>
 <translation type="unfinished">Jistě!</translation>
 </message>
 <message>
- <location line="-14"/>
+ <location line="-15"/>
 <source>Delete job</source>
 <translation type="unfinished">Smazat úlohu</translation>
 </message>
@@ -7746,7 +7856,7 @@
 <translation type="unfinished">Opravdu chcete smazat úlohu %s?</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Delete *all* job</source>
 <translation type="unfinished">Smazat všechny úlohy</translation>
 </message>
@@ -7756,7 +7866,7 @@
 <translation type="unfinished">Opravdu chcete smazat všechny úlohy?</translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Already done</source>
 <translation type="unfinished">Už je to hotovo</translation>
 </message>
@@ -7777,7 +7887,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+432"/>
 <source>Partial</source>
 <translation type="unfinished">Částečný</translation>
 </message>
@@ -7830,7 +7940,7 @@
 <context>
 <name>qprocessing</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+65"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
 <source>Unknown</source>
 <translation type="unfinished">Neznámý</translation>
 </message>
@@ -7984,7 +8094,7 @@
 <context>
 <name>qtalert</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
 <source>Alert</source>
 <translation type="unfinished">Upozornění</translation>
 </message>
@@ -7996,14 +8106,14 @@
 <translation type="unfinished">Informace</translation>
 </message>
 <message>
- <location line="+24"/>
- <location line="+30"/>
+ <location line="+26"/>
+ <location line="+31"/>
 <source>Confirmation</source>
 <translation type="unfinished">Potvrzení</translation>
 </message>
 <message>
- <location line="+19"/>
- <location line="+30"/>
+ <location line="+21"/>
+ <location line="+33"/>
 <source>Question</source>
 <translation type="unfinished">Otázka</translation>
 </message>
@@ -8880,20 +8990,13 @@
 <context>
 <name>tsdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
 <source>Error</source>
- <translation type="unfinished">Chyba</translation>
+ <translation type="obsolete">Chyba</translation>
 </message>
 <message>
- <location line="+0"/>
- <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="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+188"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+327"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
+ <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 type="unfinished"></translation>
 </message>
@@ -8905,6 +9008,12 @@
 <source>Indexing</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>twolame</name>
@@ -9274,12 +9383,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished">Vlastní</translation>
 </message>
 <message>
- <location line="+411"/>
+ <location line="+412"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished">Cílový datový tok:</translation>
 </message>
@@ -9334,13 +9443,13 @@
 </message>
 <message>
 <location line="+61"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished">Chyba</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9350,12 +9459,11 @@
 <translation>Uložit profil</translation>
 </message>
 <message>
- <location line="+11"/>
 <source>my profile</source>
- <translation>můj profil</translation>
+ <translation type="vanished">můj profil</translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10616,12 +10724,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished">Vlastní</translation>
 </message>
 <message>
- <location line="+361"/>
+ <location line="+362"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished">Cílový datový tok:</translation>
 </message>
@@ -10676,13 +10784,13 @@
 </message>
 <message>
 <location line="+41"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished">Chyba</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10692,7 +10800,7 @@
 <translation>Uložit profil</translation>
 </message>
 <message>
- <location line="+45"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12023,7 +12131,7 @@
 <context>
 <name>yadif</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
 <source>Yadif</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12033,47 +12141,78 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+53"/>
 <source>Temporal &amp; spatial check</source>
- <translation type="unfinished">Časová a prostorová kontrola</translation>
+ <translation type="obsolete">Časová a prostorová kontrola</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, temporal &amp; spatial check</source>
- <translation type="unfinished">Bob, časová a prostorová kontrola</translation>
+ <translation type="obsolete">Bob, časová a prostorová kontrola</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Skip spatial temporal check</source>
- <translation type="unfinished">Vynechat prostorovou časovou kontrolu</translation>
+ <translation type="obsolete">Vynechat prostorovou časovou kontrolu</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, skip spatial temporal check</source>
- <translation type="unfinished">Bob, vynechat prostorovou časovou kontrolu</translation>
+ <translation type="obsolete">Bob, vynechat prostorovou časovou kontrolu</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+75"/>
 <source>Bottom field first</source>
 <translation type="unfinished">Nejdřív spodní půlsnímek</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="-1"/>
 <source>Top field first</source>
 <translation type="unfinished">Nejdřív horní půlsnímek</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="-7"/>
+ <source>Frame : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Deint all</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Deint interlaced</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
 <source>_Mode:</source>
 <translation type="unfinished">_Režim:</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>_Deint:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>_Order:</source>
 <translation type="unfinished">_Pořadí:</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+3"/>
 <source>yadif</source>
 <translation type="unfinished">yadif</translation>
 </message>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_da.ts -> avidemux_2.7.4.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="+85"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+102"/>
 <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="+196"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+194"/>
 <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="-172"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-189"/>
 <source>Checking if timestamps are valid..</source>
 <translation>Tjekker om tidsstempler er gyldige...</translation>
 </message>
@@ -1058,7 +1058,7 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+34"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+36"/>
 <source>Open</source>
 <translation>Åbn</translation>
 </message>
@@ -1074,8 +1074,6 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+659"/>
- <location line="+10"/>
 <source>Queue</source>
 <translation>Sæt i kø</translation>
 </message>
@@ -1110,14 +1108,11 @@
 <translation>Luk</translation>
 </message>
 <message>
- <location line="+1"/>
- <location line="+2"/>
- <location line="+2"/>
 <source>-</source>
- <translation>-</translation>
+ <translation type="vanished">-</translation>
 </message>
 <message>
- <location line="-3"/>
+ <location line="+2"/>
 <source>Information</source>
 <translation>Information</translation>
 </message>
@@ -1179,7 +1174,8 @@
 <translation>Sæt markør B</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+510"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+525"/>
+ <location line="+3"/>
 <source>Preferences</source>
 <translation>Præferencer</translation>
 </message>
@@ -1368,7 +1364,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-144"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-147"/>
 <source>Stereo</source>
 <translation>Stereo</translation>
 </message>
@@ -1514,7 +1510,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
 <source>CPU</source>
 <translation>CPU</translation>
 </message>
@@ -1550,12 +1546,12 @@
 </message>
 <message>
 <location line="+23"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-43"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-46"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="-612"/>
+ <location filename="../../common/gui_save.cpp" line="+57"/>
 <location line="+10"/>
- <location line="+278"/>
+ <location line="+277"/>
 <location line="+19"/>
 <location line="+7"/>
 <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1628,12 +1624,12 @@
 <translation>Pluginsinfo</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-232"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-227"/>
 <source>Enable openGl support</source>
 <translation>Aktivér understøttelse af OpenGL</translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+1"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation>_Acceptér ikke-standard lydfrekvens for DVD</translation>
 </message>
@@ -1755,17 +1751,16 @@
 <translation>Prioritering</translation>
 </message>
 <message>
- <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
- <translation>_Brug alternativt mærkat for MP3 i .mp4</translation>
+ <translation type="vanished">_Brug alternativt mærkat for MP3 i .mp4</translation>
 </message>
 <message>
- <location line="+1"/>
+ <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="+6"/>
+ <location line="+10"/>
 <source>XVideo (best)</source>
 <translation>XVideo (bedste)</translation>
 </message>
@@ -1775,7 +1770,7 @@
 <translation>VDPAU (bedste)</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+6"/>
 <source>OpenGL (best)</source>
 <translation>OpenGL (bedste)</translation>
 </message>
@@ -1906,13 +1901,13 @@
 <translation>Video</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+53"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+56"/>
 <source>Threading</source>
 <translation>Trådning</translation>
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="+48"/>
- <location filename="../../common/gui_save.cpp" line="-314"/>
+ <location filename="../../common/gui_save.cpp" line="-313"/>
 <source>No audio track</source>
 <translation>Ingen lydspor</translation>
 </message>
@@ -1969,7 +1964,7 @@
 Det er nødvendigt for at kunne oprette PSP-kompatibel video.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+189"/>
+ <location filename="../../common/gui_main.cpp" line="+186"/>
 <source>Select script to save</source>
 <translation>Vælg script som skal gemmes</translation>
 </message>
@@ -1979,19 +1974,38 @@
 <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="+117"/>
+ <location line="+116"/>
 <source>Not coded in this version</source>
 <translation>Ikke kodet i denne version</translation>
 </message>
 <message>
- <location line="+196"/>
+ <location line="+204"/>
 <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>
 </message>
 <message>
- <location line="+55"/>
+ <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 type="unfinished"></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>
+ </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>
+ </message>
+ <message>
+ <location line="+60"/>
 <source>Are you sure?</source>
 <translation>Er du sikker?</translation>
 </message>
@@ -2011,21 +2025,52 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+30"/>
 <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+103"/>
 <source>Permission error</source>
 <translation>Tilladelsesfejl</translation>
 </message>
@@ -2078,7 +2123,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location line="+320"/>
+ <location line="+321"/>
 <source>Something bad happened (II)</source>
 <translation>Noget gik galt (II)</translation>
 </message>
@@ -2146,7 +2191,7 @@
 <translation>avsproxy</translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+35"/>
 <source>Frame type:</source>
 <translation>Billedtype:</translation>
 </message>
@@ -2237,12 +2282,12 @@
 <translation>Gemmer lyd</translation>
 </message>
 <message>
- <location line="+206"/>
+ <location line="+205"/>
 <source>Jpeg</source>
 <translation>JPEG</translation>
 </message>
 <message>
- <location line="+103"/>
+ <location line="+113"/>
 <location line="+83"/>
 <source>Done</source>
 <translation>Færdig</translation>
@@ -2253,24 +2298,27 @@
 <translation>Gemte %d billeder.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
 <location line="+44"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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="-249"/>
+ <location filename="../../common/gui_main.cpp" line="-250"/>
 <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="+7"/>
+ <location line="+20"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation>Fejl</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+61"/>
+ <location filename="../../common/gui_save.cpp" line="-65"/>
 <source>BMP op failed</source>
 <translation>BMP op mislykkedes</translation>
 </message>
@@ -2540,19 +2588,18 @@
 <translation>Mikser</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-278"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-282"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation>Dekod video ved brug af DXVA2 (windows)</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+6"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation>Dekod video ved brug af VDPAU (NVIDIA)</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Decode video using XVBA (AMD)</source>
- <translation>Dekod video ved brug af XVBA (AMD)</translation>
+ <translation type="vanished">Dekod video ved brug af XVBA (AMD)</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -2560,17 +2607,27 @@
 <translation>Dekod video ved brug af LIBVA (INTEL)</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>Decode video using VideoToolbox (macOS)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="-3"/>
+ <source>Ignore driver blacklist (Intel)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation>Hvis du bruger hardwaredekodning, så er det bedre at bruge den matchende skærmdriver</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+5"/>
 <source>_Revert to saved default output settings on video load</source>
 <translation>_Tilbagefør til gemte standardoutputindstillinger når video indlæses</translation>
 </message>
@@ -2580,17 +2637,27 @@
 <translation>_Søg efter ny udgivelse</translation>
 </message>
 <message>
- <location line="+57"/>
+ <location line="+56"/>
 <source>_Sanitize decode time stamps (DTS) in copy mode</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+2"/>
+ <source>Caching of decoded pictures</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Cache size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
 <source>DXVA2 (best)</source>
 <translation>DXVA2 (bedste)</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+6"/>
 <source>LIBVA (best)</source>
 <translation>LIBVA (bedste)</translation>
 </message>
@@ -2633,6 +2700,7 @@
 <message>
 <location line="+4"/>
 <location line="+3"/>
+ <location line="+3"/>
 <source>HW Accel</source>
 <translation>Hardwareacceleration</translation>
 </message>
@@ -2718,7 +2786,7 @@
 <translation>Kan ikke vælge MPEG-4 SP-codec.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1382"/>
+ <location filename="../../common/gui_main.cpp" line="-1449"/>
 <source>Select script/project to run</source>
 <translation>Vælg script/projekt som skal køre</translation>
 </message>
@@ -2733,7 +2801,7 @@
 <translation>Vælg script som skal fejlfindes</translation>
 </message>
 <message>
- <location line="+199"/>
+ <location line="+198"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation>Vælg videofil...</translation>
@@ -2754,7 +2822,7 @@
 <translation>Vælg videofil som skal føjes til slutning...</translation>
 </message>
 <message>
- <location line="+216"/>
+ <location line="+246"/>
 <location line="+21"/>
 <source>Cutting</source>
 <translation>Klipper</translation>
@@ -2765,7 +2833,7 @@
 <translation>Fejl under udklipning.</translation>
 </message>
 <message>
- <location line="+445"/>
+ <location line="+480"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
@@ -2773,7 +2841,7 @@
 Forvent problemer.</translation>
 </message>
 <message>
- <location line="+269"/>
+ <location line="+272"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation>Ugyldigt lydindeks givet</translation>
@@ -2804,7 +2872,7 @@
 <translation>Indstilling af sproget til det givne sporindeks er ikke muligt: ugyldigt sporindeks!</translation>
 </message>
 <message>
- <location line="+295"/>
+ <location line="+297"/>
 <source>Oops</source>
 <translation>Ups</translation>
 </message>
@@ -2814,12 +2882,12 @@
 <translation>Denne funktion er deaktiveret eller er ikke længere gyldig</translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+446"/>
+ <location filename="../../common/gui_play.cpp" line="+442"/>
 <source>Trouble initializing audio device</source>
 <translation>Problem ved initialisering af lydenhed</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-578"/>
+ <location filename="../../common/gui_save.cpp" line="-587"/>
 <source>Audio encoder index out of bounds</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2844,7 +2912,7 @@
 <translation>Kan ikke kontakte database. Har du Job-kontrol kørende?</translation>
 </message>
 <message>
- <location line="+228"/>
+ <location line="+227"/>
 <source>Function not implemented
 </source>
 <translation>Funktion ikke implementeret
@@ -2866,7 +2934,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+87"/>
 <source>Saving selection as set of JPEG images</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2897,11 +2965,25 @@
 </message>
 <message>
 <location line="+67"/>
+ <source>Cannot get tinyPy script engine</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Output file not specified</source>
+ <translation type="unfinished"></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>Kan ikke få tinyPÿ-script-motor</translation>
+ <translation type="vanished">Kan ikke få tinyPÿ-script-motor</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+7"/>
 <source>Cannot add job %s</source>
 <translation>Kan ikke tilføje job %s</translation>
 </message>
@@ -2934,7 +3016,7 @@
 <translation>Kan ikke opsætte lydkoder. Sørg for at din strøm er kompatibel med lydkoderen (antal kanaler, bithastighed, format)</translation>
 </message>
 <message>
- <location line="+30"/>
+ <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>
@@ -2943,20 +3025,38 @@
 Vil du fortsætte alligevel?</translation>
 </message>
 <message>
- <location line="-255"/>
- <location line="+266"/>
+ <location line="-253"/>
+ <location line="+286"/>
 <location line="+26"/>
 <source>Muxer</source>
 <translation>Muxer</translation>
 </message>
 <message>
- <location line="-292"/>
- <location line="+266"/>
+ <location line="-312"/>
+ <location line="+286"/>
 <source>Cannot instantiate muxer</source>
 <translation>Kan ikke instantiere muxer</translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="-28"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+42"/>
 <source>Cannot open </source>
 <translation>Kan ikke åbne </translation>
 </message>
@@ -3116,7 +3216,7 @@
 <translation>Gemmer</translation>
 </message>
 <message>
- <location line="+165"/>
+ <location line="+164"/>
 <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>
@@ -3224,7 +3324,7 @@
 <translation>1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+ <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"/>
@@ -3247,7 +3347,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <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>
@@ -3271,7 +3371,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_toolkit/automation.cpp" line="+238"/>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
 <source>Permission Error</source>
 <translation>Tilladelsesfejl</translation>
 </message>
@@ -3320,7 +3420,7 @@
 <context>
 <name>asciiView</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
 <source>Ascii View</source>
 <translation>ASCII-visning</translation>
 </message>
@@ -3995,13 +4095,13 @@
 <message>
 <location line="-1"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
- <location line="+90"/>
+ <location line="+87"/>
 <source>Contrast</source>
 <translation>Kontrast</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
- <location line="+90"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
+ <location line="+87"/>
 <source>Brightness</source>
 <translation>Lysstyrke</translation>
 </message>
@@ -4127,7 +4227,7 @@
 </translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
 <source>Size: </source>
 <translation type="unfinished"></translation>
 </message>
@@ -6508,7 +6608,7 @@
 <context>
 <name>lavcodec</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
 <source>_Bitrate:</source>
 <translation>_Bithastighed:</translation>
 </message>
@@ -6748,12 +6848,12 @@
 <context>
 <name>matroskademuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
 <source>Matroska Images</source>
 <translation>Matroska-billeder</translation>
 </message>
 <message>
- <location line="+433"/>
+ <location line="+431"/>
 <source>Matroska clusters</source>
 <translation>Matroska-klynger</translation>
 </message>
@@ -6952,7 +7052,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+827"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
 <source>Problem reading SVQ3 headers</source>
 <translation>Problem ved læsning af SVQ3-hoveder</translation>
 </message>
@@ -6976,7 +7076,7 @@
 <translation>Understøtter kun AAC, AC3, E-AC3 og mpegaudio til lyd</translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+146"/>
 <source>Saving mp4</source>
 <translation>Gemmer MP4</translation>
 </message>
@@ -6991,9 +7091,28 @@
 <translation>Muxing-format</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Use alternate MP3 tag</source>
- <translation>Brug alternativt MP3-tag</translation>
+ <translation type="vanished">Brug alternativt MP3-tag</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>No optimization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Move index to the beginning of the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use fragmentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Optimize for Streaming</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
@@ -7204,12 +7323,12 @@
 <context>
 <name>navigate</name>
 <message>
- <location filename="../../common/gui_navigate.cpp" line="+244"/>
+ <location filename="../../common/gui_navigate.cpp" line="+242"/>
 <source>Cannot go to next keyframe</source>
 <translation>Kan ikke gå til det næste nøglebillede</translation>
 </message>
 <message>
- <location line="+69"/>
+ <location line="+64"/>
 <source>Cannot go to previous keyframe</source>
 <translation>Kan ikke gå til det forrige nøglebillede</translation>
 </message>
@@ -7287,7 +7406,7 @@
 <translation>Forkert udformet hoved</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
 <source>Unpacking bitstream</source>
 <translation>Udpakker bitstrøm</translation>
 </message>
@@ -7434,15 +7553,13 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+80"/>
 <source>Error</source>
- <translation>Fejl</translation>
+ <translation type="vanished">Fejl</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>This file&apos;s index has been created with an older version of avidemux.
 Please delete the idx2 file and reopen.</source>
- <translation>Denne fils indeks er blevet oprettet med en ældre version af avidemux.
+ <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>
@@ -7455,27 +7572,33 @@
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>qaudiotracks</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
 <source>Select audio file</source>
 <translation>Vælg lydfil</translation>
 </message>
 <message>
 <location line="+22"/>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Error</source>
 <translation>Fejl</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-161"/>
 <source>Cannot use that file as audio track</source>
 <translation>Kan ikke bruge den fil som lydspor</translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Some tracks are used multiple times</source>
 <translation>Nogle spor er brugt flere gange</translation>
 </message>
@@ -7554,18 +7677,18 @@
 <name>qfile</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+45"/>
- <location line="+141"/>
+ <location line="+142"/>
 <source>All files (*.*)</source>
 <translation>Alle filer (*.*)</translation>
 </message>
 <message>
- <location line="-58"/>
- <location line="+105"/>
+ <location line="-59"/>
+ <location line="+106"/>
 <source> files (*.</source>
 <translation> filer (*.</translation>
 </message>
 <message>
- <location line="-81"/>
+ <location line="-82"/>
 <source>Overwrite file </source>
 <translation>Overskriv filen </translation>
 </message>
@@ -7588,7 +7711,7 @@
 <translation>Seneste projekter</translation>
 </message>
 <message>
- <location line="+660"/>
+ <location line="+671"/>
 <source>Play/Stop</source>
 <translation>Afspil/stop</translation>
 </message>
@@ -7653,7 +7776,7 @@
 <translation>Fremad ét minut</translation>
 </message>
 <message>
- <location line="+619"/>
+ <location line="+626"/>
 <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
@@ -7772,12 +7895,12 @@
 </message>
 <message>
 <location line="+64"/>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Sure!</source>
 <translation>Klart!</translation>
 </message>
 <message>
- <location line="-14"/>
+ <location line="-15"/>
 <source>Delete job</source>
 <translation>Slet job</translation>
 </message>
@@ -7787,7 +7910,7 @@
 <translation>Er du sikker på, at du vil slette %s job?</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Delete *all* job</source>
 <translation>Slet *alle* jobs</translation>
 </message>
@@ -7797,7 +7920,7 @@
 <translation>Er du sikker på, at du vil slette ALLE jobs?</translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Already done</source>
 <translation>Allerede færdig</translation>
 </message>
@@ -7818,7 +7941,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+432"/>
 <source>Partial</source>
 <translation>Delvist</translation>
 </message>
@@ -7871,7 +7994,7 @@
 <context>
 <name>qprocessing</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+65"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
 <source>Unknown</source>
 <translation>Ukendt</translation>
 </message>
@@ -8028,7 +8151,7 @@
 <context>
 <name>qtalert</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
 <source>Alert</source>
 <translation>Besked</translation>
 </message>
@@ -8040,14 +8163,14 @@
 <translation>Info</translation>
 </message>
 <message>
- <location line="+24"/>
- <location line="+30"/>
+ <location line="+26"/>
+ <location line="+31"/>
 <source>Confirmation</source>
 <translation>Bekræftelse</translation>
 </message>
 <message>
- <location line="+19"/>
- <location line="+30"/>
+ <location line="+21"/>
+ <location line="+33"/>
 <source>Question</source>
 <translation>Spørgsmål</translation>
 </message>
@@ -8924,21 +9047,19 @@
 <context>
 <name>tsdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
 <source>Error</source>
- <translation>Fejl</translation>
+ <translation type="vanished">Fejl</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>This file&apos;s index has been created with an older version of avidemux.
 Please delete the idx2 file and reopen.</source>
- <translation>Denne fils indeks er blevet oprettet med en ældre version af avidemux.
+ <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="+188"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+327"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
+ <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>Der er flere med filer fortløbende filnavne. Skal de indlæses allesammen?</translation>
 </message>
@@ -8950,6 +9071,12 @@
 <source>Indexing</source>
 <translation>Indekserer</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>twolame</name>
@@ -9322,12 +9449,12 @@
 <translation>intet</translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation>Brugerdefineret</translation>
 </message>
 <message>
- <location line="+411"/>
+ <location line="+412"/>
 <source>Target Bitrate:</source>
 <translation>Ønsket bithastighed:</translation>
 </message>
@@ -9382,13 +9509,13 @@
 </message>
 <message>
 <location line="+61"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation>Fejl</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation>Kan ikke indlæse forudindstilling</translation>
 </message>
@@ -9398,12 +9525,11 @@
 <translation>Gem profil</translation>
 </message>
 <message>
- <location line="+11"/>
 <source>my profile</source>
- <translation>min profil</translation>
+ <translation type="vanished">min profil</translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation>Overskriv</translation>
 </message>
@@ -10666,12 +10792,12 @@
 <translation>ingen</translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation>Brugerdefineret</translation>
 </message>
 <message>
- <location line="+361"/>
+ <location line="+362"/>
 <source>Target Bitrate:</source>
 <translation>Ønsket bithastighed:</translation>
 </message>
@@ -10726,13 +10852,13 @@
 </message>
 <message>
 <location line="+41"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation>Fejl</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation>Kan ikke indlæse forudindstilling</translation>
 </message>
@@ -10742,7 +10868,7 @@
 <translation>Gem profil</translation>
 </message>
 <message>
- <location line="+45"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation>Overskriv</translation>
 </message>
@@ -12074,7 +12200,7 @@
 <context>
 <name>yadif</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
 <source>Yadif</source>
 <translation></translation>
 </message>
@@ -12084,47 +12210,78 @@
 <translation>Yadif, port af avisynth version (c) Fizick.</translation>
 </message>
 <message>
- <location line="+53"/>
 <source>Temporal &amp; spatial check</source>
- <translation>Temporal- og spatialtjek</translation>
+ <translation type="vanished">Temporal- og spatialtjek</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, temporal &amp; spatial check</source>
- <translation>Bob-, temporal- og spatialtjek</translation>
+ <translation type="vanished">Bob-, temporal- og spatialtjek</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Skip spatial temporal check</source>
- <translation>Spring spatial temporal tjek over</translation>
+ <translation type="vanished">Spring spatial temporal tjek over</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, skip spatial temporal check</source>
- <translation>Bob, spring spatial temporal tjek over</translation>
+ <translation type="vanished">Bob, spring spatial temporal tjek over</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+75"/>
 <source>Bottom field first</source>
 <translation>Nederste felt først</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="-1"/>
 <source>Top field first</source>
 <translation>Øverste felt først</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="-7"/>
+ <source>Frame : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Deint all</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Deint interlaced</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
 <source>_Mode:</source>
 <translation>_Tilstand:</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>_Deint:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>_Order:</source>
 <translation>_Rækkefølge:</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+3"/>
 <source>yadif</source>
 <translation>yadif</translation>
 </message>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_de.ts -> avidemux_2.7.4.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="+232"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
 <source>Attempt to open %s failed!</source>
 <translation>Der Versuch, %s zu öffnen, ist fehlgeschlagen!</translation>
 </message>
@@ -58,7 +58,7 @@
 <translation>Prüfe Gültigkeit der Zeitstempel...</translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="+43"/>
 <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>
@@ -1052,7 +1052,7 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+230"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+246"/>
 <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,12 +1167,11 @@
 <translation type="unfinished">Priorisierung bestimmter Aufgaben</translation>
 </message>
 <message>
- <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
- <translation type="unfinished">_Alternativen &apos;Tag&apos; für MP3-Tonspuren in MPEG-4 Containern benutzen</translation>
+ <translation type="obsolete">_Alternativen &apos;Tag&apos; für MP3-Tonspuren in MPEG-4 Containern benutzen</translation>
 </message>
 <message>
- <location line="+1"/>
+ <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>
@@ -1182,7 +1181,17 @@
 <translation>Im Kopiermodus _Gleichmäßigkeit der Zeitstempel für Dekodierung (DTS) erhöhen</translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+2"/>
+ <source>Caching of decoded pictures</source>
+ <translation>Zwischenspeicher für dekodierte Frames</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Cache size:</source>
+ <translation>Größe des _Zwischenspeichers:</translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>XVideo (best)</source>
 <translation type="unfinished">XVideo (bestens)</translation>
 </message>
@@ -1192,7 +1201,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+15"/>
+ <location line="+11"/>
 <source>SDL (good)</source>
 <translation type="unfinished">SDL (gut)</translation>
 </message>
@@ -1289,7 +1298,7 @@
 <location line="+5"/>
 <location filename="../../common/gui_save.cpp" line="+57"/>
 <location line="+10"/>
- <location line="+278"/>
+ <location line="+277"/>
 <location line="+19"/>
 <location line="+7"/>
 <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1306,7 +1315,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
 <source>CPU</source>
 <translation type="unfinished">Prozessor</translation>
 </message>
@@ -1326,12 +1335,13 @@
 <translation>Standardport</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+82"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+84"/>
 <source>Pr&amp;eferences</source>
 <translation>&amp;Einstellungen</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+10"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+7"/>
+ <location line="+3"/>
 <source>Preferences</source>
 <translation>Einstellungen</translation>
 </message>
@@ -1352,8 +1362,6 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+288"/>
- <location line="+10"/>
 <source>Queue</source>
 <translation>Zur &amp;Warteschlange hinzufügen...</translation>
 </message>
@@ -1731,12 +1739,12 @@
 <translation type="unfinished">Audiogeräte</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-285"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-283"/>
 <source>Enable openGl support</source>
 <translation>OpenG_L benutzen</translation>
 </message>
 <message>
- <location line="+237"/>
+ <location line="+232"/>
 <source>_Limit Refresh Rate</source>
 <translation>_Bildwiederholungsfrequenz begrenzen</translation>
 </message>
@@ -1746,29 +1754,39 @@
 <translation>Bild _neu aufbauen nicht häufiger als nach (ms)</translation>
 </message>
 <message>
- <location line="-189"/>
+ <location line="-188"/>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+47"/>
 <source>High</source>
 <translation>Hoch</translation>
 </message>
 <message>
- <location line="-56"/>
+ <location line="-58"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation>Video mittels _DXVA2 dekodieren (nur Windows)</translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Ignore driver blacklist (Intel)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+60"/>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-2"/>
 <source>Low</source>
 <translation>Niedrig</translation>
 </message>
 <message>
- <location line="+21"/>
+ <location line="+24"/>
 <source>VDPAU (best)</source>
 <translation type="unfinished">VDPAU (bestens)</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+6"/>
 <source>OpenGL (best)</source>
 <translation>OpenGL (bestens)</translation>
 </message>
@@ -1811,46 +1829,106 @@
 <translation>Codec-Fehler</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+373"/>
+ <location filename="../../common/gui_main.cpp" line="+369"/>
 <source>Not coded in this version</source>
 <translation>Nicht implementiert in dieser Version</translation>
 </message>
 <message>
- <location line="+251"/>
+ <location line="+209"/>
+ <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.
+Trotzdem fortsetzen?</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>Codec oder Codec-Parameter an den Schnittpunkten der eingefügten Auswahl sind nicht identisch. Die Wiedergabe des im Kopiermodus gespeicherten editierten Videos kann an diesen Stellen abbrechen.
+Trotzdem fortsetzen?</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>Die Schnittpunkte der eingefügten Auswahl konnten nicht überprüft werden. Dies weist auf ein Problem mit dem Video, mit der Editierung oder auf einen Fehler im Programm hin. Für weitere Details sehen Sie bitte die Log-Datei bzw. die Konsolenausgabe des Programms ein.
+Trotzdem fortsetzen?</translation>
+ </message>
+ <message>
+ <location line="+60"/>
 <source>Are you sure?</source>
 <translation type="unfinished">Sind Sie sicher?</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 type="unfinished"></translation>
+ <translation>Das Ausschneiden des gesamten Videos ist nicht zulässig. Bitte die Position der Markierungen A und B überprüfen.</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Deleting</source>
- <translation type="unfinished"></translation>
+ <translation>Löschen</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 type="unfinished"></translation>
+ <translation>Das Löschen des gesamten Videos ist nicht zulässig. Bitte die Position der Markierungen A und B überprüfen.</translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+30"/>
 <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 type="unfinished"></translation>
+ <translation>Der Endpunkt der Auswahl zum Ausschneiden befindet sich nicht an einem Keyframe. Das im Kopiermodus gespeicherte Video wird an diesem Punkt gestört sein.
+Trotzdem fortsetzen?</translation>
 </message>
 <message>
- <location line="+5"/>
+ <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 type="unfinished"></translation>
+ <translation>Der Endpunkt der Auswahl zum Löschen befindet sich nicht an einem Keyframe. Das im Kopiermodus gespeicherte Video wird an diesem Punkt gestört sein.
+Trotzdem fortsetzen?</translation>
 </message>
 <message>
- <location line="+100"/>
+ <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>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 gewählten Schnittpunkte führen zum unerwartet zurückgehenden Zähler und möglicherweise zur stockenden Wiedergabe des im Kopiermodus gespeicherten editierten Videos an dieser Stelle.
+Trotzdem fortsetzen?</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>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 gewählten Schnittpunkte führen zum unerwartet zurückgehenden Zähler und möglicherweise zur stockenden Wiedergabe des im Kopiermodus gespeicherten editierten Videos an dieser Stelle.
+Trotzdem fortsetzen?</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>Codec oder Codec-Parameter an den Schnittpunkten nach dem Ausschneiden sind nicht identisch. Die Wiedergabe des im Kopiermodus gespeicherten editierten Videos kann an diesen Stellen abbrechen.
+Trotzdem fortsetzen?</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>Codec oder Codec-Parameter an den Schnittpunkten nach dem Löschen sind nicht identisch. Die Wiedergabe des im Kopiermodus gespeicherten editierten Videos kann an diesen Stellen abbrechen.
+Trotzdem fortsetzen?</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>Die Schnittpunkte konnten nicht überprüft werden. Dies weist auf ein Problem mit dem Video, mit der Editierung oder auf einen Fehler im Programm hin. Für weitere Details sehen Sie bitte die Log-Datei bzw. die Konsolenausgabe des Programms ein.
+Trotzdem fortsetzen?</translation>
+ </message>
+ <message>
+ <location line="+103"/>
 <source>Permission error</source>
 <translation type="unfinished">Rechtefehler</translation>
 </message>
@@ -1903,19 +1981,19 @@
 </message>
 <message>
 <location line="+5"/>
- <location line="+320"/>
+ <location line="+321"/>
 <source>Something bad happened (II)</source>
 <translation type="unfinished">Irgendetwas Schlimmes ist passiert (II)</translation>
 </message>
 <message>
- <location line="-199"/>
+ <location line="-202"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <location line="+103"/>
 <source>Checking video</source>
 <translation type="unfinished">Das Video wird geprüft</translation>
 </message>
@@ -1972,7 +2050,7 @@
 <translation type="unfinished">Avs-Proxy</translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+35"/>
 <source>Frame type:</source>
 <translation>Frame-Typ:</translation>
 </message>
@@ -1992,7 +2070,7 @@
 <translation type="unfinished">Gehe zur Zeit</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-527"/>
+ <location filename="../../common/gui_save.cpp" line="-228"/>
 <source>Select Workbench to Save</source>
 <translation type="unfinished">Arbeitsbereich als Projekt speichern</translation>
 </message>
@@ -2028,7 +2106,7 @@
 <translation type="unfinished">Audio speichern</translation>
 </message>
 <message>
- <location line="+309"/>
+ <location line="+318"/>
 <location line="+83"/>
 <source>Done</source>
 <translation type="unfinished">Fertig</translation>
@@ -2039,24 +2117,27 @@
 <translation type="unfinished">%d Bilder gespeichert.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
 <location line="+44"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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="-249"/>
+ <location filename="../../common/gui_main.cpp" line="-250"/>
 <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="+7"/>
+ <location line="+20"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation>Fehler</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+61"/>
+ <location filename="../../common/gui_save.cpp" line="-65"/>
 <source>BMP op failed</source>
 <translation type="unfinished">BMP Operation fehlgeschlagen</translation>
 </message>
@@ -2111,14 +2192,13 @@
 <translation type="unfinished">2. Durchlauf</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-167"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation>Video mittels _VDPAU dekodieren</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Decode video using XVBA (AMD)</source>
- <translation>Video mittels _XvBA (AMD Catalyst) dekodieren</translation>
+ <translation type="vanished">Video mittels _XvBA (AMD Catalyst) dekodieren</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -2126,12 +2206,12 @@
 <translation>Video mittels _LibVA dekodieren (Intel)</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>Decode video using VideoToolbox (macOS)</source>
 <translation>Video mittels _VideoToolbox dekodieren (macOS)</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+6"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation>Bei aktivierter Dekodierung in Hardware ist es ratsam, die entsprechende Video-Anzeige zu verwenden</translation>
 </message>
@@ -2151,12 +2231,12 @@
 <translation>Systemvorgabe</translation>
 </message>
 <message>
- <location line="-169"/>
+ <location line="-168"/>
 <source>_Check for new release</source>
 <translation>Auf _Update überprüfen</translation>
 </message>
 <message>
- <location line="+230"/>
+ <location line="+229"/>
 <source>GUI Rendering Options</source>
 <translation>Darstellungsoptionen der grafischen Oberfläche</translation>
 </message>
@@ -2168,6 +2248,7 @@
 <message>
 <location line="+4"/>
 <location line="+3"/>
+ <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished">HW-Beschleunigung</translation>
 </message>
@@ -2180,7 +2261,7 @@
 </translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1155"/>
+ <location filename="../../common/gui_main.cpp" line="-1223"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation>Videodatei wählen...</translation>
@@ -2191,7 +2272,7 @@
 <translation>Videodatei zum Anfügen wählen...</translation>
 </message>
 <message>
- <location line="+994"/>
+ <location line="+1062"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation type="unfinished">Ungültige Liste der Tonspuren</translation>
@@ -2202,12 +2283,12 @@
 <translation>Speichern</translation>
 </message>
 <message>
- <location line="+165"/>
+ <location line="+164"/>
 <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>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1299"/>
+ <location filename="../../common/gui_main.cpp" line="-1366"/>
 <source>Select script/project to run</source>
 <translation>Skript/Projekt zum Ausführen wählen</translation>
 </message>
@@ -2227,7 +2308,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="+153"/>
+ <location line="+152"/>
 <source>No engine</source>
 <translation>Keine Skript-Engine</translation>
 </message>
@@ -2237,14 +2318,14 @@
 <translation>tinyPy wurde beim Kompilieren nicht aktiviert</translation>
 </message>
 <message>
- <location line="+160"/>
+ <location line="+168"/>
 <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>
 </message>
 <message>
- <location line="+102"/>
+ <location line="+124"/>
 <location line="+21"/>
 <source>Cutting</source>
 <translation>Schneiden</translation>
@@ -2255,7 +2336,7 @@
 <translation>Fehler beim Ausschneiden.</translation>
 </message>
 <message>
- <location line="+784"/>
+ <location line="+822"/>
 <source>Cannot use that file as audio track</source>
 <translation>Kann diese Datei nicht als Tonspur verwenden</translation>
 </message>
@@ -2442,7 +2523,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-147"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-150"/>
 <location line="+3"/>
 <source>Sdl driver</source>
 <translation type="unfinished"></translation>
@@ -2454,14 +2535,11 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-102"/>
- <location line="+2"/>
- <location line="+2"/>
 <source>-</source>
- <translation type="unfinished">-</translation>
+ <translation type="obsolete">-</translation>
 </message>
 <message>
- <location line="+60"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-38"/>
 <source>Build Option</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2517,7 +2595,7 @@
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="-144"/>
- <location filename="../../common/gui_save.cpp" line="-588"/>
+ <location filename="../../common/gui_save.cpp" line="-597"/>
 <source>No audio track</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2565,18 +2643,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1351"/>
+ <location filename="../../common/gui_main.cpp" line="-1418"/>
 <source>Select script to save</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+1140"/>
+ <location line="+1207"/>
 <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="+506"/>
+ <location line="+508"/>
 <source>Oops</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2586,7 +2664,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+446"/>
+ <location filename="../../common/gui_play.cpp" line="+442"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished">Probleme beim Initialisieren des Audio-Gerätes</translation>
 </message>
@@ -2636,7 +2714,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+167"/>
+ <location line="+166"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -2662,7 +2740,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+87"/>
 <source>Saving selection as set of JPEG images</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2693,11 +2771,21 @@
 </message>
 <message>
 <location line="+67"/>
- <source>Cannot get tinyPÿ script engine</source>
+ <source>Cannot get tinyPy script engine</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Output file not specified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Job script %s already exists. Overwrite?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>Cannot add job %s</source>
 <translation type="unfinished">Kann den Job %s nicht hinzufügen</translation>
 </message>
@@ -2730,7 +2818,7 @@
 <translation type="unfinished">Kann Audio-Encoder nicht konfigurieren. Stellen Sie sicher, dass der Stream kompatibel ist (Anzahl der Kanäle, Bitrate, Format)</translation>
 </message>
 <message>
- <location line="+30"/>
+ <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>
@@ -2739,20 +2827,38 @@
 Trotzdem fortsetzen?</translation>
 </message>
 <message>
- <location line="-255"/>
- <location line="+266"/>
+ <location line="-253"/>
+ <location line="+286"/>
 <location line="+26"/>
 <source>Muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-292"/>
- <location line="+266"/>
+ <location line="-312"/>
+ <location line="+286"/>
 <source>Cannot instantiate muxer</source>
 <translation type="unfinished">Kann Muxer-Instanz nicht erstellen</translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="-28"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+42"/>
 <source>Cannot open </source>
 <translation type="unfinished">Keine Daten zum Muxen oder keine Ausgabedatei</translation>
 </message>
@@ -3205,7 +3311,7 @@
 <translation type="unfinished">1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+ <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"/>
@@ -3235,7 +3341,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <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>
@@ -3263,7 +3369,7 @@
 <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="+238"/>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
 <source>Permission Error</source>
 <translation>Berechtigungsfehler</translation>
 </message>
@@ -3312,7 +3418,7 @@
 <context>
 <name>asciiView</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
 <source>Ascii View</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3986,13 +4092,13 @@
 <message>
 <location line="-1"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
- <location line="+90"/>
+ <location line="+87"/>
 <source>Contrast</source>
 <translation>Kontrast</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
- <location line="+90"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
+ <location line="+87"/>
 <source>Brightness</source>
 <translation>Helligkeit</translation>
 </message>
@@ -4118,7 +4224,7 @@
 </translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
 <source>Size: </source>
 <translation type="unfinished"></translation>
 </message>
@@ -6490,7 +6596,7 @@
 <context>
 <name>lavcodec</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
 <source>_Bitrate:</source>
 <translation type="unfinished">_Bitrate (kb/s):</translation>
 </message>
@@ -6730,12 +6836,12 @@
 <context>
 <name>matroskademuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
 <source>Matroska Images</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+433"/>
+ <location line="+431"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6934,7 +7040,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+827"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">Problem beim Lesen der SVQ3 Kopfzeilen</translation>
 </message>
@@ -6958,7 +7064,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+146"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6973,9 +7079,28 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Use alternate MP3 tag</source>
- <translation type="unfinished">Alternativen Tag für MP3 benutzen</translation>
+ <translation type="obsolete">Alternativen Tag für MP3 benutzen</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>No optimization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Move index to the beginning of the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use fragmentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Optimize for Streaming</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
@@ -7185,12 +7310,12 @@
 <context>
 <name>navigate</name>
 <message>
- <location filename="../../common/gui_navigate.cpp" line="+244"/>
+ <location filename="../../common/gui_navigate.cpp" line="+242"/>
 <source>Cannot go to next keyframe</source>
 <translation>Kann nicht zum nächsten Keyframe wechseln</translation>
 </message>
 <message>
- <location line="+69"/>
+ <location line="+64"/>
 <source>Cannot go to previous keyframe</source>
 <translation>Kann nicht zum vorhergehenden Keyframe wechseln</translation>
 </message>
@@ -7268,7 +7393,7 @@
 <translation type="unfinished">Fehlerhafte Kopfzeilen</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
 <source>Unpacking bitstream</source>
 <translation type="unfinished">Bitstrom entpacken</translation>
 </message>
@@ -7415,15 +7540,8 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+80"/>
 <source>Error</source>
- <translation type="unfinished">Fehler</translation>
- </message>
- <message>
- <location line="+0"/>
- <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="unfinished"></translation>
+ <translation type="obsolete">Fehler</translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
@@ -7435,27 +7553,33 @@
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>qaudiotracks</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
 <source>Select audio file</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+22"/>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Error</source>
 <translation type="unfinished">Fehler</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-161"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished">Kann diese Datei nicht als Tonspur verwenden</translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7534,18 +7658,18 @@
 <name>qfile</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+45"/>
- <location line="+141"/>
+ <location line="+142"/>
 <source>All files (*.*)</source>
 <translation>Alle Dateien (*.*)</translation>
 </message>
 <message>
- <location line="-58"/>
- <location line="+105"/>
+ <location line="-59"/>
+ <location line="+106"/>
 <source> files (*.</source>
 <translation>-Dateien (*.</translation>
 </message>
 <message>
- <location line="-81"/>
+ <location line="-82"/>
 <source>Overwrite file </source>
 <translation type="unfinished">Überschreiben </translation>
 </message>
@@ -7563,7 +7687,7 @@
 <translation>Zuletzt verwendete &amp;Projekte</translation>
 </message>
 <message>
- <location line="+660"/>
+ <location line="+671"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7628,17 +7752,17 @@
 <translation>Eine Minute vor</translation>
 </message>
 <message>
- <location line="+1215"/>
+ <location line="+1222"/>
 <source> (%d track(s))</source>
 <translation> (%d Tonspur(en))</translation>
 </message>
 <message>
- <location line="-2172"/>
+ <location line="-2190"/>
 <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="+1576"/>
+ <location line="+1594"/>
 <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.
@@ -7752,12 +7876,12 @@
 </message>
 <message>
 <location line="+64"/>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Sure!</source>
 <translation type="unfinished">Sicher!</translation>
 </message>
 <message>
- <location line="-14"/>
+ <location line="-15"/>
 <source>Delete job</source>
 <translation type="unfinished">Job löschen</translation>
 </message>
@@ -7767,7 +7891,7 @@
 <translation type="unfinished">Der Job %s wird gelöscht. Sind Sie sicher?</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Delete *all* job</source>
 <translation type="unfinished">Alle Aufgaben löschen</translation>
 </message>
@@ -7777,7 +7901,7 @@
 <translation type="unfinished">Sie löschen hiermit alle Aufgaben. Sind Sie sicher?</translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Already done</source>
 <translation type="unfinished">Fertig</translation>
 </message>
@@ -7798,7 +7922,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+432"/>
 <source>Partial</source>
 <translation type="unfinished">Abschnittsweise Anwendung</translation>
 </message>
@@ -7851,7 +7975,7 @@
 <context>
 <name>qprocessing</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+65"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
 <source>Unknown</source>
 <translation type="unfinished">Unbekannt</translation>
 </message>
@@ -8005,7 +8129,7 @@
 <context>
 <name>qtalert</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
 <source>Alert</source>
 <translation type="unfinished">Meldung</translation>
 </message>
@@ -8017,14 +8141,14 @@
 <translation type="unfinished">Hinweis</translation>
 </message>
 <message>
- <location line="+24"/>
- <location line="+30"/>
+ <location line="+26"/>
+ <location line="+31"/>
 <source>Confirmation</source>
 <translation type="unfinished">Bestätigung</translation>
 </message>
 <message>
- <location line="+19"/>
- <location line="+30"/>
+ <location line="+21"/>
+ <location line="+33"/>
 <source>Question</source>
 <translation type="unfinished">Frage</translation>
 </message>
@@ -8901,21 +9025,19 @@
 <context>
 <name>tsdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
 <source>Error</source>
- <translation type="unfinished">Fehler</translation>
+ <translation type="obsolete">Fehler</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>This file&apos;s index has been created with an older version of avidemux.
 Please delete the idx2 file and reopen.</source>
- <translation>Der Index dieser Datei wurde mit einer älteren Version von Avidemux erstellt. 
+ <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>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+188"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+327"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
+ <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>
 </message>
@@ -8927,6 +9049,12 @@
 <source>Indexing</source>
 <translation type="unfinished">Indizierung</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>twolame</name>
@@ -9298,12 +9426,12 @@
 <translation>Kein Tuning</translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation>Benutzerdefiniert</translation>
 </message>
 <message>
- <location line="+411"/>
+ <location line="+412"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished">Ziel-Bitrate:</translation>
 </message>
@@ -9358,13 +9486,13 @@
 </message>
 <message>
 <location line="+61"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished">Fehler</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished">Kann Konfiguration nicht laden</translation>
 </message>
@@ -9374,12 +9502,7 @@
 <translation type="unfinished">Konfiguration speichern</translation>
 </message>
 <message>
- <location line="+11"/>
- <source>my profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+34"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished">Überschreiben</translation>
 </message>
@@ -10641,12 +10764,12 @@
 <translation>Kein Tuning</translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation>Benutzerdefiniert</translation>
 </message>
 <message>
- <location line="+361"/>
+ <location line="+362"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished">Ziel-Bitrate:</translation>
 </message>
@@ -10701,13 +10824,13 @@
 </message>
 <message>
 <location line="+41"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished">Fehler</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished">Kann Konfiguration nicht laden</translation>
 </message>
@@ -10717,7 +10840,7 @@
 <translation type="unfinished">Konfiguration speichern</translation>
 </message>
 <message>
- <location line="+45"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished">Überschreiben</translation>
 </message>
@@ -12049,7 +12172,7 @@
 <context>
 <name>yadif</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
 <source>Yadif</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12059,47 +12182,78 @@
 <translation type="unfinished">Yadif (Yet Another DeInterlacing Filter), Portierung der Version aus Avisynth © Alexander Balakhnin (&quot;Fizick&quot;).</translation>
 </message>
 <message>
- <location line="+53"/>
 <source>Temporal &amp; spatial check</source>
- <translation type="unfinished">Zeitliche und räumliche Prüfung</translation>
+ <translation type="obsolete">Zeitliche und räumliche Prüfung</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, temporal &amp; spatial check</source>
- <translation type="unfinished">Bob, zeitliche und räumliche Prüfung (Frequenzverdopplung!)</translation>
+ <translation type="obsolete">Bob, zeitliche und räumliche Prüfung (Frequenzverdopplung!)</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Skip spatial temporal check</source>
- <translation type="unfinished">Ohne räumliche und zeitliche Prüfung</translation>
+ <translation type="obsolete">Ohne räumliche und zeitliche Prüfung</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, skip spatial temporal check</source>
- <translation type="unfinished">Bob, ohne räumliche und zeitliche Prüfung (Frequenzverdopplung!)</translation>
+ <translation type="obsolete">Bob, ohne räumliche und zeitliche Prüfung (Frequenzverdopplung!)</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+75"/>
 <source>Bottom field first</source>
 <translation type="unfinished">Unteres Halbbild zuerst</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="-1"/>
 <source>Top field first</source>
 <translation type="unfinished">Oberes Halbbild zuerst</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="-7"/>
+ <source>Frame : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Deint all</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Deint interlaced</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
 <source>_Mode:</source>
 <translation type="unfinished">_Modus:</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>_Deint:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>_Order:</source>
 <translation type="unfinished">_Reihenfolge:</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+3"/>
 <source>yadif</source>
 <translation type="unfinished">Yadif</translation>
 </message>

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

@@ -4,7 +4,7 @@
 <context>
 <name>ADM_Composer</name>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
 <source>Attempt to open %s failed!</source>
 <translation>Η προσπάθεια ανοίγματος του %s απέτυχε.</translation>
 </message>
@@ -58,7 +58,7 @@
 <translation>Ελέγχεται η εγκυρότητα των χρονοσφραγίδων...</translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="+43"/>
 <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), είτε λείπουν, είτε αυξάνονται μονοτονικά.
@@ -1059,11 +1059,21 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation>Αποκωδικοποίηση του βίντεου με τη χρήση DXVA2 (windows)</translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Ignore driver blacklist (Intel)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+13"/>
 <source>_Revert to saved default output settings on video load</source>
 <translation>_Επαναφορά στις προεπιλεγμένες ρυθμίσεις εξόδου του βίντεου, κατά τη φόρτωση του αρχείου</translation>
@@ -1186,7 +1196,7 @@
 <translation>Ορισμός Προτεραιοτήτων</translation>
 </message>
 <message>
- <location line="+6"/>
+ <location line="+5"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation>_Προεπιλογή, για αποθήκευση, στον κατάλογο του τελευταίου διαβασμένου αρχείου</translation>
 </message>
@@ -1196,7 +1206,17 @@
 <translation>Εξυγίαν_ση των Στιγμιότυπων Αποκωδικοποίησης (DTS), όταν λειτουργεί σε κατάσταση αντιγραφής</translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+2"/>
+ <source>Caching of decoded pictures</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Cache size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>XVideo (best)</source>
 <translation>XVideo (καλύτερη)</translation>
 </message>
@@ -1206,7 +1226,7 @@
 <translation>DXVA2 (καλύτερη)</translation>
 </message>
 <message>
- <location line="+15"/>
+ <location line="+11"/>
 <source>SDL (good)</source>
 <translation>SDL (καλή)</translation>
 </message>
@@ -1309,7 +1329,7 @@
 <location line="+5"/>
 <location filename="../../common/gui_save.cpp" line="+57"/>
 <location line="+10"/>
- <location line="+278"/>
+ <location line="+277"/>
 <location line="+19"/>
 <location line="+7"/>
 <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1326,24 +1346,22 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
 <source>CPU</source>
 <translation>Κεντρικός Επεξεργαστής</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+18"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+15"/>
+ <location line="+3"/>
 <source>Preferences</source>
 <translation>Προτιμήσεις</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+44"/>
- <location line="+2"/>
- <location line="+2"/>
 <source>-</source>
- <translation>-</translation>
+ <translation type="vanished">-</translation>
 </message>
 <message>
- <location line="-1"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+49"/>
 <source>Connect to avsproxy</source>
 <translation>Σύνδεση στο avsproxy</translation>
 </message>
@@ -1547,12 +1565,31 @@
 <translation>Σφάλμα Κώδικα</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+373"/>
+ <location filename="../../common/gui_main.cpp" line="+369"/>
 <source>Not coded in this version</source>
 <translation>Δεν κωδικοποιήθηκε σε αυτή την έκδοση</translation>
 </message>
 <message>
- <location line="+251"/>
+ <location line="+209"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+60"/>
 <source>Are you sure?</source>
 <translation>Στα σίγουρα;</translation>
 </message>
@@ -1574,7 +1611,7 @@
 Παρακαλώ, έλεγξε, ξανά, τις θέσεις των δεικτών Α και Β.</translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+30"/>
 <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>
@@ -1585,7 +1622,7 @@
 Να συνεχιστεί, έτσι κι αλλιώς;</translation>
 </message>
 <message>
- <location line="+5"/>
+ <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>
@@ -1596,7 +1633,38 @@
 Να συνεχιστεί, έτσι κι αλλιώς;</translation>
 </message>
 <message>
- <location line="+100"/>
+ <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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+103"/>
 <source>Permission error</source>
 <translation>Σφάλμα δικαιωμάτων</translation>
 </message>
@@ -1650,12 +1718,12 @@
 </message>
 <message>
 <location line="+5"/>
- <location line="+320"/>
+ <location line="+321"/>
 <source>Something bad happened (II)</source>
 <translation>Κάτι στραβό συνέβη (II)</translation>
 </message>
 <message>
- <location line="-199"/>
+ <location line="-202"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
@@ -1663,7 +1731,7 @@
 Αναμένωνται προβλήματα.</translation>
 </message>
 <message>
- <location line="+100"/>
+ <location line="+103"/>
 <source>Checking video</source>
 <translation>Ελέγχεται το βίντεο</translation>
 </message>
@@ -1727,7 +1795,7 @@
 <translation>avsproxy</translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+35"/>
 <source>Frame type:</source>
 <translation>Τύπος στιγμιότυπου:</translation>
 </message>
@@ -1747,7 +1815,7 @@
 <translation>Ένταση _μεταμορφωτή:</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-229"/>
+ <location filename="../../common/gui_save.cpp" line="-228"/>
 <source>Select Workbench to Save</source>
 <translation>Επέλεξε Workbench για Αποθήκευση</translation>
 </message>
@@ -1783,7 +1851,7 @@
 <translation>Αποθηκεύεται ο ήχος</translation>
 </message>
 <message>
- <location line="+309"/>
+ <location line="+318"/>
 <location line="+83"/>
 <source>Done</source>
 <translation>Έγινε</translation>
@@ -1794,24 +1862,27 @@
 <translation>Αποθηκεύτηκαν %d εικόνες.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
 <location line="+44"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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="-247"/>
+ <location filename="../../common/gui_main.cpp" line="-248"/>
 <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="+7"/>
+ <location line="+20"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation>Σφάλμα</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+61"/>
+ <location filename="../../common/gui_save.cpp" line="-65"/>
 <source>BMP op failed</source>
 <translation>Απέτυχε η BMP λειτουργία</translation>
 </message>
@@ -1856,7 +1927,7 @@
 <translation>Αποθηκεύεται</translation>
 </message>
 <message>
- <location line="+165"/>
+ <location line="+164"/>
 <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%). 
@@ -2004,7 +2075,7 @@
 </message>
 <message>
 <location line="+13"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-123"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-126"/>
 <source>_Horizontal deblocking</source>
 <translation>Ορι_ζόντια αφαίρεση τμημάτων</translation>
 </message>
@@ -2025,14 +2096,13 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-169"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-165"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation>Αποκωδικοποίηση του βίντεου με τη χρήση VDPAU (NVIDIA)</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Decode video using XVBA (AMD)</source>
- <translation>Αποκωδικοποίηση του βίντεου με τη χρήση XVBA (AMD)</translation>
+ <translation type="vanished">Αποκωδικοποίηση του βίντεου με τη χρήση XVBA (AMD)</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -2040,22 +2110,22 @@
 <translation>Αποκωδικοποίηση του βίντεου με τη χρήση LIBVA (INTEL)</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>Decode video using VideoToolbox (macOS)</source>
 <translation>Αποκωδικοποίηση του βίντεου με τη χρήση VideoToolbox (macOS)</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+9"/>
 <source>Enable openGl support</source>
 <translation>Ενεργοποίηση της υποστήριξης openGl</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation>Αν χρησιμοποιήσεις την αποκωδικοποίηση υλικού, να επιλέξεις και τον ταιριαστό οδηγό της συσκευής απεικόνισης.</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+4"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation>_Αποδοχή μη τυποποιημένων συχνοτήτων ήχου για DVD</translation>
 </message>
@@ -2065,17 +2135,16 @@
 <translation>Έλεγ_χος για νέα έκδοση</translation>
 </message>
 <message>
- <location line="+55"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
- <translation>_Χρήση εναλλακτικής ετικέτας, για MP3 μέσα σε .mp4</translation>
+ <translation type="vanished">_Χρήση εναλλακτικής ετικέτας, για MP3 μέσα σε .mp4</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+68"/>
 <source>VDPAU (best)</source>
 <translation>VDPAU (καλύτερη)</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+6"/>
 <source>OpenGL (best)</source>
 <translation>OpenGL (καλύτερο)</translation>
 </message>
@@ -2128,6 +2197,7 @@
 <message>
 <location line="+4"/>
 <location line="+3"/>
+ <location line="+3"/>
 <source>HW Accel</source>
 <translation>Επιτάχυνση Υλικού</translation>
 </message>
@@ -2163,8 +2233,6 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+14"/>
- <location line="+10"/>
 <source>Queue</source>
 <translation>Σειρά Αναμονής</translation>
 </message>
@@ -2420,7 +2488,7 @@
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="-144"/>
- <location filename="../../common/gui_save.cpp" line="-612"/>
+ <location filename="../../common/gui_save.cpp" line="-597"/>
 <source>No audio track</source>
 <translation>Κανένα κανάλι ήχου</translation>
 </message>
@@ -2471,7 +2539,7 @@
 Είναι απαραίτητο για τη δημιουργία βίντεου συμβατό με PSP.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1382"/>
+ <location filename="../../common/gui_main.cpp" line="-1449"/>
 <source>Select script/project to run</source>
 <translation>Επέλεξε σενάριο ή εργασία για τρέξιμο</translation>
 </message>
@@ -2499,7 +2567,7 @@
 Να συνεχίσω, έτσι κι αλλιώς;</translation>
 </message>
 <message>
- <location line="+128"/>
+ <location line="+127"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation>Επιλέξτε Αρχείο Βίντεου...</translation>
@@ -2520,7 +2588,7 @@
 <translation>Επιλέξτε Αρχείο Βίντεου για Προσκόλληση...</translation>
 </message>
 <message>
- <location line="+114"/>
+ <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>
@@ -2531,7 +2599,7 @@
 Να συνεχιστεί, έτσι κι αλλιώς;</translation>
 </message>
 <message>
- <location line="+102"/>
+ <location line="+124"/>
 <location line="+21"/>
 <source>Cutting</source>
 <translation>Αποκόβει</translation>
@@ -2542,7 +2610,7 @@
 <translation>Σφάλμα κατά την αποκοπή.</translation>
 </message>
 <message>
- <location line="+757"/>
+ <location line="+795"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation>Δόθηκε μη έγκυρο ευρετήριο ήχου</translation>
@@ -2573,12 +2641,12 @@
 <translation>Ο ορισμός της γλώσσας για τα περιεχόμενα του δοσμένου καναλιού δεν είναι εφικτός: Μη έγκυρα περιεχόμενα καναλιού.</translation>
 </message>
 <message>
- <location line="+185"/>
+ <location line="+186"/>
 <source>Frame Hex Dump</source>
 <translation>Εξαγωνική Απόρριψη Στιγμιότυπων</translation>
 </message>
 <message>
- <location line="+110"/>
+ <location line="+111"/>
 <source>Oops</source>
 <translation>Ώπα της</translation>
 </message>
@@ -2588,7 +2656,7 @@
 <translation>Αυτή η λειτουργία είναι απενεργοποιημένη και δεν ισχύει πια</translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+446"/>
+ <location filename="../../common/gui_play.cpp" line="+442"/>
 <source>Trouble initializing audio device</source>
 <translation>Πρόβλημα στην αρχικοποίηση της συσκευής ήχου</translation>
 </message>
@@ -2638,7 +2706,7 @@
 <translation>Επέλεξε PNG για Αποθήκευση</translation>
 </message>
 <message>
- <location line="+167"/>
+ <location line="+166"/>
 <source>Function not implemented
 </source>
 <translation>Η λειτουργία δεν έχει υλοποιηθεί</translation>
@@ -2664,7 +2732,7 @@
 <translation>Αποτυχία αποθήκευσης ως JPEG</translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+87"/>
 <source>Saving selection as set of JPEG images</source>
 <translation>Αποθήκευση της επιλογής ως μία ομάδα από εικόνες JPEG</translation>
 </message>
@@ -2695,11 +2763,25 @@
 </message>
 <message>
 <location line="+67"/>
+ <source>Cannot get tinyPy script engine</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Output file not specified</source>
+ <translation type="unfinished"></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>Αδυναμία λήψης της μηχανής σεναρίων tinyPÿ</translation>
+ <translation type="vanished">Αδυναμία λήψης της μηχανής σεναρίων tinyPÿ</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+7"/>
 <source>Cannot add job %s</source>
 <translation>Αδυναμία προσθήκης της διαδικασίας %s</translation>
 </message>
@@ -2735,7 +2817,7 @@
 (πλήθος καναλιών, ρυθμός μπιτιών, μορφή)</translation>
 </message>
 <message>
- <location line="+30"/>
+ <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>
@@ -2747,20 +2829,38 @@
 Να συνεχιστεί, έτσι κι αλλιώς;</translation>
 </message>
 <message>
- <location line="-255"/>
- <location line="+266"/>
+ <location line="-253"/>
+ <location line="+286"/>
 <location line="+26"/>
 <source>Muxer</source>
 <translation>Πολυπλέκτης</translation>
 </message>
 <message>
- <location line="-292"/>
- <location line="+266"/>
+ <location line="-312"/>
+ <location line="+286"/>
 <source>Cannot instantiate muxer</source>
 <translation>Αδυναμία παράστασης του πολυπλέκτη</translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="-28"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+42"/>
 <source>Cannot open </source>
 <translation>Αδυναμία ανοίγματος </translation>
 </message>
@@ -3242,7 +3342,7 @@
 <translation>1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+ <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"/>
@@ -3272,7 +3372,7 @@
 <translation>Αδυναμία σύνθεσης των σκιάσεων</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <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>
@@ -3307,7 +3407,7 @@
 Θα ήθελες να συνιστεί, έτσι κι αλλιώς;</translation>
 </message>
 <message>
- <location filename="../../common/ADM_toolkit/automation.cpp" line="+238"/>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
 <source>Permission Error</source>
 <translation>Σφάλμα Δικαιωμάτων</translation>
 </message>
@@ -3361,7 +3461,7 @@
 <context>
 <name>asciiView</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
 <source>Ascii View</source>
 <translation>Προβολή Ascii</translation>
 </message>
@@ -4032,7 +4132,7 @@
 <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="+90"/>
+ <location line="+87"/>
 <source>Contrast</source>
 <translation>Αντίθεση</translation>
 </message>
@@ -4042,8 +4142,8 @@
 <translation>Προσαρμογή της αντίθεσης, της φωτεινότητας και των χρωμάτων.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
- <location line="+90"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
+ <location line="+87"/>
 <source>Brightness</source>
 <translation>Φωτεινότητα</translation>
 </message>
@@ -4167,7 +4267,7 @@
 <translation>Προειδοποίηση! : Υπερβολικά μεγάλη περιτομή κατά ύψος. Έγινε επαναφορά του ύψους.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
 <source>Size: </source>
 <translation>Μέγεθος: </translation>
 </message>
@@ -6542,7 +6642,7 @@
 <context>
 <name>lavcodec</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
 <source>_Bitrate:</source>
 <translation>Ρυθμός _Μπιτιών:</translation>
 </message>
@@ -6782,12 +6882,12 @@
 <context>
 <name>matroskademuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
 <source>Matroska Images</source>
 <translation>Εικόνες Matroska</translation>
 </message>
 <message>
- <location line="+433"/>
+ <location line="+431"/>
 <source>Matroska clusters</source>
 <translation>Συστάδες Matroska</translation>
 </message>
@@ -6986,7 +7086,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+827"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
 <source>Problem reading SVQ3 headers</source>
 <translation>Πρόβλημα στην ανάγνωση των κεφαλίδων SVQ3</translation>
 </message>
@@ -7010,7 +7110,7 @@
 <translation>Για ήχο, υποστηρίζονται μόνο τα AAC, AC3, E-AC3, και mpegaudio</translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+146"/>
 <source>Saving mp4</source>
 <translation>Αποθηκεύεται το mp4</translation>
 </message>
@@ -7025,9 +7125,28 @@
 <translation>Μορφή Πολυπλεξίματος</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Use alternate MP3 tag</source>
- <translation>Χρήση εναλλακτικών καρτελών MP3</translation>
+ <translation type="vanished">Χρήση εναλλακτικών καρτελών MP3</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>No optimization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Move index to the beginning of the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use fragmentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Optimize for Streaming</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
@@ -7238,12 +7357,12 @@
 <context>
 <name>navigate</name>
 <message>
- <location filename="../../common/gui_navigate.cpp" line="+244"/>
+ <location filename="../../common/gui_navigate.cpp" line="+242"/>
 <source>Cannot go to next keyframe</source>
 <translation>Αδυναμία μετάβασης στο επόμενο κλειδοστιγμιότυπο</translation>
 </message>
 <message>
- <location line="+69"/>
+ <location line="+64"/>
 <source>Cannot go to previous keyframe</source>
 <translation>Αδυναμία μετάβασης στο προηγούμενο κλειδοστιγμιότυπο</translation>
 </message>
@@ -7321,7 +7440,7 @@
 <translation>Παραμορφωμένη κεφαλίδα</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
 <source>Unpacking bitstream</source>
 <translation>Ξεπακετάρεται η ροή των δεδομένων</translation>
 </message>
@@ -7468,15 +7587,13 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+80"/>
 <source>Error</source>
- <translation>Σφάλμα</translation>
+ <translation type="vanished">Σφάλμα</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>This file&apos;s index has been created with an older version of avidemux.
 Please delete the idx2 file and reopen.</source>
- <translation>Τα περιεχόμενα αυτού του φακέλου έχουν δημιουργηθεί με μια παλαιότερη έκδοση του Αβιντεμούξιου.
+ <translation type="vanished">Τα περιεχόμενα αυτού του φακέλου έχουν δημιουργηθεί με μια παλαιότερη έκδοση του Αβιντεμούξιου.
 Παρακαλώ, διέγραψε το αρχείο idx2, και κάνε ξανά άνοιγμα.</translation>
 </message>
 <message>
@@ -7489,27 +7606,33 @@
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>qaudiotracks</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
 <source>Select audio file</source>
 <translation>Επέλεξε αρχείο ήχου</translation>
 </message>
 <message>
 <location line="+22"/>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Error</source>
 <translation>Σφάλμα</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-161"/>
 <source>Cannot use that file as audio track</source>
 <translation>Αδυναμία χρήσης αυτού του αρχείου σαν κανάλι ήχου</translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Some tracks are used multiple times</source>
 <translation>Κάποια κανάλια χρησιμοποιούνται πολλαπλές φορές</translation>
 </message>
@@ -7588,18 +7711,18 @@
 <name>qfile</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+45"/>
- <location line="+141"/>
+ <location line="+142"/>
 <source>All files (*.*)</source>
 <translation>Όλα τα αρχεία (*.*)</translation>
 </message>
 <message>
- <location line="-58"/>
- <location line="+105"/>
+ <location line="-59"/>
+ <location line="+106"/>
 <source> files (*.</source>
 <translation> αρχεία (*.</translation>
 </message>
 <message>
- <location line="-81"/>
+ <location line="-82"/>
 <source>Overwrite file </source>
 <translation>Επανωγραφή του αρχείου </translation>
 </message>
@@ -7622,7 +7745,7 @@
 <translation>Πρόσφατες Εργασίες</translation>
 </message>
 <message>
- <location line="+660"/>
+ <location line="+671"/>
 <source>Play/Stop</source>
 <translation>Αναπαραγωγή ή Σταμάτημα</translation>
 </message>
@@ -7687,7 +7810,7 @@
 <translation>Προς τα εμπρός, κατά ένα λεπτό</translation>
 </message>
 <message>
- <location line="+619"/>
+ <location line="+626"/>
 <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
 <translation>Η εφαρμογή αντιμετώπισε ένα μοιραίο πρόβλημα
@@ -7806,12 +7929,12 @@
 </message>
 <message>
 <location line="+64"/>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Sure!</source>
 <translation>Σίγουρα!</translation>
 </message>
 <message>
- <location line="-14"/>
+ <location line="-15"/>
 <source>Delete job</source>
 <translation>Διαγραφή διαδικασίας</translation>
 </message>
@@ -7821,7 +7944,7 @@
 <translation>Σίγουρα να διαγραφεί η διαδικασία %s ;</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Delete *all* job</source>
 <translation>Διαγραφή *όλων* των διαδικασιών</translation>
 </message>
@@ -7831,7 +7954,7 @@
 <translation>Σίγουρα να διαγραφούν ΟΛΕΣ οι διαδικασίες;</translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Already done</source>
 <translation>Έγινε ήδη</translation>
 </message>
@@ -7852,7 +7975,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+432"/>
 <source>Partial</source>
 <translation>Μερικό</translation>
 </message>
@@ -7905,7 +8028,7 @@
 <context>
 <name>qprocessing</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+65"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
 <source>Unknown</source>
 <translation>Άγνωστο</translation>
 </message>
@@ -8060,7 +8183,7 @@
 <context>
 <name>qtalert</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
 <source>Alert</source>
 <translation>Συναγερμός</translation>
 </message>
@@ -8072,14 +8195,14 @@
 <translation>Πληροφορίες</translation>
 </message>
 <message>
- <location line="+24"/>
- <location line="+30"/>
+ <location line="+26"/>
+ <location line="+31"/>
 <source>Confirmation</source>
 <translation>Επιβεβαίωση</translation>
 </message>
 <message>
- <location line="+19"/>
- <location line="+30"/>
+ <location line="+21"/>
+ <location line="+33"/>
 <source>Question</source>
 <translation>Ερώτηση</translation>
 </message>
@@ -8956,21 +9079,19 @@
 <context>
 <name>tsdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
 <source>Error</source>
- <translation>Σφάλμα</translation>
+ <translation type="vanished">Σφάλμα</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>This file&apos;s index has been created with an older version of avidemux.
 Please delete the idx2 file and reopen.</source>
- <translation>Τα περιεχόμενα αυτού του φακέλου έχουν δημιουργηθεί με μια παλαιότερη έκδοση του Αβιντεμούξιου.
+ <translation type="vanished">Τα περιεχόμενα αυτού του φακέλου έχουν δημιουργηθεί με μια παλαιότερη έκδοση του Αβιντεμούξιου.
 Παρακαλώ, διέγραψε το αρχείο idx2, και κάνε ξανά άνοιγμα.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+188"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+327"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
+ <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>Υπάρχουν αρκετά αρχεία με συνεχόμενες ονομασίες. Να φορτωθούν όλα μαζί;</translation>
 </message>
@@ -8982,6 +9103,12 @@
 <source>Indexing</source>
 <translation>Δημιουργία ευρετηρίου</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>twolame</name>
@@ -9353,12 +9480,12 @@
 <translation>κανένα</translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation>Προσαρμοσμένο</translation>
 </message>
 <message>
- <location line="+411"/>
+ <location line="+412"/>
 <source>Target Bitrate:</source>
 <translation>Ρυθμός Μπιτιών Προορισμού:</translation>
 </message>
@@ -9415,13 +9542,13 @@
 </message>
 <message>
 <location line="+61"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation>Σφάλμα</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation>Αδυναμία φορτώματος της προρύθμισης</translation>
 </message>
@@ -9431,12 +9558,11 @@
 <translation>Αποθήκευση του Προφίλ</translation>
 </message>
 <message>
- <location line="+11"/>
 <source>my profile</source>
- <translation>το προφίλ μου</translation>
+ <translation type="vanished">το προφίλ μου</translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation>Επανωγραφή</translation>
 </message>
@@ -10698,12 +10824,12 @@
 <translation>κανένα</translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation>Προσαρμοσμένο</translation>
 </message>
 <message>
- <location line="+361"/>
+ <location line="+362"/>
 <source>Target Bitrate:</source>
 <translation>Ρυθμός Μπιτιών Προορισμού:</translation>
 </message>
@@ -10760,13 +10886,13 @@
 </message>
 <message>
 <location line="+41"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation>Σφάλμα</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation>Αδυναμία φορτώματος της προρύθμισης</translation>
 </message>
@@ -10776,7 +10902,7 @@
 <translation>Αποθήκευση του Προφίλ</translation>
 </message>
 <message>
- <location line="+45"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation>Επανωγραφή</translation>
 </message>
@@ -12108,7 +12234,7 @@
 <context>
 <name>yadif</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
 <source>Yadif</source>
 <translation>Yadif</translation>
 </message>
@@ -12118,47 +12244,78 @@
 <translation>Yadif, προσαρμογή της έκδοσης avisynth (c) Fizick.</translation>
 </message>
 <message>
- <location line="+53"/>
 <source>Temporal &amp; spatial check</source>
- <translation>Χρονικός κ΄ χωρικός έλεγχος</translation>
+ <translation type="vanished">Χρονικός κ΄ χωρικός έλεγχος</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, temporal &amp; spatial check</source>
- <translation>Bob, χρονικός κ&apos; χωρικός έλεγχος</translation>
+ <translation type="vanished">Bob, χρονικός κ&apos; χωρικός έλεγχος</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Skip spatial temporal check</source>
- <translation>Παράβλεψη χωρικού χρονικού ελέγχου</translation>
+ <translation type="vanished">Παράβλεψη χωρικού χρονικού ελέγχου</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, skip spatial temporal check</source>
- <translation>Bob, παράληψη χωρικού κ&apos; χρονικού ελέγχου</translation>
+ <translation type="vanished">Bob, παράληψη χωρικού κ&apos; χρονικού ελέγχου</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+75"/>
 <source>Bottom field first</source>
 <translation>Πρώτα το κάτω πεδίο</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="-1"/>
 <source>Top field first</source>
 <translation>Πρώτα το επάνω πεδίο</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="-7"/>
+ <source>Frame : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Deint all</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Deint interlaced</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
 <source>_Mode:</source>
 <translation>_Κατάσταση Λειτουργίας:</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>_Deint:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>_Order:</source>
 <translation>_Ταξινόμηση:</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+3"/>
 <source>yadif</source>
 <translation>yadif</translation>
 </message>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_en.ts -> avidemux_2.7.4.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="+196"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+194"/>
 <source>Cannot find a demuxer for %s</source>
 <translation type="unfinished"></translation>
 </message>
@@ -56,7 +56,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="+43"/>
 <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>
@@ -1050,7 +1050,7 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+34"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+36"/>
 <source>Open</source>
 <translation>&amp;Open...</translation>
 </message>
@@ -1066,8 +1066,6 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+659"/>
- <location line="+10"/>
 <source>Queue</source>
 <translation>Qu&amp;eue</translation>
 </message>
@@ -1298,7 +1296,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+366"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+381"/>
 <source>Stereo</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1454,7 +1452,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
 <source>CPU</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1500,12 +1498,12 @@
 </message>
 <message>
 <location line="+23"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-43"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-46"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="-612"/>
+ <location filename="../../common/gui_save.cpp" line="+57"/>
 <location line="+10"/>
- <location line="+278"/>
+ <location line="+277"/>
 <location line="+19"/>
 <location line="+7"/>
 <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1610,42 +1608,47 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-170"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+6"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Decode video using XVBA (AMD)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
 <source>Decode video using LIBVA (INTEL)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>Decode video using VideoToolbox (macOS)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+9"/>
 <source>Enable openGl support</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="-9"/>
+ <source>Ignore driver blacklist (Intel)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1778,21 +1781,26 @@
 </message>
 <message>
 <location line="+5"/>
- <source>_Use alternative tag for MP3 in .mp4</source>
+ <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Default to the directory of the last read file for saving</source>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Caching of decoded pictures</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <source>_Cache size:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+6"/>
 <source>XVideo (best)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1807,7 +1815,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+3"/>
 <source>OpenGL (best)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1951,6 +1959,7 @@
 <message>
 <location line="+4"/>
 <location line="+3"/>
+ <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1970,7 +1979,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+7"/>
+ <location line="+3"/>
 <source>Preferences</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1985,14 +1995,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <location line="+2"/>
- <location line="+2"/>
- <source>-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-1"/>
+ <location line="+6"/>
 <source>Connect to avsproxy</source>
 <translation type="unfinished">Connect &amp;to avsproxy</translation>
 </message>
@@ -2057,18 +2060,21 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
 <location line="+44"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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="+1476"/>
+ <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="+189"/>
+ <location filename="../../common/gui_save.cpp" line="+199"/>
+ <location line="+99"/>
+ <location line="+7"/>
+ <location line="+20"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation type="unfinished"></translation>
@@ -2105,7 +2111,7 @@
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="+48"/>
- <location filename="../../common/gui_save.cpp" line="-503"/>
+ <location filename="../../common/gui_save.cpp" line="-638"/>
 <source>No audio track</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2164,7 +2170,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1382"/>
+ <location filename="../../common/gui_main.cpp" line="-1449"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2189,7 +2195,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+117"/>
+ <location line="+116"/>
 <source>Not coded in this version</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2215,14 +2221,33 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+114"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+55"/>
+ <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 type="unfinished"></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>
+ </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>
+ </message>
+ <message>
+ <location line="+60"/>
 <source>Are you sure?</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2253,21 +2278,52 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+8"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+103"/>
 <source>Permission error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2319,19 +2375,19 @@
 </message>
 <message>
 <location line="+5"/>
- <location line="+320"/>
+ <location line="+321"/>
 <source>Something bad happened (II)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-199"/>
+ <location line="-202"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <location line="+103"/>
 <source>Checking video</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2424,7 +2480,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+35"/>
 <source>Frame type:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2439,7 +2495,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+110"/>
+ <location line="+111"/>
 <source>Oops</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2449,7 +2505,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+446"/>
+ <location filename="../../common/gui_play.cpp" line="+442"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2530,7 +2586,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+96"/>
+ <location line="+95"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -2556,7 +2612,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+87"/>
 <source>Saving selection as set of JPEG images</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2586,18 +2642,33 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-34"/>
+ <location line="+67"/>
+ <source>Cannot get tinyPy script engine</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Output file not specified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Job script %s already exists. Overwrite?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-121"/>
 <location line="+83"/>
 <source>Done</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-574"/>
+ <location line="-583"/>
 <source>Audio encoder index out of bounds</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+491"/>
+ <location line="+500"/>
 <source>Saved %d images.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2627,12 +2698,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
- <source>Cannot get tinyPÿ script engine</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
+ <location line="+41"/>
 <source>Cannot add job %s</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2672,27 +2738,45 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+30"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="-255"/>
- <location line="+266"/>
+ <location line="-253"/>
+ <location line="+286"/>
 <location line="+26"/>
 <source>Muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-292"/>
- <location line="+266"/>
+ <location line="-312"/>
+ <location line="+286"/>
 <source>Cannot instantiate muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="-28"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+42"/>
 <source>Cannot open </source>
 <translation type="unfinished"></translation>
 </message>
@@ -3087,7 +3171,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+165"/>
+ <location line="+164"/>
 <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>
@@ -3189,7 +3273,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+ <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"/>
@@ -3218,7 +3302,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <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>
@@ -3242,7 +3326,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_toolkit/automation.cpp" line="+238"/>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
 <source>Permission Error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3291,7 +3375,7 @@
 <context>
 <name>asciiView</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
 <source>Ascii View</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3958,7 +4042,7 @@
 <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="+90"/>
+ <location line="+87"/>
 <source>Contrast</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3968,8 +4052,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
- <location line="+90"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
+ <location line="+87"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4091,7 +4175,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
 <source>Size: </source>
 <translation type="unfinished"></translation>
 </message>
@@ -6461,7 +6545,7 @@
 <context>
 <name>lavcodec</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
 <source>_Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6701,12 +6785,12 @@
 <context>
 <name>matroskademuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
 <source>Matroska Images</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+433"/>
+ <location line="+431"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6905,7 +6989,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+827"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6929,7 +7013,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+146"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6944,8 +7028,23 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+2"/>
+ <source>No optimization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+1"/>
- <source>Use alternate MP3 tag</source>
+ <source>Move index to the beginning of the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use fragmentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Optimize for Streaming</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -7156,12 +7255,12 @@
 <context>
 <name>navigate</name>
 <message>
- <location filename="../../common/gui_navigate.cpp" line="+244"/>
+ <location filename="../../common/gui_navigate.cpp" line="+242"/>
 <source>Cannot go to next keyframe</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+69"/>
+ <location line="+64"/>
 <source>Cannot go to previous keyframe</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7239,7 +7338,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
 <source>Unpacking bitstream</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7386,17 +7485,6 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+80"/>
- <source>Error</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <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="unfinished"></translation>
- </message>
- <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
 <source>Indexing</source>
 <translation type="unfinished"></translation>
@@ -7406,27 +7494,33 @@
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>qaudiotracks</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
 <source>Select audio file</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+22"/>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Error</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-161"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7505,18 +7599,18 @@
 <name>qfile</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+45"/>
- <location line="+141"/>
+ <location line="+142"/>
 <source>All files (*.*)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-58"/>
- <location line="+105"/>
+ <location line="-59"/>
+ <location line="+106"/>
 <source> files (*.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-81"/>
+ <location line="-82"/>
 <source>Overwrite file </source>
 <translation type="unfinished"></translation>
 </message>
@@ -7539,7 +7633,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+660"/>
+ <location line="+671"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7604,7 +7698,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+619"/>
+ <location line="+626"/>
 <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>
@@ -7722,12 +7816,12 @@
 </message>
 <message>
 <location line="+64"/>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Sure!</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-14"/>
+ <location line="-15"/>
 <source>Delete job</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7737,7 +7831,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Delete *all* job</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7747,7 +7841,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Already done</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7768,7 +7862,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+432"/>
 <source>Partial</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7821,7 +7915,7 @@
 <context>
 <name>qprocessing</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+65"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
 <source>Unknown</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7975,7 +8069,7 @@
 <context>
 <name>qtalert</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
 <source>Alert</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7987,14 +8081,14 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
- <location line="+30"/>
+ <location line="+26"/>
+ <location line="+31"/>
 <source>Confirmation</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+19"/>
- <location line="+30"/>
+ <location line="+21"/>
+ <location line="+33"/>
 <source>Question</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8871,20 +8965,9 @@
 <context>
 <name>tsdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
- <source>Error</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <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="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+188"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+327"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
+ <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 type="unfinished"></translation>
 </message>
@@ -8896,6 +8979,12 @@
 <source>Indexing</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>twolame</name>
@@ -9265,12 +9354,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+411"/>
+ <location line="+412"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9321,13 +9410,13 @@
 </message>
 <message>
 <location line="+61"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9337,12 +9426,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
- <source>my profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+34"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10603,12 +10687,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+361"/>
+ <location line="+362"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10659,13 +10743,13 @@
 </message>
 <message>
 <location line="+41"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10675,7 +10759,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+45"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12006,7 +12090,7 @@
 <context>
 <name>yadif</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
 <source>Yadif</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12016,47 +12100,62 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+53"/>
- <source>Temporal &amp; spatial check</source>
+ <location line="+75"/>
+ <source>Bottom field first</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Top field first</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>Frame : Temporal &amp; spatial check</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Bob, temporal &amp; spatial check</source>
+ <source>Field : Temporal &amp; spatial check</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Skip spatial temporal check</source>
+ <source>Frame : Skip spatial temporal check</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Bob, skip spatial temporal check</source>
+ <source>Field : Skip spatial temporal check</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Bottom field first</source>
+ <location line="+9"/>
+ <source>Deint all</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Top field first</source>
+ <source>Deint interlaced</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+5"/>
 <source>_Mode:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>_Deint:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>_Order:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+3"/>
 <source>yadif</source>
 <translation type="unfinished"></translation>
 </message>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_es.ts -> avidemux_2.7.4.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="+232"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
 <source>Attempt to open %s failed!</source>
 <translation>¡Error al intentar abrir %s!</translation>
 </message>
@@ -58,7 +58,7 @@
 <translation>Comprobando si las marcas de tiempo son válidas..</translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="+43"/>
 <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>
@@ -1058,11 +1058,21 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation>Decodificar vídeos usando DXVA2 (windows)</translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Ignore driver blacklist (Intel)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation>Permitir frecuencias de _audio no estándar para DVD</translation>
@@ -1190,12 +1200,11 @@
 <translation>Priorización</translation>
 </message>
 <message>
- <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
- <translation>_Usar una etiqueta alternativa para MP3 en .mp4</translation>
+ <translation type="vanished">_Usar una etiqueta alternativa para MP3 en .mp4</translation>
 </message>
 <message>
- <location line="+1"/>
+ <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>
@@ -1205,7 +1214,7 @@
 <translation>_Sanear las marcas de tiempo de decodificación (DTS) en modo de copia</translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+9"/>
 <source>XVideo (best)</source>
 <translation>XVideo (mejor)</translation>
 </message>
@@ -1215,7 +1224,7 @@
 <translation></translation>
 </message>
 <message>
- <location line="+15"/>
+ <location line="+11"/>
 <source>SDL (good)</source>
 <translation>SDL (bueno)</translation>
 </message>
@@ -1340,7 +1349,7 @@
 <location line="+5"/>
 <location filename="../../common/gui_save.cpp" line="+57"/>
 <location line="+10"/>
- <location line="+278"/>
+ <location line="+277"/>
 <location line="+19"/>
 <location line="+7"/>
 <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1357,7 +1366,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
 <source>CPU</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1367,12 +1376,13 @@
 <translation>Subprocesos</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+82"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+84"/>
 <source>Pr&amp;eferences</source>
 <translation>Pr&amp;eferencias</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+14"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+11"/>
+ <location line="+3"/>
 <source>Preferences</source>
 <translation>Preferencias</translation>
 </message>
@@ -1393,8 +1403,6 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+288"/>
- <location line="+10"/>
 <source>Queue</source>
 <translation>Cola</translation>
 </message>
@@ -1429,14 +1437,7 @@
 <translation>Cerrar</translation>
 </message>
 <message>
- <location line="+1"/>
 <location line="+2"/>
- <location line="+2"/>
- <source>-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-3"/>
 <source>Information</source>
 <translation>Información</translation>
 </message>
@@ -1826,23 +1827,23 @@
 <translation>Guardar tarea</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-285"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-283"/>
 <source>Enable openGl support</source>
 <translation>Activar el soporte para openGL</translation>
 </message>
 <message>
- <location line="+74"/>
+ <location line="+73"/>
 <source>VDPAU (best)</source>
 <translation>VDPAU (mejor)</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+6"/>
 <source>OpenGL (best)</source>
 <translation>OpenGL (mejor)</translation>
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="+48"/>
- <location filename="../../common/gui_save.cpp" line="-612"/>
+ <location filename="../../common/gui_save.cpp" line="-313"/>
 <source>No audio track</source>
 <translation>No hay pistas de audio</translation>
 </message>
@@ -1899,17 +1900,36 @@
 Se necesita para crear vídeos compatibles con PSP.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+189"/>
+ <location filename="../../common/gui_main.cpp" line="+186"/>
 <source>Select script to save</source>
 <translation>Seleccionar script a guardar</translation>
 </message>
 <message>
- <location line="+184"/>
+ <location line="+183"/>
 <source>Not coded in this version</source>
 <translation>Sin codificar en esta versión</translation>
 </message>
 <message>
- <location line="+251"/>
+ <location line="+209"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+60"/>
 <source>Are you sure?</source>
 <translation>¿Está seguro?</translation>
 </message>
@@ -1929,7 +1949,7 @@
 <translation>Es imposible borrar el vídeo entero. Vuelva a comprobar los marcadores de posición A y B.</translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+30"/>
 <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>
@@ -1938,7 +1958,7 @@
 ¿Proceder de todas formas?</translation>
 </message>
 <message>
- <location line="+5"/>
+ <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>
@@ -1947,7 +1967,38 @@
 ¿Proceder de todas formas?</translation>
 </message>
 <message>
- <location line="+100"/>
+ <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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+103"/>
 <source>Permission error</source>
 <translation>Error de permisos</translation>
 </message>
@@ -2000,12 +2051,12 @@
 </message>
 <message>
 <location line="+5"/>
- <location line="+320"/>
+ <location line="+321"/>
 <source>Something bad happened (II)</source>
 <translation>Algo malo ha sucedido (II)</translation>
 </message>
 <message>
- <location line="-199"/>
+ <location line="-202"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
@@ -2013,7 +2064,7 @@
 Espere problemas.</translation>
 </message>
 <message>
- <location line="+100"/>
+ <location line="+103"/>
 <source>Checking video</source>
 <translation>Comprobando el vídeo</translation>
 </message>
@@ -2076,7 +2127,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+35"/>
 <source>Frame type:</source>
 <translation>Tipo de fotograma:</translation>
 </message>
@@ -2167,7 +2218,7 @@
 <translation>Guardando audio</translation>
 </message>
 <message>
- <location line="+309"/>
+ <location line="+318"/>
 <location line="+83"/>
 <source>Done</source>
 <translation>Hecho</translation>
@@ -2178,24 +2229,27 @@
 <translation>Guardadas %d imágenes.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
 <location line="+44"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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="-249"/>
+ <location filename="../../common/gui_main.cpp" line="-250"/>
 <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="+7"/>
+ <location line="+20"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation>Error</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+61"/>
+ <location filename="../../common/gui_save.cpp" line="-65"/>
 <source>BMP op failed</source>
 <translation>Error en la operación BMP</translation>
 </message>
@@ -2395,7 +2449,7 @@
 <translation>Guardando</translation>
 </message>
 <message>
- <location line="+165"/>
+ <location line="+164"/>
 <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>
@@ -2500,14 +2554,13 @@
 <translation>Información de complementos</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-90"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-86"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation>Decodificar vídeos usando VDPAU (NVIDIA)</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Decode video using XVBA (AMD)</source>
- <translation>Decodificar vídeos usando XVBA (AMD)</translation>
+ <translation type="vanished">Decodificar vídeos usando XVBA (AMD)</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -2515,22 +2568,32 @@
 <translation>Decodificar vídeos usando LIBVA (INTEL)</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>Decode video using VideoToolbox (macOS)</source>
 <translation>Decodificar vídeos usando VideoToolbox (macOS)</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+6"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation>Si utiliza la decodificación hardware, es mejor utilizar el controlador de pantalla correspondiente</translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+8"/>
 <source>_Check for new release</source>
 <translation>_Comprobar si hay versiones nuevas</translation>
 </message>
 <message>
- <location line="+78"/>
+ <location line="+58"/>
+ <source>Caching of decoded pictures</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Cache size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
 <source>LIBVA (best)</source>
 <translation>LIBVA (mejor)</translation>
 </message>
@@ -2578,6 +2641,7 @@
 <message>
 <location line="+4"/>
 <location line="+3"/>
+ <location line="+3"/>
 <source>HW Accel</source>
 <translation>Aceleración hardware</translation>
 </message>
@@ -2646,7 +2710,7 @@
 <translation>No se puede seleccionar el códec MPEG-4 SP.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1382"/>
+ <location filename="../../common/gui_main.cpp" line="-1449"/>
 <source>Select script/project to run</source>
 <translation>Seleccionar script/proyecto a ejecutar</translation>
 </message>
@@ -2666,7 +2730,7 @@
 <translation>Está a punto de vaciar la lista de archivos y proyectos recientes. Esto no se puede deshacer. ¿Procecer?</translation>
 </message>
 <message>
- <location line="+128"/>
+ <location line="+127"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation>Seleccionar archivo de vídeo...</translation>
@@ -2687,7 +2751,7 @@
 <translation>Seleccionar archivo de vídeo a anexar...</translation>
 </message>
 <message>
- <location line="+114"/>
+ <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>
@@ -2696,7 +2760,7 @@
 ¿Proceder de todas formas?</translation>
 </message>
 <message>
- <location line="+102"/>
+ <location line="+124"/>
 <location line="+21"/>
 <source>Cutting</source>
 <translation>Cortando</translation>
@@ -2707,7 +2771,7 @@
 <translation>Error al cortar.</translation>
 </message>
 <message>
- <location line="+757"/>
+ <location line="+795"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation>Se ha dado un índice de audio no válido</translation>
@@ -2738,7 +2802,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="+295"/>
+ <location line="+297"/>
 <source>Oops</source>
 <translation>Huy</translation>
 </message>
@@ -2748,12 +2812,12 @@
 <translation>Esta función esta deshabilitada o ya no es válida</translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+446"/>
+ <location filename="../../common/gui_play.cpp" line="+442"/>
 <source>Trouble initializing audio device</source>
 <translation>Problemas al inicializar el dispositivo de audio</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-578"/>
+ <location filename="../../common/gui_save.cpp" line="-587"/>
 <source>Audio encoder index out of bounds</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2778,7 +2842,7 @@
 <translation>No se puede acceder a la base de datos. ¿Tiene el control de tareas en ejecución?</translation>
 </message>
 <message>
- <location line="+228"/>
+ <location line="+227"/>
 <source>Function not implemented
 </source>
 <translation>Función no implementada
@@ -2805,7 +2869,7 @@
 <translation>Error al guardar como JPEG</translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+87"/>
 <source>Saving selection as set of JPEG images</source>
 <translation>Guardando la selección como un conjunto de imágenes JPEG</translation>
 </message>
@@ -2836,11 +2900,25 @@
 </message>
 <message>
 <location line="+67"/>
+ <source>Cannot get tinyPy script engine</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Output file not specified</source>
+ <translation type="unfinished"></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>No se puede obtener el motor de script tinyPÿ</translation>
+ <translation type="vanished">No se puede obtener el motor de script tinyPÿ</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+7"/>
 <source>Cannot add job %s</source>
 <translation>No se puede añadir la tarea %s</translation>
 </message>
@@ -2873,7 +2951,7 @@
 <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>
 <message>
- <location line="+30"/>
+ <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>
@@ -2882,20 +2960,38 @@
 ¿Quiere continuar de todas formas?</translation>
 </message>
 <message>
- <location line="-255"/>
- <location line="+266"/>
+ <location line="-253"/>
+ <location line="+286"/>
 <location line="+26"/>
 <source>Muxer</source>
 <translation>Multiplexor</translation>
 </message>
 <message>
- <location line="-292"/>
- <location line="+266"/>
+ <location line="-312"/>
+ <location line="+286"/>
 <source>Cannot instantiate muxer</source>
 <translation>No se puede instanciar el multiplexor</translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="-28"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+42"/>
 <source>Cannot open </source>
 <translation>No se puede abrir </translation>
 </message>
@@ -3225,7 +3321,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+ <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"/>
@@ -3255,7 +3351,7 @@
 <translation>No se puede compilar el sombreador</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <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>
@@ -3283,7 +3379,7 @@
 <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="+238"/>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
 <source>Permission Error</source>
 <translation>Error de permisos</translation>
 </message>
@@ -3332,7 +3428,7 @@
 <context>
 <name>asciiView</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
 <source>Ascii View</source>
 <translation>Vista Ascii</translation>
 </message>
@@ -4007,13 +4103,13 @@
 <message>
 <location line="-1"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
- <location line="+90"/>
+ <location line="+87"/>
 <source>Contrast</source>
 <translation>Contraste</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
- <location line="+90"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
+ <location line="+87"/>
 <source>Brightness</source>
 <translation>Brillo</translation>
 </message>
@@ -4139,7 +4235,7 @@
 </translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
 <source>Size: </source>
 <translation>Tamaño: </translation>
 </message>
@@ -6521,7 +6617,7 @@
 <context>
 <name>lavcodec</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
 <source>_Bitrate:</source>
 <translation>Tasa de _bits:</translation>
 </message>
@@ -6761,12 +6857,12 @@
 <context>
 <name>matroskademuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
 <source>Matroska Images</source>
 <translation>Imágenes Matroska</translation>
 </message>
 <message>
- <location line="+433"/>
+ <location line="+431"/>
 <source>Matroska clusters</source>
 <translation>Clústeres Matroska</translation>
 </message>
@@ -6965,7 +7061,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+827"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
 <source>Problem reading SVQ3 headers</source>
 <translation>Ha habido un problema leyendo las cabeceras SVQ3</translation>
 </message>
@@ -6989,7 +7085,7 @@
 <translation>Solo se admiten AAC, AC3, E-AC3 y mpegaudio para el audio</translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+146"/>
 <source>Saving mp4</source>
 <translation>Guardando mp4</translation>
 </message>
@@ -7004,9 +7100,28 @@
 <translation>Formato de multiplexado</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Use alternate MP3 tag</source>
- <translation>_Usar etiqueta alternativa para MP3</translation>
+ <translation type="vanished">_Usar etiqueta alternativa para MP3</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>No optimization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Move index to the beginning of the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use fragmentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Optimize for Streaming</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
@@ -7217,12 +7332,12 @@
 <context>
 <name>navigate</name>
 <message>
- <location filename="../../common/gui_navigate.cpp" line="+244"/>
+ <location filename="../../common/gui_navigate.cpp" line="+242"/>
 <source>Cannot go to next keyframe</source>
 <translation>No se puede ir al fotograma siguiente</translation>
 </message>
 <message>
- <location line="+69"/>
+ <location line="+64"/>
 <source>Cannot go to previous keyframe</source>
 <translation>No se puede ir al fotograma anterior</translation>
 </message>
@@ -7300,7 +7415,7 @@
 <translation>Cabecera mal formada</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
 <source>Unpacking bitstream</source>
 <translation>Desempaquetando flujo de bits</translation>
 </message>
@@ -7447,15 +7562,13 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+80"/>
 <source>Error</source>
- <translation>Error</translation>
+ <translation type="vanished">Error</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>This file&apos;s index has been created with an older version of avidemux.
 Please delete the idx2 file and reopen.</source>
- <translation>El archivo de índices fue creado con una versión antigua de avidemux.
+ <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>
@@ -7468,27 +7581,33 @@
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>qaudiotracks</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
 <source>Select audio file</source>
 <translation>Seleccionar archivo de audio</translation>
 </message>
 <message>
 <location line="+22"/>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Error</source>
 <translation>Error</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-161"/>
 <source>Cannot use that file as audio track</source>
 <translation>No se puede usar ese archivo como pista de audio</translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Some tracks are used multiple times</source>
 <translation>Algunas pistas se usan varias veces</translation>
 </message>
@@ -7567,18 +7686,18 @@
 <name>qfile</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+45"/>
- <location line="+141"/>
+ <location line="+142"/>
 <source>All files (*.*)</source>
 <translation>Todos los archivos (*.*)</translation>
 </message>
 <message>
- <location line="-58"/>
- <location line="+105"/>
+ <location line="-59"/>
+ <location line="+106"/>
 <source> files (*.</source>
 <translation> archivos (*.</translation>
 </message>
 <message>
- <location line="-81"/>
+ <location line="-82"/>
 <source>Overwrite file </source>
 <translation>Sobrescribir el archivo </translation>
 </message>
@@ -7601,7 +7720,7 @@
 <translation>Proyectos recientes</translation>
 </message>
 <message>
- <location line="+660"/>
+ <location line="+671"/>
 <source>Play/Stop</source>
 <translation>Reproducir/Detener</translation>
 </message>
@@ -7666,7 +7785,7 @@
 <translation>Avanzar un minuto</translation>
 </message>
 <message>
- <location line="+619"/>
+ <location line="+626"/>
 <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.
@@ -7785,12 +7904,12 @@
 </message>
 <message>
 <location line="+64"/>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Sure!</source>
 <translation>¡Seguro!</translation>
 </message>
 <message>
- <location line="-14"/>
+ <location line="-15"/>
 <source>Delete job</source>
 <translation>Borrar tarea</translation>
 </message>
@@ -7800,7 +7919,7 @@
 <translation>¿Seguro que quiere borrar %s tareas?</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Delete *all* job</source>
 <translation>Borrar *todas* las tareas</translation>
 </message>
@@ -7810,7 +7929,7 @@
 <translation>¿Seguro que quiere borrar TODAS las tareas?</translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Already done</source>
 <translation>Ya está hecho</translation>
 </message>
@@ -7831,7 +7950,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+432"/>
 <source>Partial</source>
 <translation>Parcial</translation>
 </message>
@@ -7884,7 +8003,7 @@
 <context>
 <name>qprocessing</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+65"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
 <source>Unknown</source>
 <translation>Desconocido</translation>
 </message>
@@ -8041,7 +8160,7 @@
 <context>
 <name>qtalert</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
 <source>Alert</source>
 <translation>Alerta</translation>
 </message>
@@ -8053,14 +8172,14 @@
 <translation>Información</translation>
 </message>
 <message>
- <location line="+24"/>
- <location line="+30"/>
+ <location line="+26"/>
+ <location line="+31"/>
 <source>Confirmation</source>
 <translation>Confirmación</translation>
 </message>
 <message>
- <location line="+19"/>
- <location line="+30"/>
+ <location line="+21"/>
+ <location line="+33"/>
 <source>Question</source>
 <translation>Pregunta</translation>
 </message>
@@ -8938,21 +9057,19 @@
 <context>
 <name>tsdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
 <source>Error</source>
- <translation>Error</translation>
+ <translation type="vanished">Error</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>This file&apos;s index has been created with an older version of avidemux.
 Please delete the idx2 file and reopen.</source>
- <translation>El archivo de índices fue creado con una versión antigua de avidemux.
+ <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="+188"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+327"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
+ <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>Hay varios archivos con nombres de archivo secuenciales. ¿Debería cargarlos todos?</translation>
 </message>
@@ -8964,6 +9081,12 @@
 <source>Indexing</source>
 <translation>Indexando</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>twolame</name>
@@ -9336,12 +9459,12 @@
 <translation>ninguno</translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation>Personalizado</translation>
 </message>
 <message>
- <location line="+411"/>
+ <location line="+412"/>
 <source>Target Bitrate:</source>
 <translation>Tasa de bits objetivo:</translation>
 </message>
@@ -9396,13 +9519,13 @@
 </message>
 <message>
 <location line="+61"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation>Error</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation>No se puede cargar el preajuste</translation>
 </message>
@@ -9412,12 +9535,11 @@
 <translation>Guardar perfil</translation>
 </message>
 <message>
- <location line="+11"/>
 <source>my profile</source>
- <translation>mi perfil</translation>
+ <translation type="vanished">mi perfil</translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation>Sobrescribir</translation>
 </message>
@@ -10680,12 +10802,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation>Personalizado</translation>
 </message>
 <message>
- <location line="+361"/>
+ <location line="+362"/>
 <source>Target Bitrate:</source>
 <translation>Tasa de bits objetivo:</translation>
 </message>
@@ -10740,13 +10862,13 @@
 </message>
 <message>
 <location line="+41"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation>Error</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation>No se puede cargar el preajuste</translation>
 </message>
@@ -10756,7 +10878,7 @@
 <translation>Guardar perfil</translation>
 </message>
 <message>
- <location line="+45"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation>Sobrescribir</translation>
 </message>
@@ -12088,7 +12210,7 @@
 <context>
 <name>yadif</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
 <source>Yadif</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12098,47 +12220,78 @@
 <translation>Yadif, adaptado de la versión de avisynth (c) Fizick.</translation>
 </message>
 <message>
- <location line="+53"/>
 <source>Temporal &amp; spatial check</source>
- <translation>Comprobación temporal y espacial</translation>
+ <translation type="vanished">Comprobación temporal y espacial</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, temporal &amp; spatial check</source>
- <translation>Bob, comprobación temporal y espacial</translation>
+ <translation type="vanished">Bob, comprobación temporal y espacial</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Skip spatial temporal check</source>
- <translation>Omitir la comprobación espacio-temporal</translation>
+ <translation type="vanished">Omitir la comprobación espacio-temporal</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, skip spatial temporal check</source>
- <translation>Bob, omitir la comprobación espacio-temporal</translation>
+ <translation type="vanished">Bob, omitir la comprobación espacio-temporal</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+75"/>
 <source>Bottom field first</source>
 <translation>Campo inferior primero</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="-1"/>
 <source>Top field first</source>
 <translation>Campo superior primero</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="-7"/>
+ <source>Frame : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Deint all</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Deint interlaced</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
 <source>_Mode:</source>
 <translation>_Modo:</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>_Deint:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>_Order:</source>
 <translation>_Orden:</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+3"/>
 <source>yadif</source>
 <translation type="unfinished"></translation>
 </message>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_eu.ts -> avidemux_2.7.4.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="+196"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+194"/>
 <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="+85"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+102"/>
 <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="-172"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-189"/>
 <source>Checking if timestamps are valid..</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1099,7 +1099,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+366"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+381"/>
 <source>Stereo</source>
 <translation>Estereoa</translation>
 </message>
@@ -1250,7 +1250,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
 <source>CPU</source>
 <translation>CPU</translation>
 </message>
@@ -1296,12 +1296,12 @@
 </message>
 <message>
 <location line="+23"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-43"/>
+ <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="+278"/>
+ <location line="+277"/>
 <location line="+19"/>
 <location line="+7"/>
 <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1406,17 +1406,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-170"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+1"/>
+ <source>Ignore driver blacklist (Intel)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
 <source>Enable openGl support</source>
 <translation>Gaitu openGl sostengua</translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+1"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation>_Onartu audio maiztasun ez-estandarra DVD-rako</translation>
 </message>
@@ -1543,16 +1553,25 @@
 <translation>Lehentasunpena</translation>
 </message>
 <message>
- <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
- <translation>_Erabili aukerazko etiketak MP3-rako .mp4-an</translation>
+ <translation type="vanished">_Erabili aukerazko etiketak MP3-rako .mp4-an</translation>
 </message>
 <message>
- <location line="+1"/>
+ <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"/>
+ <source>Caching of decoded pictures</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Cache size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+6"/>
 <source>XVideo (best)</source>
 <translation>XVideo (hoberena)</translation>
@@ -1568,7 +1587,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+3"/>
 <source>OpenGL (best)</source>
 <translation>OpenGL (hoberena)</translation>
 </message>
@@ -1677,17 +1696,18 @@
 <translation>Bideoa</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+53"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+56"/>
 <source>Threading</source>
 <translation>Hariak</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+11"/>
+ <location line="+3"/>
 <source>Preferences</source>
 <translation>Hobespenak</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+34"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+36"/>
 <source>Open</source>
 <translation>Ireki</translation>
 </message>
@@ -1703,8 +1723,6 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+288"/>
- <location line="+10"/>
 <source>Queue</source>
 <translation>Lerrokatu</translation>
 </message>
@@ -1739,14 +1757,11 @@
 <translation>Itxi</translation>
 </message>
 <message>
- <location line="+1"/>
- <location line="+2"/>
- <location line="+2"/>
 <source>-</source>
- <translation>-</translation>
+ <translation type="vanished">-</translation>
 </message>
 <message>
- <location line="-3"/>
+ <location line="+2"/>
 <source>Information</source>
 <translation>Argibideak</translation>
 </message>
@@ -1965,7 +1980,7 @@
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="+48"/>
- <location filename="../../common/gui_save.cpp" line="-612"/>
+ <location filename="../../common/gui_save.cpp" line="-313"/>
 <source>No audio track</source>
 <translation>Audio biderik ez</translation>
 </message>
@@ -2022,17 +2037,36 @@
 Hau beharrezkoa da PSP bateragarri bideoa sortzeko.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+189"/>
+ <location filename="../../common/gui_main.cpp" line="+186"/>
 <source>Select script to save</source>
 <translation>Hautatu gordetzeko eskripta</translation>
 </message>
 <message>
- <location line="+184"/>
+ <location line="+183"/>
 <source>Not coded in this version</source>
 <translation>Kodeatu gabe bertsio honetan</translation>
 </message>
 <message>
- <location line="+251"/>
+ <location line="+209"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+60"/>
 <source>Are you sure?</source>
 <translation>Zihur zaude?</translation>
 </message>
@@ -2052,21 +2086,52 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+30"/>
 <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+103"/>
 <source>Permission error</source>
 <translation>Baimen akatsa</translation>
 </message>
@@ -2119,19 +2184,19 @@
 </message>
 <message>
 <location line="+5"/>
- <location line="+320"/>
+ <location line="+321"/>
 <source>Something bad happened (II)</source>
 <translation>Zerbait gaitza gertatu da (II)</translation>
 </message>
 <message>
- <location line="-199"/>
+ <location line="-202"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <location line="+103"/>
 <source>Checking video</source>
 <translation>Bideoa aztertzen</translation>
 </message>
@@ -2194,7 +2259,7 @@
 <translation>avsproxy</translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+35"/>
 <source>Frame type:</source>
 <translation>Frame mota:</translation>
 </message>
@@ -2265,12 +2330,12 @@
 <translation>Audioa gordetzen</translation>
 </message>
 <message>
- <location line="+206"/>
+ <location line="+205"/>
 <source>Jpeg</source>
 <translation>Jpeg</translation>
 </message>
 <message>
- <location line="+103"/>
+ <location line="+113"/>
 <location line="+83"/>
 <source>Done</source>
 <translation>Eginda</translation>
@@ -2281,24 +2346,27 @@
 <translation>%d irudi gordeta.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
 <location line="+44"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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="-249"/>
+ <location filename="../../common/gui_main.cpp" line="-250"/>
 <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="+7"/>
+ <location line="+20"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation>Akatsa</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+61"/>
+ <location filename="../../common/gui_save.cpp" line="-65"/>
 <source>BMP op failed</source>
 <translation>BMP op hutsegitea</translation>
 </message>
@@ -2563,7 +2631,7 @@
 <translation type="unfinished">Gordetzen</translation>
 </message>
 <message>
- <location line="+165"/>
+ <location line="+164"/>
 <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>
@@ -2573,37 +2641,32 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-291"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-290"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Decode video using XVBA (AMD)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
 <source>Decode video using LIBVA (INTEL)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>Decode video using VideoToolbox (macOS)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+6"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+8"/>
 <source>_Check for new release</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+57"/>
+ <location line="+56"/>
 <source>_Sanitize decode time stamps (DTS) in copy mode</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2651,6 +2714,7 @@
 <message>
 <location line="+4"/>
 <location line="+3"/>
+ <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2710,7 +2774,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1382"/>
+ <location filename="../../common/gui_main.cpp" line="-1449"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2730,7 +2794,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+128"/>
+ <location line="+127"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation type="unfinished"></translation>
@@ -2751,14 +2815,14 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+114"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+102"/>
+ <location line="+124"/>
 <location line="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
@@ -2769,7 +2833,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+757"/>
+ <location line="+795"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation type="unfinished"></translation>
@@ -2800,7 +2864,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+295"/>
+ <location line="+297"/>
 <source>Oops</source>
 <translation type="unfinished">Ustekabea</translation>
 </message>
@@ -2810,12 +2874,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+446"/>
+ <location filename="../../common/gui_play.cpp" line="+442"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished">Arazoak audio gailua abiarazterakoan</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-578"/>
+ <location filename="../../common/gui_save.cpp" line="-587"/>
 <source>Audio encoder index out of bounds</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2840,7 +2904,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+228"/>
+ <location line="+227"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -2861,7 +2925,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+87"/>
 <source>Saving selection as set of JPEG images</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2892,11 +2956,21 @@
 </message>
 <message>
 <location line="+67"/>
- <source>Cannot get tinyPÿ script engine</source>
+ <source>Cannot get tinyPy script engine</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Output file not specified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Job script %s already exists. Overwrite?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>Cannot add job %s</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2928,27 +3002,45 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+30"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="-255"/>
- <location line="+266"/>
+ <location line="-253"/>
+ <location line="+286"/>
 <location line="+26"/>
 <source>Muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-292"/>
- <location line="+266"/>
+ <location line="-312"/>
+ <location line="+286"/>
 <source>Cannot instantiate muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="-28"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+42"/>
 <source>Cannot open </source>
 <translation type="unfinished"></translation>
 </message>
@@ -3200,7 +3292,7 @@
 <translation type="unfinished">1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+ <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"/>
@@ -3229,7 +3321,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <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>
@@ -3253,7 +3345,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_toolkit/automation.cpp" line="+238"/>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
 <source>Permission Error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3302,7 +3394,7 @@
 <context>
 <name>asciiView</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
 <source>Ascii View</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3969,7 +4061,7 @@
 <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="+90"/>
+ <location line="+87"/>
 <source>Contrast</source>
 <translation type="unfinished">Zuribeltztasuna</translation>
 </message>
@@ -3979,8 +4071,8 @@
 <translation>Zehaztu zuribeltztasuna, dizdira eta margoak.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
- <location line="+90"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
+ <location line="+87"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4104,7 +4196,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
 <source>Size: </source>
 <translation type="unfinished"></translation>
 </message>
@@ -6474,7 +6566,7 @@
 <context>
 <name>lavcodec</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
 <source>_Bitrate:</source>
 <translation type="unfinished">_Bitneurria:</translation>
 </message>
@@ -6714,12 +6806,12 @@
 <context>
 <name>matroskademuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
 <source>Matroska Images</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+433"/>
+ <location line="+431"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6918,7 +7010,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+827"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">Arazoak SVQ3 idazburuak irakurtzean</translation>
 </message>
@@ -6942,7 +7034,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+146"/>
 <source>Saving mp4</source>
 <translation type="unfinished">mp4 gordetzea</translation>
 </message>
@@ -6957,8 +7049,23 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+2"/>
+ <source>No optimization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+1"/>
- <source>Use alternate MP3 tag</source>
+ <source>Move index to the beginning of the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use fragmentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Optimize for Streaming</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -7169,12 +7276,12 @@
 <context>
 <name>navigate</name>
 <message>
- <location filename="../../common/gui_navigate.cpp" line="+244"/>
+ <location filename="../../common/gui_navigate.cpp" line="+242"/>
 <source>Cannot go to next keyframe</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+69"/>
+ <location line="+64"/>
 <source>Cannot go to previous keyframe</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7252,7 +7359,7 @@
 <translation type="unfinished">Idazburu gaizkieratua</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
 <source>Unpacking bitstream</source>
 <translation type="unfinished">Bitjarioa despaketatzen</translation>
 </message>
@@ -7399,15 +7506,8 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+80"/>
 <source>Error</source>
- <translation type="unfinished">Akatsa</translation>
- </message>
- <message>
- <location line="+0"/>
- <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="unfinished"></translation>
+ <translation type="obsolete">Akatsa</translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
@@ -7419,27 +7519,33 @@
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>qaudiotracks</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
 <source>Select audio file</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+22"/>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Error</source>
 <translation type="unfinished">Akatsa</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-161"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7518,18 +7624,18 @@
 <name>qfile</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+45"/>
- <location line="+141"/>
+ <location line="+142"/>
 <source>All files (*.*)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-58"/>
- <location line="+105"/>
+ <location line="-59"/>
+ <location line="+106"/>
 <source> files (*.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-81"/>
+ <location line="-82"/>
 <source>Overwrite file </source>
 <translation type="unfinished"></translation>
 </message>
@@ -7552,7 +7658,7 @@
 <translation type="unfinished">Azken Egitasmoak</translation>
 </message>
 <message>
- <location line="+660"/>
+ <location line="+671"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7617,7 +7723,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+619"/>
+ <location line="+626"/>
 <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>
@@ -7735,12 +7841,12 @@
 </message>
 <message>
 <location line="+64"/>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Sure!</source>
 <translation type="unfinished">Zihur!</translation>
 </message>
 <message>
- <location line="-14"/>
+ <location line="-15"/>
 <source>Delete job</source>
 <translation type="unfinished">Ezabatu lana</translation>
 </message>
@@ -7750,7 +7856,7 @@
 <translation type="unfinished">Zihur zaude %s lana ezabatzea nahi duzula?</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Delete *all* job</source>
 <translation type="unfinished">Ezabatu lan *guzitiak*</translation>
 </message>
@@ -7760,7 +7866,7 @@
 <translation type="unfinished">Zihur zaude lana GUZTIAK ezabatzea nahi dituzula?</translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Already done</source>
 <translation type="unfinished">Jadanik eginda</translation>
 </message>
@@ -7781,7 +7887,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+432"/>
 <source>Partial</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7834,7 +7940,7 @@
 <context>
 <name>qprocessing</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+65"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
 <source>Unknown</source>
 <translation type="unfinished">Ezezaguna</translation>
 </message>
@@ -7988,7 +8094,7 @@
 <context>
 <name>qtalert</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
 <source>Alert</source>
 <translation type="unfinished">Alerta</translation>
 </message>
@@ -8000,14 +8106,14 @@
 <translation type="unfinished">Argibideak</translation>
 </message>
 <message>
- <location line="+24"/>
- <location line="+30"/>
+ <location line="+26"/>
+ <location line="+31"/>
 <source>Confirmation</source>
 <translation type="unfinished">Baieztapena</translation>
 </message>
 <message>
- <location line="+19"/>
- <location line="+30"/>
+ <location line="+21"/>
+ <location line="+33"/>
 <source>Question</source>
 <translation type="unfinished">Galdera</translation>
 </message>
@@ -8884,20 +8990,13 @@
 <context>
 <name>tsdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
 <source>Error</source>
- <translation type="unfinished">Akatsa</translation>
+ <translation type="obsolete">Akatsa</translation>
 </message>
 <message>
- <location line="+0"/>
- <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="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+188"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+327"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
+ <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 type="unfinished"></translation>
 </message>
@@ -8909,6 +9008,12 @@
 <source>Indexing</source>
 <translation type="unfinished">Aurkibidetzen</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>twolame</name>
@@ -9278,12 +9383,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+411"/>
+ <location line="+412"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished">Xede Bitneurria:</translation>
 </message>
@@ -9338,13 +9443,13 @@
 </message>
 <message>
 <location line="+61"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished">Akatsa</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9354,12 +9459,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
- <source>my profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+34"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10620,12 +10720,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+361"/>
+ <location line="+362"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished">Xede Bitneurria:</translation>
 </message>
@@ -10680,13 +10780,13 @@
 </message>
 <message>
 <location line="+41"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished">Akatsa</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10696,7 +10796,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+45"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12027,7 +12127,7 @@
 <context>
 <name>yadif</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
 <source>Yadif</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12037,47 +12137,78 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+53"/>
 <source>Temporal &amp; spatial check</source>
- <translation type="unfinished">Denbora &amp; espazio hautapena</translation>
+ <translation type="obsolete">Denbora &amp; espazio hautapena</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, temporal &amp; spatial check</source>
- <translation type="unfinished">Bob, denbora &amp; espazio hautapena</translation>
+ <translation type="obsolete">Bob, denbora &amp; espazio hautapena</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Skip spatial temporal check</source>
- <translation type="unfinished">Jauzi espazio denbora hautapena</translation>
+ <translation type="obsolete">Jauzi espazio denbora hautapena</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, skip spatial temporal check</source>
- <translation type="unfinished">Bob, jauzi espazio denbora hautapena</translation>
+ <translation type="obsolete">Bob, jauzi espazio denbora hautapena</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+75"/>
 <source>Bottom field first</source>
 <translation type="unfinished">Beheko eremua lehenik</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="-1"/>
 <source>Top field first</source>
 <translation type="unfinished">Goiko eremua lehenik</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="-7"/>
+ <source>Frame : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Deint all</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Deint interlaced</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
 <source>_Mode:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>_Deint:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>_Order:</source>
 <translation type="unfinished">_Ordena:</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+3"/>
 <source>yadif</source>
 <translation type="unfinished">yadif</translation>
 </message>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_fr.ts -> avidemux_2.7.4.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="+85"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+102"/>
 <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="+196"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+194"/>
 <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="-172"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-189"/>
 <source>Checking if timestamps are valid..</source>
 <translation>Vérification des informations de temps</translation>
 </message>
@@ -1057,17 +1057,27 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation>Utiliser DXVA2 pour décoder (Windows)</translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+1"/>
+ <source>Ignore driver blacklist (Intel)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
 <source>Enable openGl support</source>
 <translation>Activer OpenGL</translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+1"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation>Accepter les fréquences non standard pour les DVDs</translation>
 </message>
@@ -1184,17 +1194,16 @@
 <translation>Priorités</translation>
 </message>
 <message>
- <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
- <translation>Utiliser un tag alternatif pour les pistes mp3 (.mp4)</translation>
+ <translation type="vanished">Utiliser un tag alternatif pour les pistes mp3 (.mp4)</translation>
 </message>
 <message>
- <location line="+1"/>
+ <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="+6"/>
+ <location line="+10"/>
 <source>XVideo (best)</source>
 <translation>Xvideo (rapide)</translation>
 </message>
@@ -1209,7 +1218,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+3"/>
 <source>OpenGL (best)</source>
 <translation>OpenGL (rapide)</translation>
 </message>
@@ -1311,7 +1320,7 @@
 <translation>Sortie</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+34"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+36"/>
 <source>Open</source>
 <translation>Ouvrir</translation>
 </message>
@@ -1715,17 +1724,17 @@
 <translation>Impossible de choisir le codec FLV1.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+189"/>
+ <location filename="../../common/gui_main.cpp" line="+186"/>
 <source>Select script to save</source>
 <translation>Choisir le script à sauvegarder</translation>
 </message>
 <message>
- <location line="+435"/>
+ <location line="+464"/>
 <source>Are you sure?</source>
 <translation>Etes vous sur ?</translation>
 </message>
 <message>
- <location line="+181"/>
+ <location line="+218"/>
 <source>Cannot open &quot;%s&quot;.</source>
 <translation>Impossible d&apos;ouvrir &quot;%s&quot;.</translation>
 </message>
@@ -1745,7 +1754,7 @@
 <translation>Plusieurs pistes audio</translation>
 </message>
 <message>
- <location line="+424"/>
+ <location line="+425"/>
 <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>
@@ -1842,7 +1851,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
 <source>CPU</source>
 <translation></translation>
 </message>
@@ -1888,12 +1897,12 @@
 </message>
 <message>
 <location line="+23"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-43"/>
+ <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="+278"/>
+ <location line="+277"/>
 <location line="+19"/>
 <location line="+7"/>
 <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1971,14 +1980,13 @@
 <translation>Deringing</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-238"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-234"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation>Utiliser VDPAU pour décoder (NVIDIA)</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Decode video using XVBA (AMD)</source>
- <translation>Utiliser XVBA pour décoder (AMD)</translation>
+ <translation type="vanished">Utiliser XVBA pour décoder (AMD)</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -1986,17 +1994,17 @@
 <translation>Utiliser LIBVA pour décoder (INTEL/...)</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>Decode video using VideoToolbox (macOS)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+6"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation>Si vous activez le décodage HW, il est préférable d&apos;utiliser la même méthode d&apos;affichage</translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+8"/>
 <source>_Check for new release</source>
 <translation>Vérifier si il y a de nouvelle version</translation>
 </message>
@@ -2011,12 +2019,22 @@
 <translation></translation>
 </message>
 <message>
- <location line="+21"/>
+ <location line="+20"/>
 <source>_Sanitize decode time stamps (DTS) in copy mode</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+21"/>
+ <location line="+2"/>
+ <source>Caching of decoded pictures</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Cache size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
 <source>LIBVA (best)</source>
 <translation></translation>
 </message>
@@ -2085,6 +2103,7 @@
 <message>
 <location line="+4"/>
 <location line="+3"/>
+ <location line="+3"/>
 <source>HW Accel</source>
 <translation>Accel. HW</translation>
 </message>
@@ -2104,26 +2123,18 @@
 <translation>Port par défaut</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+7"/>
+ <location line="+3"/>
 <source>Preferences</source>
 <translation>Préférences</translation>
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-109"/>
- <location filename="../../common/gui_save.cpp" line="+288"/>
- <location line="+10"/>
 <source>Queue</source>
 <translation>Mettre en queue</translation>
 </message>
 <message>
- <location line="+7"/>
- <location line="+2"/>
- <location line="+2"/>
- <source>-</source>
- <translation></translation>
- </message>
- <message>
- <location line="-3"/>
+ <location line="+8"/>
 <source>Information</source>
 <translation></translation>
 </message>
@@ -2143,9 +2154,9 @@
 <translation></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
 <location line="+44"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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"/>
@@ -2154,7 +2165,10 @@
 <location line="+24"/>
 <location line="+8"/>
 <location line="+4"/>
- <location filename="../../common/gui_save.cpp" line="-109"/>
+ <location filename="../../common/gui_save.cpp" line="+199"/>
+ <location line="+99"/>
+ <location line="+7"/>
+ <location line="+20"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation>Erreur</translation>
@@ -2191,7 +2205,7 @@
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="-82"/>
- <location filename="../../common/gui_save.cpp" line="-503"/>
+ <location filename="../../common/gui_save.cpp" line="-638"/>
 <source>No audio track</source>
 <translation>Pas de piste audio</translation>
 </message>
@@ -2213,7 +2227,7 @@
 Il est nécessaire pour créer un fichier compatible PSP</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1382"/>
+ <location filename="../../common/gui_main.cpp" line="-1449"/>
 <source>Select script/project to run</source>
 <translation>Choisir un script/projet à lancer</translation>
 </message>
@@ -2233,7 +2247,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+117"/>
+ <location line="+116"/>
 <source>Not coded in this version</source>
 <translation>Pas disponible dans cette version</translation>
 </message>
@@ -2259,14 +2273,33 @@
 <translation>Choisir le fichier à concatener</translation>
 </message>
 <message>
- <location line="+114"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+102"/>
+ <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 type="unfinished"></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>
+ </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>
+ </message>
+ <message>
+ <location line="+107"/>
 <location line="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
@@ -2292,21 +2325,52 @@
 <translation>Erreur lors de la coupe</translation>
 </message>
 <message>
- <location line="+8"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+103"/>
 <source>Permission error</source>
 <translation>Erreur de permission</translation>
 </message>
@@ -2338,19 +2402,19 @@
 </message>
 <message>
 <location line="+5"/>
- <location line="+320"/>
+ <location line="+321"/>
 <source>Something bad happened (II)</source>
 <translation>Quelque chose d&apos;horrible est arrivé (II)</translation>
 </message>
 <message>
- <location line="-199"/>
+ <location line="-202"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <location line="+103"/>
 <source>Checking video</source>
 <translation>Vérification de la vidéo</translation>
 </message>
@@ -2437,7 +2501,7 @@
 <translation></translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+35"/>
 <source>Frame type:</source>
 <translation>Type d&apos;image:</translation>
 </message>
@@ -2452,7 +2516,7 @@
 <translation>Hex dump:</translation>
 </message>
 <message>
- <location line="+110"/>
+ <location line="+111"/>
 <source>Oops</source>
 <translation></translation>
 </message>
@@ -2462,7 +2526,7 @@
 <translation>Cette fonction est désactivée ou plus disponible.</translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+446"/>
+ <location filename="../../common/gui_play.cpp" line="+442"/>
 <source>Trouble initializing audio device</source>
 <translation>Le device audio ne peut pas être initialisé</translation>
 </message>
@@ -2548,7 +2612,7 @@
 <translation>Sauvegarde audio</translation>
 </message>
 <message>
- <location line="+96"/>
+ <location line="+95"/>
 <source>Function not implemented
 </source>
 <translation>Fonction non implementée</translation>
@@ -2574,7 +2638,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+87"/>
 <source>Saving selection as set of JPEG images</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2604,7 +2668,22 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-34"/>
+ <location line="+67"/>
+ <source>Cannot get tinyPy script engine</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Output file not specified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Job script %s already exists. Overwrite?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-121"/>
 <location line="+83"/>
 <source>Done</source>
 <translation>Fait</translation>
@@ -2640,12 +2719,11 @@
 <translation>Le fichier %s n&apos;a pas été enregistré correctement.</translation>
 </message>
 <message>
- <location line="+14"/>
 <source>Cannot get tinyPÿ script engine</source>
- <translation>Impossible d&apos;obtenir le moteur de script tinyPÿ</translation>
+ <translation type="vanished">Impossible d&apos;obtenir le moteur de script tinyPÿ</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+41"/>
 <source>Cannot add job %s</source>
 <translation>Impossible d&apos;ajouter le job %s</translation>
 </message>
@@ -2686,7 +2764,7 @@
 <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>
 <message>
- <location line="+30"/>
+ <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>
@@ -2695,20 +2773,38 @@
 Voulez-vous continuer ?</translation>
 </message>
 <message>
- <location line="-255"/>
- <location line="+266"/>
+ <location line="-253"/>
+ <location line="+286"/>
 <location line="+26"/>
 <source>Muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-292"/>
- <location line="+266"/>
+ <location line="-312"/>
+ <location line="+286"/>
 <source>Cannot instantiate muxer</source>
 <translation>Impossible d&apos;instancier muxer</translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="-28"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+42"/>
 <source>Cannot open </source>
 <translation type="unfinished">Ne peut pas ouvrir</translation>
 </message>
@@ -3098,7 +3194,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+165"/>
+ <location line="+164"/>
 <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 +3299,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+ <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"/>
@@ -3233,7 +3329,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <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>
@@ -3257,7 +3353,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_toolkit/automation.cpp" line="+238"/>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
 <source>Permission Error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3306,7 +3402,7 @@
 <context>
 <name>asciiView</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
 <source>Ascii View</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3974,7 +4070,7 @@
 <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="+90"/>
+ <location line="+87"/>
 <source>Contrast</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3984,8 +4080,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
- <location line="+90"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
+ <location line="+87"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4107,7 +4203,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
 <source>Size: </source>
 <translation type="unfinished"></translation>
 </message>
@@ -6477,7 +6573,7 @@
 <context>
 <name>lavcodec</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
 <source>_Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6717,12 +6813,12 @@
 <context>
 <name>matroskademuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
 <source>Matroska Images</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+433"/>
+ <location line="+431"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6921,7 +7017,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+827"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">Impossible de lire l&apos;entete SVQ3</translation>
 </message>
@@ -6945,7 +7041,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+146"/>
 <source>Saving mp4</source>
 <translation type="unfinished">Sauvegarde au format MP4</translation>
 </message>
@@ -6960,8 +7056,23 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+2"/>
+ <source>No optimization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+1"/>
- <source>Use alternate MP3 tag</source>
+ <source>Move index to the beginning of the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use fragmentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Optimize for Streaming</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -7172,12 +7283,12 @@
 <context>
 <name>navigate</name>
 <message>
- <location filename="../../common/gui_navigate.cpp" line="+244"/>
+ <location filename="../../common/gui_navigate.cpp" line="+242"/>
 <source>Cannot go to next keyframe</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+69"/>
+ <location line="+64"/>
 <source>Cannot go to previous keyframe</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7255,7 +7366,7 @@
 <translation type="unfinished">En tete incorrecte</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
 <source>Unpacking bitstream</source>
 <translation type="unfinished">Conversion en cours</translation>
 </message>
@@ -7402,15 +7513,13 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+80"/>
 <source>Error</source>
- <translation>Erreur</translation>
+ <translation type="vanished">Erreur</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>This file&apos;s index has been created with an older version of avidemux.
 Please delete the idx2 file and reopen.</source>
- <translation>L&apos;index de ce fichier a été créé avec une version plus ancienne d&apos;avidemux.
+ <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>
@@ -7423,27 +7532,33 @@
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>qaudiotracks</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
 <source>Select audio file</source>
 <translation>Sélectionner un fichier audio</translation>
 </message>
 <message>
 <location line="+22"/>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Error</source>
 <translation>Erreur</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-161"/>
 <source>Cannot use that file as audio track</source>
 <translation>Impossible d&apos;utiliser ce fichier comme piste audio</translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Some tracks are used multiple times</source>
 <translation>Certaines pistes sont utilisées plusieurs fois</translation>
 </message>
@@ -7522,18 +7637,18 @@
 <name>qfile</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+45"/>
- <location line="+141"/>
+ <location line="+142"/>
 <source>All files (*.*)</source>
 <translation>Tous les fichiers (*.*)</translation>
 </message>
 <message>
- <location line="-58"/>
- <location line="+105"/>
+ <location line="-59"/>
+ <location line="+106"/>
 <source> files (*.</source>
 <translation> fichiers (*.</translation>
 </message>
 <message>
- <location line="-81"/>
+ <location line="-82"/>
 <source>Overwrite file </source>
 <translation>Écraser le fichier </translation>
 </message>
@@ -7556,7 +7671,7 @@
 <translation>Projets Récents</translation>
 </message>
 <message>
- <location line="+660"/>
+ <location line="+671"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7621,7 +7736,7 @@
 <translation>Avancer d&apos;une minute</translation>
 </message>
 <message>
- <location line="+619"/>
+ <location line="+626"/>
 <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
@@ -7740,12 +7855,12 @@
 </message>
 <message>
 <location line="+64"/>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Sure!</source>
 <translation type="unfinished">Sur!</translation>
 </message>
 <message>
- <location line="-14"/>
+ <location line="-15"/>
 <source>Delete job</source>
 <translation>Détruire le job</translation>
 </message>
@@ -7755,7 +7870,7 @@
 <translation>Êtes vous sur de vouloir détruire %s job ?</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Delete *all* job</source>
 <translation>Détruire *tous* les jobs</translation>
 </message>
@@ -7765,7 +7880,7 @@
 <translation>Êtes vous sur de vouloir détruire TOUS les jobs ?</translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Already done</source>
 <translation>Déjà fait</translation>
 </message>
@@ -7786,7 +7901,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+432"/>
 <source>Partial</source>
 <translation>Partiel</translation>
 </message>
@@ -7839,7 +7954,7 @@
 <context>
 <name>qprocessing</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+65"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
 <source>Unknown</source>
 <translation>Inconnu</translation>
 </message>
@@ -7994,7 +8109,7 @@
 <context>
 <name>qtalert</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
 <source>Alert</source>
 <translation>Alerte</translation>
 </message>
@@ -8006,14 +8121,14 @@
 <translation>Information</translation>
 </message>
 <message>
- <location line="+24"/>
- <location line="+30"/>
+ <location line="+26"/>
+ <location line="+31"/>
 <source>Confirmation</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+19"/>
- <location line="+30"/>
+ <location line="+21"/>
+ <location line="+33"/>
 <source>Question</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8890,21 +9005,19 @@
 <context>
 <name>tsdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
 <source>Error</source>
- <translation>Erreur</translation>
+ <translation type="vanished">Erreur</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>This file&apos;s index has been created with an older version of avidemux.
 Please delete the idx2 file and reopen.</source>
- <translation>L&apos;index de ce fichier a été créé avec une version plus ancienne d&apos;avidemux.
+ <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="+188"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+327"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
+ <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>Il existe plusieurs fichiers avec des noms de fichiers séquentiels. Devraient-ils tous être chargés?</translation>
 </message>
@@ -8916,6 +9029,12 @@
 <source>Indexing</source>
 <translation>Indexation</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>twolame</name>
@@ -9285,12 +9404,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation>Manuel</translation>
 </message>
 <message>
- <location line="+411"/>
+ <location line="+412"/>
 <source>Target Bitrate:</source>
 <translation>Bitrate cible :</translation>
 </message>
@@ -9345,13 +9464,13 @@
 </message>
 <message>
 <location line="+61"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation>Erreur</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9361,12 +9480,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
- <source>my profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+34"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10629,12 +10743,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation>Manuel</translation>
 </message>
 <message>
- <location line="+361"/>
+ <location line="+362"/>
 <source>Target Bitrate:</source>
 <translation>Bitrate cible :</translation>
 </message>
@@ -10689,13 +10803,13 @@
 </message>
 <message>
 <location line="+41"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation>Erreur</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation>Impossible de charger le préréglage</translation>
 </message>
@@ -10705,7 +10819,7 @@
 <translation>Enregistrer le Profil</translation>
 </message>
 <message>
- <location line="+45"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation>Écraser</translation>
 </message>
@@ -12037,7 +12151,7 @@
 <context>
 <name>yadif</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
 <source>Yadif</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12047,47 +12161,62 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+53"/>
- <source>Temporal &amp; spatial check</source>
+ <location line="+75"/>
+ <source>Bottom field first</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Top field first</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>Frame : Temporal &amp; spatial check</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Bob, temporal &amp; spatial check</source>
+ <source>Field : Temporal &amp; spatial check</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Skip spatial temporal check</source>
+ <source>Frame : Skip spatial temporal check</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Bob, skip spatial temporal check</source>
+ <source>Field : Skip spatial temporal check</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Bottom field first</source>
+ <location line="+9"/>
+ <source>Deint all</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Top field first</source>
+ <source>Deint interlaced</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+5"/>
 <source>_Mode:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>_Deint:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>_Order:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+3"/>
 <source>yadif</source>
 <translation type="unfinished"></translation>
 </message>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_hu.ts -> avidemux_2.7.4.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="+232"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
 <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="+85"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+102"/>
 <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="-172"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-189"/>
 <source>Checking if timestamps are valid..</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1056,11 +1056,21 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Ignore driver blacklist (Intel)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation>Nem szabványos DVD hangsáv frekvencia elfogadása</translation>
@@ -1176,12 +1186,11 @@
 <translation>Prioritások beállítása</translation>
 </message>
 <message>
- <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
- <translation>Alternatív MP3 Tag használata .mp4-ben</translation>
+ <translation type="vanished">Alternatív MP3 Tag használata .mp4-ben</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+5"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1191,7 +1200,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+9"/>
 <source>XVideo (best)</source>
 <translation>XVideo (legjobb)</translation>
 </message>
@@ -1201,7 +1210,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+15"/>
+ <location line="+11"/>
 <source>SDL (good)</source>
 <translation>SDL (jó)</translation>
 </message>
@@ -1298,7 +1307,7 @@
 <location line="+5"/>
 <location filename="../../common/gui_save.cpp" line="+57"/>
 <location line="+10"/>
- <location line="+278"/>
+ <location line="+277"/>
 <location line="+19"/>
 <location line="+7"/>
 <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1315,7 +1324,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
 <source>CPU</source>
 <translation>CPU</translation>
 </message>
@@ -1325,12 +1334,13 @@
 <translation>Szálak</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+82"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+84"/>
 <source>Pr&amp;eferences</source>
 <translation>Beállítások</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+14"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+11"/>
+ <location line="+3"/>
 <source>Preferences</source>
 <translation>Beállítások</translation>
 </message>
@@ -1351,8 +1361,6 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+288"/>
- <location line="+10"/>
 <source>Queue</source>
 <translation>Küldendő</translation>
 </message>
@@ -1387,14 +1395,11 @@
 <translation>Bezárás</translation>
 </message>
 <message>
- <location line="+1"/>
- <location line="+2"/>
- <location line="+2"/>
 <source>-</source>
- <translation>-</translation>
+ <translation type="vanished">-</translation>
 </message>
 <message>
- <location line="-3"/>
+ <location line="+2"/>
 <source>Information</source>
 <translation>Jellemzők</translation>
 </message>
@@ -1891,12 +1896,12 @@
 <translation>Bővítmények infó</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-285"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-283"/>
 <source>Enable openGl support</source>
 <translation>OpenGL engedélyezés</translation>
 </message>
 <message>
- <location line="+49"/>
+ <location line="+45"/>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+4"/>
 <source>High</source>
 <translation>Magas</translation>
@@ -1908,12 +1913,12 @@
 <translation>Alacsony</translation>
 </message>
 <message>
- <location line="+21"/>
+ <location line="+24"/>
 <source>VDPAU (best)</source>
 <translation>VDPAU (legjobb)</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+6"/>
 <source>OpenGL (best)</source>
 <translation>OpenGL (legjobb)</translation>
 </message>
@@ -1952,7 +1957,7 @@
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="+48"/>
- <location filename="../../common/gui_save.cpp" line="-612"/>
+ <location filename="../../common/gui_save.cpp" line="-313"/>
 <source>No audio track</source>
 <translation>Nincs hangsáv</translation>
 </message>
@@ -2009,17 +2014,36 @@
 A PSP kompatibilis videóhoz szükséges.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+189"/>
+ <location filename="../../common/gui_main.cpp" line="+186"/>
 <source>Select script to save</source>
 <translation>Mentendő szkript választás</translation>
 </message>
 <message>
- <location line="+184"/>
+ <location line="+183"/>
 <source>Not coded in this version</source>
 <translation>Nem kódolt ebben a verzióban</translation>
 </message>
 <message>
- <location line="+251"/>
+ <location line="+209"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+60"/>
 <source>Are you sure?</source>
 <translation>Biztos benne?</translation>
 </message>
@@ -2039,21 +2063,52 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+30"/>
 <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+103"/>
 <source>Permission error</source>
 <translation>Hozzáférési hiba</translation>
 </message>
@@ -2106,19 +2161,19 @@
 </message>
 <message>
 <location line="+5"/>
- <location line="+320"/>
+ <location line="+321"/>
 <source>Something bad happened (II)</source>
 <translation>Valami rossz történt (II)</translation>
 </message>
 <message>
- <location line="-199"/>
+ <location line="-202"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <location line="+103"/>
 <source>Checking video</source>
 <translation>Videó ellenőrzés</translation>
 </message>
@@ -2181,7 +2236,7 @@
 <translation>avsProxy</translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+35"/>
 <source>Frame type:</source>
 <translation>Képkocka típus:</translation>
 </message>
@@ -2272,12 +2327,12 @@
 <translation>Hang mentése</translation>
 </message>
 <message>
- <location line="+206"/>
+ <location line="+205"/>
 <source>Jpeg</source>
 <translation>Jpeg</translation>
 </message>
 <message>
- <location line="+103"/>
+ <location line="+113"/>
 <location line="+83"/>
 <source>Done</source>
 <translation>Kész</translation>
@@ -2288,24 +2343,27 @@
 <translation>%d kép mentve.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
 <location line="+44"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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="-249"/>
+ <location filename="../../common/gui_main.cpp" line="-250"/>
 <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="+7"/>
+ <location line="+20"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation>Hiba</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+61"/>
+ <location filename="../../common/gui_save.cpp" line="-65"/>
 <source>BMP op failed</source>
 <translation>BMP művelet sikertelen</translation>
 </message>
@@ -2575,37 +2633,42 @@
 <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="-167"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Decode video using XVBA (AMD)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
 <source>Decode video using LIBVA (INTEL)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>Decode video using VideoToolbox (macOS)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+6"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+8"/>
 <source>_Check for new release</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+78"/>
+ <location line="+58"/>
+ <source>Caching of decoded pictures</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Cache size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
 <source>LIBVA (best)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2648,6 +2711,7 @@
 <message>
 <location line="+4"/>
 <location line="+3"/>
+ <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2702,7 +2766,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1382"/>
+ <location filename="../../common/gui_main.cpp" line="-1449"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2722,7 +2786,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+128"/>
+ <location line="+127"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation type="unfinished"></translation>
@@ -2743,14 +2807,14 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+114"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+102"/>
+ <location line="+124"/>
 <location line="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
@@ -2761,7 +2825,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+757"/>
+ <location line="+795"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation type="unfinished"></translation>
@@ -2792,7 +2856,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+295"/>
+ <location line="+297"/>
 <source>Oops</source>
 <translation type="unfinished">Hopp</translation>
 </message>
@@ -2802,12 +2866,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+446"/>
+ <location filename="../../common/gui_play.cpp" line="+442"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished">Probléma a hangeszköz inicializálásánál</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-578"/>
+ <location filename="../../common/gui_save.cpp" line="-587"/>
 <source>Audio encoder index out of bounds</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2832,7 +2896,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+228"/>
+ <location line="+227"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -2853,7 +2917,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+87"/>
 <source>Saving selection as set of JPEG images</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2884,11 +2948,21 @@
 </message>
 <message>
 <location line="+67"/>
- <source>Cannot get tinyPÿ script engine</source>
+ <source>Cannot get tinyPy script engine</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Output file not specified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Job script %s already exists. Overwrite?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>Cannot add job %s</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2920,27 +2994,45 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+30"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="-255"/>
- <location line="+266"/>
+ <location line="-253"/>
+ <location line="+286"/>
 <location line="+26"/>
 <source>Muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-292"/>
- <location line="+266"/>
+ <location line="-312"/>
+ <location line="+286"/>
 <source>Cannot instantiate muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="-28"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+42"/>
 <source>Cannot open </source>
 <translation type="unfinished"></translation>
 </message>
@@ -3100,7 +3192,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+165"/>
+ <location line="+164"/>
 <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>
@@ -3202,7 +3294,7 @@
 <translation type="unfinished">1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+ <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"/>
@@ -3231,7 +3323,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <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>
@@ -3255,7 +3347,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_toolkit/automation.cpp" line="+238"/>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
 <source>Permission Error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3304,7 +3396,7 @@
 <context>
 <name>asciiView</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
 <source>Ascii View</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3976,13 +4068,13 @@
 <message>
 <location line="-1"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
- <location line="+90"/>
+ <location line="+87"/>
 <source>Contrast</source>
 <translation>kontraszt</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
- <location line="+90"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
+ <location line="+87"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4106,7 +4198,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="+324"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
 <source>Size: </source>
 <translation type="unfinished"></translation>
 </message>
@@ -6476,7 +6568,7 @@
 <context>
 <name>lavcodec</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
 <source>_Bitrate:</source>
 <translation type="unfinished">Bitsebesség:</translation>
 </message>
@@ -6716,12 +6808,12 @@
 <context>
 <name>matroskademuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
 <source>Matroska Images</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+433"/>
+ <location line="+431"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6920,7 +7012,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+827"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">Probléma a SVQ3 fejek olvasásánál</translation>
 </message>
@@ -6944,7 +7036,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+146"/>
 <source>Saving mp4</source>
 <translation type="unfinished">mp4 mentés</translation>
 </message>
@@ -6959,8 +7051,23 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+2"/>
+ <source>No optimization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+1"/>
- <source>Use alternate MP3 tag</source>
+ <source>Move index to the beginning of the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use fragmentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Optimize for Streaming</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -7171,12 +7278,12 @@
 <context>
 <name>navigate</name>
 <message>
- <location filename="../../common/gui_navigate.cpp" line="+244"/>
+ <location filename="../../common/gui_navigate.cpp" line="+242"/>
 <source>Cannot go to next keyframe</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+69"/>
+ <location line="+64"/>
 <source>Cannot go to previous keyframe</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7254,7 +7361,7 @@
 <translation type="unfinished">Hibás formátumú fejléc</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
 <source>Unpacking bitstream</source>
 <translation type="unfinished">Bitsream kicsomagolása</translation>
 </message>
@@ -7401,15 +7508,8 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+80"/>
 <source>Error</source>
- <translation type="unfinished">Hiba</translation>
- </message>
- <message>
- <location line="+0"/>
- <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="unfinished"></translation>
+ <translation type="obsolete">Hiba</translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
@@ -7421,27 +7521,33 @@
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>qaudiotracks</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
 <source>Select audio file</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+22"/>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Error</source>
 <translation type="unfinished">Hiba</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-161"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7520,18 +7626,18 @@
 <name>qfile</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+45"/>
- <location line="+141"/>
+ <location line="+142"/>
 <source>All files (*.*)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-58"/>
- <location line="+105"/>
+ <location line="-59"/>
+ <location line="+106"/>
 <source> files (*.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-81"/>
+ <location line="-82"/>
 <source>Overwrite file </source>
 <translation type="unfinished"></translation>
 </message>
@@ -7554,7 +7660,7 @@
 <translation type="unfinished">Legutóbbi projektek</translation>
 </message>
 <message>
- <location line="+660"/>
+ <location line="+671"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7619,7 +7725,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+619"/>
+ <location line="+626"/>
 <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>
@@ -7737,12 +7843,12 @@
 </message>
 <message>
 <location line="+64"/>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Sure!</source>
 <translation type="unfinished">Biztos!</translation>
 </message>
 <message>
- <location line="-14"/>
+ <location line="-15"/>
 <source>Delete job</source>
 <translation type="unfinished">Feladat törlése</translation>
 </message>
@@ -7752,7 +7858,7 @@
 <translation type="unfinished">Biztos, hogy törli a(z) %s feladatot ?</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Delete *all* job</source>
 <translation type="unfinished">Összes feladat förlése</translation>
 </message>
@@ -7762,7 +7868,7 @@
 <translation type="unfinished">Biztos, hogy törölni akarja az összes feladatot ?</translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Already done</source>
 <translation type="unfinished">Már kész</translation>
 </message>
@@ -7783,7 +7889,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+432"/>
 <source>Partial</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7836,7 +7942,7 @@
 <context>
 <name>qprocessing</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+65"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
 <source>Unknown</source>
 <translation type="unfinished">Ismeretlen</translation>
 </message>
@@ -7990,7 +8096,7 @@
 <context>
 <name>qtalert</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
 <source>Alert</source>
 <translation type="unfinished">Figyelem</translation>
 </message>
@@ -8002,14 +8108,14 @@
 <translation type="unfinished">Információ</translation>
 </message>
 <message>
- <location line="+24"/>
- <location line="+30"/>
+ <location line="+26"/>
+ <location line="+31"/>
 <source>Confirmation</source>
 <translation type="unfinished">Megerősítés</translation>
 </message>
 <message>
- <location line="+19"/>
- <location line="+30"/>
+ <location line="+21"/>
+ <location line="+33"/>
 <source>Question</source>
 <translation type="unfinished">Kérdés</translation>
 </message>
@@ -8886,20 +8992,13 @@
 <context>
 <name>tsdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
 <source>Error</source>
- <translation type="unfinished">Hiba</translation>
+ <translation type="obsolete">Hiba</translation>
 </message>
 <message>
- <location line="+0"/>
- <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="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+188"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+327"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
+ <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 type="unfinished"></translation>
 </message>
@@ -8911,6 +9010,12 @@
 <source>Indexing</source>
 <translation type="unfinished">Indexelés</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>twolame</name>
@@ -9280,12 +9385,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished">Egyéni</translation>
 </message>
 <message>
- <location line="+411"/>
+ <location line="+412"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished">Cél bitsebesség:</translation>
 </message>
@@ -9340,13 +9445,13 @@
 </message>
 <message>
 <location line="+61"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished">Hiba</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9356,12 +9461,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
- <source>my profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+34"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10622,12 +10722,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished">Egyéni</translation>
 </message>
 <message>
- <location line="+361"/>
+ <location line="+362"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished">Cél bitsebesség:</translation>
 </message>
@@ -10682,13 +10782,13 @@
 </message>
 <message>
 <location line="+41"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished">Hiba</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10698,7 +10798,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+45"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12029,7 +12129,7 @@
 <context>
 <name>yadif</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
 <source>Yadif</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12039,47 +12139,62 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+53"/>
- <source>Temporal &amp; spatial check</source>
+ <location line="+75"/>
+ <source>Bottom field first</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Top field first</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>Frame : Temporal &amp; spatial check</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Bob, temporal &amp; spatial check</source>
+ <source>Field : Temporal &amp; spatial check</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Skip spatial temporal check</source>
+ <source>Frame : Skip spatial temporal check</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Bob, skip spatial temporal check</source>
+ <source>Field : Skip spatial temporal check</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Bottom field first</source>
+ <location line="+9"/>
+ <source>Deint all</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Top field first</source>
+ <source>Deint interlaced</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+5"/>
 <source>_Mode:</source>
 <translation type="unfinished">Mód:</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>_Deint:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>_Order:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+3"/>
 <source>yadif</source>
 <translation type="unfinished"></translation>
 </message>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_it.ts -> avidemux_2.7.4.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="+232"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
 <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="+85"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+102"/>
 <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="-172"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-189"/>
 <source>Checking if timestamps are valid..</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1056,11 +1056,21 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Ignore driver blacklist (Intel)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation>_Accetta frequenze audio non standard per DVD</translation>
@@ -1188,12 +1198,11 @@
 <translation>Prioritizzazione</translation>
 </message>
 <message>
- <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
- <translation>_Usa etichette alternative per gli MP3 in file .mp4</translation>
+ <translation type="vanished">_Usa etichette alternative per gli MP3 in file .mp4</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+5"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1203,7 +1212,17 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+2"/>
+ <source>Caching of decoded pictures</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Cache size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>XVideo (best)</source>
 <translation>XVideo (migliore)</translation>
 </message>
@@ -1213,7 +1232,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+15"/>
+ <location line="+11"/>
 <source>SDL (good)</source>
 <translation>SDL (buono)</translation>
 </message>
@@ -1343,7 +1362,7 @@
 <location line="+5"/>
 <location filename="../../common/gui_save.cpp" line="+57"/>
 <location line="+10"/>
- <location line="+278"/>
+ <location line="+277"/>
 <location line="+19"/>
 <location line="+7"/>
 <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1360,7 +1379,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
 <source>CPU</source>
 <translation>CPU</translation>
 </message>
@@ -1370,12 +1389,13 @@
 <translation>Threading</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+82"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+84"/>
 <source>Pr&amp;eferences</source>
 <translation>Preferenze</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+14"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+11"/>
+ <location line="+3"/>
 <source>Preferences</source>
 <translation>Preferenze</translation>
 </message>
@@ -1396,8 +1416,6 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+288"/>
- <location line="+10"/>
 <source>Queue</source>
 <translation>Coda</translation>
 </message>
@@ -1432,14 +1450,11 @@
 <translation>Chiudi</translation>
 </message>
 <message>
- <location line="+1"/>
- <location line="+2"/>
- <location line="+2"/>
 <source>-</source>
- <translation>-</translation>
+ <translation type="vanished">-</translation>
 </message>
 <message>
- <location line="-3"/>
+ <location line="+2"/>
 <source>Information</source>
 <translation>Informazioni</translation>
 </message>
@@ -1934,23 +1949,23 @@
 <translation>Info plugin</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-285"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-283"/>
 <source>Enable openGl support</source>
 <translation>Attiva supporto OpenGL</translation>
 </message>
 <message>
- <location line="+74"/>
+ <location line="+73"/>
 <source>VDPAU (best)</source>
 <translation>VDPAU (migliore)</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+6"/>
 <source>OpenGL (best)</source>
 <translation>OpenGL (migliore)</translation>
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="+48"/>
- <location filename="../../common/gui_save.cpp" line="-612"/>
+ <location filename="../../common/gui_save.cpp" line="-313"/>
 <source>No audio track</source>
 <translation>Nessuna traccia audio</translation>
 </message>
@@ -2007,17 +2022,36 @@
 È necessario per creare un video compatibile con PSP.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+189"/>
+ <location filename="../../common/gui_main.cpp" line="+186"/>
 <source>Select script to save</source>
 <translation>Seleziona lo script da salvare</translation>
 </message>
 <message>
- <location line="+184"/>
+ <location line="+183"/>
 <source>Not coded in this version</source>
 <translation>Non incluso in questa versione</translation>
 </message>
 <message>
- <location line="+251"/>
+ <location line="+209"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+60"/>
 <source>Are you sure?</source>
 <translation>Sei sicuro?</translation>
 </message>
@@ -2037,21 +2071,52 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+30"/>
 <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+103"/>
 <source>Permission error</source>
 <translation>Errore di permesso</translation>
 </message>
@@ -2104,19 +2169,19 @@
 </message>
 <message>
 <location line="+5"/>
- <location line="+320"/>
+ <location line="+321"/>
 <source>Something bad happened (II)</source>
 <translation>C&apos;è stato qualche errore (II)</translation>
 </message>
 <message>
- <location line="-199"/>
+ <location line="-202"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <location line="+103"/>
 <source>Checking video</source>
 <translation>Verifica video in corso</translation>
 </message>
@@ -2179,7 +2244,7 @@
 <translation>avsproxy</translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+35"/>
 <source>Frame type:</source>
 <translation>Tipo di fotogramma:</translation>
 </message>
@@ -2270,12 +2335,12 @@
 <translation>Salvataggio audio in corso</translation>
 </message>
 <message>
- <location line="+206"/>
+ <location line="+205"/>
 <source>Jpeg</source>
 <translation>Jpeg</translation>
 </message>
 <message>
- <location line="+103"/>
+ <location line="+113"/>
 <location line="+83"/>
 <source>Done</source>
 <translation>Fatto</translation>
@@ -2286,24 +2351,27 @@
 <translation>%d immagini salvate.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
 <location line="+44"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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="-249"/>
+ <location filename="../../common/gui_main.cpp" line="-250"/>
 <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="+7"/>
+ <location line="+20"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation>Errore</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+61"/>
+ <location filename="../../common/gui_save.cpp" line="-65"/>
 <source>BMP op failed</source>
 <translation>Op. BMP fallita</translation>
 </message>
@@ -2373,7 +2441,7 @@
 <translation type="unfinished">Salvataggio in corso</translation>
 </message>
 <message>
- <location line="+165"/>
+ <location line="+164"/>
 <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>
@@ -2383,37 +2451,32 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-90"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-86"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Decode video using XVBA (AMD)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
 <source>Decode video using LIBVA (INTEL)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>Decode video using VideoToolbox (macOS)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+6"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+8"/>
 <source>_Check for new release</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+78"/>
+ <location line="+77"/>
 <source>LIBVA (best)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2456,6 +2519,7 @@
 <message>
 <location line="+4"/>
 <location line="+3"/>
+ <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2510,7 +2574,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1382"/>
+ <location filename="../../common/gui_main.cpp" line="-1449"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2530,7 +2594,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+128"/>
+ <location line="+127"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation type="unfinished"></translation>
@@ -2551,14 +2615,14 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+114"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+102"/>
+ <location line="+124"/>
 <location line="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
@@ -2569,7 +2633,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+757"/>
+ <location line="+795"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation type="unfinished"></translation>
@@ -2600,7 +2664,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+295"/>
+ <location line="+297"/>
 <source>Oops</source>
 <translation type="unfinished">Ops</translation>
 </message>
@@ -2610,12 +2674,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+446"/>
+ <location filename="../../common/gui_play.cpp" line="+442"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-578"/>
+ <location filename="../../common/gui_save.cpp" line="-587"/>
 <source>Audio encoder index out of bounds</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2640,7 +2704,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+228"/>
+ <location line="+227"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -2661,7 +2725,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+87"/>
 <source>Saving selection as set of JPEG images</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2692,11 +2756,21 @@
 </message>
 <message>
 <location line="+67"/>
- <source>Cannot get tinyPÿ script engine</source>
+ <source>Cannot get tinyPy script engine</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Output file not specified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Job script %s already exists. Overwrite?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>Cannot add job %s</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2728,27 +2802,45 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+30"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="-255"/>
- <location line="+266"/>
+ <location line="-253"/>
+ <location line="+286"/>
 <location line="+26"/>
 <source>Muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-292"/>
- <location line="+266"/>
+ <location line="-312"/>
+ <location line="+286"/>
 <source>Cannot instantiate muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="-28"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+42"/>
 <source>Cannot open </source>
 <translation type="unfinished"></translation>
 </message>
@@ -3200,7 +3292,7 @@
 <translation type="unfinished">1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+ <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"/>
@@ -3229,7 +3321,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <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>
@@ -3253,7 +3345,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_toolkit/automation.cpp" line="+238"/>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
 <source>Permission Error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3302,7 +3394,7 @@
 <context>
 <name>asciiView</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
 <source>Ascii View</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3969,7 +4061,7 @@
 <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="+90"/>
+ <location line="+87"/>
 <source>Contrast</source>
 <translation type="unfinished">Contrasto</translation>
 </message>
@@ -3979,8 +4071,8 @@
 <translation type="unfinished">Regola contrasto, luminosità e colori.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
- <location line="+90"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
+ <location line="+87"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4104,7 +4196,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
 <source>Size: </source>
 <translation type="unfinished"></translation>
 </message>
@@ -6476,7 +6568,7 @@
 <context>
 <name>lavcodec</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
 <source>_Bitrate:</source>
 <translation type="unfinished">_Bitrate:</translation>
 </message>
@@ -6716,12 +6808,12 @@
 <context>
 <name>matroskademuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
 <source>Matroska Images</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+433"/>
+ <location line="+431"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6920,7 +7012,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+827"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">Problema di lettura delle intestazioni SVQ3</translation>
 </message>
@@ -6944,7 +7036,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+146"/>
 <source>Saving mp4</source>
 <translation type="unfinished">Salvataggio mp4 in corso</translation>
 </message>
@@ -6959,8 +7051,23 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+2"/>
+ <source>No optimization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Move index to the beginning of the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+1"/>
- <source>Use alternate MP3 tag</source>
+ <source>Use fragmentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Optimize for Streaming</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -7171,12 +7278,12 @@
 <context>
 <name>navigate</name>
 <message>
- <location filename="../../common/gui_navigate.cpp" line="+244"/>
+ <location filename="../../common/gui_navigate.cpp" line="+242"/>
 <source>Cannot go to next keyframe</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+69"/>
+ <location line="+64"/>
 <source>Cannot go to previous keyframe</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7254,7 +7361,7 @@
 <translation type="unfinished">Intestazione errata</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
 <source>Unpacking bitstream</source>
 <translation type="unfinished">Decompressione flusso di bit</translation>
 </message>
@@ -7401,15 +7508,8 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+80"/>
 <source>Error</source>
- <translation type="unfinished">Errore</translation>
- </message>
- <message>
- <location line="+0"/>
- <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="unfinished"></translation>
+ <translation type="obsolete">Errore</translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
@@ -7421,27 +7521,33 @@
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>qaudiotracks</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
 <source>Select audio file</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+22"/>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Error</source>
 <translation type="unfinished">Errore</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-161"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7520,18 +7626,18 @@
 <name>qfile</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+45"/>
- <location line="+141"/>
+ <location line="+142"/>
 <source>All files (*.*)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-58"/>
- <location line="+105"/>
+ <location line="-59"/>
+ <location line="+106"/>
 <source> files (*.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-81"/>
+ <location line="-82"/>
 <source>Overwrite file </source>
 <translation type="unfinished"></translation>
 </message>
@@ -7554,7 +7660,7 @@
 <translation type="unfinished">Progetti recenti</translation>
 </message>
 <message>
- <location line="+660"/>
+ <location line="+671"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7619,7 +7725,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+619"/>
+ <location line="+626"/>
 <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>
@@ -7737,12 +7843,12 @@
 </message>
 <message>
 <location line="+64"/>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Sure!</source>
 <translation type="unfinished">Sicuro!</translation>
 </message>
 <message>
- <location line="-14"/>
+ <location line="-15"/>
 <source>Delete job</source>
 <translation type="unfinished">Elimina attività</translation>
 </message>
@@ -7752,7 +7858,7 @@
 <translation type="unfinished">Sei sicuro di voler eliminare l&apos;attività %s?</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Delete *all* job</source>
 <translation type="unfinished">Elimina *tutte* le attività</translation>
 </message>
@@ -7762,7 +7868,7 @@
 <translation type="unfinished">Sei sicuro di voler eliminare TUTTE le attività?</translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Already done</source>
 <translation type="unfinished">Già fatto</translation>
 </message>
@@ -8238,7 +8344,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+432"/>
 <source>Partial</source>
 <translation type="unfinished">Parziale</translation>
 </message>
@@ -8291,7 +8397,7 @@
 <context>
 <name>qprocessing</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+65"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
 <source>Unknown</source>
 <translation type="unfinished">Sconosciuto</translation>
 </message>
@@ -8445,7 +8551,7 @@
 <context>
 <name>qtalert</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
 <source>Alert</source>
 <translation type="unfinished">Avviso</translation>
 </message>
@@ -8457,14 +8563,14 @@
 <translation type="unfinished">Info</translation>
 </message>
 <message>
- <location line="+24"/>
- <location line="+30"/>
+ <location line="+26"/>
+ <location line="+31"/>
 <source>Confirmation</source>
 <translation type="unfinished">Conferma</translation>
 </message>
 <message>
- <location line="+19"/>
- <location line="+30"/>
+ <location line="+21"/>
+ <location line="+33"/>
 <source>Question</source>
 <translation type="unfinished">Domanda</translation>
 </message>
@@ -9341,20 +9447,13 @@
 <context>
 <name>tsdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
 <source>Error</source>
- <translation type="unfinished">Errore</translation>
+ <translation type="obsolete">Errore</translation>
 </message>
 <message>
- <location line="+0"/>
- <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="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+188"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+327"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
+ <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 type="unfinished"></translation>
 </message>
@@ -9366,6 +9465,12 @@
 <source>Indexing</source>
 <translation type="unfinished">Indicizzazione</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>twolame</name>
@@ -9735,12 +9840,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished">Personalizzato</translation>
 </message>
 <message>
- <location line="+411"/>
+ <location line="+412"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished">Bitrate finale:</translation>
 </message>
@@ -9791,13 +9896,13 @@
 </message>
 <message>
 <location line="+61"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished">Errore</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9807,12 +9912,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
- <source>my profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+34"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11073,12 +11173,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished">Personalizzato</translation>
 </message>
 <message>
- <location line="+361"/>
+ <location line="+362"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished">Bitrate finale:</translation>
 </message>
@@ -11129,13 +11229,13 @@
 </message>
 <message>
 <location line="+41"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished">Errore</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11145,7 +11245,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+45"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12476,7 +12576,7 @@
 <context>
 <name>yadif</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
 <source>Yadif</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12486,47 +12586,74 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+53"/>
 <source>Temporal &amp; spatial check</source>
- <translation type="unfinished">Verifica temporale e spaziale</translation>
+ <translation type="obsolete">Verifica temporale e spaziale</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, temporal &amp; spatial check</source>
- <translation type="unfinished">Sdoppia, verifica temporale e spaziale</translation>
+ <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"/>
+ <source>Bottom field first</source>
+ <translation type="unfinished">Prima il semiquadro inferiore</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Top field first</source>
+ <translation type="unfinished">Prima il semiquadro superiore</translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>Frame : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Skip spatial temporal check</source>
+ <source>Field : Temporal &amp; spatial check</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Bob, skip spatial temporal check</source>
- <translation type="unfinished">Sdoppia, salta verifica temporale e spaziale</translation>
+ <source>Frame : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Bottom field first</source>
- <translation type="unfinished">Prima il semiquadro inferiore</translation>
+ <location line="+1"/>
+ <source>Field : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Deint all</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Top field first</source>
- <translation type="unfinished">Prima il semiquadro superiore</translation>
+ <source>Deint interlaced</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+5"/>
 <source>_Mode:</source>
 <translation type="unfinished">_Modalità:</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>_Deint:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>_Order:</source>
 <translation type="unfinished">_Ordine:</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+3"/>
 <source>yadif</source>
 <translation type="unfinished">yadif</translation>
 </message>

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="ja_JP">
 <context>
 <name>ADM_Composer</name>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
 <source>Attempt to open %s failed!</source>
 <translation type="unfinished">%s を開く試みは失敗しました!</translation>
 </message>
@@ -56,7 +56,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="+43"/>
 <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>
@@ -1050,11 +1050,21 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Ignore driver blacklist (Intel)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation type="unfinished">DVDに標準でない音声周波数を受け付ける(_A)</translation>
@@ -1195,12 +1205,11 @@
 </translation>
 </message>
 <message>
- <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
- <translation type="unfinished">.mp4にmp3の代替タグを使う(_U)</translation>
+ <translation type="obsolete">.mp4にmp3の代替タグを使う(_U)</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+5"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1210,7 +1219,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+9"/>
 <source>XVideo (best)</source>
 <translation type="unfinished">
 </translation>
@@ -1221,7 +1230,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+15"/>
+ <location line="+11"/>
 <source>SDL (good)</source>
 <translation type="unfinished">
 </translation>
@@ -1349,7 +1358,7 @@
 <location line="+5"/>
 <location filename="../../common/gui_save.cpp" line="+57"/>
 <location line="+10"/>
- <location line="+278"/>
+ <location line="+277"/>
 <location line="+19"/>
 <location line="+7"/>
 <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1366,7 +1375,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
 <source>CPU</source>
 <translation type="unfinished">CPU</translation>
 </message>
@@ -1377,19 +1386,17 @@
 </translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+11"/>
+ <location line="+3"/>
 <source>Preferences</source>
 <translation type="unfinished">設定</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+44"/>
- <location line="+2"/>
- <location line="+2"/>
 <source>-</source>
- <translation type="unfinished">-</translation>
+ <translation type="obsolete">-</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+72"/>
 <source>Copy</source>
 <translation type="unfinished">コピー</translation>
 </message>
@@ -1558,12 +1565,31 @@
 <translation type="unfinished">コーデックエラー</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+373"/>
+ <location filename="../../common/gui_main.cpp" line="+369"/>
 <source>Not coded in this version</source>
 <translation type="unfinished">このバージョンではコード化されていません</translation>
 </message>
 <message>
- <location line="+251"/>
+ <location line="+209"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+60"/>
 <source>Are you sure?</source>
 <translation type="unfinished">本当ですか&#xa0;?</translation>
 </message>
@@ -1583,21 +1609,52 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+30"/>
 <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+103"/>
 <source>Permission error</source>
 <translation type="unfinished">パーミッション エラー</translation>
 </message>
@@ -1650,19 +1707,19 @@
 </message>
 <message>
 <location line="+5"/>
- <location line="+320"/>
+ <location line="+321"/>
 <source>Something bad happened (II)</source>
 <translation type="unfinished">何か悪いことが起きました (II)</translation>
 </message>
 <message>
- <location line="-199"/>
+ <location line="-202"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <location line="+103"/>
 <source>Checking video</source>
 <translation type="unfinished">映像をチェック中</translation>
 </message>
@@ -1725,7 +1782,7 @@
 <translation type="unfinished">AvsProxy</translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+35"/>
 <source>Frame type:</source>
 <translation type="unfinished">フレームタイプ:</translation>
 </message>
@@ -1750,7 +1807,7 @@
 <translation type="unfinished">デリング(_D)</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-229"/>
+ <location filename="../../common/gui_save.cpp" line="-228"/>
 <source>Select Workbench to Save</source>
 <translation type="unfinished">保存するプロジェクトの選択</translation>
 </message>
@@ -1786,7 +1843,7 @@
 <translation type="unfinished">音声保存中</translation>
 </message>
 <message>
- <location line="+309"/>
+ <location line="+318"/>
 <location line="+83"/>
 <source>Done</source>
 <translation type="unfinished">完了</translation>
@@ -1797,24 +1854,27 @@
 <translation type="unfinished">%d 画像を保存.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
 <location line="+44"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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="-249"/>
+ <location filename="../../common/gui_main.cpp" line="-250"/>
 <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="+7"/>
+ <location line="+20"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation type="unfinished">エラー</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+61"/>
+ <location filename="../../common/gui_save.cpp" line="-65"/>
 <source>BMP op failed</source>
 <translation type="unfinished">BMP op 失敗</translation>
 </message>
@@ -1999,47 +2059,52 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-291"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-290"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Decode video using XVBA (AMD)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
 <source>Decode video using LIBVA (INTEL)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>Decode video using VideoToolbox (macOS)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+9"/>
 <source>Enable openGl support</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+8"/>
 <source>_Check for new release</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+58"/>
+ <source>Caching of decoded pictures</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Cache size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>VDPAU (best)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+6"/>
 <source>OpenGL (best)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2092,6 +2157,7 @@
 <message>
 <location line="+4"/>
 <location line="+3"/>
+ <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2122,8 +2188,6 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+14"/>
- <location line="+10"/>
 <source>Queue</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2406,7 +2470,7 @@
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="-144"/>
- <location filename="../../common/gui_save.cpp" line="-612"/>
+ <location filename="../../common/gui_save.cpp" line="-597"/>
 <source>No audio track</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2454,7 +2518,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1382"/>
+ <location filename="../../common/gui_main.cpp" line="-1449"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2479,7 +2543,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+128"/>
+ <location line="+127"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation type="unfinished"></translation>
@@ -2500,14 +2564,14 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+114"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+102"/>
+ <location line="+124"/>
 <location line="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
@@ -2518,7 +2582,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+757"/>
+ <location line="+795"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation type="unfinished"></translation>
@@ -2549,7 +2613,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+295"/>
+ <location line="+297"/>
 <source>Oops</source>
 <translation type="unfinished">しまった</translation>
 </message>
@@ -2559,7 +2623,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+446"/>
+ <location filename="../../common/gui_play.cpp" line="+442"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished">音声デバイス初期化トラブル</translation>
 </message>
@@ -2609,7 +2673,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+167"/>
+ <location line="+166"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -2635,7 +2699,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+87"/>
 <source>Saving selection as set of JPEG images</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2666,11 +2730,21 @@
 </message>
 <message>
 <location line="+67"/>
- <source>Cannot get tinyPÿ script engine</source>
+ <source>Cannot get tinyPy script engine</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Output file not specified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Job script %s already exists. Overwrite?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>Cannot add job %s</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2702,27 +2776,45 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+30"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="-255"/>
- <location line="+266"/>
+ <location line="-253"/>
+ <location line="+286"/>
 <location line="+26"/>
 <source>Muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-292"/>
- <location line="+266"/>
+ <location line="-312"/>
+ <location line="+286"/>
 <source>Cannot instantiate muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="-28"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+42"/>
 <source>Cannot open </source>
 <translation type="unfinished"></translation>
 </message>
@@ -3108,7 +3200,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+165"/>
+ <location line="+164"/>
 <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>
@@ -3210,7 +3302,7 @@
 <translation type="unfinished">1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+ <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"/>
@@ -3239,7 +3331,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <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>
@@ -3263,7 +3355,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_toolkit/automation.cpp" line="+238"/>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
 <source>Permission Error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3312,7 +3404,7 @@
 <context>
 <name>asciiView</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
 <source>Ascii View</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3981,7 +4073,7 @@
 <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="+90"/>
+ <location line="+87"/>
 <source>Contrast</source>
 <translation type="unfinished">コントラスト</translation>
 </message>
@@ -3991,8 +4083,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
- <location line="+90"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
+ <location line="+87"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4116,7 +4208,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
 <source>Size: </source>
 <translation type="unfinished"></translation>
 </message>
@@ -6492,7 +6584,7 @@
 <context>
 <name>lavcodec</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
 <source>_Bitrate:</source>
 <translation type="unfinished">ビットレート(_B):</translation>
 </message>
@@ -6732,12 +6824,12 @@
 <context>
 <name>matroskademuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
 <source>Matroska Images</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+433"/>
+ <location line="+431"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6936,7 +7028,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+827"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">SVQ3ヘッダ読取に問題</translation>
 </message>
@@ -6960,7 +7052,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+146"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6975,8 +7067,23 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+2"/>
+ <source>No optimization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+1"/>
- <source>Use alternate MP3 tag</source>
+ <source>Move index to the beginning of the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use fragmentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Optimize for Streaming</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -7187,12 +7294,12 @@
 <context>
 <name>navigate</name>
 <message>
- <location filename="../../common/gui_navigate.cpp" line="+244"/>
+ <location filename="../../common/gui_navigate.cpp" line="+242"/>
 <source>Cannot go to next keyframe</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+69"/>
+ <location line="+64"/>
 <source>Cannot go to previous keyframe</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7270,7 +7377,7 @@
 <translation type="unfinished">誤った形式のヘッダ</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
 <source>Unpacking bitstream</source>
 <translation type="unfinished">ビットストリームをアンパック中</translation>
 </message>
@@ -7417,15 +7524,8 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+80"/>
 <source>Error</source>
- <translation type="unfinished">エラー</translation>
- </message>
- <message>
- <location line="+0"/>
- <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="unfinished"></translation>
+ <translation type="obsolete">エラー</translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
@@ -7437,27 +7537,33 @@
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>qaudiotracks</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
 <source>Select audio file</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+22"/>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Error</source>
 <translation type="unfinished">エラー</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-161"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7536,18 +7642,18 @@
 <name>qfile</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+45"/>
- <location line="+141"/>
+ <location line="+142"/>
 <source>All files (*.*)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-58"/>
- <location line="+105"/>
+ <location line="-59"/>
+ <location line="+106"/>
 <source> files (*.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-81"/>
+ <location line="-82"/>
 <source>Overwrite file </source>
 <translation type="unfinished"></translation>
 </message>
@@ -7570,7 +7676,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+660"/>
+ <location line="+671"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7635,7 +7741,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+619"/>
+ <location line="+626"/>
 <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>
@@ -7754,12 +7860,12 @@
 </message>
 <message>
 <location line="+64"/>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Sure!</source>
 <translation type="unfinished">本当!</translation>
 </message>
 <message>
- <location line="-14"/>
+ <location line="-15"/>
 <source>Delete job</source>
 <translation type="unfinished">ジョブを削除</translation>
 </message>
@@ -7769,7 +7875,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Delete *all* job</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7779,7 +7885,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Already done</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7800,7 +7906,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+432"/>
 <source>Partial</source>
 <translation type="unfinished">部分適用</translation>
 </message>
@@ -7853,7 +7959,7 @@
 <context>
 <name>qprocessing</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+65"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
 <source>Unknown</source>
 <translation type="unfinished">不明</translation>
 </message>
@@ -8007,7 +8113,7 @@
 <context>
 <name>qtalert</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
 <source>Alert</source>
 <translation type="unfinished">警告</translation>
 </message>
@@ -8019,14 +8125,14 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
- <location line="+30"/>
+ <location line="+26"/>
+ <location line="+31"/>
 <source>Confirmation</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+19"/>
- <location line="+30"/>
+ <location line="+21"/>
+ <location line="+33"/>
 <source>Question</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8905,20 +9011,13 @@
 <context>
 <name>tsdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
 <source>Error</source>
- <translation type="unfinished">エラー</translation>
+ <translation type="obsolete">エラー</translation>
 </message>
 <message>
- <location line="+0"/>
- <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="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+188"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+327"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
+ <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 type="unfinished"></translation>
 </message>
@@ -8930,6 +9029,12 @@
 <source>Indexing</source>
 <translation type="unfinished">インデックス作成中</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>twolame</name>
@@ -9299,12 +9404,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished">カスタム</translation>
 </message>
 <message>
- <location line="+411"/>
+ <location line="+412"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9355,13 +9460,13 @@
 </message>
 <message>
 <location line="+61"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished">エラー</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9371,12 +9476,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
- <source>my profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+34"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10639,12 +10739,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished">カスタム</translation>
 </message>
 <message>
- <location line="+361"/>
+ <location line="+362"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10695,13 +10795,13 @@
 </message>
 <message>
 <location line="+41"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished">エラー</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10711,7 +10811,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+45"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12046,7 +12146,7 @@
 <context>
 <name>yadif</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
 <source>Yadif</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12056,47 +12156,78 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+53"/>
 <source>Temporal &amp; spatial check</source>
- <translation type="unfinished">時間と空間チェック</translation>
+ <translation type="obsolete">時間と空間チェック</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, temporal &amp; spatial check</source>
- <translation type="unfinished">Bob, 時間と空間チェック</translation>
+ <translation type="obsolete">Bob, 時間と空間チェック</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Skip spatial temporal check</source>
- <translation type="unfinished">空間-時間チェックをスキップ</translation>
+ <translation type="obsolete">空間-時間チェックをスキップ</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, skip spatial temporal check</source>
- <translation type="unfinished">Bob, 空間-時間チェックをスキップ</translation>
+ <translation type="obsolete">Bob, 空間-時間チェックをスキップ</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+75"/>
 <source>Bottom field first</source>
 <translation type="unfinished">ボトムフィールドが先</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="-1"/>
 <source>Top field first</source>
 <translation type="unfinished">トップフィールドが先</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="-7"/>
+ <source>Frame : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Deint all</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Deint interlaced</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
 <source>_Mode:</source>
 <translation type="unfinished">モード(_M):</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>_Deint:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>_Order:</source>
 <translation type="unfinished">オーダー(_O):</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+3"/>
 <source>yadif</source>
 <translation type="unfinished"></translation>
 </message>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_ko.ts -> avidemux_2.7.4.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="+196"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+194"/>
 <source>Cannot find a demuxer for %s</source>
 <translation>%s용 디먹서를 찾을 수 없습니다</translation>
 </message>
@@ -58,7 +58,7 @@
 <translation>타임스탬프가 유효한지 검사 중..</translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="+43"/>
 <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>
@@ -1058,7 +1058,7 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+34"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+36"/>
 <source>Open</source>
 <translation>열기</translation>
 </message>
@@ -1074,8 +1074,6 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+659"/>
- <location line="+10"/>
 <source>Queue</source>
 <translation>대기열</translation>
 </message>
@@ -1306,7 +1304,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+366"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+381"/>
 <source>Stereo</source>
 <translation>스테레오</translation>
 </message>
@@ -1462,7 +1460,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
 <source>CPU</source>
 <translation>CPU</translation>
 </message>
@@ -1508,12 +1506,12 @@
 </message>
 <message>
 <location line="+23"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-43"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-46"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="-612"/>
+ <location filename="../../common/gui_save.cpp" line="+57"/>
 <location line="+10"/>
- <location line="+278"/>
+ <location line="+277"/>
 <location line="+19"/>
 <location line="+7"/>
 <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1618,19 +1616,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-170"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation>DXVA2로 비디오 디코드 (윈도우)</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+6"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation>VDPAU로 비디오 디코드 (엔비디아)</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Decode video using XVBA (AMD)</source>
- <translation>XVBA로 비디오 디코드 (AMD)</translation>
+ <translation type="vanished">XVBA로 비디오 디코드 (AMD)</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -1638,22 +1635,32 @@
 <translation>LIBVA로 비디오 디코드 (인텔)</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>Decode video using VideoToolbox (macOS)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+9"/>
 <source>Enable openGl support</source>
 <translation>OpenGL 지원 활성화하기</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation>하드웨어 디코딩시, 일치하는 디스플레이 드라이버 사용</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="-9"/>
+ <source>Ignore driver blacklist (Intel)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation>DVD에 대해 비표준 오디오 주파수 받아들이기 </translation>
 </message>
@@ -1785,12 +1792,11 @@
 <translation>우선 순위</translation>
 </message>
 <message>
- <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
- <translation>.mp4에서 MP3용 대체 태그 사용하기</translation>
+ <translation type="vanished">.mp4에서 MP3용 대체 태그 사용하기</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+5"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation>최근 읽은 파일의 폴더를 저장용 폴더로 사용하기</translation>
 </message>
@@ -1800,7 +1806,17 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+2"/>
+ <source>Caching of decoded pictures</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Cache size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>XVideo (best)</source>
 <translation>XVideo (최상)</translation>
 </message>
@@ -1815,7 +1831,7 @@
 <translation>DXVA2 (최상)</translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+3"/>
 <source>OpenGL (best)</source>
 <translation>OpenGL (최상)</translation>
 </message>
@@ -1959,6 +1975,7 @@
 <message>
 <location line="+4"/>
 <location line="+3"/>
+ <location line="+3"/>
 <source>HW Accel</source>
 <translation>HW 가속</translation>
 </message>
@@ -1978,7 +1995,8 @@
 <translation>기본 사용 포트</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+7"/>
+ <location line="+3"/>
 <source>Preferences</source>
 <translation>환경 설정</translation>
 </message>
@@ -1993,14 +2011,11 @@
 <translation>JPEG로 저장</translation>
 </message>
 <message>
- <location line="+3"/>
- <location line="+2"/>
- <location line="+2"/>
 <source>-</source>
- <translation>-</translation>
+ <translation type="vanished">-</translation>
 </message>
 <message>
- <location line="-1"/>
+ <location line="+6"/>
 <source>Connect to avsproxy</source>
 <translation>avsproxy에 연결</translation>
 </message>
@@ -2065,18 +2080,21 @@
 <translation>다음 검정 프레임</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
 <location line="+44"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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="+1476"/>
+ <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="+189"/>
+ <location filename="../../common/gui_save.cpp" line="+199"/>
+ <location line="+99"/>
+ <location line="+7"/>
+ <location line="+20"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation>오류</translation>
@@ -2116,7 +2134,7 @@
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="+48"/>
- <location filename="../../common/gui_save.cpp" line="-503"/>
+ <location filename="../../common/gui_save.cpp" line="-638"/>
 <source>No audio track</source>
 <translation>오디오 트랙 없음</translation>
 </message>
@@ -2175,7 +2193,7 @@
 <translation>FAAC 코덱이 없습니다! PSP 호환 비디오를 만들 때 필요합니다.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1382"/>
+ <location filename="../../common/gui_main.cpp" line="-1449"/>
 <source>Select script/project to run</source>
 <translation>실행할 스크립트/프로젝트 선택</translation>
 </message>
@@ -2200,7 +2218,7 @@
 <translation>최근 파일과 프로젝트의 목록을 지우려고 합니다. 이 작업은 복구할 수 없습니다. 진행할까요?</translation>
 </message>
 <message>
- <location line="+117"/>
+ <location line="+116"/>
 <source>Not coded in this version</source>
 <translation>이 버전에 코딩되어 있지 않습니다</translation>
 </message>
@@ -2226,14 +2244,33 @@
 <translation>덧붙일 비디오 파일 선택...</translation>
 </message>
 <message>
- <location line="+114"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+55"/>
+ <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 type="unfinished"></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>
+ </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>
+ </message>
+ <message>
+ <location line="+60"/>
 <source>Are you sure?</source>
 <translation>확실한가요?</translation>
 </message>
@@ -2264,21 +2301,52 @@
 <translation>잘라내는 중 오류 발생.</translation>
 </message>
 <message>
- <location line="+8"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+103"/>
 <source>Permission error</source>
 <translation>권한 오류</translation>
 </message>
@@ -2331,19 +2399,19 @@
 </message>
 <message>
 <location line="+5"/>
- <location line="+320"/>
+ <location line="+321"/>
 <source>Something bad happened (II)</source>
 <translation>잘못된 일이 발생했습니다 (II)</translation>
 </message>
 <message>
- <location line="-199"/>
+ <location line="-202"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
 <translation>TinyPY 플러그인이 없습니다. 문제가 생길 수 있습니다.</translation>
 </message>
 <message>
- <location line="+100"/>
+ <location line="+103"/>
 <source>Checking video</source>
 <translation>비디오 검사 중</translation>
 </message>
@@ -2436,7 +2504,7 @@
 <translation>avsproxy</translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+35"/>
 <source>Frame type:</source>
 <translation>프레임 형식:</translation>
 </message>
@@ -2451,7 +2519,7 @@
 <translation>프레임 헥스 덤프</translation>
 </message>
 <message>
- <location line="+110"/>
+ <location line="+111"/>
 <source>Oops</source>
 <translation>웁스</translation>
 </message>
@@ -2461,7 +2529,7 @@
 <translation>이 기능이 비활성화되었거나 더 이상 유효하지 않습니다</translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+446"/>
+ <location filename="../../common/gui_play.cpp" line="+442"/>
 <source>Trouble initializing audio device</source>
 <translation>오디오 장치 초기화 중 문제 발생</translation>
 </message>
@@ -2547,7 +2615,7 @@
 <translation>오디오 저장 중</translation>
 </message>
 <message>
- <location line="+96"/>
+ <location line="+95"/>
 <source>Function not implemented
 </source>
 <translation>기능이 구현되지 않았습니다</translation>
@@ -2573,7 +2641,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+87"/>
 <source>Saving selection as set of JPEG images</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2603,7 +2671,22 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-34"/>
+ <location line="+67"/>
+ <source>Cannot get tinyPy script engine</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Output file not specified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Job script %s already exists. Overwrite?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-121"/>
 <location line="+83"/>
 <source>Done</source>
 <translation>완료</translation>
@@ -2639,12 +2722,11 @@
 <translation>%s 파일을 제대로 저장하지 못했습니다.</translation>
 </message>
 <message>
- <location line="+14"/>
 <source>Cannot get tinyPÿ script engine</source>
- <translation>TinyPÿ 스크립트 엔진을 가져올 수 없습니다</translation>
+ <translation type="vanished">TinyPÿ 스크립트 엔진을 가져올 수 없습니다</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+41"/>
 <source>Cannot add job %s</source>
 <translation>%s 작업을 추가할 수 없습니다</translation>
 </message>
@@ -2684,7 +2766,7 @@
 <translation>오디오 인코더를 설정할 수 없습니다, 스트림이 오디오 인코더와 호환되는지 확인하세요 (채널수, 비트레이트, 형식)</translation>
 </message>
 <message>
- <location line="+30"/>
+ <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>
@@ -2693,20 +2775,38 @@
 어쨌든 계속할까요?</translation>
 </message>
 <message>
- <location line="-255"/>
- <location line="+266"/>
+ <location line="-253"/>
+ <location line="+286"/>
 <location line="+26"/>
 <source>Muxer</source>
 <translation>먹서</translation>
 </message>
 <message>
- <location line="-292"/>
- <location line="+266"/>
+ <location line="-312"/>
+ <location line="+286"/>
 <source>Cannot instantiate muxer</source>
 <translation>먹서를 인스턴스화할 수 없습니다</translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="-28"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+42"/>
 <source>Cannot open </source>
 <translation>열 수 없습니다</translation>
 </message>
@@ -3101,7 +3201,7 @@
 <translation>저장 중</translation>
 </message>
 <message>
- <location line="+165"/>
+ <location line="+164"/>
 <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 +3303,7 @@
 <translation>1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+ <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"/>
@@ -3233,7 +3333,7 @@
 <translation>쉐이더를 컴파일할 수 없습니다</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <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>
@@ -3257,7 +3357,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_toolkit/automation.cpp" line="+238"/>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
 <source>Permission Error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3306,7 +3406,7 @@
 <context>
 <name>asciiView</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
 <source>Ascii View</source>
 <translation>아스키 보기</translation>
 </message>
@@ -3975,7 +4075,7 @@
 <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="+90"/>
+ <location line="+87"/>
 <source>Contrast</source>
 <translation>대비</translation>
 </message>
@@ -3985,8 +4085,8 @@
 <translation>대비, 밝기와 색상을 조정합니다.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
- <location line="+90"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
+ <location line="+87"/>
 <source>Brightness</source>
 <translation>밝기</translation>
 </message>
@@ -4110,7 +4210,7 @@
 <translation>경고: 높이를 너무 많이 잘라냈습니다! 높이 초기화!</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
 <source>Size: </source>
 <translation type="unfinished"></translation>
 </message>
@@ -6483,7 +6583,7 @@
 <context>
 <name>lavcodec</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
 <source>_Bitrate:</source>
 <translation>비트레이트:</translation>
 </message>
@@ -6723,12 +6823,12 @@
 <context>
 <name>matroskademuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
 <source>Matroska Images</source>
 <translation>Matroska 이미지</translation>
 </message>
 <message>
- <location line="+433"/>
+ <location line="+431"/>
 <source>Matroska clusters</source>
 <translation>Matroska 클러스터</translation>
 </message>
@@ -6927,7 +7027,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+827"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
 <source>Problem reading SVQ3 headers</source>
 <translation>SVQ3 헤더를 읽는 중 문제 발생</translation>
 </message>
@@ -6951,7 +7051,7 @@
 <translation>오디오용으로 AAC, AC3, E-AC3와 MPEG 오디오만 지원합니다</translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+146"/>
 <source>Saving mp4</source>
 <translation>MP4 저장 중</translation>
 </message>
@@ -6966,9 +7066,28 @@
 <translation>먹싱 형식</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Use alternate MP3 tag</source>
- <translation>대체 MP3 태그 사용</translation>
+ <translation type="vanished">대체 MP3 태그 사용</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>No optimization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Move index to the beginning of the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use fragmentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Optimize for Streaming</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
@@ -7178,12 +7297,12 @@
 <context>
 <name>navigate</name>
 <message>
- <location filename="../../common/gui_navigate.cpp" line="+244"/>
+ <location filename="../../common/gui_navigate.cpp" line="+242"/>
 <source>Cannot go to next keyframe</source>
 <translation>다음 키프레임으로 이동할 수 없습니다</translation>
 </message>
 <message>
- <location line="+69"/>
+ <location line="+64"/>
 <source>Cannot go to previous keyframe</source>
 <translation>이전 키프레임으로 이동할 수 없습니다</translation>
 </message>
@@ -7261,7 +7380,7 @@
 <translation>잘못된 형식의 헤더</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
 <source>Unpacking bitstream</source>
 <translation>비트스트림 압축 해제 중</translation>
 </message>
@@ -7408,15 +7527,13 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+80"/>
 <source>Error</source>
- <translation>오류</translation>
+ <translation type="vanished">오류</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>This file&apos;s index has been created with an older version of avidemux.
 Please delete the idx2 file and reopen.</source>
- <translation>이 파일의 인덱스는 이전 버전의 avidemux로 만들었습니다.
+ <translation type="vanished">이 파일의 인덱스는 이전 버전의 avidemux로 만들었습니다.
 idx2 파일을 삭제하고 파일을 다시 여세요.</translation>
 </message>
 <message>
@@ -7429,27 +7546,33 @@
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>qaudiotracks</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
 <source>Select audio file</source>
 <translation>오디오 파일 선택</translation>
 </message>
 <message>
 <location line="+22"/>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Error</source>
 <translation>오류</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-161"/>
 <source>Cannot use that file as audio track</source>
 <translation>그 파일을 오디오 트랙으로 사용할 수 없습니다</translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Some tracks are used multiple times</source>
 <translation>몇몇 트랙이 중복 사용되었습니다</translation>
 </message>
@@ -7528,18 +7651,18 @@
 <name>qfile</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+45"/>
- <location line="+141"/>
+ <location line="+142"/>
 <source>All files (*.*)</source>
 <translation>전체 파일 (*.*)</translation>
 </message>
 <message>
- <location line="-58"/>
- <location line="+105"/>
+ <location line="-59"/>
+ <location line="+106"/>
 <source> files (*.</source>
 <translation>파일 (*.</translation>
 </message>
 <message>
- <location line="-81"/>
+ <location line="-82"/>
 <source>Overwrite file </source>
 <translation>파일 덮어쓰기</translation>
 </message>
@@ -7562,7 +7685,7 @@
 <translation>최근 프로젝트</translation>
 </message>
 <message>
- <location line="+660"/>
+ <location line="+671"/>
 <source>Play/Stop</source>
 <translation>재생/정지</translation>
 </message>
@@ -7627,7 +7750,7 @@
 <translation>1분 앞으로</translation>
 </message>
 <message>
- <location line="+619"/>
+ <location line="+626"/>
 <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
 <translation>프로그램에서 치명적인 문제가 발생했습니다
@@ -7746,12 +7869,12 @@
 </message>
 <message>
 <location line="+64"/>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Sure!</source>
 <translation>확인!</translation>
 </message>
 <message>
- <location line="-14"/>
+ <location line="-15"/>
 <source>Delete job</source>
 <translation>작업 삭제</translation>
 </message>
@@ -7761,7 +7884,7 @@
 <translation>%s 작업을 정말 삭제할까요?</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Delete *all* job</source>
 <translation>*전체* 작업 삭제</translation>
 </message>
@@ -7771,7 +7894,7 @@
 <translation>전체 작업을 정말 삭제할까요?</translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Already done</source>
 <translation>이미 완료</translation>
 </message>
@@ -7792,7 +7915,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+432"/>
 <source>Partial</source>
 <translation>일부분</translation>
 </message>
@@ -7845,7 +7968,7 @@
 <context>
 <name>qprocessing</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+65"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
 <source>Unknown</source>
 <translation>알 수 없음</translation>
 </message>
@@ -7999,7 +8122,7 @@
 <context>
 <name>qtalert</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
 <source>Alert</source>
 <translation>경고</translation>
 </message>
@@ -8011,14 +8134,14 @@
 <translation>정보</translation>
 </message>
 <message>
- <location line="+24"/>
- <location line="+30"/>
+ <location line="+26"/>
+ <location line="+31"/>
 <source>Confirmation</source>
 <translation>확인</translation>
 </message>
 <message>
- <location line="+19"/>
- <location line="+30"/>
+ <location line="+21"/>
+ <location line="+33"/>
 <source>Question</source>
 <translation>질문</translation>
 </message>
@@ -8895,21 +9018,19 @@
 <context>
 <name>tsdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
 <source>Error</source>
- <translation>오류</translation>
+ <translation type="vanished">오류</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>This file&apos;s index has been created with an older version of avidemux.
 Please delete the idx2 file and reopen.</source>
- <translation>이 파일의 인덱스는 이전 버전의 avidemux로 만들었습니다.
+ <translation type="vanished">이 파일의 인덱스는 이전 버전의 avidemux로 만들었습니다.
 idx2 파일을 삭제하고 파일을 다시 여세요.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+188"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+327"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
+ <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>연속적인 파일 이름을 가진 파일이 여럿 있습니다. 전부 불러올까요?</translation>
 </message>
@@ -8921,6 +9042,12 @@
 <source>Indexing</source>
 <translation>인덱싱</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>twolame</name>
@@ -9292,12 +9419,12 @@
 <translation>없음</translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation>사용자 정의</translation>
 </message>
 <message>
- <location line="+411"/>
+ <location line="+412"/>
 <source>Target Bitrate:</source>
 <translation>대상 비트레이트:</translation>
 </message>
@@ -9352,13 +9479,13 @@
 </message>
 <message>
 <location line="+61"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation>오류</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation>프리셋을 불러올 수 없습니다</translation>
 </message>
@@ -9368,12 +9495,11 @@
 <translation>프로파일 저장</translation>
 </message>
 <message>
- <location line="+11"/>
 <source>my profile</source>
- <translation>내 프로파일</translation>
+ <translation type="vanished">내 프로파일</translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation>덮어쓰기</translation>
 </message>
@@ -10635,12 +10761,12 @@
 <translation>없음</translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation>사용자 정의</translation>
 </message>
 <message>
- <location line="+361"/>
+ <location line="+362"/>
 <source>Target Bitrate:</source>
 <translation>대상 비트레이트:</translation>
 </message>
@@ -10691,13 +10817,13 @@
 </message>
 <message>
 <location line="+41"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation>오류</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation>프리셋을 불러올 수 없습니다</translation>
 </message>
@@ -10707,7 +10833,7 @@
 <translation>프로파일 저장</translation>
 </message>
 <message>
- <location line="+45"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation>덮어쓰기</translation>
 </message>
@@ -12039,7 +12165,7 @@
 <context>
 <name>yadif</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
 <source>Yadif</source>
 <translation>Yadif</translation>
 </message>
@@ -12049,47 +12175,78 @@
 <translation>Fizick 이 만든 avisynth 버전의 Yadif를 포팅한 필터입니다.</translation>
 </message>
 <message>
- <location line="+53"/>
 <source>Temporal &amp; spatial check</source>
- <translation>시간 &amp; 공간 검사</translation>
+ <translation type="vanished">시간 &amp; 공간 검사</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, temporal &amp; spatial check</source>
- <translation>Bob, 시간 &amp; 공간 검사</translation>
+ <translation type="vanished">Bob, 시간 &amp; 공간 검사</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Skip spatial temporal check</source>
- <translation>시간 공간 검사 건너뛰기</translation>
+ <translation type="vanished">시간 공간 검사 건너뛰기</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, skip spatial temporal check</source>
- <translation>Bob, 시간 공간 검사 건너뛰기</translation>
+ <translation type="vanished">Bob, 시간 공간 검사 건너뛰기</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+75"/>
 <source>Bottom field first</source>
 <translation>하단 필드 먼저</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="-1"/>
 <source>Top field first</source>
 <translation>상단 필드 먼저</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="-7"/>
+ <source>Frame : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Deint all</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Deint interlaced</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
 <source>_Mode:</source>
 <translation>모드:</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>_Deint:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>_Order:</source>
 <translation>순서:</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+3"/>
 <source>yadif</source>
 <translation>Yadif</translation>
 </message>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_pl.ts -> avidemux_2.7.4.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="+232"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
 <source>Attempt to open %s failed!</source>
 <translation>Nie udało się otworzyć %s!</translation>
 </message>
@@ -58,7 +58,7 @@
 <translation>Sprawdzanie, czy znaczniki czasu są prawidłowe...</translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="+43"/>
 <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>
@@ -1058,11 +1058,21 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation>Dekoduj wideo używając DXVA2 (windows)</translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Ignore driver blacklist (Intel)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation>_Akceptuj niestandardową częstotliwość dźwięku dla DVD</translation>
@@ -1190,12 +1200,11 @@
 <translation>Priorytetyzacja</translation>
 </message>
 <message>
- <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
- <translation>_Użyj alternatywnej etykiety dla pliku MP3 w .mp4</translation>
+ <translation type="vanished">_Użyj alternatywnej etykiety dla pliku MP3 w .mp4</translation>
 </message>
 <message>
- <location line="+1"/>
+ <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>
@@ -1205,7 +1214,7 @@
 <translation>Oczyść dekodowane znaczniki czasowe (DTS) w trybie kopiowania</translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+9"/>
 <source>XVideo (best)</source>
 <translation>XVideo (najlepszy)</translation>
 </message>
@@ -1215,7 +1224,7 @@
 <translation>DXVA2 (najlepsze)</translation>
 </message>
 <message>
- <location line="+15"/>
+ <location line="+11"/>
 <source>SDL (good)</source>
 <translation>SDL (dobry)</translation>
 </message>
@@ -1345,7 +1354,7 @@
 <location line="+5"/>
 <location filename="../../common/gui_save.cpp" line="+57"/>
 <location line="+10"/>
- <location line="+278"/>
+ <location line="+277"/>
 <location line="+19"/>
 <location line="+7"/>
 <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1362,7 +1371,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
 <source>CPU</source>
 <translation>Procesor</translation>
 </message>
@@ -1372,24 +1381,22 @@
 <translation>Wątkowanie</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+82"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+84"/>
 <source>Pr&amp;eferences</source>
 <translation>Preferencje</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+14"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+11"/>
+ <location line="+3"/>
 <source>Preferences</source>
 <translation>Preferencje</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-38"/>
- <location line="+2"/>
- <location line="+2"/>
 <source>-</source>
- <translation>-</translation>
+ <translation type="vanished">-</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-12"/>
 <source>Copy</source>
 <translation>Kopiuj</translation>
 </message>
@@ -1619,12 +1626,31 @@
 <translation>Błąd kodeka</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+373"/>
+ <location filename="../../common/gui_main.cpp" line="+369"/>
 <source>Not coded in this version</source>
 <translation>Nie zaimplementowane w tej wersji</translation>
 </message>
 <message>
- <location line="+251"/>
+ <location line="+209"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+60"/>
 <source>Are you sure?</source>
 <translation>Na pewno?</translation>
 </message>
@@ -1644,7 +1670,7 @@
 <translation>Nie można usunąć całego wideo. Proszę sprawdzić pozycję znaczników A i B.</translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+30"/>
 <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>
@@ -1653,7 +1679,7 @@
 Czy kontynuować mimo to?</translation>
 </message>
 <message>
- <location line="+5"/>
+ <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>
@@ -1662,7 +1688,38 @@
 Czy kontynuować mimo to?</translation>
 </message>
 <message>
- <location line="+100"/>
+ <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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+103"/>
 <source>Permission error</source>
 <translation>Błąd: Brak uprawnień</translation>
 </message>
@@ -1715,12 +1772,12 @@
 </message>
 <message>
 <location line="+5"/>
- <location line="+320"/>
+ <location line="+321"/>
 <source>Something bad happened (II)</source>
 <translation>Stało się coś złego (II)</translation>
 </message>
 <message>
- <location line="-199"/>
+ <location line="-202"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
@@ -1728,7 +1785,7 @@
 Spodziewaj się problemów.</translation>
 </message>
 <message>
- <location line="+100"/>
+ <location line="+103"/>
 <source>Checking video</source>
 <translation>Sprawdzanie wideo</translation>
 </message>
@@ -1791,7 +1848,7 @@
 <translation>avsproxy</translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+35"/>
 <source>Frame type:</source>
 <translation>Typ klatki:</translation>
 </message>
@@ -1821,7 +1878,7 @@
 <translation>Deringing</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-229"/>
+ <location filename="../../common/gui_save.cpp" line="-228"/>
 <source>Select Workbench to Save</source>
 <translation type="unfinished">Wybierz narzędzia do zapisania</translation>
 </message>
@@ -1857,7 +1914,7 @@
 <translation>Zapisywanie dźwięku</translation>
 </message>
 <message>
- <location line="+309"/>
+ <location line="+318"/>
 <location line="+83"/>
 <source>Done</source>
 <translation>Zrobione</translation>
@@ -1868,24 +1925,27 @@
 <translation>Zapisano %d obrazów.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
 <location line="+44"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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="-249"/>
+ <location filename="../../common/gui_main.cpp" line="-250"/>
 <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="+7"/>
+ <location line="+20"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation>Błąd</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+61"/>
+ <location filename="../../common/gui_save.cpp" line="-65"/>
 <source>BMP op failed</source>
 <translation>Nie udało się otworzyć pliku BMP</translation>
 </message>
@@ -1930,7 +1990,7 @@
 <translation>Zapisywanie</translation>
 </message>
 <message>
- <location line="+165"/>
+ <location line="+164"/>
 <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>
@@ -2020,14 +2080,13 @@
 <translation>Multipleksery</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-291"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-290"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation>Dekoduj wideo używając VDPAU (NVIDIA)</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Decode video using XVBA (AMD)</source>
- <translation>Dekoduj wideo używając XVBA (AMD)</translation>
+ <translation type="vanished">Dekoduj wideo używając XVBA (AMD)</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -2035,32 +2094,42 @@
 <translation>Dekoduj wideo używając LIBVA (INTEL)</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>Decode video using VideoToolbox (macOS)</source>
 <translation>Dekoduj wideo używając VideoToolbox (macOS)</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+9"/>
 <source>Enable openGl support</source>
 <translation>Włącz obsługę OpenGL</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation>Jeśli używasz dekodowania sprzętowego, lepiej jest używać zgodny sterownik graficzny</translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+8"/>
 <source>_Check for new release</source>
 <translation>Sprawdź czy jest nowe wydanie</translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+58"/>
+ <source>Caching of decoded pictures</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Cache size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>VDPAU (best)</source>
 <translation>VDPAU (najlepsze)</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+6"/>
 <source>OpenGL (best)</source>
 <translation>OpenGL (najlepsze)</translation>
 </message>
@@ -2108,6 +2177,7 @@
 <message>
 <location line="+4"/>
 <location line="+3"/>
+ <location line="+3"/>
 <source>HW Accel</source>
 <translation>Akceleracja sprzętowa</translation>
 </message>
@@ -2138,8 +2208,6 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+14"/>
- <location line="+10"/>
 <source>Queue</source>
 <translation>Kolejka</translation>
 </message>
@@ -2415,7 +2483,7 @@
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="-144"/>
- <location filename="../../common/gui_save.cpp" line="-612"/>
+ <location filename="../../common/gui_save.cpp" line="-597"/>
 <source>No audio track</source>
 <translation>Brak ścieżki dźwiękowej</translation>
 </message>
@@ -2466,7 +2534,7 @@
 Jest on wymagany do tworzenia wideo kompatybilnego z PSP.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1382"/>
+ <location filename="../../common/gui_main.cpp" line="-1449"/>
 <source>Select script/project to run</source>
 <translation>Wybierz skrypt/projekt do uruchomienia</translation>
 </message>
@@ -2491,7 +2559,7 @@
 <translation>Zamierzasz wyczyścić listę ostatnich plików i projektów. Tego nie można cofnąć. Kontynuować?</translation>
 </message>
 <message>
- <location line="+128"/>
+ <location line="+127"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation>Wybierz plik wideo...</translation>
@@ -2512,7 +2580,7 @@
 <translation>Wybierz plik wideo do dołączenia...</translation>
 </message>
 <message>
- <location line="+114"/>
+ <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>
@@ -2521,7 +2589,7 @@
 Czy kontynuować mimo to?</translation>
 </message>
 <message>
- <location line="+102"/>
+ <location line="+124"/>
 <location line="+21"/>
 <source>Cutting</source>
 <translation>Przycinanie</translation>
@@ -2532,7 +2600,7 @@
 <translation>Błąd podczas wycinania.</translation>
 </message>
 <message>
- <location line="+757"/>
+ <location line="+795"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation>Podano nieprawidłowy indeks audio</translation>
@@ -2563,7 +2631,7 @@
 <translation>Ustawienie języka dla podanego indeksu ścieżki nie jest możliwe: Nieprawidłowy indeks ścieżki!</translation>
 </message>
 <message>
- <location line="+295"/>
+ <location line="+297"/>
 <source>Oops</source>
 <translation>Oops</translation>
 </message>
@@ -2573,7 +2641,7 @@
 <translation>Ta funkcja jest wyłączona lub nie jest już obowiązująca</translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+446"/>
+ <location filename="../../common/gui_play.cpp" line="+442"/>
 <source>Trouble initializing audio device</source>
 <translation>Problem z zainicjowaniem urządzenia audio</translation>
 </message>
@@ -2623,7 +2691,7 @@
 <translation>Wybierz plik PNG do zapisu</translation>
 </message>
 <message>
- <location line="+167"/>
+ <location line="+166"/>
 <source>Function not implemented
 </source>
 <translation>Funkcja nie zaimplementowana
@@ -2650,7 +2718,7 @@
 <translation>Nie udało się zapisać jako JPEG</translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+87"/>
 <source>Saving selection as set of JPEG images</source>
 <translation>Zapisywanie zaznaczenia w postaci zestawu obrazów JPEG</translation>
 </message>
@@ -2681,11 +2749,25 @@
 </message>
 <message>
 <location line="+67"/>
+ <source>Cannot get tinyPy script engine</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Output file not specified</source>
+ <translation type="unfinished"></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>Nie można uzyskać silnika skryptów tinyPÿ</translation>
+ <translation type="vanished">Nie można uzyskać silnika skryptów tinyPÿ</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+7"/>
 <source>Cannot add job %s</source>
 <translation>Nie można dodać zadania %s</translation>
 </message>
@@ -2718,7 +2800,7 @@
 <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>
 <message>
- <location line="+30"/>
+ <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>
@@ -2727,20 +2809,38 @@
 Czy kontynuować mimo to?</translation>
 </message>
 <message>
- <location line="-255"/>
- <location line="+266"/>
+ <location line="-253"/>
+ <location line="+286"/>
 <location line="+26"/>
 <source>Muxer</source>
 <translation>Mukser</translation>
 </message>
 <message>
- <location line="-292"/>
- <location line="+266"/>
+ <location line="-312"/>
+ <location line="+286"/>
 <source>Cannot instantiate muxer</source>
 <translation>Nie można utworzyć instancji muksera</translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="-28"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+42"/>
 <source>Cannot open </source>
 <translation>Nie można otworzyć </translation>
 </message>
@@ -3223,7 +3323,7 @@
 <translation>1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+ <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"/>
@@ -3253,7 +3353,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <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>
@@ -3277,7 +3377,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_toolkit/automation.cpp" line="+238"/>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
 <source>Permission Error</source>
 <translation>Błąd uprawnień</translation>
 </message>
@@ -3328,7 +3428,7 @@
 <context>
 <name>asciiView</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
 <source>Ascii View</source>
 <translation>Widok ASCII</translation>
 </message>
@@ -4003,13 +4103,13 @@
 <message>
 <location line="-1"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
- <location line="+90"/>
+ <location line="+87"/>
 <source>Contrast</source>
 <translation>Kontrast</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
- <location line="+90"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
+ <location line="+87"/>
 <source>Brightness</source>
 <translation>Jasność</translation>
 </message>
@@ -4133,7 +4233,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="+324"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
 <source>Size: </source>
 <translation>Rozmiar: </translation>
 </message>
@@ -6514,7 +6614,7 @@
 <context>
 <name>lavcodec</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
 <source>_Bitrate:</source>
 <translation>_Przepływność:</translation>
 </message>
@@ -6755,12 +6855,12 @@
 <context>
 <name>matroskademuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
 <source>Matroska Images</source>
 <translation>Obrazy Matroska</translation>
 </message>
 <message>
- <location line="+433"/>
+ <location line="+431"/>
 <source>Matroska clusters</source>
 <translation>Klastry Matroska</translation>
 </message>
@@ -6959,7 +7059,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+827"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
 <source>Problem reading SVQ3 headers</source>
 <translation>Wystąpił problem podczas czytania nagłówków SVQ3</translation>
 </message>
@@ -6983,7 +7083,7 @@
 <translation>Dla dźwięku wspierane są tylko formaty AAC, AC3, E-AC3 i mpegaudio dźwięku</translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+146"/>
 <source>Saving mp4</source>
 <translation>Zapisywanie MP4</translation>
 </message>
@@ -6998,9 +7098,28 @@
 <translation>Format muksowania</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Use alternate MP3 tag</source>
- <translation>Użyj alternatywnej etykiety pliku MP3</translation>
+ <translation type="vanished">Użyj alternatywnej etykiety pliku MP3</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>No optimization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Move index to the beginning of the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use fragmentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Optimize for Streaming</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
@@ -7210,12 +7329,12 @@
 <context>
 <name>navigate</name>
 <message>
- <location filename="../../common/gui_navigate.cpp" line="+244"/>
+ <location filename="../../common/gui_navigate.cpp" line="+242"/>
 <source>Cannot go to next keyframe</source>
 <translation>Nie można przejść do następnej klatki kluczowej</translation>
 </message>
 <message>
- <location line="+69"/>
+ <location line="+64"/>
 <source>Cannot go to previous keyframe</source>
 <translation>Nie można przejść do poprzedniej klatki kluczowej</translation>
 </message>
@@ -7293,7 +7412,7 @@
 <translation>Zdeformowany nagłówek</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
 <source>Unpacking bitstream</source>
 <translation>Rozpakowanie strumienia bitów</translation>
 </message>
@@ -7440,15 +7559,13 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+80"/>
 <source>Error</source>
- <translation>Błąd</translation>
+ <translation type="vanished">Błąd</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>This file&apos;s index has been created with an older version of avidemux.
 Please delete the idx2 file and reopen.</source>
- <translation>Indeks dla tego pliku został utworzony w starszej wersji avidemux.
+ <translation type="vanished">Indeks dla tego pliku został utworzony w starszej wersji avidemux.
 Proszę usunąć plik idx2 i otworzyć ponownie.</translation>
 </message>
 <message>
@@ -7461,27 +7578,33 @@
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>qaudiotracks</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
 <source>Select audio file</source>
 <translation>Wybierz plik dźwiękowy</translation>
 </message>
 <message>
 <location line="+22"/>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Error</source>
 <translation>Błąd</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-161"/>
 <source>Cannot use that file as audio track</source>
 <translation>Nie można użyć tego pliku jako ścieżkę dźwiękową</translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Some tracks are used multiple times</source>
 <translation>Niektóre ścieżki są używane wielokrotnie</translation>
 </message>
@@ -7560,18 +7683,18 @@
 <name>qfile</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+45"/>
- <location line="+141"/>
+ <location line="+142"/>
 <source>All files (*.*)</source>
 <translation>Wszystkie pliki (*.*)</translation>
 </message>
 <message>
- <location line="-58"/>
- <location line="+105"/>
+ <location line="-59"/>
+ <location line="+106"/>
 <source> files (*.</source>
 <translation type="unfinished"> pliki (*.</translation>
 </message>
 <message>
- <location line="-81"/>
+ <location line="-82"/>
 <source>Overwrite file </source>
 <translation>Zastąp plik </translation>
 </message>
@@ -7594,7 +7717,7 @@
 <translation>Ostatnie projekty</translation>
 </message>
 <message>
- <location line="+660"/>
+ <location line="+671"/>
 <source>Play/Stop</source>
 <translation>Odtwórz/Zatrzymaj</translation>
 </message>
@@ -7659,7 +7782,7 @@
 <translation>Do przodu jedna minuta</translation>
 </message>
 <message>
- <location line="+619"/>
+ <location line="+626"/>
 <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!
@@ -7778,12 +7901,12 @@
 </message>
 <message>
 <location line="+64"/>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Sure!</source>
 <translation>Na pewno!</translation>
 </message>
 <message>
- <location line="-14"/>
+ <location line="-15"/>
 <source>Delete job</source>
 <translation>Usuń zadanie</translation>
 </message>
@@ -7793,7 +7916,7 @@
 <translation>Na pewno chcesz usunąć zadanie %s?</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Delete *all* job</source>
 <translation>Usuń *wszystkie* zadania</translation>
 </message>
@@ -7803,7 +7926,7 @@
 <translation>Na pewno chcesz usunąć WSZYSTKIE zadania?</translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Already done</source>
 <translation>Już zrobione</translation>
 </message>
@@ -7824,7 +7947,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+432"/>
 <source>Partial</source>
 <translation>Częściowy</translation>
 </message>
@@ -7877,7 +8000,7 @@
 <context>
 <name>qprocessing</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+65"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
 <source>Unknown</source>
 <translation>Nieznany</translation>
 </message>
@@ -8031,7 +8154,7 @@
 <context>
 <name>qtalert</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
 <source>Alert</source>
 <translation>Powiadom mnie</translation>
 </message>
@@ -8043,14 +8166,14 @@
 <translation>Informacja</translation>
 </message>
 <message>
- <location line="+24"/>
- <location line="+30"/>
+ <location line="+26"/>
+ <location line="+31"/>
 <source>Confirmation</source>
 <translation>Potwierdzenie</translation>
 </message>
 <message>
- <location line="+19"/>
- <location line="+30"/>
+ <location line="+21"/>
+ <location line="+33"/>
 <source>Question</source>
 <translation>Pytanie</translation>
 </message>
@@ -8927,21 +9050,19 @@
 <context>
 <name>tsdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
 <source>Error</source>
- <translation>Błąd</translation>
+ <translation type="vanished">Błąd</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>This file&apos;s index has been created with an older version of avidemux.
 Please delete the idx2 file and reopen.</source>
- <translation>Indeks dla tego pliku został utworzony w starszej wersji avidemux.
+ <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="+188"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+327"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
+ <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>Istnieje kilka plików z sekwencyjnymi nazwami plików. Czy wszystkie powinny być załadowane?</translation>
 </message>
@@ -8953,6 +9074,12 @@
 <source>Indexing</source>
 <translation>Indeksowanie</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>twolame</name>
@@ -9323,12 +9450,12 @@
 <translation>brak</translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation>Własne</translation>
 </message>
 <message>
- <location line="+411"/>
+ <location line="+412"/>
 <source>Target Bitrate:</source>
 <translation>Docelowa przepływność:</translation>
 </message>
@@ -9379,13 +9506,13 @@
 </message>
 <message>
 <location line="+61"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation>Błąd</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation>Nie można wczytać ustawień</translation>
 </message>
@@ -9395,12 +9522,11 @@
 <translation>Zapisz profil</translation>
 </message>
 <message>
- <location line="+11"/>
 <source>my profile</source>
- <translation>mój profil</translation>
+ <translation type="vanished">mój profil</translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation>Zastąp</translation>
 </message>
@@ -10663,12 +10789,12 @@
 <translation>brak</translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished">Własna</translation>
 </message>
 <message>
- <location line="+361"/>
+ <location line="+362"/>
 <source>Target Bitrate:</source>
 <translation>Docelowa przepływność:</translation>
 </message>
@@ -10719,13 +10845,13 @@
 </message>
 <message>
 <location line="+41"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation>Błąd</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation>Nie można wczytać ustawień</translation>
 </message>
@@ -10735,7 +10861,7 @@
 <translation>Zapisz profil</translation>
 </message>
 <message>
- <location line="+45"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation>Zastąp</translation>
 </message>
@@ -12069,7 +12195,7 @@
 <context>
 <name>yadif</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
 <source>Yadif</source>
 <translation>Yadif</translation>
 </message>
@@ -12079,47 +12205,78 @@
 <translation>Yadif, przeniesione z wersji avisynth (c) Fizick.</translation>
 </message>
 <message>
- <location line="+53"/>
 <source>Temporal &amp; spatial check</source>
- <translation>Sprawdzanie czasowe i przestrzenne</translation>
+ <translation type="vanished">Sprawdzanie czasowe i przestrzenne</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, temporal &amp; spatial check</source>
- <translation>Bob, sprawdzanie czasowe i przestrzenne</translation>
+ <translation type="vanished">Bob, sprawdzanie czasowe i przestrzenne</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Skip spatial temporal check</source>
- <translation>Pomiń sprawdzanie przestrzenno-czasowe</translation>
+ <translation type="vanished">Pomiń sprawdzanie przestrzenno-czasowe</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, skip spatial temporal check</source>
- <translation>Bob, pomiń sprawdzanie przestrzenno-czasowe</translation>
+ <translation type="vanished">Bob, pomiń sprawdzanie przestrzenno-czasowe</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+75"/>
 <source>Bottom field first</source>
 <translation>Najpierw półobraz dolny</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="-1"/>
 <source>Top field first</source>
 <translation>Najpierw półobraz górny</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="-7"/>
+ <source>Frame : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Deint all</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Deint interlaced</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
 <source>_Mode:</source>
 <translation>_Tryb:</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>_Deint:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>_Order:</source>
 <translation>_Kolejność:</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+3"/>
 <source>yadif</source>
 <translation>yadif</translation>
 </message>

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="pt_BR">
 <context>
 <name>ADM_Composer</name>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+196"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+194"/>
 <source>Cannot find a demuxer for %s</source>
 <translation type="unfinished"></translation>
 </message>
@@ -56,7 +56,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="+43"/>
 <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>
@@ -1050,7 +1050,7 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+443"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+458"/>
 <source>Output</source>
 <translation type="unfinished">Saida</translation>
 </message>
@@ -1254,7 +1254,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
 <source>CPU</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1300,12 +1300,12 @@
 </message>
 <message>
 <location line="+23"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-43"/>
+ <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="+278"/>
+ <location line="+277"/>
 <location line="+19"/>
 <location line="+7"/>
 <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1410,42 +1410,47 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-170"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+6"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Decode video using XVBA (AMD)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
 <source>Decode video using LIBVA (INTEL)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>Decode video using VideoToolbox (macOS)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+9"/>
 <source>Enable openGl support</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="-9"/>
+ <source>Ignore driver blacklist (Intel)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1578,21 +1583,26 @@
 </message>
 <message>
 <location line="+5"/>
- <source>_Use alternative tag for MP3 in .mp4</source>
+ <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Default to the directory of the last read file for saving</source>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Caching of decoded pictures</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <source>_Cache size:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+6"/>
 <source>XVideo (best)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1607,7 +1617,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+3"/>
 <source>OpenGL (best)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1746,6 +1756,7 @@
 <message>
 <location line="+4"/>
 <location line="+3"/>
+ <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1765,12 +1776,13 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+7"/>
+ <location line="+3"/>
 <source>Preferences</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+34"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+36"/>
 <source>Open</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1786,8 +1798,6 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+288"/>
- <location line="+10"/>
 <source>Queue</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1822,14 +1832,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+1"/>
 <location line="+2"/>
- <location line="+2"/>
- <source>-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-3"/>
 <source>Information</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2057,18 +2060,21 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
 <location line="+44"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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="+1476"/>
+ <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="-109"/>
+ <location filename="../../common/gui_save.cpp" line="+199"/>
+ <location line="+99"/>
+ <location line="+7"/>
+ <location line="+20"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation type="unfinished"></translation>
@@ -2105,7 +2111,7 @@
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="+48"/>
- <location filename="../../common/gui_save.cpp" line="-503"/>
+ <location filename="../../common/gui_save.cpp" line="-638"/>
 <source>No audio track</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2164,7 +2170,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1382"/>
+ <location filename="../../common/gui_main.cpp" line="-1449"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2189,7 +2195,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+117"/>
+ <location line="+116"/>
 <source>Not coded in this version</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2215,14 +2221,33 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+114"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+55"/>
+ <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 type="unfinished"></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>
+ </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>
+ </message>
+ <message>
+ <location line="+60"/>
 <source>Are you sure?</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2253,21 +2278,52 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+8"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+103"/>
 <source>Permission error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2319,19 +2375,19 @@
 </message>
 <message>
 <location line="+5"/>
- <location line="+320"/>
+ <location line="+321"/>
 <source>Something bad happened (II)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-199"/>
+ <location line="-202"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <location line="+103"/>
 <source>Checking video</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2424,7 +2480,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+35"/>
 <source>Frame type:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2439,7 +2495,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+110"/>
+ <location line="+111"/>
 <source>Oops</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2449,7 +2505,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+446"/>
+ <location filename="../../common/gui_play.cpp" line="+442"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2530,7 +2586,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+96"/>
+ <location line="+95"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -2556,7 +2612,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+87"/>
 <source>Saving selection as set of JPEG images</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2586,18 +2642,33 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-34"/>
+ <location line="+67"/>
+ <source>Cannot get tinyPy script engine</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Output file not specified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Job script %s already exists. Overwrite?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-121"/>
 <location line="+83"/>
 <source>Done</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-574"/>
+ <location line="-583"/>
 <source>Audio encoder index out of bounds</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+491"/>
+ <location line="+500"/>
 <source>Saved %d images.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2627,12 +2698,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
- <source>Cannot get tinyPÿ script engine</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
+ <location line="+41"/>
 <source>Cannot add job %s</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2672,27 +2738,45 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+30"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="-255"/>
- <location line="+266"/>
+ <location line="-253"/>
+ <location line="+286"/>
 <location line="+26"/>
 <source>Muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-292"/>
- <location line="+266"/>
+ <location line="-312"/>
+ <location line="+286"/>
 <source>Cannot instantiate muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="-28"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+42"/>
 <source>Cannot open </source>
 <translation type="unfinished"></translation>
 </message>
@@ -3087,7 +3171,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+165"/>
+ <location line="+164"/>
 <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>
@@ -3189,7 +3273,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+ <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"/>
@@ -3218,7 +3302,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <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>
@@ -3242,7 +3326,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_toolkit/automation.cpp" line="+238"/>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
 <source>Permission Error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3291,7 +3375,7 @@
 <context>
 <name>asciiView</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
 <source>Ascii View</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3958,7 +4042,7 @@
 <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="+90"/>
+ <location line="+87"/>
 <source>Contrast</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3968,8 +4052,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
- <location line="+90"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
+ <location line="+87"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4091,7 +4175,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
 <source>Size: </source>
 <translation type="unfinished"></translation>
 </message>
@@ -6461,7 +6545,7 @@
 <context>
 <name>lavcodec</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
 <source>_Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6701,12 +6785,12 @@
 <context>
 <name>matroskademuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
 <source>Matroska Images</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+433"/>
+ <location line="+431"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6905,7 +6989,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+827"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6929,7 +7013,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+146"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6944,8 +7028,23 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+2"/>
+ <source>No optimization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+1"/>
- <source>Use alternate MP3 tag</source>
+ <source>Move index to the beginning of the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use fragmentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Optimize for Streaming</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -7156,12 +7255,12 @@
 <context>
 <name>navigate</name>
 <message>
- <location filename="../../common/gui_navigate.cpp" line="+244"/>
+ <location filename="../../common/gui_navigate.cpp" line="+242"/>
 <source>Cannot go to next keyframe</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+69"/>
+ <location line="+64"/>
 <source>Cannot go to previous keyframe</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7239,7 +7338,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
 <source>Unpacking bitstream</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7386,17 +7485,6 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+80"/>
- <source>Error</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <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="unfinished"></translation>
- </message>
- <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
 <source>Indexing</source>
 <translation type="unfinished"></translation>
@@ -7406,27 +7494,33 @@
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>qaudiotracks</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
 <source>Select audio file</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+22"/>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Error</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-161"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7505,18 +7599,18 @@
 <name>qfile</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+45"/>
- <location line="+141"/>
+ <location line="+142"/>
 <source>All files (*.*)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-58"/>
- <location line="+105"/>
+ <location line="-59"/>
+ <location line="+106"/>
 <source> files (*.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-81"/>
+ <location line="-82"/>
 <source>Overwrite file </source>
 <translation type="unfinished"></translation>
 </message>
@@ -7539,7 +7633,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+660"/>
+ <location line="+671"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7604,7 +7698,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+619"/>
+ <location line="+626"/>
 <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>
@@ -7722,12 +7816,12 @@
 </message>
 <message>
 <location line="+64"/>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Sure!</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-14"/>
+ <location line="-15"/>
 <source>Delete job</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7737,7 +7831,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Delete *all* job</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7747,7 +7841,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Already done</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7768,7 +7862,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+432"/>
 <source>Partial</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7821,7 +7915,7 @@
 <context>
 <name>qprocessing</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+65"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
 <source>Unknown</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7975,7 +8069,7 @@
 <context>
 <name>qtalert</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
 <source>Alert</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7987,14 +8081,14 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
- <location line="+30"/>
+ <location line="+26"/>
+ <location line="+31"/>
 <source>Confirmation</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+19"/>
- <location line="+30"/>
+ <location line="+21"/>
+ <location line="+33"/>
 <source>Question</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8871,20 +8965,9 @@
 <context>
 <name>tsdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
- <source>Error</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <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="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+188"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+327"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
+ <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 type="unfinished"></translation>
 </message>
@@ -8896,6 +8979,12 @@
 <source>Indexing</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>twolame</name>
@@ -9265,12 +9354,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+411"/>
+ <location line="+412"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9321,13 +9410,13 @@
 </message>
 <message>
 <location line="+61"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9337,12 +9426,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
- <source>my profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+34"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10603,12 +10687,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+361"/>
+ <location line="+362"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10659,13 +10743,13 @@
 </message>
 <message>
 <location line="+41"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10675,7 +10759,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+45"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12006,7 +12090,7 @@
 <context>
 <name>yadif</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
 <source>Yadif</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12016,47 +12100,62 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+53"/>
- <source>Temporal &amp; spatial check</source>
+ <location line="+75"/>
+ <source>Bottom field first</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Top field first</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>Frame : Temporal &amp; spatial check</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Bob, temporal &amp; spatial check</source>
+ <source>Field : Temporal &amp; spatial check</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Skip spatial temporal check</source>
+ <source>Frame : Skip spatial temporal check</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Bob, skip spatial temporal check</source>
+ <source>Field : Skip spatial temporal check</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Bottom field first</source>
+ <location line="+9"/>
+ <source>Deint all</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Top field first</source>
+ <source>Deint interlaced</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+5"/>
 <source>_Mode:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>_Deint:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>_Order:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+3"/>
 <source>yadif</source>
 <translation type="unfinished"></translation>
 </message>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_ru.ts -> avidemux_2.7.4.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="+232"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
 <source>Attempt to open %s failed!</source>
 <translation type="unfinished">Ошибка при открытии %s!</translation>
 </message>
@@ -58,7 +58,7 @@
 <translation type="unfinished">Проверка правильности временных меток...</translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="+43"/>
 <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>
@@ -529,7 +529,7 @@
 <message>
 <location line="-10"/>
 <source>&amp;Tools</source>
- <translation type="unfinished">С&amp;ервис</translation>
+ <translation type="unfinished">&amp;Инструменты</translation>
 </message>
 <message>
 <location line="-36"/>
@@ -1060,11 +1060,21 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation>Декодировать видео посредством DXVA2 (Windows)</translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Ignore driver blacklist (Intel)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation type="unfinished">_Разрешать нестандартную частоту звука для DVD</translation>
@@ -1187,12 +1197,11 @@
 <translation type="unfinished">Приоритет</translation>
 </message>
 <message>
- <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
- <translation type="unfinished">_Использовать альтернативные тэги для MP3 в .MP4</translation>
+ <translation type="obsolete">_Использовать альтернативные тэги для MP3 в .MP4</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+5"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished">_Сохранять видео в папке с последним прочитанным файлом по умолчанию</translation>
 </message>
@@ -1202,7 +1211,7 @@
 <translation type="unfinished">В режиме _копирования повысить равномерность отметок времени декодирования (DTS)</translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+9"/>
 <source>XVideo (best)</source>
 <translation type="unfinished">XVideo (лучшее)</translation>
 </message>
@@ -1212,7 +1221,7 @@
 <translation type="unfinished">DXVA2 (лучшее)</translation>
 </message>
 <message>
- <location line="+15"/>
+ <location line="+11"/>
 <source>SDL (good)</source>
 <translation type="unfinished">SDL (хорошо)</translation>
 </message>
@@ -1311,7 +1320,7 @@
 <location line="+5"/>
 <location filename="../../common/gui_save.cpp" line="+57"/>
 <location line="+10"/>
- <location line="+278"/>
+ <location line="+277"/>
 <location line="+19"/>
 <location line="+7"/>
 <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1327,17 +1336,18 @@
 <translation type="unfinished">Видео</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+39"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+42"/>
 <source>Threading</source>
 <translation type="unfinished">Многопоточность</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+82"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+84"/>
 <source>Pr&amp;eferences</source>
 <translation>&amp;Настройки</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+14"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+11"/>
+ <location line="+3"/>
 <source>Preferences</source>
 <translation>Настройки</translation>
 </message>
@@ -1486,46 +1496,106 @@
 <translation type="unfinished">Ошибка аудиокодера</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+373"/>
+ <location filename="../../common/gui_main.cpp" line="+369"/>
 <source>Not coded in this version</source>
 <translation type="unfinished">Нет в этой версии</translation>
 </message>
 <message>
- <location line="+251"/>
+ <location line="+209"/>
+ <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) на таких ключевых кадрах не сбрасывается. Образовавшиеся точки разреза вставки при сохранении видео в режиме копирования могут привести к задержке воспроизведения из-за нарушенного порядка показа изображений.
+Всё равно продолжить?</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>Кодек или параметры кодирования на точках разреза вставки не совпадают. Воспроизведение видео, сохранённого в режиме копирования, может на этих точках обрываться.
+Всё равно продолжить?</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>Не удалось проверить точки разреза вставки. Это указывает на проблему либо с исходным видео, либо с шагами редактирования, либо является проявлением ошибки в программе. За деталями обратитесь, пожалуйста, к журнальному файлу приложения или к консольным сообщениям.
+Всё равно продолжить?</translation>
+ </message>
+ <message>
+ <location line="+60"/>
 <source>Are you sure?</source>
 <translation type="unfinished">Вы уверены?</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 type="unfinished"></translation>
+ <translation>Вырезать видео целиком недопустимо. Пожалуйста, проверьте положение меток A и B.</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Deleting</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Удаление</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 type="unfinished"></translation>
+ <translation>Удалить видео целиком недопустимо. Пожалуйста, проверьте порожение меток A и B.</translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+30"/>
 <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 type="unfinished"></translation>
+ <translation>Конечная точка вырезки находится не на ключевом кадре. При сохранении видео в режиме копирования на этом месте будут повреждения.
+Всё равно продолжить?</translation>
 </message>
 <message>
- <location line="+5"/>
+ <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 type="unfinished"></translation>
+ <translation>Конечная точка удаления находится не на ключевом кадре. При сохранении видео в режиме копирования на этом месте будут повреждения.
+Всё равно продолжить?</translation>
 </message>
 <message>
- <location line="+100"/>
+ <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>Это видео использует кадры прямого доступа без мгновенного обновления декодирования (non-IDR). Счётчик очерёдности показа изображений (POC) на таких ключевых кадрах не сбрасывается. Выбранные конечные точки выреза при сохранении видео в режиме копирования могут привести к задержке воспроизведения из-за нарушенного порядка показа изображений.
+Всё равно продолжить?</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>Это видео использует кадры прямого доступа без мгновенного обновления декодирования (non-IDR). Счётчик очерёдности показа изображений (POC) на таких ключевых кадрах не сбрасывается. Выбранные конечные точки удаления при сохранении видео в режиме копирования могут привести к задержке воспроизведения из-за нарушенного порядка показа изображений.
+Всё равно продолжить?</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>Кодек или параметры кодирования на точках разреза не совпадают. Воспроизведение видео, сохранённого в режиме копирования, может на этих точках обрываться.
+Всё равно продолжить?</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>Кодек или параметры кодирования на точках разреза не совпадают. Воспроизведение видео, сохранённого в режиме копирования, может на этих точках обрываться.
+Всё равно продолжить?</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>Не удалось проверить точки разреза. Это указывает на проблему либо с исходным видео, либо с шагами редактирования, либо является проявлением ошибки в программе. За деталями обратитесь, пожалуйста, к журнальному файлу приложения или к консольным сообщениям.
+Всё равно продолжить?</translation>
+ </message>
+ <message>
+ <location line="+103"/>
 <source>Permission error</source>
 <translation type="unfinished">Ошибка прав доступа</translation>
 </message>
@@ -1578,12 +1648,12 @@
 </message>
 <message>
 <location line="+5"/>
- <location line="+320"/>
+ <location line="+321"/>
 <source>Something bad happened (II)</source>
 <translation type="unfinished">Ошибка при обновлении видео</translation>
 </message>
 <message>
- <location line="-199"/>
+ <location line="-202"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
@@ -1591,7 +1661,7 @@
 Возможны проблемы.</translation>
 </message>
 <message>
- <location line="+100"/>
+ <location line="+103"/>
 <source>Checking video</source>
 <translation type="unfinished">Проверка видео</translation>
 </message>
@@ -1644,7 +1714,7 @@
 Он запущен?</translation>
 </message>
 <message>
- <location line="+39"/>
+ <location line="+40"/>
 <source>Frame type:</source>
 <translation type="unfinished">Тип кадра:</translation>
 </message>
@@ -1669,7 +1739,7 @@
 <translation type="unfinished">Уровень фильтрации:</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-229"/>
+ <location filename="../../common/gui_save.cpp" line="-228"/>
 <source>Select Workbench to Save</source>
 <translation type="unfinished">Выберите файл для сохранения</translation>
 </message>
@@ -1705,7 +1775,7 @@
 <translation type="unfinished">Сохранение аудио</translation>
 </message>
 <message>
- <location line="+309"/>
+ <location line="+318"/>
 <location line="+83"/>
 <source>Done</source>
 <translation type="unfinished">Выполнено</translation>
@@ -1716,24 +1786,27 @@
 <translation type="unfinished">Сохранено изображений: %d </translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
 <location line="+44"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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="-249"/>
+ <location filename="../../common/gui_main.cpp" line="-250"/>
 <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="+7"/>
+ <location line="+20"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation type="unfinished">Ошибка</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+61"/>
+ <location filename="../../common/gui_save.cpp" line="-65"/>
 <source>BMP op failed</source>
 <translation type="unfinished">Ошибка открытия BMP</translation>
 </message>
@@ -2004,14 +2077,13 @@
 <translation type="unfinished">_Дерингинг</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-273"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-272"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished">Декодировать видео с помощью VDPAU (NVIDIA)</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Decode video using XVBA (AMD)</source>
- <translation type="unfinished">Декодировать видео с помощью XVBA (AMD)</translation>
+ <translation type="obsolete">Декодировать видео с помощью XVBA (AMD)</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -2019,22 +2091,22 @@
 <translation type="unfinished">Декодировать видео с помощью LIBVA (INTEL)</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>Decode video using VideoToolbox (macOS)</source>
 <translation type="unfinished">Декодировать видео с помощью VideoToolbox (macOS)</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+9"/>
 <source>Enable openGl support</source>
 <translation type="unfinished">Включить поддержку OpenGL</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished">При включении аппаратного ускорения лучше использовать подходящий видеодрайвер</translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+8"/>
 <source>_Check for new release</source>
 <translation>_Проверять обновления</translation>
 </message>
@@ -2044,12 +2116,22 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+62"/>
+ <location line="+55"/>
+ <source>Caching of decoded pictures</source>
+ <translation>Кэширование декодированных кадров</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Cache size:</source>
+ <translation>Разм_ер кэша:</translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>VDPAU (best)</source>
 <translation type="unfinished">VDPAU (лучшее)</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+6"/>
 <source>OpenGL (best)</source>
 <translation type="unfinished">OpenGL (лучшее)</translation>
 </message>
@@ -2128,6 +2210,7 @@
 <message>
 <location line="+4"/>
 <location line="+3"/>
+ <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished">Аппаратное ускорение</translation>
 </message>
@@ -2158,8 +2241,6 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+14"/>
- <location line="+10"/>
 <source>Queue</source>
 <translation type="unfinished">&amp;В очередь</translation>
 </message>
@@ -2194,14 +2275,7 @@
 <translation>&amp;Закрыть файл</translation>
 </message>
 <message>
- <location line="+1"/>
 <location line="+2"/>
- <location line="+2"/>
- <source>-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-3"/>
 <source>Information</source>
 <translation type="unfinished">Сво&amp;йства</translation>
 </message>
@@ -2407,7 +2481,7 @@
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="-144"/>
- <location filename="../../common/gui_save.cpp" line="-612"/>
+ <location filename="../../common/gui_save.cpp" line="-597"/>
 <source>No audio track</source>
 <translation type="unfinished">Нет звуковой дорожки</translation>
 </message>
@@ -2458,7 +2532,7 @@
 Он требуется для создания видео, совместимого с PSP.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1382"/>
+ <location filename="../../common/gui_main.cpp" line="-1449"/>
 <source>Select script/project to run</source>
 <translation type="unfinished">Выбрать скрипт/проект для запуска</translation>
 </message>
@@ -2483,7 +2557,7 @@
 <translation>Вы собираетесь очистить список недавно открытых файлов и проектов. Этот шаг необратим. Продолжить?</translation>
 </message>
 <message>
- <location line="+128"/>
+ <location line="+127"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation type="unfinished">Выбрать файл видео...</translation>
@@ -2504,14 +2578,15 @@
 <translation type="unfinished">Выбрать файл видео для присоединения...</translation>
 </message>
 <message>
- <location line="+114"/>
+ <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 type="unfinished"></translation>
+ <translation>Точки разреза вставленного видео находятся не на ключевых кадрах. Видео, сохранённое в режиме копирования, будет на этих местах повреждено.
+Всё равно продолжить?</translation>
 </message>
 <message>
- <location line="+102"/>
+ <location line="+124"/>
 <location line="+21"/>
 <source>Cutting</source>
 <translation type="unfinished">Обрезка</translation>
@@ -2522,7 +2597,7 @@
 <translation type="unfinished">Ошибка обрезки</translation>
 </message>
 <message>
- <location line="+757"/>
+ <location line="+795"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation type="unfinished">Неверный индекс аудио</translation>
@@ -2563,7 +2638,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+147"/>
+ <location line="+149"/>
 <source>Oops</source>
 <translation type="unfinished">Предупреждение</translation>
 </message>
@@ -2573,7 +2648,7 @@
 <translation type="unfinished">Функция отключена или более недействительна</translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+446"/>
+ <location filename="../../common/gui_play.cpp" line="+442"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished">Проблема при инициализации аудиоустройства.</translation>
 </message>
@@ -2623,7 +2698,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+167"/>
+ <location line="+166"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished">Функция не включена</translation>
@@ -2649,7 +2724,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+87"/>
 <source>Saving selection as set of JPEG images</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2680,11 +2755,25 @@
 </message>
 <message>
 <location line="+67"/>
+ <source>Cannot get tinyPy script engine</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Output file not specified</source>
+ <translation type="unfinished"></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="unfinished">Невозможно запустить движок скрипта tinyPy</translation>
+ <translation type="obsolete">Невозможно запустить движок скрипта tinyPy</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+7"/>
 <source>Cannot add job %s</source>
 <translation type="unfinished">Невозможно добавить операцию %s</translation>
 </message>
@@ -2717,30 +2806,49 @@
 <translation type="unfinished">Невозможно настроить аудиокодек, убедитесь в совместимости потока с ним (количество каналов, битрейт, формат)</translation>
 </message>
 <message>
- <location line="+30"/>
+ <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 type="unfinished">Установлен режим копирования для видео, но точки обрезки находятся не на ключевых кадрах.
-Видео будет сохранено, но в месте точек обрезки возможны повреждения.
-Вы все равно хотите продолжить?
- </translation>
+ <translation>Установлен режим копирования для видео, но точки разреза находятся не на ключевых кадрах. Видео будет сохранено, но на точках разреза будут повреждения.
+Всё равно продолжить?</translation>
 </message>
 <message>
- <location line="-255"/>
- <location line="+266"/>
+ <location line="-253"/>
+ <location line="+286"/>
 <location line="+26"/>
 <source>Muxer</source>
 <translation type="unfinished">Мультиплексор</translation>
 </message>
 <message>
- <location line="-292"/>
- <location line="+266"/>
+ <location line="-312"/>
+ <location line="+286"/>
 <source>Cannot instantiate muxer</source>
 <translation type="unfinished">Невозможно подтвердить мультиплексор</translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="-28"/>
+ <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) на таких ключевых кадрах не сбрасывается. Выбранные точки разреза при сохранении видео в режиме копирования могут привести к задержке воспроизведения из-за нарушенного порядка показа изображений.
+Всё равно продолжить?</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>Кодек или параметры кодирования на точках разреза не совпадают. Воспроизведение видео, сохранённого в режиме копирования, может на этих точках обрываться.
+Всё равно продолжить?</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>Не удалось проверить точки разреза. Это указывает на проблему либо с исходным видео, либо с шагами редактирования, либо является проявлением ошибки в программе. За деталями обратитесь, пожалуйста, к журнальному файлу приложения или к консольным сообщениям.
+Всё равно продолжить?</translation>
+ </message>
+ <message>
+ <location line="+42"/>
 <source>Cannot open </source>
 <translation type="unfinished">Невозможно открыть </translation>
 </message>
@@ -3110,7 +3218,7 @@
 <translation type="unfinished">Сохранение</translation>
 </message>
 <message>
- <location line="+165"/>
+ <location line="+164"/>
 <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>
@@ -3217,7 +3325,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+ <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"/>
@@ -3247,7 +3355,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <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>
@@ -3271,7 +3379,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_toolkit/automation.cpp" line="+238"/>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
 <source>Permission Error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3320,7 +3428,7 @@
 <context>
 <name>asciiView</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
 <source>Ascii View</source>
 <translation type="unfinished">ASCII-вид</translation>
 </message>
@@ -3788,37 +3896,37 @@
 <message>
 <location line="+32"/>
 <source>Change FPS</source>
- <translation type="unfinished">Изменить кадры/c</translation>
+ <translation>Изменить частоту кадров</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Speed up/slow down the video as if altering fps. This filter changes duration.</source>
- <translation type="unfinished">Ускорение/замедление видео при изменении кадров/c. Этот фильтр изменяет продолжительность видео.</translation>
+ <translation>Ускорить или замедлить видео за счёт изменения частоты кадров. Этот фильтр изменяет продолжительность видео.</translation>
 </message>
 <message>
 <location line="+141"/>
 <source>Source Fps:</source>
- <translation type="unfinished">Кадры/с источника:</translation>
+ <translation>Режим исходной частоты кадров:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Source frame rate:</source>
- <translation type="unfinished">Частота кадров источника:</translation>
+ <translation>Исходная частота в ручном режиме:</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Destination Fps:</source>
- <translation type="unfinished">Кадры/с приемника:</translation>
+ <translation>Режим целевой частоты кадров:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Destination frame rate:</source>
- <translation type="unfinished">Частота кадров приемника:</translation>
+ <translation>Целевая частота в ручном режиме:</translation>
 </message>
 <message>
 <location line="+8"/>
 <source>Change fps</source>
- <translation type="unfinished">Изменить кадры/с</translation>
+ <translation>Изменить частоту кадров</translation>
 </message>
 <message>
 <location line="+5"/>
@@ -3828,7 +3936,7 @@
 <message>
 <location line="+0"/>
 <source>Invalid fps</source>
- <translation type="unfinished">Неверные кадры/с</translation>
+ <translation>Неверная частота кадров</translation>
 </message>
 </context>
 <context>
@@ -3995,13 +4103,13 @@
 <message>
 <location line="-1"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
- <location line="+90"/>
+ <location line="+87"/>
 <source>Contrast</source>
 <translation type="unfinished">Контраст</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
- <location line="+90"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
+ <location line="+87"/>
 <source>Brightness</source>
 <translation type="unfinished">Яркость</translation>
 </message>
@@ -4127,7 +4235,7 @@
 </translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
 <source>Size: </source>
 <translation type="unfinished"></translation>
 </message>
@@ -6509,7 +6617,7 @@
 <context>
 <name>lavcodec</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
 <source>_Bitrate:</source>
 <translation type="unfinished">Битрейт:</translation>
 </message>
@@ -6749,12 +6857,12 @@
 <context>
 <name>matroskademuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
 <source>Matroska Images</source>
 <translation type="unfinished">Изображения Matroska</translation>
 </message>
 <message>
- <location line="+433"/>
+ <location line="+431"/>
 <source>Matroska clusters</source>
 <translation type="unfinished">Кластеры Matroska</translation>
 </message>
@@ -6953,7 +7061,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+827"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">Ошибка чтения заголовков SVQ3</translation>
 </message>
@@ -6977,7 +7085,7 @@
 <translation type="unfinished">Для аудио поддерживаются только AAC, AC3, E-AC3 и mpegaudio</translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+146"/>
 <source>Saving mp4</source>
 <translation type="unfinished">Сохранение в MP4</translation>
 </message>
@@ -6992,9 +7100,28 @@
 <translation type="unfinished">Формат мультиплексирования</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Use alternate MP3 tag</source>
- <translation type="unfinished">Использовать альтернативные тэги для MP3</translation>
+ <translation type="obsolete">Использовать альтернативные тэги для MP3</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>No optimization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Move index to the beginning of the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use fragmentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Optimize for Streaming</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
@@ -7205,12 +7332,12 @@
 <context>
 <name>navigate</name>
 <message>
- <location filename="../../common/gui_navigate.cpp" line="+244"/>
+ <location filename="../../common/gui_navigate.cpp" line="+242"/>
 <source>Cannot go to next keyframe</source>
 <translation type="unfinished">Невозможно перейти к следующему ключевому кадру</translation>
 </message>
 <message>
- <location line="+69"/>
+ <location line="+64"/>
 <source>Cannot go to previous keyframe</source>
 <translation type="unfinished">Невозможно перейти к предыдущему ключевому кадру</translation>
 </message>
@@ -7288,7 +7415,7 @@
 <translation type="unfinished">Заголовок неверной формы</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
 <source>Unpacking bitstream</source>
 <translation type="unfinished">Распаковка потока</translation>
 </message>
@@ -7435,15 +7562,13 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+80"/>
 <source>Error</source>
- <translation type="unfinished">Ошибка</translation>
+ <translation type="obsolete">Ошибка</translation>
 </message>
 <message>
- <location line="+0"/>
 <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="unfinished">Индекс &apos;этого файла был создан старой версией Avidemux.
+ <translation type="obsolete">Индекс &apos;этого файла был создан старой версией Avidemux.
 Пожалуйста, удалите файл idx2 и откройте заново.</translation>
 </message>
 <message>
@@ -7456,27 +7581,33 @@
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>qaudiotracks</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
 <source>Select audio file</source>
 <translation type="unfinished">Выбрать файл аудио</translation>
 </message>
 <message>
 <location line="+22"/>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Error</source>
 <translation type="unfinished">Ошибка</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-161"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished">Невозможно использовать файл как аудиодорожку</translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished">Некоторые дорожки использованы несколько раз</translation>
 </message>
@@ -7555,18 +7686,18 @@
 <name>qfile</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+45"/>
- <location line="+141"/>
+ <location line="+142"/>
 <source>All files (*.*)</source>
 <translation>Все файлы (*.*)</translation>
 </message>
 <message>
- <location line="-58"/>
- <location line="+105"/>
+ <location line="-59"/>
+ <location line="+106"/>
 <source> files (*.</source>
 <translation> файлы (*.</translation>
 </message>
 <message>
- <location line="-81"/>
+ <location line="-82"/>
 <source>Overwrite file </source>
 <translation>Перезаписать файл </translation>
 </message>
@@ -7589,7 +7720,7 @@
 <translation type="unfinished">Предыдущие проекты</translation>
 </message>
 <message>
- <location line="+660"/>
+ <location line="+671"/>
 <source>Play/Stop</source>
 <translation type="unfinished">Старт/стоп</translation>
 </message>
@@ -7654,7 +7785,7 @@
 <translation>Вперед на 1 минуту</translation>
 </message>
 <message>
- <location line="+619"/>
+ <location line="+626"/>
 <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">Приложение столкнулось с критической проблемой
@@ -7721,7 +7852,7 @@
 <message>
 <location line="+172"/>
 <source>Restore previous session</source>
- <translation type="unfinished"></translation>
+ <translation>Восстановить предыдущую сессию</translation>
 </message>
 </context>
 <context>
@@ -7773,12 +7904,12 @@
 </message>
 <message>
 <location line="+64"/>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Sure!</source>
 <translation type="unfinished">Да</translation>
 </message>
 <message>
- <location line="-14"/>
+ <location line="-15"/>
 <source>Delete job</source>
 <translation type="unfinished">Удалить задание</translation>
 </message>
@@ -7788,7 +7919,7 @@
 <translation type="unfinished">Вы уверены, что хотите удалить задание %s?</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Delete *all* job</source>
 <translation type="unfinished">Удалить все задания</translation>
 </message>
@@ -7798,7 +7929,7 @@
 <translation type="unfinished">Вы уверены что хотите удалить все задания?</translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Already done</source>
 <translation type="unfinished">Уже сделано</translation>
 </message>
@@ -7819,7 +7950,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+432"/>
 <source>Partial</source>
 <translation type="unfinished">Частичное наложение</translation>
 </message>
@@ -7872,7 +8003,7 @@
 <context>
 <name>qprocessing</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+65"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
 <source>Unknown</source>
 <translation type="unfinished">Неизвестно</translation>
 </message>
@@ -8028,7 +8159,7 @@
 <context>
 <name>qtalert</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
 <source>Alert</source>
 <translation type="unfinished">Внимание</translation>
 </message>
@@ -8040,14 +8171,14 @@
 <translation type="unfinished">Информация</translation>
 </message>
 <message>
- <location line="+24"/>
- <location line="+30"/>
+ <location line="+26"/>
+ <location line="+31"/>
 <source>Confirmation</source>
 <translation type="unfinished">Подтверждение</translation>
 </message>
 <message>
- <location line="+19"/>
- <location line="+30"/>
+ <location line="+21"/>
+ <location line="+33"/>
 <source>Question</source>
 <translation type="unfinished">Вопрос</translation>
 </message>
@@ -8149,7 +8280,7 @@
 <message>
 <location line="+6"/>
 <source>Resample fps</source>
- <translation type="unfinished">Изменить fps</translation>
+ <translation>Ресамплировать видео</translation>
 </message>
 <message>
 <location line="-325"/>
@@ -8184,12 +8315,12 @@
 <message>
 <location line="+35"/>
 <source>Resample FPS</source>
- <translation type="unfinished">Изменить кадры/с</translation>
+ <translation>Ресамплировать видео</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Change and enforce FPS. Keep duration and sync.</source>
- <translation type="unfinished">Изменить кадры/с и установить их принудительно. Сохраняет продолжительность и синхронизацию.</translation>
+ <translation>Ресамплировать видео под данную частоту кадров при сохранении продолжительности и синхронизации.</translation>
 </message>
 </context>
 <context>
@@ -8197,7 +8328,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
 <source>Width and height cannot be odd</source>
- <translation type="unfinished">Ширина и высота не могут быть нечетными</translation>
+ <translation>Ширина и высота не могут быть нечетными</translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+80"/>
@@ -8207,7 +8338,7 @@
 <message>
 <location line="+1"/>
 <source>swScale Resizer.</source>
- <translation type="unfinished">Изменение размера swScale.</translation>
+ <translation>Изменить размер с помощью swScale.</translation>
 </message>
 </context>
 <context>
@@ -8924,21 +9055,19 @@
 <context>
 <name>tsdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
 <source>Error</source>
- <translation type="unfinished">Ошибка</translation>
+ <translation type="obsolete">Ошибка</translation>
 </message>
 <message>
- <location line="+0"/>
 <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="unfinished">Индекс &apos;этого файла был создан старой версией Avidemux.
+ <translation type="obsolete">Индекс &apos;этого файла был создан старой версией Avidemux.
 Пожалуйста, удалите файл idx2 и откройте заново.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+188"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+327"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
+ <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 type="unfinished">Обнаружены несколько файлов с последовательными именами. Загрузить их все?</translation>
 </message>
@@ -8950,6 +9079,12 @@
 <source>Indexing</source>
 <translation type="unfinished">Индексирование</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>twolame</name>
@@ -9321,12 +9456,12 @@
 <translation type="unfinished">нет</translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished">Вручную</translation>
 </message>
 <message>
- <location line="+411"/>
+ <location line="+412"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished">Целевой битрейт:</translation>
 </message>
@@ -9381,13 +9516,13 @@
 </message>
 <message>
 <location line="+61"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished">Ошибка</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished">Невозможно загрузить предустановку</translation>
 </message>
@@ -9397,12 +9532,11 @@
 <translation type="unfinished">Сохранить профиль</translation>
 </message>
 <message>
- <location line="+11"/>
 <source>my profile</source>
- <translation type="unfinished">мой профиль</translation>
+ <translation type="obsolete">мой профиль</translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished">Перезаписать</translation>
 </message>
@@ -10666,12 +10800,12 @@
 <translation type="unfinished">нет</translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished">Вручную</translation>
 </message>
 <message>
- <location line="+361"/>
+ <location line="+362"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished">Целевой битрейт</translation>
 </message>
@@ -10726,13 +10860,13 @@
 </message>
 <message>
 <location line="+41"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished">Ошибка</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished">Невозможно загрузить предустановку</translation>
 </message>
@@ -10742,7 +10876,7 @@
 <translation type="unfinished">Сохранить профиль</translation>
 </message>
 <message>
- <location line="+45"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished">Перезаписать</translation>
 </message>
@@ -12075,7 +12209,7 @@
 <context>
 <name>yadif</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
 <source>Yadif</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12085,47 +12219,78 @@
 <translation type="unfinished">Yadif, порт версии avisynth (c) Fizick.</translation>
 </message>
 <message>
- <location line="+53"/>
 <source>Temporal &amp; spatial check</source>
- <translation type="unfinished">Временная &amp; пространственная проверка</translation>
+ <translation type="obsolete">Временная &amp; пространственная проверка</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, temporal &amp; spatial check</source>
- <translation type="unfinished">Bob, временная &amp; пространственная проверка</translation>
+ <translation type="obsolete">Bob, временная &amp; пространственная проверка</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Skip spatial temporal check</source>
- <translation type="unfinished">Пропустить временную &amp; пространственную проверку</translation>
+ <translation type="obsolete">Пропустить временную &amp; пространственную проверку</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, skip spatial temporal check</source>
- <translation type="unfinished">Bob, пропустить временную &amp; пространственную проверку</translation>
+ <translation type="obsolete">Bob, пропустить временную &amp; пространственную проверку</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+75"/>
 <source>Bottom field first</source>
 <translation type="unfinished">Нижнее поле первое</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="-1"/>
 <source>Top field first</source>
 <translation type="unfinished">Верхнее поле первое</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="-7"/>
+ <source>Frame : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Deint all</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Deint interlaced</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
 <source>_Mode:</source>
 <translation type="unfinished">_Режим:</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>_Deint:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>_Order:</source>
 <translation type="unfinished">Порядок:</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+3"/>
 <source>yadif</source>
 <translation type="unfinished"></translation>
 </message>

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="sr_RS">
 <context>
 <name>ADM_Composer</name>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
 <source>Attempt to open %s failed!</source>
 <translation type="unfinished">Покушај да отворим %s није успео!</translation>
 </message>
@@ -56,7 +56,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="+43"/>
 <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>
@@ -1050,11 +1050,21 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Ignore driver blacklist (Intel)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation type="unfinished">_Дозволи нестандардне учестаности звука за ДВД</translation>
@@ -1182,12 +1192,11 @@
 <translation type="unfinished">Постављање приоритета</translation>
 </message>
 <message>
- <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
- <translation type="unfinished">Користи _алтернативни таг за MP3 у .mp4</translation>
+ <translation type="obsolete">Користи _алтернативни таг за MP3 у .mp4</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+5"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1197,7 +1206,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+9"/>
 <source>XVideo (best)</source>
 <translation type="unfinished">XVideo (најбоље)</translation>
 </message>
@@ -1207,7 +1216,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+15"/>
+ <location line="+11"/>
 <source>SDL (good)</source>
 <translation type="unfinished">SDL (добро)</translation>
 </message>
@@ -1332,7 +1341,7 @@
 <location line="+5"/>
 <location filename="../../common/gui_save.cpp" line="+57"/>
 <location line="+10"/>
- <location line="+278"/>
+ <location line="+277"/>
 <location line="+19"/>
 <location line="+7"/>
 <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1349,7 +1358,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
 <source>CPU</source>
 <translation type="unfinished">Процесори</translation>
 </message>
@@ -1359,19 +1368,17 @@
 <translation type="unfinished">Више нити</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+11"/>
+ <location line="+3"/>
 <source>Preferences</source>
 <translation type="unfinished">Поставке</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+44"/>
- <location line="+2"/>
- <location line="+2"/>
 <source>-</source>
- <translation type="unfinished">-</translation>
+ <translation type="obsolete">-</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+72"/>
 <source>Copy</source>
 <translation type="unfinished">Без измене</translation>
 </message>
@@ -1540,12 +1547,31 @@
 <translation type="unfinished">Грешка у кодецима</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+373"/>
+ <location filename="../../common/gui_main.cpp" line="+369"/>
 <source>Not coded in this version</source>
 <translation type="unfinished">Није кодирано у овој верзији</translation>
 </message>
 <message>
- <location line="+251"/>
+ <location line="+209"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+60"/>
 <source>Are you sure?</source>
 <translation type="unfinished">Да ли си сигуран?</translation>
 </message>
@@ -1565,21 +1591,52 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+30"/>
 <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+103"/>
 <source>Permission error</source>
 <translation type="unfinished">Грешка са дозволама</translation>
 </message>
@@ -1632,19 +1689,19 @@
 </message>
 <message>
 <location line="+5"/>
- <location line="+320"/>
+ <location line="+321"/>
 <source>Something bad happened (II)</source>
 <translation type="unfinished">Нешто лоше се десило (II)</translation>
 </message>
 <message>
- <location line="-199"/>
+ <location line="-202"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <location line="+103"/>
 <source>Checking video</source>
 <translation type="unfinished">Проверавам видео</translation>
 </message>
@@ -1707,7 +1764,7 @@
 <translation type="unfinished">avsproxy</translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+35"/>
 <source>Frame type:</source>
 <translation type="unfinished">Тип кадра:</translation>
 </message>
@@ -1732,7 +1789,7 @@
 <translation type="unfinished">_Дерингинг</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-229"/>
+ <location filename="../../common/gui_save.cpp" line="-228"/>
 <source>Select Workbench to Save</source>
 <translation type="unfinished">Изабери датотеку да сачувам тезгу</translation>
 </message>
@@ -1768,7 +1825,7 @@
 <translation type="unfinished">Снимам звук</translation>
 </message>
 <message>
- <location line="+309"/>
+ <location line="+318"/>
 <location line="+83"/>
 <source>Done</source>
 <translation type="unfinished">Завршено</translation>
@@ -1779,24 +1836,27 @@
 <translation type="unfinished">Сачувано %d слика.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
 <location line="+44"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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="-249"/>
+ <location filename="../../common/gui_main.cpp" line="-250"/>
 <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="+7"/>
+ <location line="+20"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation type="unfinished">Грешка</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+61"/>
+ <location filename="../../common/gui_save.cpp" line="-65"/>
 <source>BMP op failed</source>
 <translation type="unfinished">Рад над BMP неуспео</translation>
 </message>
@@ -1981,47 +2041,52 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-291"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-290"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Decode video using XVBA (AMD)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
 <source>Decode video using LIBVA (INTEL)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>Decode video using VideoToolbox (macOS)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+9"/>
 <source>Enable openGl support</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+8"/>
 <source>_Check for new release</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+58"/>
+ <source>Caching of decoded pictures</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Cache size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>VDPAU (best)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+6"/>
 <source>OpenGL (best)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2074,6 +2139,7 @@
 <message>
 <location line="+4"/>
 <location line="+3"/>
+ <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2104,8 +2170,6 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+14"/>
- <location line="+10"/>
 <source>Queue</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2388,7 +2452,7 @@
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="-144"/>
- <location filename="../../common/gui_save.cpp" line="-612"/>
+ <location filename="../../common/gui_save.cpp" line="-597"/>
 <source>No audio track</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2436,7 +2500,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1382"/>
+ <location filename="../../common/gui_main.cpp" line="-1449"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2461,7 +2525,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+128"/>
+ <location line="+127"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation type="unfinished"></translation>
@@ -2482,14 +2546,14 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+114"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+102"/>
+ <location line="+124"/>
 <location line="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
@@ -2500,7 +2564,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+757"/>
+ <location line="+795"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation type="unfinished"></translation>
@@ -2531,7 +2595,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+295"/>
+ <location line="+297"/>
 <source>Oops</source>
 <translation type="unfinished">Упс...</translation>
 </message>
@@ -2541,7 +2605,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+446"/>
+ <location filename="../../common/gui_play.cpp" line="+442"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished">Проблеми при покретању звучне картице</translation>
 </message>
@@ -2591,7 +2655,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+167"/>
+ <location line="+166"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -2617,7 +2681,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+87"/>
 <source>Saving selection as set of JPEG images</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2648,11 +2712,21 @@
 </message>
 <message>
 <location line="+67"/>
- <source>Cannot get tinyPÿ script engine</source>
+ <source>Cannot get tinyPy script engine</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Output file not specified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Job script %s already exists. Overwrite?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>Cannot add job %s</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2684,27 +2758,45 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+30"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="-255"/>
- <location line="+266"/>
+ <location line="-253"/>
+ <location line="+286"/>
 <location line="+26"/>
 <source>Muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-292"/>
- <location line="+266"/>
+ <location line="-312"/>
+ <location line="+286"/>
 <source>Cannot instantiate muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="-28"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+42"/>
 <source>Cannot open </source>
 <translation type="unfinished"></translation>
 </message>
@@ -3089,7 +3181,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+165"/>
+ <location line="+164"/>
 <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>
@@ -3191,7 +3283,7 @@
 <translation type="unfinished">1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+ <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"/>
@@ -3220,7 +3312,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <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>
@@ -3244,7 +3336,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_toolkit/automation.cpp" line="+238"/>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
 <source>Permission Error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3293,7 +3385,7 @@
 <context>
 <name>asciiView</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
 <source>Ascii View</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3960,7 +4052,7 @@
 <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="+90"/>
+ <location line="+87"/>
 <source>Contrast</source>
 <translation type="unfinished">Контраст</translation>
 </message>
@@ -3970,8 +4062,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
- <location line="+90"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
+ <location line="+87"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4096,7 +4188,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
 <source>Size: </source>
 <translation type="unfinished"></translation>
 </message>
@@ -6466,7 +6558,7 @@
 <context>
 <name>lavcodec</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
 <source>_Bitrate:</source>
 <translation type="unfinished">_Битски проток:</translation>
 </message>
@@ -6706,12 +6798,12 @@
 <context>
 <name>matroskademuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
 <source>Matroska Images</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+433"/>
+ <location line="+431"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6910,7 +7002,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+827"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">Проблем при читању SVQ3 заглавља</translation>
 </message>
@@ -6934,7 +7026,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+146"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6949,8 +7041,23 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+2"/>
+ <source>No optimization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+1"/>
- <source>Use alternate MP3 tag</source>
+ <source>Move index to the beginning of the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use fragmentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Optimize for Streaming</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -7161,12 +7268,12 @@
 <context>
 <name>navigate</name>
 <message>
- <location filename="../../common/gui_navigate.cpp" line="+244"/>
+ <location filename="../../common/gui_navigate.cpp" line="+242"/>
 <source>Cannot go to next keyframe</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+69"/>
+ <location line="+64"/>
 <source>Cannot go to previous keyframe</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7244,7 +7351,7 @@
 <translation type="unfinished">Неисправно заглавље</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
 <source>Unpacking bitstream</source>
 <translation type="unfinished">Распакујем битски ток</translation>
 </message>
@@ -7391,15 +7498,8 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+80"/>
 <source>Error</source>
- <translation type="unfinished">Грешка</translation>
- </message>
- <message>
- <location line="+0"/>
- <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="unfinished"></translation>
+ <translation type="obsolete">Грешка</translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
@@ -7411,27 +7511,33 @@
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>qaudiotracks</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
 <source>Select audio file</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+22"/>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Error</source>
 <translation type="unfinished">Грешка</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-161"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7510,18 +7616,18 @@
 <name>qfile</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+45"/>
- <location line="+141"/>
+ <location line="+142"/>
 <source>All files (*.*)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-58"/>
- <location line="+105"/>
+ <location line="-59"/>
+ <location line="+106"/>
 <source> files (*.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-81"/>
+ <location line="-82"/>
 <source>Overwrite file </source>
 <translation type="unfinished"></translation>
 </message>
@@ -7544,7 +7650,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+660"/>
+ <location line="+671"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7609,7 +7715,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+619"/>
+ <location line="+626"/>
 <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>
@@ -7727,12 +7833,12 @@
 </message>
 <message>
 <location line="+64"/>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Sure!</source>
 <translation type="unfinished">Sigurno!</translation>
 </message>
 <message>
- <location line="-14"/>
+ <location line="-15"/>
 <source>Delete job</source>
 <translation type="unfinished">Уклони задатак</translation>
 </message>
@@ -7742,7 +7848,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Delete *all* job</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7752,7 +7858,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Already done</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7773,7 +7879,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+432"/>
 <source>Partial</source>
 <translation type="unfinished">Половично</translation>
 </message>
@@ -7826,7 +7932,7 @@
 <context>
 <name>qprocessing</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+65"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
 <source>Unknown</source>
 <translation type="unfinished">Непознато</translation>
 </message>
@@ -7980,7 +8086,7 @@
 <context>
 <name>qtalert</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
 <source>Alert</source>
 <translation type="unfinished">Узбуна</translation>
 </message>
@@ -7992,14 +8098,14 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
- <location line="+30"/>
+ <location line="+26"/>
+ <location line="+31"/>
 <source>Confirmation</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+19"/>
- <location line="+30"/>
+ <location line="+21"/>
+ <location line="+33"/>
 <source>Question</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8876,20 +8982,13 @@
 <context>
 <name>tsdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
 <source>Error</source>
- <translation type="unfinished">Грешка</translation>
+ <translation type="obsolete">Грешка</translation>
 </message>
 <message>
- <location line="+0"/>
- <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="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+188"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+327"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
+ <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 type="unfinished"></translation>
 </message>
@@ -8901,6 +9000,12 @@
 <source>Indexing</source>
 <translation type="unfinished">Правим индекс</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>twolame</name>
@@ -9270,12 +9375,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished">Произвољно</translation>
 </message>
 <message>
- <location line="+411"/>
+ <location line="+412"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9326,13 +9431,13 @@
 </message>
 <message>
 <location line="+61"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished">Грешка</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9342,12 +9447,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
- <source>my profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+34"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10608,12 +10708,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished">Произвољно</translation>
 </message>
 <message>
- <location line="+361"/>
+ <location line="+362"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10664,13 +10764,13 @@
 </message>
 <message>
 <location line="+41"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished">Грешка</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10680,7 +10780,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+45"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12011,7 +12111,7 @@
 <context>
 <name>yadif</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
 <source>Yadif</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12021,47 +12121,78 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+53"/>
 <source>Temporal &amp; spatial check</source>
- <translation type="unfinished">Темпорална и спатиална провера</translation>
+ <translation type="obsolete">Темпорална и спатиална провера</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, temporal &amp; spatial check</source>
- <translation type="unfinished">Bob, темпорална и спатиална провера</translation>
+ <translation type="obsolete">Bob, темпорална и спатиална провера</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Skip spatial temporal check</source>
- <translation type="unfinished">Прескочи спатиалну темпоралну проверу</translation>
+ <translation type="obsolete">Прескочи спатиалну темпоралну проверу</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, skip spatial temporal check</source>
- <translation type="unfinished">Bob, прескочи спатиалну темпоралну проверу</translation>
+ <translation type="obsolete">Bob, прескочи спатиалну темпоралну проверу</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+75"/>
 <source>Bottom field first</source>
 <translation type="unfinished">Најпре доња поља</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="-1"/>
 <source>Top field first</source>
 <translation type="unfinished">Најпре горња поља</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="-7"/>
+ <source>Frame : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Deint all</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Deint interlaced</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
 <source>_Mode:</source>
 <translation type="unfinished">_Режим:</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>_Deint:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>_Order:</source>
 <translation type="unfinished">_Редослед:</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+3"/>
 <source>yadif</source>
 <translation type="unfinished"></translation>
 </message>

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="sr_Latn_RS">
 <context>
 <name>ADM_Composer</name>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
 <source>Attempt to open %s failed!</source>
 <translation type="unfinished">Pokušaj da otvorim %s nije uspeo!</translation>
 </message>
@@ -56,7 +56,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="+43"/>
 <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>
@@ -1050,11 +1050,21 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Ignore driver blacklist (Intel)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation type="unfinished">_Dozvoli nestandardne učestanosti zvuka za DVD</translation>
@@ -1182,12 +1192,11 @@
 <translation type="unfinished">Postavljanje prioriteta</translation>
 </message>
 <message>
- <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
- <translation type="unfinished">Koristi _alternativni tag za MP3 u .mp4</translation>
+ <translation type="obsolete">Koristi _alternativni tag za MP3 u .mp4</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+5"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1197,7 +1206,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+9"/>
 <source>XVideo (best)</source>
 <translation type="unfinished">XVideo (najbolje)</translation>
 </message>
@@ -1207,7 +1216,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+15"/>
+ <location line="+11"/>
 <source>SDL (good)</source>
 <translation type="unfinished">SDL (dobro)</translation>
 </message>
@@ -1332,7 +1341,7 @@
 <location line="+5"/>
 <location filename="../../common/gui_save.cpp" line="+57"/>
 <location line="+10"/>
- <location line="+278"/>
+ <location line="+277"/>
 <location line="+19"/>
 <location line="+7"/>
 <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1349,7 +1358,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
 <source>CPU</source>
 <translation type="unfinished">Procesori</translation>
 </message>
@@ -1359,19 +1368,17 @@
 <translation type="unfinished">Više niti</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+11"/>
+ <location line="+3"/>
 <source>Preferences</source>
 <translation type="unfinished">Postavke</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+44"/>
- <location line="+2"/>
- <location line="+2"/>
 <source>-</source>
- <translation type="unfinished">-</translation>
+ <translation type="obsolete">-</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+72"/>
 <source>Copy</source>
 <translation type="unfinished">Bez izmene</translation>
 </message>
@@ -1540,12 +1547,31 @@
 <translation type="unfinished">Greška u kodecima</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+373"/>
+ <location filename="../../common/gui_main.cpp" line="+369"/>
 <source>Not coded in this version</source>
 <translation type="unfinished">Nije kodirano u ovoj verziji</translation>
 </message>
 <message>
- <location line="+251"/>
+ <location line="+209"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+60"/>
 <source>Are you sure?</source>
 <translation type="unfinished">Da li si siguran?</translation>
 </message>
@@ -1565,21 +1591,52 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+30"/>
 <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+103"/>
 <source>Permission error</source>
 <translation type="unfinished">Greška sa dozvolama</translation>
 </message>
@@ -1632,19 +1689,19 @@
 </message>
 <message>
 <location line="+5"/>
- <location line="+320"/>
+ <location line="+321"/>
 <source>Something bad happened (II)</source>
 <translation type="unfinished">Nešto loše se desilo (II)</translation>
 </message>
 <message>
- <location line="-199"/>
+ <location line="-202"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <location line="+103"/>
 <source>Checking video</source>
 <translation type="unfinished">Proveravam video</translation>
 </message>
@@ -1707,7 +1764,7 @@
 <translation type="unfinished">avsproxy</translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+35"/>
 <source>Frame type:</source>
 <translation type="unfinished">Tip kadra:</translation>
 </message>
@@ -1732,7 +1789,7 @@
 <translation type="unfinished">_Deringing</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-229"/>
+ <location filename="../../common/gui_save.cpp" line="-228"/>
 <source>Select Workbench to Save</source>
 <translation type="unfinished">Izaberi datoteku da sačuvam tezgu</translation>
 </message>
@@ -1768,7 +1825,7 @@
 <translation type="unfinished">Snimam zvuk</translation>
 </message>
 <message>
- <location line="+309"/>
+ <location line="+318"/>
 <location line="+83"/>
 <source>Done</source>
 <translation type="unfinished">Završeno</translation>
@@ -1779,24 +1836,27 @@
 <translation type="unfinished">Sačuvano %d slika.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
 <location line="+44"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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="-249"/>
+ <location filename="../../common/gui_main.cpp" line="-250"/>
 <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="+7"/>
+ <location line="+20"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation type="unfinished">Greška</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+61"/>
+ <location filename="../../common/gui_save.cpp" line="-65"/>
 <source>BMP op failed</source>
 <translation type="unfinished">Rad nad BMP neuspeo</translation>
 </message>
@@ -1981,47 +2041,52 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-291"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-290"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Decode video using XVBA (AMD)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
 <source>Decode video using LIBVA (INTEL)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>Decode video using VideoToolbox (macOS)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+9"/>
 <source>Enable openGl support</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+8"/>
 <source>_Check for new release</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+58"/>
+ <source>Caching of decoded pictures</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Cache size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>VDPAU (best)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+6"/>
 <source>OpenGL (best)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2074,6 +2139,7 @@
 <message>
 <location line="+4"/>
 <location line="+3"/>
+ <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2104,8 +2170,6 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+14"/>
- <location line="+10"/>
 <source>Queue</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2388,7 +2452,7 @@
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="-144"/>
- <location filename="../../common/gui_save.cpp" line="-612"/>
+ <location filename="../../common/gui_save.cpp" line="-597"/>
 <source>No audio track</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2436,7 +2500,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1382"/>
+ <location filename="../../common/gui_main.cpp" line="-1449"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2461,7 +2525,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+128"/>
+ <location line="+127"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation type="unfinished"></translation>
@@ -2482,14 +2546,14 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+114"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+102"/>
+ <location line="+124"/>
 <location line="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
@@ -2500,7 +2564,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+757"/>
+ <location line="+795"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation type="unfinished"></translation>
@@ -2531,7 +2595,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+295"/>
+ <location line="+297"/>
 <source>Oops</source>
 <translation type="unfinished">Ups...</translation>
 </message>
@@ -2541,7 +2605,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+446"/>
+ <location filename="../../common/gui_play.cpp" line="+442"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished">Problemi pri pokretanju zvučne kartice</translation>
 </message>
@@ -2591,7 +2655,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+167"/>
+ <location line="+166"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -2617,7 +2681,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+87"/>
 <source>Saving selection as set of JPEG images</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2648,11 +2712,21 @@
 </message>
 <message>
 <location line="+67"/>
- <source>Cannot get tinyPÿ script engine</source>
+ <source>Cannot get tinyPy script engine</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Output file not specified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Job script %s already exists. Overwrite?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>Cannot add job %s</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2684,27 +2758,45 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+30"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="-255"/>
- <location line="+266"/>
+ <location line="-253"/>
+ <location line="+286"/>
 <location line="+26"/>
 <source>Muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-292"/>
- <location line="+266"/>
+ <location line="-312"/>
+ <location line="+286"/>
 <source>Cannot instantiate muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="-28"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+42"/>
 <source>Cannot open </source>
 <translation type="unfinished"></translation>
 </message>
@@ -3089,7 +3181,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+165"/>
+ <location line="+164"/>
 <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>
@@ -3191,7 +3283,7 @@
 <translation type="unfinished">1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+ <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"/>
@@ -3220,7 +3312,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <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>
@@ -3244,7 +3336,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_toolkit/automation.cpp" line="+238"/>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
 <source>Permission Error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3293,7 +3385,7 @@
 <context>
 <name>asciiView</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
 <source>Ascii View</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3960,7 +4052,7 @@
 <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="+90"/>
+ <location line="+87"/>
 <source>Contrast</source>
 <translation type="unfinished">Kontrast</translation>
 </message>
@@ -3970,8 +4062,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
- <location line="+90"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
+ <location line="+87"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4096,7 +4188,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
 <source>Size: </source>
 <translation type="unfinished"></translation>
 </message>
@@ -6466,7 +6558,7 @@
 <context>
 <name>lavcodec</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
 <source>_Bitrate:</source>
 <translation type="unfinished">_Bitski protok:</translation>
 </message>
@@ -6706,12 +6798,12 @@
 <context>
 <name>matroskademuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
 <source>Matroska Images</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+433"/>
+ <location line="+431"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6910,7 +7002,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+827"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">Problem pri čitanju SVQ3 zaglavlja</translation>
 </message>
@@ -6934,7 +7026,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+146"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6949,8 +7041,23 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+2"/>
+ <source>No optimization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+1"/>
- <source>Use alternate MP3 tag</source>
+ <source>Move index to the beginning of the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use fragmentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Optimize for Streaming</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -7161,12 +7268,12 @@
 <context>
 <name>navigate</name>
 <message>
- <location filename="../../common/gui_navigate.cpp" line="+244"/>
+ <location filename="../../common/gui_navigate.cpp" line="+242"/>
 <source>Cannot go to next keyframe</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+69"/>
+ <location line="+64"/>
 <source>Cannot go to previous keyframe</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7244,7 +7351,7 @@
 <translation type="unfinished">Neispravno zaglavlje</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
 <source>Unpacking bitstream</source>
 <translation type="unfinished">Raspakujem bitski tok</translation>
 </message>
@@ -7391,15 +7498,8 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+80"/>
 <source>Error</source>
- <translation type="unfinished">Greška</translation>
- </message>
- <message>
- <location line="+0"/>
- <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="unfinished"></translation>
+ <translation type="obsolete">Greška</translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
@@ -7411,27 +7511,33 @@
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>qaudiotracks</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
 <source>Select audio file</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+22"/>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Error</source>
 <translation type="unfinished">Greška</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-161"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7510,18 +7616,18 @@
 <name>qfile</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+45"/>
- <location line="+141"/>
+ <location line="+142"/>
 <source>All files (*.*)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-58"/>
- <location line="+105"/>
+ <location line="-59"/>
+ <location line="+106"/>
 <source> files (*.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-81"/>
+ <location line="-82"/>
 <source>Overwrite file </source>
 <translation type="unfinished"></translation>
 </message>
@@ -7544,7 +7650,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+660"/>
+ <location line="+671"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7609,7 +7715,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+619"/>
+ <location line="+626"/>
 <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>
@@ -7727,12 +7833,12 @@
 </message>
 <message>
 <location line="+64"/>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Sure!</source>
 <translation type="unfinished">Sigurno!</translation>
 </message>
 <message>
- <location line="-14"/>
+ <location line="-15"/>
 <source>Delete job</source>
 <translation type="unfinished">Ukloni zadatak</translation>
 </message>
@@ -7742,7 +7848,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Delete *all* job</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7752,7 +7858,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Already done</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7773,7 +7879,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+432"/>
 <source>Partial</source>
 <translation type="unfinished">Polovično</translation>
 </message>
@@ -7826,7 +7932,7 @@
 <context>
 <name>qprocessing</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+65"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
 <source>Unknown</source>
 <translation type="unfinished">Nepoznato</translation>
 </message>
@@ -7980,7 +8086,7 @@
 <context>
 <name>qtalert</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
 <source>Alert</source>
 <translation type="unfinished">Uzbuna</translation>
 </message>
@@ -7992,14 +8098,14 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
- <location line="+30"/>
+ <location line="+26"/>
+ <location line="+31"/>
 <source>Confirmation</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+19"/>
- <location line="+30"/>
+ <location line="+21"/>
+ <location line="+33"/>
 <source>Question</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8876,20 +8982,13 @@
 <context>
 <name>tsdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
 <source>Error</source>
- <translation type="unfinished">Greška</translation>
+ <translation type="obsolete">Greška</translation>
 </message>
 <message>
- <location line="+0"/>
- <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="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+188"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+327"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
+ <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 type="unfinished"></translation>
 </message>
@@ -8901,6 +9000,12 @@
 <source>Indexing</source>
 <translation type="unfinished">Pravim indeks</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>twolame</name>
@@ -9270,12 +9375,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished">Proizvoljno</translation>
 </message>
 <message>
- <location line="+411"/>
+ <location line="+412"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9326,13 +9431,13 @@
 </message>
 <message>
 <location line="+61"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished">Greška</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9342,12 +9447,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
- <source>my profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+34"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10608,12 +10708,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished">Proizvoljno</translation>
 </message>
 <message>
- <location line="+361"/>
+ <location line="+362"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10664,13 +10764,13 @@
 </message>
 <message>
 <location line="+41"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished">Greška</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10680,7 +10780,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+45"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12011,7 +12111,7 @@
 <context>
 <name>yadif</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
 <source>Yadif</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12021,47 +12121,78 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+53"/>
 <source>Temporal &amp; spatial check</source>
- <translation type="unfinished">Temporalna i spatialna provera</translation>
+ <translation type="obsolete">Temporalna i spatialna provera</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, temporal &amp; spatial check</source>
- <translation type="unfinished">Bob, temporalna i spatialna provera</translation>
+ <translation type="obsolete">Bob, temporalna i spatialna provera</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Skip spatial temporal check</source>
- <translation type="unfinished">Preskoči spatialnu temporalnu proveru</translation>
+ <translation type="obsolete">Preskoči spatialnu temporalnu proveru</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, skip spatial temporal check</source>
- <translation type="unfinished">Bob, preskoči spatialnu temporalnu proveru</translation>
+ <translation type="obsolete">Bob, preskoči spatialnu temporalnu proveru</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+75"/>
 <source>Bottom field first</source>
 <translation type="unfinished">Najpre donja polja</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="-1"/>
 <source>Top field first</source>
 <translation type="unfinished">Najpre gornja polja</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="-7"/>
+ <source>Frame : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Deint all</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Deint interlaced</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
 <source>_Mode:</source>
 <translation type="unfinished">_Režim:</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>_Deint:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>_Order:</source>
 <translation type="unfinished">_Redosled:</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+3"/>
 <source>yadif</source>
 <translation type="unfinished"></translation>
 </message>

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="tr_TR">
 <context>
 <name>ADM_Composer</name>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
 <source>Attempt to open %s failed!</source>
 <translation type="unfinished">%s açma teşebbüsü başarısız oldu!</translation>
 </message>
@@ -56,7 +56,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="+43"/>
 <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>
@@ -1054,11 +1054,21 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Ignore driver blacklist (Intel)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation type="unfinished">
@@ -1207,13 +1217,12 @@
 </translation>
 </message>
 <message>
- <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
- <translation type="unfinished">
+ <translation type="obsolete">
 </translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+5"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1223,7 +1232,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+9"/>
 <source>XVideo (best)</source>
 <translation type="unfinished">
 </translation>
@@ -1234,7 +1243,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+15"/>
+ <location line="+11"/>
 <source>SDL (good)</source>
 <translation type="unfinished">
 </translation>
@@ -1367,7 +1376,7 @@
 <location line="+5"/>
 <location filename="../../common/gui_save.cpp" line="+57"/>
 <location line="+10"/>
- <location line="+278"/>
+ <location line="+277"/>
 <location line="+19"/>
 <location line="+7"/>
 <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1384,7 +1393,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
 <source>CPU</source>
 <translation type="unfinished">
 </translation>
@@ -1396,20 +1405,18 @@
 </translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+11"/>
+ <location line="+3"/>
 <source>Preferences</source>
 <translation type="unfinished">Tercihler</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+44"/>
- <location line="+2"/>
- <location line="+2"/>
 <source>-</source>
- <translation type="unfinished">
+ <translation type="obsolete">
 </translation>
 </message>
 <message>
- <location line="+22"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+72"/>
 <source>Copy</source>
 <translation type="unfinished">Kopyala</translation>
 </message>
@@ -1600,12 +1607,31 @@
 <translation type="unfinished">Kodek Hatası</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+373"/>
+ <location filename="../../common/gui_main.cpp" line="+369"/>
 <source>Not coded in this version</source>
 <translation type="unfinished">Bu sürümde kodlanmamış</translation>
 </message>
 <message>
- <location line="+251"/>
+ <location line="+209"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+60"/>
 <source>Are you sure?</source>
 <translation type="unfinished">
 </translation>
@@ -1626,21 +1652,52 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+30"/>
 <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+103"/>
 <source>Permission error</source>
 <translation type="unfinished">İzin hatası</translation>
 </message>
@@ -1693,19 +1750,19 @@
 </message>
 <message>
 <location line="+5"/>
- <location line="+320"/>
+ <location line="+321"/>
 <source>Something bad happened (II)</source>
 <translation type="unfinished">Kötü birşeyler oldu (II)</translation>
 </message>
 <message>
- <location line="-199"/>
+ <location line="-202"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+100"/>
+ <location line="+103"/>
 <source>Checking video</source>
 <translation type="unfinished">
 </translation>
@@ -1773,7 +1830,7 @@
 </translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+35"/>
 <source>Frame type:</source>
 <translation type="unfinished">
 </translation>
@@ -1801,7 +1858,7 @@
 <translation type="unfinished">_Halka Azaltma</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-229"/>
+ <location filename="../../common/gui_save.cpp" line="-228"/>
 <source>Select Workbench to Save</source>
 <translation type="unfinished">
 </translation>
@@ -1843,7 +1900,7 @@
 <translation type="unfinished">Ses kaydediliyor</translation>
 </message>
 <message>
- <location line="+309"/>
+ <location line="+318"/>
 <location line="+83"/>
 <source>Done</source>
 <translation type="unfinished">Tamamlandı</translation>
@@ -1854,24 +1911,27 @@
 <translation type="unfinished">%d resim kaydedildi.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
 <location line="+44"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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="-249"/>
+ <location filename="../../common/gui_main.cpp" line="-250"/>
 <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="+7"/>
+ <location line="+20"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation type="unfinished">Hata</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+61"/>
+ <location filename="../../common/gui_save.cpp" line="-65"/>
 <source>BMP op failed</source>
 <translation type="unfinished">BMP işlemmi başarısız oldu</translation>
 </message>
@@ -2056,47 +2116,52 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-291"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-290"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Decode video using XVBA (AMD)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
 <source>Decode video using LIBVA (INTEL)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>Decode video using VideoToolbox (macOS)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+9"/>
 <source>Enable openGl support</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="-3"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+8"/>
 <source>_Check for new release</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+58"/>
+ <source>Caching of decoded pictures</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Cache size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>VDPAU (best)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+6"/>
 <source>OpenGL (best)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2149,6 +2214,7 @@
 <message>
 <location line="+4"/>
 <location line="+3"/>
+ <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2179,8 +2245,6 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+14"/>
- <location line="+10"/>
 <source>Queue</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2463,7 +2527,7 @@
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="-144"/>
- <location filename="../../common/gui_save.cpp" line="-612"/>
+ <location filename="../../common/gui_save.cpp" line="-597"/>
 <source>No audio track</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2511,7 +2575,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1382"/>
+ <location filename="../../common/gui_main.cpp" line="-1449"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2536,7 +2600,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+128"/>
+ <location line="+127"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation type="unfinished"></translation>
@@ -2557,14 +2621,14 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+114"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+102"/>
+ <location line="+124"/>
 <location line="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
@@ -2575,7 +2639,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+757"/>
+ <location line="+795"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation type="unfinished"></translation>
@@ -2606,7 +2670,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+295"/>
+ <location line="+297"/>
 <source>Oops</source>
 <translation type="unfinished">Ah</translation>
 </message>
@@ -2616,7 +2680,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+446"/>
+ <location filename="../../common/gui_play.cpp" line="+442"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished">Ses aygıtının başlatılmasında hata</translation>
 </message>
@@ -2667,7 +2731,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+167"/>
+ <location line="+166"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -2693,7 +2757,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+87"/>
 <source>Saving selection as set of JPEG images</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2724,11 +2788,21 @@
 </message>
 <message>
 <location line="+67"/>
- <source>Cannot get tinyPÿ script engine</source>
+ <source>Cannot get tinyPy script engine</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Output file not specified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Job script %s already exists. Overwrite?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>Cannot add job %s</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2760,27 +2834,45 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+30"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="-255"/>
- <location line="+266"/>
+ <location line="-253"/>
+ <location line="+286"/>
 <location line="+26"/>
 <source>Muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-292"/>
- <location line="+266"/>
+ <location line="-312"/>
+ <location line="+286"/>
 <source>Cannot instantiate muxer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="-28"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+42"/>
 <source>Cannot open </source>
 <translation type="unfinished"></translation>
 </message>
@@ -3166,7 +3258,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+165"/>
+ <location line="+164"/>
 <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>
@@ -3273,7 +3365,7 @@
 <translation type="unfinished">1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+ <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"/>
@@ -3302,7 +3394,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <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>
@@ -3326,7 +3418,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_toolkit/automation.cpp" line="+238"/>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
 <source>Permission Error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3376,7 +3468,7 @@
 <context>
 <name>asciiView</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
 <source>Ascii View</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4050,7 +4142,7 @@
 <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="+90"/>
+ <location line="+87"/>
 <source>Contrast</source>
 <translation type="unfinished">Fark</translation>
 </message>
@@ -4060,8 +4152,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
- <location line="+90"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
+ <location line="+87"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4186,7 +4278,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
 <source>Size: </source>
 <translation type="unfinished"></translation>
 </message>
@@ -6592,7 +6684,7 @@
 <context>
 <name>lavcodec</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
 <source>_Bitrate:</source>
 <translation type="unfinished">
 </translation>
@@ -6835,12 +6927,12 @@
 <context>
 <name>matroskademuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+46"/>
 <source>Matroska Images</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+433"/>
+ <location line="+431"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7039,7 +7131,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+827"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">SVQ3 başlıklarının okunmasında hata</translation>
 </message>
@@ -7063,7 +7155,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+146"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7078,8 +7170,23 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+2"/>
+ <source>No optimization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+1"/>
- <source>Use alternate MP3 tag</source>
+ <source>Move index to the beginning of the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use fragmentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Optimize for Streaming</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -7290,12 +7397,12 @@
 <context>
 <name>navigate</name>
 <message>
- <location filename="../../common/gui_navigate.cpp" line="+244"/>
+ <location filename="../../common/gui_navigate.cpp" line="+242"/>
 <source>Cannot go to next keyframe</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+69"/>
+ <location line="+64"/>
 <source>Cannot go to previous keyframe</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7373,7 +7480,7 @@
 <translation type="unfinished">Bozuk başlık</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
 <source>Unpacking bitstream</source>
 <translation type="unfinished">
 </translation>
@@ -7532,15 +7639,8 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+80"/>
 <source>Error</source>
- <translation type="unfinished">Hata</translation>
- </message>
- <message>
- <location line="+0"/>
- <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="unfinished"></translation>
+ <translation type="obsolete">Hata</translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
@@ -7553,27 +7653,33 @@
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>qaudiotracks</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
 <source>Select audio file</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+22"/>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Error</source>
 <translation type="unfinished">Hata</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-161"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+161"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7654,18 +7760,18 @@
 <name>qfile</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+45"/>
- <location line="+141"/>
+ <location line="+142"/>
 <source>All files (*.*)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-58"/>
- <location line="+105"/>
+ <location line="-59"/>
+ <location line="+106"/>
 <source> files (*.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-81"/>
+ <location line="-82"/>
 <source>Overwrite file </source>
 <translation type="unfinished"></translation>
 </message>
@@ -7688,7 +7794,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+660"/>
+ <location line="+671"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7753,7 +7859,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+619"/>
+ <location line="+626"/>
 <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>
@@ -7871,12 +7977,12 @@
 </message>
 <message>
 <location line="+64"/>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Sure!</source>
 <translation type="unfinished">Kesinlikle!</translation>
 </message>
 <message>
- <location line="-14"/>
+ <location line="-15"/>
 <source>Delete job</source>
 <translation type="unfinished">Görevi sil</translation>
 </message>
@@ -7886,7 +7992,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Delete *all* job</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7896,7 +8002,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Already done</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7917,7 +8023,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+432"/>
 <source>Partial</source>
 <translation type="unfinished">Parçalı</translation>
 </message>
@@ -7970,7 +8076,7 @@
 <context>
 <name>qprocessing</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+65"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
 <source>Unknown</source>
 <translation type="unfinished">
 </translation>
@@ -8127,7 +8233,7 @@
 <context>
 <name>qtalert</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
 <source>Alert</source>
 <translation type="unfinished">Uyarı</translation>
 </message>
@@ -8139,14 +8245,14 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
- <location line="+30"/>
+ <location line="+26"/>
+ <location line="+31"/>
 <source>Confirmation</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+19"/>
- <location line="+30"/>
+ <location line="+21"/>
+ <location line="+33"/>
 <source>Question</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9041,20 +9147,13 @@
 <context>
 <name>tsdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
 <source>Error</source>
- <translation type="unfinished">Hata</translation>
+ <translation type="obsolete">Hata</translation>
 </message>
 <message>
- <location line="+0"/>
- <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="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+188"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+327"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
+ <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 type="unfinished"></translation>
 </message>
@@ -9067,6 +9166,12 @@
 <translation type="unfinished">
 </translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+89"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>twolame</name>
@@ -9441,12 +9546,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished">Özel</translation>
 </message>
 <message>
- <location line="+411"/>
+ <location line="+412"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9497,13 +9602,13 @@
 </message>
 <message>
 <location line="+61"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished">Hata</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9513,12 +9618,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
- <source>my profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+34"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10782,12 +10882,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+38"/>
 <source>Custom</source>
 <translation type="unfinished">Özel</translation>
 </message>
 <message>
- <location line="+361"/>
+ <location line="+362"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10838,13 +10938,13 @@
 </message>
 <message>
 <location line="+41"/>
- <location line="+69"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation type="unfinished">Hata</translation>
 </message>
 <message>
- <location line="-83"/>
+ <location line="-84"/>
 <source>Cannot load preset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10854,7 +10954,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+45"/>
+ <location line="+46"/>
 <source>Overwrite</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12192,7 +12292,7 @@
 <context>
 <name>yadif</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
 <source>Yadif</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12202,53 +12302,84 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+53"/>
 <source>Temporal &amp; spatial check</source>
- <translation type="unfinished">
+ <translation type="obsolete">
 </translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, temporal &amp; spatial check</source>
- <translation type="unfinished">
+ <translation type="obsolete">
 </translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Skip spatial temporal check</source>
- <translation type="unfinished">Uzamsal zamansal kontrolü atla</translation>
+ <translation type="obsolete">Uzamsal zamansal kontrolü atla</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, skip spatial temporal check</source>
- <translation type="unfinished">
+ <translation type="obsolete">
 </translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+75"/>
 <source>Bottom field first</source>
 <translation type="unfinished">
 </translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="-1"/>
 <source>Top field first</source>
 <translation type="unfinished">
 </translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="-7"/>
+ <source>Frame : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Deint all</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Deint interlaced</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
 <source>_Mode:</source>
 <translation type="unfinished">_Kip:</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>_Deint:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>_Order:</source>
 <translation type="unfinished">
 </translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+3"/>
 <source>yadif</source>
 <translation type="unfinished"></translation>
 </message>

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

@@ -9,7 +9,7 @@
 <translation>检查时间戳是否有效..</translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="+43"/>
 <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="+260"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+258"/>
 <source>width</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1060,11 +1060,8 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+44"/>
- <location line="+2"/>
- <location line="+2"/>
 <source>-</source>
- <translation>-</translation>
+ <translation type="vanished">-</translation>
 </message>
 <message>
 <location filename="../../common/gui_save.cpp" line="+67"/>
@@ -1082,12 +1079,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+277"/>
+ <location line="+276"/>
 <source>Failed to save as JPEG</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+87"/>
 <source>Saving selection as set of JPEG images</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1117,6 +1114,21 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+67"/>
+ <source>Cannot get tinyPy script engine</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Output file not specified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Job script %s already exists. Overwrite?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+372"/>
 <source>1:1</source>
 <translation>1:1</translation>
@@ -1143,7 +1155,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+492"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+510"/>
 <source>CPU</source>
 <translation>CPU</translation>
 </message>
@@ -1158,7 +1170,7 @@
 <translation>DTS</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+21"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+71"/>
 <source>Cut</source>
 <translation>剪切</translation>
 </message>
@@ -1168,7 +1180,7 @@
 <translation>GMC</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-475"/>
+ <location filename="../../common/gui_save.cpp" line="-571"/>
 <source>Job</source>
 <translation>工作</translation>
 </message>
@@ -1193,13 +1205,13 @@
 <translation>MP4</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-214"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-216"/>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-19"/>
 <source>Low</source>
 <translation>低</translation>
 </message>
 <message>
- <location line="+80"/>
+ <location line="+79"/>
 <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-12"/>
 <source>PCM</source>
 <translation>PCM</translation>
@@ -1245,7 +1257,7 @@
 <translation>H263</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+441"/>
+ <location filename="../../common/gui_save.cpp" line="+450"/>
 <location line="+83"/>
 <source>Done</source>
 <translation>完成</translation>
@@ -1256,7 +1268,7 @@
 <translation>增益</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-84"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-83"/>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-45"/>
 <source>High</source>
 <translation>高</translation>
@@ -1267,7 +1279,7 @@
 <translation>LPCM</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-186"/>
+ <location filename="../../common/gui_save.cpp" line="-196"/>
 <source>Jpeg</source>
 <translation>Jpeg</translation>
 </message>
@@ -1304,7 +1316,7 @@
 <translation>QDM2</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+1835"/>
+ <location filename="../../common/gui_main.cpp" line="+1901"/>
 <source>Oops</source>
 <translation>Oops</translation>
 </message>
@@ -1350,7 +1362,7 @@
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="+48"/>
- <location filename="../../common/gui_save.cpp" line="-398"/>
+ <location filename="../../common/gui_save.cpp" line="-397"/>
 <source>No audio track</source>
 <translation>没有音轨</translation>
 </message>
@@ -1376,7 +1388,7 @@
 <translation>它没&apos;有LAME！，它需要去建立 FLV视频。</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+588"/>
+ <location filename="../../common/gui_save.cpp" line="+597"/>
 <source>File %s was NOT saved correctly.</source>
 <translation>文件 %s 保存不正确。</translation>
 </message>
@@ -1392,12 +1404,12 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-86"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+212"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+211"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="-588"/>
+ <location filename="../../common/gui_save.cpp" line="-597"/>
 <location line="+10"/>
- <location line="+278"/>
+ <location line="+277"/>
 <location line="+19"/>
 <location line="+7"/>
 <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1410,7 +1422,7 @@
 <translation>关闭</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+ <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"/>
@@ -1423,18 +1435,21 @@
 <translation>只显示错误警告</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
 <location line="+44"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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="-359"/>
+ <location filename="../../common/gui_main.cpp" line="-361"/>
 <location line="+27"/>
 <location line="+24"/>
 <location line="+8"/>
 <location line="+4"/>
- <location filename="../../common/gui_save.cpp" line="+189"/>
+ <location filename="../../common/gui_save.cpp" line="+199"/>
+ <location line="+99"/>
+ <location line="+7"/>
+ <location line="+20"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation>错误</translation>
@@ -1451,7 +1466,7 @@
 </message>
 <message>
 <location filename="../../common/gui_savenew.cpp" line="-225"/>
- <location line="+266"/>
+ <location line="+286"/>
 <location line="+26"/>
 <source>Muxer</source>
 <translation>复合器</translation>
@@ -1463,8 +1478,6 @@
 </message>
 <message>
 <location line="-34"/>
- <location filename="../../common/gui_save.cpp" line="+99"/>
- <location line="+10"/>
 <source>Queue</source>
 <translation>工作清单</translation>
 </message>
@@ -1484,7 +1497,7 @@
 <translation>改进最大溢出(%)</translation>
 </message>
 <message>
- <location filename="../../common/gui_savenew.cpp" line="-140"/>
+ <location filename="../../common/gui_savenew.cpp" line="-160"/>
 <location line="+12"/>
 <location line="+16"/>
 <location line="+8"/>
@@ -1497,6 +1510,24 @@
 <translation>不能设置音频编码器，请确保您的数据流是兼容音频编码器(数字频道、比特速率、格式）</translation>
 </message>
 <message>
+ <location line="+33"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+9"/>
 <source>Overflow Control Strength</source>
 <translation>溢出控制强度</translation>
@@ -1518,7 +1549,7 @@
 <translation>第二代定向逻辑</translation>
 </message>
 <message>
- <location filename="../../common/gui_savenew.cpp" line="-73"/>
+ <location filename="../../common/gui_savenew.cpp" line="-118"/>
 <source>Cannot instantiate video chain</source>
 <translation>不能安装视频链</translation>
 </message>
@@ -1528,7 +1559,7 @@
 <translation>译码器选项(&amp;D)</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-125"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-124"/>
 <source>Enable 3DNOWEXT</source>
 <translation>启用 3DNOWEXT</translation>
 </message>
@@ -1557,7 +1588,7 @@
 <translation>转变音量 (ms):</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-728"/>
+ <location filename="../../common/gui_main.cpp" line="-766"/>
 <source>Error while cutting out.</source>
 <translation>剪切时发生错误.</translation>
 </message>
@@ -1572,12 +1603,12 @@
 <translation>不能增加工作 %s</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+124"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+123"/>
 <source>Pro Logic</source>
 <translation>定向逻辑</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+629"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+628"/>
 <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>
@@ -1587,7 +1618,7 @@
 <translation>太短</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+624"/>
+ <location filename="../../common/gui_main.cpp" line="+662"/>
 <source>Marker A &gt; B</source>
 <translation>标记 A &gt; B</translation>
 </message>
@@ -1609,12 +1640,12 @@
 </message>
 <message>
 <location filename="../../common/gui_savenew.cpp" line="-152"/>
- <location line="+266"/>
+ <location line="+286"/>
 <source>Cannot instantiate muxer</source>
 <translation>不能安装复合器</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+519"/>
+ <location filename="../../common/gui_main.cpp" line="+521"/>
 <source>This function is disabled or no longer valid</source>
 <translation>此功能被禁用或不再有效</translation>
 </message>
@@ -1624,7 +1655,7 @@
 <translation>Max B 模式</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-48"/>
+ <location filename="../../common/gui_save.cpp" line="-65"/>
 <source>BMP op failed</source>
 <translation>BMP 通过失败</translation>
 </message>
@@ -1665,7 +1696,7 @@
 <translation>未知</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1654"/>
+ <location filename="../../common/gui_main.cpp" line="-1723"/>
 <source>Select script to run</source>
 <translation>选择脚本去执行</translation>
 </message>
@@ -1675,17 +1706,27 @@
 <translation>没降混合</translation>
 </message>
 <message>
- <location line="-120"/>
+ <location line="-119"/>
 <source>Enable SSE2</source>
 <translation>启用 SSE2</translation>
 </message>
 <message>
- <location line="-22"/>
+ <location line="-28"/>
+ <source>Ignore driver blacklist (Intel)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>Decode video using VideoToolbox (macOS)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+23"/>
+ <location line="+26"/>
 <source>Enable SSE3</source>
 <translation>启用 SSE3</translation>
 </message>
@@ -1700,7 +1741,7 @@
 <translation>插件-音频装置(ADM)</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+1148"/>
+ <location filename="../../common/gui_main.cpp" line="+1215"/>
 <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+120"/>
 <source>Something bad happened</source>
 <translation>有些事发生问题</translation>
@@ -1716,19 +1757,38 @@
 <translation>无法删除此选取范围。</translation>
 </message>
 <message>
- <location line="-411"/>
+ <location line="-412"/>
 <source>Multiple Audio Tracks</source>
 <translation>多音轨</translation>
 </message>
 <message>
- <location line="-336"/>
+ <location line="-395"/>
 <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>
 </message>
 <message>
- <location line="+103"/>
+ <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 type="unfinished"></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>
+ </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>
+ </message>
+ <message>
+ <location line="+108"/>
 <source>It is impossible to cut out the entire video. Please recheck the position of markers A and B.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1743,26 +1803,57 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+30"/>
 <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+306"/>
+ <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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+309"/>
 <source>Something failed when appending</source>
 <translation>当增加时某些事情失败</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-479"/>
+ <location filename="../../common/gui_save.cpp" line="-488"/>
 <source>Select Workbench to Save</source>
 <translation>选择工作台进行保存</translation>
 </message>
@@ -1772,7 +1863,7 @@
 <translation>反转向上和向下箭头键进行导航</translation>
 </message>
 <message>
- <location line="+84"/>
+ <location line="+83"/>
 <source>SDL (good)</source>
 <translation>SDL (好)</translation>
 </message>
@@ -1818,7 +1909,7 @@
 <translation>最大Gop(图像群组)大小</translation>
 </message>
 <message>
- <location filename="../../common/gui_savenew.cpp" line="-311"/>
+ <location filename="../../common/gui_savenew.cpp" line="-331"/>
 <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
 <translation>重用以前首先传递数据？警告，设定必须关闭.</translation>
@@ -1834,12 +1925,12 @@
 <translation>开启应用程序文件夹目录(&amp;F)</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-161"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-160"/>
 <source>Above normal</source>
 <translation>高于一般</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-822"/>
+ <location filename="../../common/gui_main.cpp" line="-888"/>
 <source>Select script to save</source>
 <translation>选择脚本去保存</translation>
 </message>
@@ -1856,7 +1947,7 @@
 </translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+266"/>
+ <location filename="../../common/gui_main.cpp" line="+265"/>
 <source>Select Video File to Append...</source>
 <translation>选择视频去附加合并(二视带宽高比要一致)...</translation>
 </message>
@@ -1876,7 +1967,7 @@
 <translation>插件-视频译码器(ADM)</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+1073"/>
+ <location filename="../../common/gui_main.cpp" line="+1141"/>
 <source>Unable to set the audio language: No video loaded yet!</source>
 <translation>无法设置音频语言：仍然未载入视频！</translation>
 </message>
@@ -1947,7 +2038,7 @@
 <translation>最小Gop(图像群组)大小</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-682"/>
+ <location filename="../../common/gui_main.cpp" line="-683"/>
 <source>Try &apos;File&apos; -&gt; &apos;Load/Run Project...&apos;</source>
 <translation>尝试 &apos;文件&apos; -&gt; &apos;加载/执行 项目...&apos;</translation>
 </message>
@@ -1957,7 +2048,7 @@
 <translation>发现没有 AAC 音频编码器插件程序。</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+879"/>
+ <location filename="../../common/gui_main.cpp" line="+881"/>
 <source>Frame Hex Dump</source>
 <translation>帧十六进制转储</translation>
 </message>
@@ -1982,7 +2073,7 @@
 <translation>AMR-NB</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-920"/>
+ <location filename="../../common/gui_main.cpp" line="-922"/>
 <source>Permission error</source>
 <translation>权限许可错误</translation>
 </message>
@@ -1998,12 +2089,12 @@
 <translation>核心已编译，没有 LIBVA 的支持，但它已编译应用程序，安装不匹配</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+731"/>
+ <location filename="../../common/gui_main.cpp" line="+732"/>
 <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="+67"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+66"/>
 <source>OpenGL (best)</source>
 <translation>OpenGL (最好)</translation>
 </message>
@@ -2036,12 +2127,12 @@
 <translation>自定义</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1163"/>
+ <location filename="../../common/gui_main.cpp" line="-1231"/>
 <source>Not coded in this version</source>
 <translation>没有编进这个版本</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+484"/>
+ <location filename="../../common/gui_save.cpp" line="+493"/>
 <source>Failed</source>
 <translation>已失败</translation>
 </message>
@@ -2061,7 +2152,7 @@
 <translation>忽略</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+923"/>
+ <location filename="../../common/gui_main.cpp" line="+991"/>
 <source>No error found</source>
 <translation>没有找到错误</translation>
 </message>
@@ -2102,7 +2193,7 @@
 <translation>运动</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-521"/>
+ <location filename="../../common/gui_save.cpp" line="-530"/>
 <source>Job name</source>
 <translation>工作名称</translation>
 </message>
@@ -2112,12 +2203,12 @@
 <translation>复合器</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+434"/>
+ <location filename="../../common/gui_save.cpp" line="+443"/>
 <source>Saved %d images.</source>
 <translation>已保存 %d 个图像。</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-83"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-82"/>
 <source>Normal</source>
 <translation>一般</translation>
 </message>
@@ -2128,7 +2219,7 @@
 <translation>清除最近使用的 文件 及 项目</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-58"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-60"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation>译码视频使用 DXVA2 (windows)</translation>
 </message>
@@ -2138,17 +2229,17 @@
 <translation>运动搜索精度</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+225"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+226"/>
 <source>Output</source>
 <translation>输出</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-194"/>
+ <location filename="../../common/gui_save.cpp" line="-204"/>
 <source>Cannot create stream</source>
 <translation>不能建立流</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-204"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-203"/>
 <source>Enable all SIMD</source>
 <translation>启用所有 SIMD</translation>
 </message>
@@ -2166,17 +2257,16 @@
 </translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-19"/>
 <source>Decode video using XVBA (AMD)</source>
- <translation>译码视频使用 XVBA (AMD)</translation>
+ <translation type="vanished">译码视频使用 XVBA (AMD)</translation>
 </message>
 <message>
- <location line="+164"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+144"/>
 <source>_AudioDevice</source>
 <translation>音频装置</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="-171"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="-170"/>
 <source>Saving</source>
 <translation>保存中</translation>
 </message>
@@ -2197,7 +2287,7 @@
 <translation>广泛搜寻</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1111"/>
+ <location filename="../../common/gui_main.cpp" line="-1178"/>
 <source>Select script to debug</source>
 <translation>选择脚本去调试</translation>
 </message>
@@ -2232,7 +2322,7 @@
 <translation>转到第一帧(开始)</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+620"/>
+ <location filename="../../common/gui_main.cpp" line="+686"/>
 <source>Cannot open &quot;%s&quot;.</source>
 <translation>无法开启 &quot;%s&quot;。</translation>
 </message>
@@ -2257,7 +2347,7 @@
 <translation>转到下一帧</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-247"/>
+ <location filename="../../common/gui_save.cpp" line="-246"/>
 <source>Cannot reach database. Do you have Job control running ?</source>
 <translation>不能到达数据库，你有工作控制执行吗？</translation>
 </message>
@@ -2302,12 +2392,12 @@
 <translation>插件-音频编码器(ADM)</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-64"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-60"/>
 <source>DXVA2 (best)</source>
 <translation>DXVA2 (最好)</translation>
 </message>
 <message>
- <location line="+47"/>
+ <location line="+43"/>
 <source>No alerts</source>
 <translation>不显示任何警告</translation>
 </message>
@@ -2336,7 +2426,7 @@
 <translation>没有改变</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-549"/>
+ <location filename="../../common/gui_main.cpp" line="-615"/>
 <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>
@@ -2347,12 +2437,12 @@
 <translation>Sdl 驱动程序r</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+153"/>
+ <location filename="../../common/gui_main.cpp" line="+152"/>
 <source>No engine</source>
 <translation>没有引擎</translation>
 </message>
 <message>
- <location line="+400"/>
+ <location line="+467"/>
 <source>&quot;%s&quot; does not exist.</source>
 <translation>&quot;%s&quot; 不存在。</translation>
 </message>
@@ -2367,7 +2457,7 @@
 <translation>建立时间轴</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-124"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-120"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation>译码视频使用 VDPAU (NVIDIA)</translation>
 </message>
@@ -2383,7 +2473,7 @@
 <translation>加载保存设定</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+914"/>
+ <location filename="../../common/gui_main.cpp" line="+916"/>
 <source>Frame size:</source>
 <translation>帧大小:</translation>
 </message>
@@ -2414,7 +2504,7 @@
 <translation>NTSC 16:9</translation>
 </message>
 <message>
- <location filename="../../common/gui_savenew.cpp" line="+274"/>
+ <location filename="../../common/gui_savenew.cpp" line="+272"/>
 <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>
@@ -2423,7 +2513,7 @@
 您要继续吗 ?</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-913"/>
+ <location filename="../../common/gui_main.cpp" line="-915"/>
 <source>File error</source>
 <translation>文件错误</translation>
 </message>
@@ -2438,7 +2528,7 @@
 <translation>%d 分(s)</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+61"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+57"/>
 <source>_Volume control:</source>
 <translation>音量控制:</translation>
 </message>
@@ -2448,7 +2538,7 @@
 <translation>默认的后置处理</translation>
 </message>
 <message>
- <location filename="../../common/gui_savenew.cpp" line="-91"/>
+ <location filename="../../common/gui_savenew.cpp" line="-89"/>
 <location line="+24"/>
 <source>Cannot create encoder</source>
 <translation>不能建立编码器</translation>
@@ -2464,32 +2554,32 @@
 <translation>x86-64</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+471"/>
+ <location filename="../../common/gui_main.cpp" line="+472"/>
 <source>Checking video</source>
 <translation>正在检查视频</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+504"/>
+ <location filename="../../common/gui_save.cpp" line="+513"/>
 <source>Saving %s as a BMP file failed.</source>
 <translation>另存 %s 为 BMP 档失败。</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-159"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-158"/>
 <source>_Enable alternative keyboard shortcuts</source>
 <translation>启用备用的键盘快捷方式</translation>
 </message>
 <message>
- <location line="-11"/>
+ <location line="-9"/>
 <source>Decode video using LIBVA (INTEL)</source>
 <translation>译码视频使用 LIBVA (INTEL)</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-435"/>
+ <location filename="../../common/gui_main.cpp" line="-436"/>
 <source>Cannot open project using the video loader.</source>
 <translation>使用视频加载器时无法开启项目。</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+91"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+88"/>
 <source>LIBVA (best)</source>
 <translation>LIBVA (最好)</translation>
 </message>
@@ -2499,7 +2589,7 @@
 <translation>Film 转成 PAL</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-434"/>
+ <location filename="../../common/gui_save.cpp" line="-443"/>
 <source>Select File to Save</source>
 <translation>选择文件进行保存</translation>
 </message>
@@ -2524,7 +2614,7 @@
 <translation>重复取样频率 (Hz)</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+695"/>
+ <location filename="../../common/gui_main.cpp" line="+696"/>
 <source>Setting the language for the given track index is not possible: Invalid track index!</source>
 <translation>设定的语言无法提供跟踪索引：无效跟踪指标！</translation>
 </message>
@@ -2544,7 +2634,7 @@
 <translation>没有文件加载</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-635"/>
+ <location filename="../../common/gui_main.cpp" line="-636"/>
 <source>The file you just loaded contains several audio tracks.
 Go to Audio-&gt;MainTrack to select the active one.</source>
 <translation>这文件刚刚加载包含一些音频轨道。
@@ -2556,12 +2646,12 @@
 <translation>视频编码器</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+68"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+71"/>
 <source>Threading</source>
 <translation>线程</translation>
 </message>
 <message>
- <location line="-106"/>
+ <location line="-109"/>
 <source>_Strength:</source>
 <translation>强度:</translation>
 </message>
@@ -2576,7 +2666,7 @@
 <translation>保存工作</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-156"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-155"/>
 <source>_Check for new release</source>
 <translation>检查有新版本</translation>
 </message>
@@ -2586,12 +2676,22 @@
 <translation>索引/拆开打包的优先次序:</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+9"/>
 <source>_Sanitize decode time stamps (DTS) in copy mode</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+98"/>
+ <location line="+2"/>
+ <source>Caching of decoded pictures</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Cache size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+95"/>
 <source>De_ringing</source>
 <translation>去除环状色斑</translation>
 </message>
@@ -2616,7 +2716,7 @@
 <translation>关键帧提高(%)</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-149"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-148"/>
 <source>Enable MMX</source>
 <translation>启用 MMX</translation>
 </message>
@@ -2626,7 +2726,7 @@
 <translation>启用 SSE</translation>
 </message>
 <message>
- <location line="-17"/>
+ <location line="-18"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation>如果你使用硬件译码，最好使用匹配的显示驱动程序</translation>
 </message>
@@ -2639,11 +2739,12 @@
 <message>
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+257"/>
 <location line="+3"/>
+ <location line="+3"/>
 <source>HW Accel</source>
 <translation>HW 硬件加速器</translation>
 </message>
 <message>
- <location line="-257"/>
+ <location line="-259"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation>同意在 DVD 使用非标准的音频频率</translation>
 </message>
@@ -2678,7 +2779,7 @@
 <translation>音频轨道有必要建立这样的档</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+571"/>
+ <location filename="../../common/gui_main.cpp" line="+572"/>
 <source>Cannot use that file as audio track</source>
 <translation>不能使用该档作为音频轨道</translation>
 </message>
@@ -2703,12 +2804,12 @@
 <translation>非常高</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1319"/>
+ <location filename="../../common/gui_main.cpp" line="-1386"/>
 <source>Select script/project to run</source>
 <translation>选择要执行的脚本/项目</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+215"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
 <source>_Always ask which port to use</source>
 <translation>制作视频始终询问要使用哪个埠(Avidemux+Avisynth)</translation>
 </message>
@@ -2738,7 +2839,7 @@
 <translation>低比特率的场景（%）</translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+446"/>
+ <location filename="../../common/gui_play.cpp" line="+442"/>
 <source>Trouble initializing audio device</source>
 <translation>音频装置初始化时发生问题</translation>
 </message>
@@ -2749,7 +2850,7 @@
 <translation>核心已编译，没有 XVBA 的支持，但它已编译应用程序，安装不匹配</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-179"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-182"/>
 <source>Video _display:</source>
 <translation>视频 显示:</translation>
 </message>
@@ -2765,7 +2866,7 @@
 <translation>去除垂直方向块状色斑</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+1143"/>
+ <location filename="../../common/gui_main.cpp" line="+1210"/>
 <source>Errors found in %u frames</source>
 <translation>在 %u 帧中发现错误</translation>
 </message>
@@ -2795,7 +2896,7 @@
 <translation>自由型 2</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-629"/>
+ <location filename="../../common/gui_main.cpp" line="-667"/>
 <location line="+21"/>
 <source>Cutting</source>
 <translation>剪切</translation>
@@ -2811,7 +2912,7 @@
 <translation>几秒钟</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+475"/>
+ <location filename="../../common/gui_save.cpp" line="+484"/>
 <source>File %s has been successfully saved.</source>
 <translation>文件 %s 已经成功地保存。</translation>
 </message>
@@ -2841,7 +2942,7 @@
 <translation>前往时间点</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-210"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-209"/>
 <source>Multi-threading</source>
 <translation>多线程</translation>
 </message>
@@ -2871,17 +2972,17 @@
 <translation>取消标记</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+230"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
 <source>Default port to use</source>
 <translation>制作视频要使用默认埠(Avidemux)</translation>
 </message>
 <message>
- <location line="-147"/>
+ <location line="-150"/>
 <source>_Message level:</source>
 <translation>信息等级:</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+629"/>
+ <location filename="../../common/gui_main.cpp" line="+667"/>
 <source>You can&apos;t remove all frames</source>
 <translation>你不&apos;能移除所有的帧</translation>
 </message>
@@ -2891,12 +2992,12 @@
 <translation>高级(&amp;A)</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-128"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-123"/>
 <source>Enable openGl support</source>
 <translation>启用openGl支援</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-912"/>
+ <location filename="../../common/gui_main.cpp" line="-980"/>
 <source>tinyPy script is not enabled in this build</source>
 <translation>在生成中未启用 tinyPy 脚本</translation>
 </message>
@@ -2906,7 +3007,7 @@
 <translation>无法安装编译码器，比特率太低？</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-518"/>
+ <location filename="../../common/gui_save.cpp" line="-527"/>
 <source>Output file</source>
 <translation>输出文件</translation>
 </message>
@@ -2943,7 +3044,7 @@
 <translation>取消编辑(&amp;C)</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+1231"/>
+ <location filename="../../common/gui_main.cpp" line="+1299"/>
 <source>Failed to connect to avsproxy.
 Is it running ?</source>
 <translation>无法联机到 avs代理，
@@ -2976,7 +3077,8 @@
 <translation>另存图片(&amp;S)</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+285"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+280"/>
+ <location line="+3"/>
 <source>Preferences</source>
 <translation>首选项-偏好设定</translation>
 </message>
@@ -2996,9 +3098,8 @@
 <translation>正在保存音频</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-221"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
- <translation>在 .mp4 对 MP3 使用选择对象卷标</translation>
+ <translation type="vanished">在 .mp4 对 MP3 使用选择对象卷标</translation>
 </message>
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-29"/>
@@ -3011,7 +3112,7 @@
 <translation>开启应用程序Log(&amp;L)</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+96"/>
+ <location filename="../../common/gui_save.cpp" line="+95"/>
 <source>Function not implemented
 </source>
 <translation>函数尚未执行
@@ -3024,7 +3125,7 @@
 <translation>过滤器(&amp;F)</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-21"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-244"/>
 <source>_lavc threads:</source>
 <translation>lavc 线程:</translation>
 </message>
@@ -3039,7 +3140,7 @@
 <translation>灰阶</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+195"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+194"/>
 <source>Refresh Rate Cap (ms)</source>
 <translation>重整速率上限 (ms)</translation>
 </message>
@@ -3080,7 +3181,7 @@
 <translation>AvsProxy</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-181"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-180"/>
 <source>_Playback priority:</source>
 <translation>倒带优先次序:</translation>
 </message>
@@ -3091,7 +3192,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="-1"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+105"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+104"/>
 <source>_Horizontal deblocking</source>
 <translation>去除水平方向块状色斑</translation>
 </message>
@@ -3121,7 +3222,7 @@
 <translation>2通</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-838"/>
+ <location filename="../../common/gui_main.cpp" line="-839"/>
 <source>Could not open the file</source>
 <translation>无法开启此文件</translation>
 </message>
@@ -3156,12 +3257,12 @@
 <translation>系统语言</translation>
 </message>
 <message>
- <location line="-107"/>
+ <location line="-103"/>
 <source>XVideo (best)</source>
 <translation>XVideo (最好)</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+287"/>
+ <location filename="../../common/gui_main.cpp" line="+285"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
@@ -3173,8 +3274,8 @@
 <translation>音频编码器</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-164"/>
- <location line="+320"/>
+ <location filename="../../common/gui_main.cpp" line="-162"/>
+ <location line="+321"/>
 <source>Something bad happened (II)</source>
 <translation>不幸的事情发生 (II)</translation>
 </message>
@@ -3184,7 +3285,7 @@
 <translation>保存失败</translation>
 </message>
 <message>
- <location line="-217"/>
+ <location line="-216"/>
 <location line="+2"/>
 <source>Select File to Save Audio</source>
 <translation>选择文件来保存音频</translation>
@@ -3210,9 +3311,8 @@
 <translation>插件-音频(ADM)</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+503"/>
 <source>Cannot get tinyPÿ script engine</source>
- <translation>不能获得tinyPÿ脚本引擎</translation>
+ <translation type="vanished">不能获得tinyPÿ脚本引擎</translation>
 </message>
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+6"/>
@@ -3225,7 +3325,7 @@
 <translation>模式决定</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-532"/>
+ <location filename="../../common/gui_save.cpp" line="-29"/>
 <source>Queue job to jobList</source>
 <translation>工作清单</translation>
 </message>
@@ -3235,12 +3335,12 @@
 <translation>内部开启错误中 0x%x</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-880"/>
+ <location filename="../../common/gui_main.cpp" line="-918"/>
 <source>Are you sure?</source>
 <translation>确定吗?</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <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>
@@ -3264,7 +3364,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_toolkit/automation.cpp" line="+238"/>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
 <source>Permission Error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3313,7 +3413,7 @@
 <context>
 <name>asciiView</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
 <source>Ascii View</source>
 <translation>1.5-ASCII视图(美国信息交换标准代码)</translation>
 </message>
@@ -3986,13 +4086,13 @@
 <message>
 <location line="-1"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
- <location line="+90"/>
+ <location line="+87"/>
 <source>Contrast</source>
 <translation>3.2-对比</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
- <location line="+90"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
+ <location line="+87"/>
 <source>Brightness</source>
 <translation>亮度</translation>
 </message>
@@ -4116,7 +4216,7 @@
 </translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
 <source>Size: </source>
 <translation type="unfinished"></translation>
 </message>
@@ -6496,7 +6596,7 @@
 <context>
 <name>lavcodec</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
 <source>_Bitrate:</source>
 <translation>比特率:</translation>
 </message>
@@ -6736,12 +6836,12 @@
 <context>
 <name>matroskademuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+481"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+477"/>
 <source>Matroska clusters</source>
 <translation>Matroska 集群</translation>
 </message>
 <message>
- <location line="-433"/>
+ <location line="-431"/>
 <source>Matroska Images</source>
 <translation>Matroska 图像</translation>
 </message>
@@ -6940,7 +7040,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+827"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
 <source>Problem reading SVQ3 headers</source>
 <translation>读取 SVQ3 档头时发生问题</translation>
 </message>
@@ -6954,6 +7054,26 @@
 </message>
 <message>
 <location line="+2"/>
+ <source>No optimization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Move index to the beginning of the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use fragmentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Optimize for Streaming</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Force aspect ratio</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6988,7 +7108,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+207"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+223"/>
 <source>Saving PSP</source>
 <translation>保存 PSP</translation>
 </message>
@@ -6998,17 +7118,16 @@
 <translation>保存 mp4</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="-10"/>
 <source>Use alternate MP3 tag</source>
- <translation>使用备用的 MP3 标记</translation>
+ <translation type="vanished">使用备用的 MP3 标记</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="-139"/>
+ <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="+13"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+3"/>
 <source>MP4 Muxer</source>
 <translation>复合器</translation>
 </message>
@@ -7192,7 +7311,7 @@
 <context>
 <name>navigate</name>
 <message>
- <location filename="../../common/gui_navigate.cpp" line="+501"/>
+ <location filename="../../common/gui_navigate.cpp" line="+494"/>
 <source>Seek</source>
 <translation>寻求</translation>
 </message>
@@ -7207,7 +7326,7 @@
 <translation>转到上一帧(关键帧或I帧)</translation>
 </message>
 <message>
- <location line="-69"/>
+ <location line="-64"/>
 <source>Cannot go to next keyframe</source>
 <translation>转到下一帧(关键帧或I帧)</translation>
 </message>
@@ -7275,7 +7394,7 @@
 <translation>不正常的标头</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
 <source>Unpacking bitstream</source>
 <translation>解压比特流</translation>
 </message>
@@ -7422,9 +7541,8 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+80"/>
 <source>Error</source>
- <translation>错误</translation>
+ <translation type="vanished">错误</translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
@@ -7432,27 +7550,32 @@
 <translation>正在索引</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+0"/>
 <source>This file&apos;s index has been created with an older version of avidemux.
 Please delete the idx2 file and reopen.</source>
- <translation>用旧版本的剪切建立此档&apos;案索引，请删除 idx2 档，然后重新打开。</translation>
+ <translation type="vanished">用旧版本的剪切建立此档&apos;案索引，请删除 idx2 档，然后重新打开。</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+42"/>
+ <location line="+42"/>
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>qaudiotracks</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+510"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+517"/>
 <source>copy</source>
 <translation>复制</translation>
 </message>
 <message>
- <location line="-354"/>
- <location line="+152"/>
+ <location line="-363"/>
+ <location line="+161"/>
 <source>Error</source>
 <translation>错误</translation>
 </message>
@@ -7477,7 +7600,7 @@
 <translation>....增加音频轨</translation>
 </message>
 <message>
- <location line="-342"/>
+ <location line="-351"/>
 <source>Select audio file</source>
 <translation>将选择音频文件</translation>
 </message>
@@ -7487,7 +7610,7 @@
 <translation>不能使用该档作为音频轨道</translation>
 </message>
 <message>
- <location line="+278"/>
+ <location line="+287"/>
 <source> from video</source>
 <translation> 来至视频</translation>
 </message>
@@ -7541,18 +7664,18 @@
 <name>qfile</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+128"/>
- <location line="+105"/>
+ <location line="+106"/>
 <source> files (*.</source>
 <translation> 文件 (*.</translation>
 </message>
 <message>
- <location line="-188"/>
- <location line="+141"/>
+ <location line="-189"/>
+ <location line="+142"/>
 <source>All files (*.*)</source>
 <translation>所有文件 (*.*)</translation>
 </message>
 <message>
- <location line="-34"/>
+ <location line="-35"/>
 <source>Overwrite file </source>
 <translation>覆写文件 </translation>
 </message>
@@ -7560,34 +7683,34 @@
 <context>
 <name>qgui2</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+2050"/>
+ <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+2068"/>
 <source>%c-%s (%02d)</source>
 <translation>%c-%s (%02d)</translation>
 </message>
 <message>
- <location line="-917"/>
+ <location line="-924"/>
 <source>Set start marker</source>
 <translation>设定开始标记</translation>
 </message>
 <message>
- <location line="-675"/>
+ <location line="-686"/>
 <source>Recent Projects</source>
 <translation>最近使用的 项目(&amp;P)</translation>
 </message>
 <message>
- <location line="+1330"/>
+ <location line="+1348"/>
 <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="-661"/>
+ <location line="-668"/>
 <source>Go to previous keyframe</source>
 <translation>转到上一帧(关键帧或I帧)</translation>
 </message>
 <message>
- <location line="-915"/>
+ <location line="-926"/>
 <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>
@@ -7597,7 +7720,7 @@
 <translation>最近使用的 文件(&amp;F)</translation>
 </message>
 <message>
- <location line="+673"/>
+ <location line="+684"/>
 <source>Go to next keyframe</source>
 <translation>转到下一帧(关键帧或I帧)</translation>
 </message>
@@ -7642,12 +7765,12 @@
 <translation>转到上一帧</translation>
 </message>
 <message>
- <location line="+1263"/>
+ <location line="+1270"/>
 <source> (%d track(s))</source>
 <translation> (%d 轨(s))</translation>
 </message>
 <message>
- <location line="-1260"/>
+ <location line="-1267"/>
 <source>Go to next frame</source>
 <translation>转到下一帧</translation>
 </message>
@@ -7719,7 +7842,7 @@
 </message>
 <message>
 <location line="+88"/>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Sure!</source>
 <translation>确定!</translation>
 </message>
@@ -7729,7 +7852,7 @@
 <translation>确定要删除所有工作?</translation>
 </message>
 <message>
- <location line="-78"/>
+ <location line="-79"/>
 <source>End Time</source>
 <translation>终了时间</translation>
 </message>
@@ -7759,12 +7882,12 @@
 <translation>已成功</translation>
 </message>
 <message>
- <location line="+126"/>
+ <location line="+128"/>
 <source>This script has already been successfully executed.</source>
 <translation>这个脚本已经成功执行。</translation>
 </message>
 <message>
- <location line="-126"/>
+ <location line="-128"/>
 <source>Running</source>
 <translation>正在执行</translation>
 </message>
@@ -7784,12 +7907,12 @@
 <translation>删除工作</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Delete *all* job</source>
 <translation>删除*所有*工作</translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Already done</source>
 <translation>已经完成</translation>
 </message>
@@ -7805,7 +7928,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+680"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+676"/>
 <source>Add</source>
 <translation>加入</translation>
 </message>
@@ -7858,7 +7981,7 @@
 <context>
 <name>qprocessing</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+159"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+163"/>
 <source>_Resume</source>
 <translation>恢复</translation>
 </message>
@@ -8015,7 +8138,7 @@
 <context>
 <name>qtalert</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+38"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+39"/>
 <location line="+25"/>
 <location line="+25"/>
 <source>Info</source>
@@ -8027,8 +8150,8 @@
 <translation>警告</translation>
 </message>
 <message>
- <location line="+129"/>
- <location line="+30"/>
+ <location line="+134"/>
+ <location line="+33"/>
 <source>Question</source>
 <translation>问题</translation>
 </message>
@@ -8038,8 +8161,8 @@
 <translation>问题?</translation>
 </message>
 <message>
- <location line="-72"/>
- <location line="+30"/>
+ <location line="-78"/>
+ <location line="+31"/>
 <source>Confirmation</source>
 <translation>答复</translation>
 </message>
@@ -8911,31 +9034,35 @@
 <context>
 <name>tsdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
 <source>Error</source>
- <translation>错误</translation>
+ <translation type="vanished">错误</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+198"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+91"/>
+ <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"/>
 <source>Indexing</source>
 <translation>正在索引</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+0"/>
 <source>This file&apos;s index has been created with an older version of avidemux.
 Please delete the idx2 file and reopen.</source>
- <translation>这是用旧版本Avidemux建立的索引文件 &apos;案，请删除 idx2 档，然后重新打开。</translation>
+ <translation type="vanished">这是用旧版本Avidemux建立的索引文件 &apos;案，请删除 idx2 档，然后重新打开。</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="-10"/>
+ <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"/>
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>twolame</name>
@@ -9289,24 +9416,24 @@
 <context>
 <name>x264</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+637"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+643"/>
 <source>MB</source>
 <translation>MB</translation>
 </message>
 <message>
- <location line="-459"/>
+ <location line="-465"/>
 <source>none</source>
 <translation>无</translation>
 </message>
 <message>
- <location line="+610"/>
- <location line="+69"/>
+ <location line="+616"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation>错误</translation>
 </message>
 <message>
- <location line="-144"/>
+ <location line="-145"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Macroblock-Tree optimisation will automatically be disabled.
 
 Do you wish to continue?</source>
@@ -9323,32 +9450,32 @@
 <translation>目标视频大小:</translation>
 </message>
 <message>
- <location line="+239"/>
+ <location line="+240"/>
 <source>Do you really want to delete the </source>
 <translation>你准备希望删除这 </translation>
 </message>
 <message>
- <location line="-87"/>
+ <location line="-88"/>
 <source>Cannot load preset</source>
 <translation>无法加载默认定</translation>
 </message>
 <message>
- <location line="+89"/>
+ <location line="+90"/>
 <source>Delete</source>
 <translation>删除</translation>
 </message>
 <message>
- <location line="-666"/>
+ <location line="-668"/>
 <source>Custom</source>
 <translation>自定义</translation>
 </message>
 <message>
- <location line="+646"/>
+ <location line="+648"/>
 <source>Cannot save preset</source>
 <translation>无法保存默认定</translation>
 </message>
 <message>
- <location line="-230"/>
+ <location line="-231"/>
 <source>Quantiser:</source>
 <translation>量化器:</translation>
 </message>
@@ -9364,17 +9491,16 @@
 <translation>kbit/s</translation>
 </message>
 <message>
- <location line="+172"/>
 <source>my profile</source>
- <translation>我的配置文件</translation>
+ <translation type="vanished">我的配置文件</translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+207"/>
 <source>Replace the following preset ?:</source>
 <translation>替代以下的默认定吗?:</translation>
 </message>
 <message>
- <location line="-226"/>
+ <location line="-227"/>
 <source>Target Bitrate:</source>
 <translation>目标比特速率：</translation>
 </message>
@@ -9396,7 +9522,7 @@
 <translation>品质:</translation>
 </message>
 <message>
- <location line="+240"/>
+ <location line="+241"/>
 <source>Cannot delete custom profile</source>
 <translation>不能删除自定义的配置文件</translation>
 </message>
@@ -9406,14 +9532,14 @@
 <translation>复写</translation>
 </message>
 <message>
- <location line="-133"/>
+ <location line="-134"/>
 <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>宏块树优化需要平差自适应量化(AQ)来启用，平差自适应量化(AQ)将自动启用，您要继续吗？</translation>
 </message>
 <message>
- <location line="+162"/>
+ <location line="+163"/>
 <source>Delete preset</source>
 <translation>删除默认定</translation>
 </message>
@@ -10629,24 +10755,24 @@
 <context>
 <name>x265</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+594"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+600"/>
 <source>MB</source>
 <translation>MB</translation>
 </message>
 <message>
- <location line="-410"/>
+ <location line="-416"/>
 <source>none</source>
 <translation>无</translation>
 </message>
 <message>
- <location line="+568"/>
- <location line="+69"/>
+ <location line="+574"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation>错误</translation>
 </message>
 <message>
- <location line="-124"/>
+ <location line="-125"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Macroblock-Tree optimisation will automatically be disabled.
 
 Do you wish to continue?</source>
@@ -10663,32 +10789,32 @@
 <translation>目标视频大小:</translation>
 </message>
 <message>
- <location line="+246"/>
+ <location line="+247"/>
 <source>Do you really want to delete the </source>
 <translation>你打算删除 </translation>
 </message>
 <message>
- <location line="-87"/>
+ <location line="-88"/>
 <source>Cannot load preset</source>
 <translation>不能载入默认定</translation>
 </message>
 <message>
- <location line="+89"/>
+ <location line="+90"/>
 <source>Delete</source>
 <translation>删除</translation>
 </message>
 <message>
- <location line="-624"/>
+ <location line="-626"/>
 <source>Custom</source>
 <translation>自定义</translation>
 </message>
 <message>
- <location line="+604"/>
+ <location line="+606"/>
 <source>Cannot save preset</source>
 <translation>无法保存默认定</translation>
 </message>
 <message>
- <location line="-237"/>
+ <location line="-238"/>
 <source>Quantiser:</source>
 <translation>量化值:</translation>
 </message>
@@ -10704,12 +10830,12 @@
 <translation>kbit/s</translation>
 </message>
 <message>
- <location line="+213"/>
+ <location line="+214"/>
 <source>Replace the following preset ?:</source>
 <translation>要替代以下默认定?:</translation>
 </message>
 <message>
- <location line="-234"/>
+ <location line="-235"/>
 <source>Target Bitrate:</source>
 <translation>目标比特率：</translation>
 </message>
@@ -10731,7 +10857,7 @@
 <translation>品质:</translation>
 </message>
 <message>
- <location line="+247"/>
+ <location line="+248"/>
 <source>Cannot delete custom profile</source>
 <translation>不能删除自定义的配置文件</translation>
 </message>
@@ -10741,14 +10867,14 @@
 <translation>复写</translation>
 </message>
 <message>
- <location line="-113"/>
+ <location line="-114"/>
 <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>宏块优化需要平差自适应量化(AQ)来启用，平差自适应量化(AQ)将自动启用，您要继续吗？</translation>
 </message>
 <message>
- <location line="+142"/>
+ <location line="+143"/>
 <source>Delete preset</source>
 <translation>删除默认定</translation>
 </message>
@@ -12050,57 +12176,88 @@
 <context>
 <name>yadif</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
 <source>Yadif</source>
 <translation>2.1-亚迪夫(yadif)过滤器</translation>
 </message>
 <message>
- <location line="+69"/>
+ <location line="+68"/>
+ <source>Frame : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Deint all</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Deint interlaced</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>_Deint:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
 <source>yadif</source>
 <translation>yadif</translation>
 </message>
 <message>
- <location line="-8"/>
+ <location line="-16"/>
 <source>Top field first</source>
 <translation>顶部首先扫描</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+13"/>
 <source>_Order:</source>
 <translation>命令:</translation>
 </message>
 <message>
- <location line="-1"/>
+ <location line="-2"/>
 <source>_Mode:</source>
 <translation>模式:</translation>
 </message>
 <message>
- <location line="-63"/>
+ <location line="-85"/>
 <source>Yadif, port of avisynth version (c) Fizick.</source>
 <translation>Yadif阜，Avisynth出口商Fizick版本(c).</translation>
 </message>
 <message>
- <location line="+53"/>
 <source>Temporal &amp; spatial check</source>
- <translation>时间l &amp; 空间检查</translation>
+ <translation type="vanished">时间l &amp; 空间检查</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, temporal &amp; spatial check</source>
- <translation>振动，空间 &amp; 时间检查</translation>
+ <translation type="vanished">振动，空间 &amp; 时间检查</translation>
 </message>
 <message>
- <location line="+2"/>
 <source>Bob, skip spatial temporal check</source>
- <translation>振动，略过空间时间检查</translation>
+ <translation type="vanished">振动，略过空间时间检查</translation>
 </message>
 <message>
- <location line="-1"/>
 <source>Skip spatial temporal check</source>
- <translation>略过空间时间检查</translation>
+ <translation type="vanished">略过空间时间检查</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+75"/>
 <source>Bottom field first</source>
 <translation>底部首先扫描</translation>
 </message>

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

@@ -9,7 +9,7 @@
 <translation>檢查時間戳記是否有效..</translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="+43"/>
 <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="+260"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+258"/>
 <source>width</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1060,11 +1060,8 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+44"/>
- <location line="+2"/>
- <location line="+2"/>
 <source>-</source>
- <translation>-</translation>
+ <translation type="vanished">-</translation>
 </message>
 <message>
 <location filename="../../common/gui_save.cpp" line="+67"/>
@@ -1082,12 +1079,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+277"/>
+ <location line="+276"/>
 <source>Failed to save as JPEG</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+87"/>
 <source>Saving selection as set of JPEG images</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1117,6 +1114,21 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+67"/>
+ <source>Cannot get tinyPy script engine</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Output file not specified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Job script %s already exists. Overwrite?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+372"/>
 <source>1:1</source>
 <translation>1:1</translation>
@@ -1143,7 +1155,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+492"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+510"/>
 <source>CPU</source>
 <translation>CPU</translation>
 </message>
@@ -1158,7 +1170,7 @@
 <translation>DTS</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+21"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+71"/>
 <source>Cut</source>
 <translation>剪下</translation>
 </message>
@@ -1168,7 +1180,7 @@
 <translation>GMC</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-475"/>
+ <location filename="../../common/gui_save.cpp" line="-571"/>
 <source>Job</source>
 <translation>工作</translation>
 </message>
@@ -1193,13 +1205,13 @@
 <translation>MP4</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-214"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-216"/>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-19"/>
 <source>Low</source>
 <translation>低</translation>
 </message>
 <message>
- <location line="+80"/>
+ <location line="+79"/>
 <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-12"/>
 <source>PCM</source>
 <translation>PCM</translation>
@@ -1245,7 +1257,7 @@
 <translation>H263</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+441"/>
+ <location filename="../../common/gui_save.cpp" line="+450"/>
 <location line="+83"/>
 <source>Done</source>
 <translation>完成</translation>
@@ -1256,7 +1268,7 @@
 <translation>增音</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-84"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-83"/>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-45"/>
 <source>High</source>
 <translation>高</translation>
@@ -1267,7 +1279,7 @@
 <translation>LPCM</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-186"/>
+ <location filename="../../common/gui_save.cpp" line="-196"/>
 <source>Jpeg</source>
 <translation>Jpeg</translation>
 </message>
@@ -1304,7 +1316,7 @@
 <translation>QDM2</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+1835"/>
+ <location filename="../../common/gui_main.cpp" line="+1901"/>
 <source>Oops</source>
 <translation>Oops</translation>
 </message>
@@ -1350,7 +1362,7 @@
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="+48"/>
- <location filename="../../common/gui_save.cpp" line="-398"/>
+ <location filename="../../common/gui_save.cpp" line="-397"/>
 <source>No audio track</source>
 <translation>沒有音軌</translation>
 </message>
@@ -1376,7 +1388,7 @@
 <translation>它沒&apos;有LAME！，它需要去建立 FLV影片。</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+588"/>
+ <location filename="../../common/gui_save.cpp" line="+597"/>
 <source>File %s was NOT saved correctly.</source>
 <translation>檔案 %s 儲存不正確。</translation>
 </message>
@@ -1392,12 +1404,12 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-86"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+212"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+211"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="-588"/>
+ <location filename="../../common/gui_save.cpp" line="-597"/>
 <location line="+10"/>
- <location line="+278"/>
+ <location line="+277"/>
 <location line="+19"/>
 <location line="+7"/>
 <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1410,7 +1422,7 @@
 <translation>關閉</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+ <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"/>
@@ -1423,18 +1435,21 @@
 <translation>只顯示錯誤警告</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
 <location line="+44"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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="-359"/>
+ <location filename="../../common/gui_main.cpp" line="-361"/>
 <location line="+27"/>
 <location line="+24"/>
 <location line="+8"/>
 <location line="+4"/>
- <location filename="../../common/gui_save.cpp" line="+189"/>
+ <location filename="../../common/gui_save.cpp" line="+199"/>
+ <location line="+99"/>
+ <location line="+7"/>
+ <location line="+20"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation>錯誤</translation>
@@ -1451,7 +1466,7 @@
 </message>
 <message>
 <location filename="../../common/gui_savenew.cpp" line="-225"/>
- <location line="+266"/>
+ <location line="+286"/>
 <location line="+26"/>
 <source>Muxer</source>
 <translation>複合器</translation>
@@ -1463,8 +1478,6 @@
 </message>
 <message>
 <location line="-34"/>
- <location filename="../../common/gui_save.cpp" line="+99"/>
- <location line="+10"/>
 <source>Queue</source>
 <translation>工作清單</translation>
 </message>
@@ -1484,7 +1497,7 @@
 <translation>改進最大溢出(%)</translation>
 </message>
 <message>
- <location filename="../../common/gui_savenew.cpp" line="-140"/>
+ <location filename="../../common/gui_savenew.cpp" line="-160"/>
 <location line="+12"/>
 <location line="+16"/>
 <location line="+8"/>
@@ -1497,6 +1510,24 @@
 <translation>不能設置音訊編碼器，請確保您的數據流是相容音訊編碼器(數位頻道、位元速率、格式）</translation>
 </message>
 <message>
+ <location line="+33"/>
+ <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>
+ </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>
+ </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>
+ </message>
+ <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+9"/>
 <source>Overflow Control Strength</source>
 <translation>溢出控制強度</translation>
@@ -1518,7 +1549,7 @@
 <translation>第二代定向邏輯</translation>
 </message>
 <message>
- <location filename="../../common/gui_savenew.cpp" line="-73"/>
+ <location filename="../../common/gui_savenew.cpp" line="-118"/>
 <source>Cannot instantiate video chain</source>
 <translation>不能安裝影片鏈</translation>
 </message>
@@ -1528,7 +1559,7 @@
 <translation>解碼器選項(&amp;D)</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-125"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-124"/>
 <source>Enable 3DNOWEXT</source>
 <translation>啟用 3DNOWEXT</translation>
 </message>
@@ -1557,7 +1588,7 @@
 <translation>位移音量 (ms):</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-728"/>
+ <location filename="../../common/gui_main.cpp" line="-766"/>
 <source>Error while cutting out.</source>
 <translation>剪下時發生錯誤.</translation>
 </message>
@@ -1572,12 +1603,12 @@
 <translation>不能增加工作 %s</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+124"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+123"/>
 <source>Pro Logic</source>
 <translation>定向邏輯</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+629"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+628"/>
 <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>
@@ -1587,7 +1618,7 @@
 <translation>太短</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+624"/>
+ <location filename="../../common/gui_main.cpp" line="+662"/>
 <source>Marker A &gt; B</source>
 <translation>標記 A &gt; B</translation>
 </message>
@@ -1609,12 +1640,12 @@
 </message>
 <message>
 <location filename="../../common/gui_savenew.cpp" line="-152"/>
- <location line="+266"/>
+ <location line="+286"/>
 <source>Cannot instantiate muxer</source>
 <translation>不能安裝複合器</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+519"/>
+ <location filename="../../common/gui_main.cpp" line="+521"/>
 <source>This function is disabled or no longer valid</source>
 <translation>此功能被停用或不再有效</translation>
 </message>
@@ -1624,7 +1655,7 @@
 <translation>Max B 模式</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-48"/>
+ <location filename="../../common/gui_save.cpp" line="-65"/>
 <source>BMP op failed</source>
 <translation>BMP 通過失敗</translation>
 </message>
@@ -1665,7 +1696,7 @@
 <translation>未知</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1654"/>
+ <location filename="../../common/gui_main.cpp" line="-1723"/>
 <source>Select script to run</source>
 <translation>選擇腳本去執行</translation>
 </message>
@@ -1675,17 +1706,27 @@
 <translation>沒降混合</translation>
 </message>
 <message>
- <location line="-120"/>
+ <location line="-119"/>
 <source>Enable SSE2</source>
 <translation>啟用 SSE2</translation>
 </message>
 <message>
- <location line="-22"/>
+ <location line="-28"/>
+ <source>Ignore driver blacklist (Intel)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>Decode video using VideoToolbox (macOS)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+23"/>
+ <location line="+26"/>
 <source>Enable SSE3</source>
 <translation>啟用 SSE3</translation>
 </message>
@@ -1700,7 +1741,7 @@
 <translation>外掛-音訊裝置(ADM)</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+1148"/>
+ <location filename="../../common/gui_main.cpp" line="+1215"/>
 <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+120"/>
 <source>Something bad happened</source>
 <translation>有些事發生問題</translation>
@@ -1716,19 +1757,38 @@
 <translation>無法刪除此選取範圍。</translation>
 </message>
 <message>
- <location line="-411"/>
+ <location line="-412"/>
 <source>Multiple Audio Tracks</source>
 <translation>多音軌</translation>
 </message>
 <message>
- <location line="-336"/>
+ <location line="-395"/>
 <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>
 </message>
 <message>
- <location line="+103"/>
+ <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 type="unfinished"></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>
+ </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>
+ </message>
+ <message>
+ <location line="+108"/>
 <source>It is impossible to cut out the entire video. Please recheck the position of markers A and B.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1743,26 +1803,57 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+30"/>
 <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <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 type="unfinished"></translation>
 </message>
 <message>
- <location line="+306"/>
+ <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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <location line="+309"/>
 <source>Something failed when appending</source>
 <translation>當增加時某些事情失敗</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-479"/>
+ <location filename="../../common/gui_save.cpp" line="-488"/>
 <source>Select Workbench to Save</source>
 <translation>選擇工作台進行儲存</translation>
 </message>
@@ -1772,7 +1863,7 @@
 <translation>反轉向上和向下方向鍵進行導航</translation>
 </message>
 <message>
- <location line="+84"/>
+ <location line="+83"/>
 <source>SDL (good)</source>
 <translation>SDL (好)</translation>
 </message>
@@ -1818,7 +1909,7 @@
 <translation>最大Gop(圖像群組)大小</translation>
 </message>
 <message>
- <location filename="../../common/gui_savenew.cpp" line="-311"/>
+ <location filename="../../common/gui_savenew.cpp" line="-331"/>
 <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
 <translation>重用以前首先傳遞資料？警告，設定必須關閉.</translation>
@@ -1834,12 +1925,12 @@
 <translation>開啟應用程式資料夾目錄(&amp;F)</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-161"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-160"/>
 <source>Above normal</source>
 <translation>高於一般</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-822"/>
+ <location filename="../../common/gui_main.cpp" line="-888"/>
 <source>Select script to save</source>
 <translation>選擇腳本去儲存</translation>
 </message>
@@ -1856,7 +1947,7 @@
 </translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+266"/>
+ <location filename="../../common/gui_main.cpp" line="+265"/>
 <source>Select Video File to Append...</source>
 <translation>選擇影片去附加合併(二影片寬高比要一致)...</translation>
 </message>
@@ -1876,7 +1967,7 @@
 <translation>外掛-影片解碼器(ADM)</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+1073"/>
+ <location filename="../../common/gui_main.cpp" line="+1141"/>
 <source>Unable to set the audio language: No video loaded yet!</source>
 <translation>無法設置音訊語言：仍然未載入影片！</translation>
 </message>
@@ -1947,7 +2038,7 @@
 <translation>最小Gop(圖像群組)大小</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-682"/>
+ <location filename="../../common/gui_main.cpp" line="-683"/>
 <source>Try &apos;File&apos; -&gt; &apos;Load/Run Project...&apos;</source>
 <translation>嘗試 &apos;檔案&apos; -&gt; &apos;載入/執行 專案...&apos;</translation>
 </message>
@@ -1957,7 +2048,7 @@
 <translation>發現沒有 AAC 音訊編碼器外掛程式。</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+879"/>
+ <location filename="../../common/gui_main.cpp" line="+881"/>
 <source>Frame Hex Dump</source>
 <translation>幀十六進位轉儲</translation>
 </message>
@@ -1982,7 +2073,7 @@
 <translation>AMR-NB</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-920"/>
+ <location filename="../../common/gui_main.cpp" line="-922"/>
 <source>Permission error</source>
 <translation>權限許可錯誤</translation>
 </message>
@@ -1998,12 +2089,12 @@
 <translation>核心已編譯，沒有 LIBVA 的支援，但它已編譯應用程式，安裝不匹配</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+731"/>
+ <location filename="../../common/gui_main.cpp" line="+732"/>
 <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="+67"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+66"/>
 <source>OpenGL (best)</source>
 <translation>OpenGL (最好)</translation>
 </message>
@@ -2036,12 +2127,12 @@
 <translation>自訂</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1163"/>
+ <location filename="../../common/gui_main.cpp" line="-1231"/>
 <source>Not coded in this version</source>
 <translation>沒有編進這個版本</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+484"/>
+ <location filename="../../common/gui_save.cpp" line="+493"/>
 <source>Failed</source>
 <translation>已失敗</translation>
 </message>
@@ -2061,7 +2152,7 @@
 <translation>忽略</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+923"/>
+ <location filename="../../common/gui_main.cpp" line="+991"/>
 <source>No error found</source>
 <translation>沒有找到錯誤</translation>
 </message>
@@ -2102,7 +2193,7 @@
 <translation>運動</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-521"/>
+ <location filename="../../common/gui_save.cpp" line="-530"/>
 <source>Job name</source>
 <translation>工作名稱</translation>
 </message>
@@ -2112,12 +2203,12 @@
 <translation>複合器</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+434"/>
+ <location filename="../../common/gui_save.cpp" line="+443"/>
 <source>Saved %d images.</source>
 <translation>已儲存 %d 個圖像。</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-83"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-82"/>
 <source>Normal</source>
 <translation>一般</translation>
 </message>
@@ -2128,7 +2219,7 @@
 <translation>清除最近使用的 檔案 及 專案</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-58"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-60"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation>解碼影片使用 DXVA2 (windows)</translation>
 </message>
@@ -2138,17 +2229,17 @@
 <translation>運動搜索精度</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+225"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+226"/>
 <source>Output</source>
 <translation>輸出</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-194"/>
+ <location filename="../../common/gui_save.cpp" line="-204"/>
 <source>Cannot create stream</source>
 <translation>不能建立流</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-204"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-203"/>
 <source>Enable all SIMD</source>
 <translation>啟用所有 SIMD</translation>
 </message>
@@ -2166,17 +2257,16 @@
 </translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-19"/>
 <source>Decode video using XVBA (AMD)</source>
- <translation>解碼影片使用 XVBA (AMD)</translation>
+ <translation type="vanished">解碼影片使用 XVBA (AMD)</translation>
 </message>
 <message>
- <location line="+164"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+144"/>
 <source>_AudioDevice</source>
 <translation>音訊裝置</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="-171"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="-170"/>
 <source>Saving</source>
 <translation>儲存中</translation>
 </message>
@@ -2197,7 +2287,7 @@
 <translation>廣泛搜尋</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1111"/>
+ <location filename="../../common/gui_main.cpp" line="-1178"/>
 <source>Select script to debug</source>
 <translation>選擇腳本去除錯</translation>
 </message>
@@ -2232,7 +2322,7 @@
 <translation>轉到第一幀(開始)</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+620"/>
+ <location filename="../../common/gui_main.cpp" line="+686"/>
 <source>Cannot open &quot;%s&quot;.</source>
 <translation>無法開啟 &quot;%s&quot;。</translation>
 </message>
@@ -2257,7 +2347,7 @@
 <translation>轉到下一幀</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-247"/>
+ <location filename="../../common/gui_save.cpp" line="-246"/>
 <source>Cannot reach database. Do you have Job control running ?</source>
 <translation>不能到達資料庫，你有工作控制執行嗎？</translation>
 </message>
@@ -2302,12 +2392,12 @@
 <translation>外掛-音訊編碼器(ADM)</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-64"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-60"/>
 <source>DXVA2 (best)</source>
 <translation>DXVA2 (最好)</translation>
 </message>
 <message>
- <location line="+47"/>
+ <location line="+43"/>
 <source>No alerts</source>
 <translation>不顯示任何警告</translation>
 </message>
@@ -2336,7 +2426,7 @@
 <translation>沒有改變</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-549"/>
+ <location filename="../../common/gui_main.cpp" line="-615"/>
 <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>
@@ -2347,12 +2437,12 @@
 <translation>Sdl 驅動程式r</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+153"/>
+ <location filename="../../common/gui_main.cpp" line="+152"/>
 <source>No engine</source>
 <translation>沒有引擎</translation>
 </message>
 <message>
- <location line="+400"/>
+ <location line="+467"/>
 <source>&quot;%s&quot; does not exist.</source>
 <translation>&quot;%s&quot; 不存在。</translation>
 </message>
@@ -2367,7 +2457,7 @@
 <translation>建立時間軸</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-124"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-120"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation>解碼影片使用 VDPAU (NVIDIA)</translation>
 </message>
@@ -2383,7 +2473,7 @@
 <translation>載入儲存設定</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+914"/>
+ <location filename="../../common/gui_main.cpp" line="+916"/>
 <source>Frame size:</source>
 <translation>幀大小:</translation>
 </message>
@@ -2414,7 +2504,7 @@
 <translation>NTSC 16:9</translation>
 </message>
 <message>
- <location filename="../../common/gui_savenew.cpp" line="+274"/>
+ <location filename="../../common/gui_savenew.cpp" line="+272"/>
 <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>
@@ -2423,7 +2513,7 @@
 您要繼續嗎 ?</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-913"/>
+ <location filename="../../common/gui_main.cpp" line="-915"/>
 <source>File error</source>
 <translation>檔案錯誤</translation>
 </message>
@@ -2438,7 +2528,7 @@
 <translation>%d 分(s)</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+61"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+57"/>
 <source>_Volume control:</source>
 <translation>音量控制:</translation>
 </message>
@@ -2448,7 +2538,7 @@
 <translation>預設的後置處理</translation>
 </message>
 <message>
- <location filename="../../common/gui_savenew.cpp" line="-91"/>
+ <location filename="../../common/gui_savenew.cpp" line="-89"/>
 <location line="+24"/>
 <source>Cannot create encoder</source>
 <translation>不能建立編碼器</translation>
@@ -2464,32 +2554,32 @@
 <translation>x86-64</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+471"/>
+ <location filename="../../common/gui_main.cpp" line="+472"/>
 <source>Checking video</source>
 <translation>正在檢查影片</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+504"/>
+ <location filename="../../common/gui_save.cpp" line="+513"/>
 <source>Saving %s as a BMP file failed.</source>
 <translation>另存 %s 為 BMP 檔失敗。</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-159"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-158"/>
 <source>_Enable alternative keyboard shortcuts</source>
 <translation>啟用備用的鍵盤快速鍵</translation>
 </message>
 <message>
- <location line="-11"/>
+ <location line="-9"/>
 <source>Decode video using LIBVA (INTEL)</source>
 <translation>解碼影片使用 LIBVA (INTEL)</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-435"/>
+ <location filename="../../common/gui_main.cpp" line="-436"/>
 <source>Cannot open project using the video loader.</source>
 <translation>使用影片載入器時無法開啟專案。</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+91"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+88"/>
 <source>LIBVA (best)</source>
 <translation>LIBVA (最好)</translation>
 </message>
@@ -2499,7 +2589,7 @@
 <translation>Film 轉成 PAL</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-434"/>
+ <location filename="../../common/gui_save.cpp" line="-443"/>
 <source>Select File to Save</source>
 <translation>選擇檔案進行儲存</translation>
 </message>
@@ -2524,7 +2614,7 @@
 <translation>重新取樣頻率 (Hz)</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+695"/>
+ <location filename="../../common/gui_main.cpp" line="+696"/>
 <source>Setting the language for the given track index is not possible: Invalid track index!</source>
 <translation>設定的語言無法提供跟蹤索引：無效跟蹤指標！</translation>
 </message>
@@ -2544,7 +2634,7 @@
 <translation>沒有檔案載入</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-635"/>
+ <location filename="../../common/gui_main.cpp" line="-636"/>
 <source>The file you just loaded contains several audio tracks.
 Go to Audio-&gt;MainTrack to select the active one.</source>
 <translation>這檔案剛剛載入包含一些音訊軌道。
@@ -2556,12 +2646,12 @@
 <translation>影片編碼器</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+68"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+71"/>
 <source>Threading</source>
 <translation>線程</translation>
 </message>
 <message>
- <location line="-106"/>
+ <location line="-109"/>
 <source>_Strength:</source>
 <translation>強度:</translation>
 </message>
@@ -2576,7 +2666,7 @@
 <translation>儲存工作</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-156"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-155"/>
 <source>_Check for new release</source>
 <translation>檢查有新版本</translation>
 </message>
@@ -2586,12 +2676,22 @@
 <translation>索引/拆開打包的優先次序:</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+9"/>
 <source>_Sanitize decode time stamps (DTS) in copy mode</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+98"/>
+ <location line="+2"/>
+ <source>Caching of decoded pictures</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Cache size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+95"/>
 <source>De_ringing</source>
 <translation>去除環狀色斑</translation>
 </message>
@@ -2616,7 +2716,7 @@
 <translation>關鍵幀提高(%)</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-149"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-148"/>
 <source>Enable MMX</source>
 <translation>啟用 MMX</translation>
 </message>
@@ -2626,7 +2726,7 @@
 <translation>啟用 SSE</translation>
 </message>
 <message>
- <location line="-17"/>
+ <location line="-18"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation>如果你使用硬體解碼，最好使用匹配的顯示驅動程式</translation>
 </message>
@@ -2639,11 +2739,12 @@
 <message>
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+257"/>
 <location line="+3"/>
+ <location line="+3"/>
 <source>HW Accel</source>
 <translation>HW 硬體加速器</translation>
 </message>
 <message>
- <location line="-257"/>
+ <location line="-259"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation>同意在 DVD 使用非標準的音訊頻率</translation>
 </message>
@@ -2678,7 +2779,7 @@
 <translation>音訊軌道有必要建立這樣的檔</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+571"/>
+ <location filename="../../common/gui_main.cpp" line="+572"/>
 <source>Cannot use that file as audio track</source>
 <translation>不能使用該檔作為音訊軌道</translation>
 </message>
@@ -2703,12 +2804,12 @@
 <translation>非常高</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1319"/>
+ <location filename="../../common/gui_main.cpp" line="-1386"/>
 <source>Select script/project to run</source>
 <translation>選擇要執行的腳本/專案</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+215"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
 <source>_Always ask which port to use</source>
 <translation>製作影片始終詢問要使用哪個埠(Avidemux+Avisynth)</translation>
 </message>
@@ -2738,7 +2839,7 @@
 <translation>低位元率的場景（%）</translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+446"/>
+ <location filename="../../common/gui_play.cpp" line="+442"/>
 <source>Trouble initializing audio device</source>
 <translation>音訊裝置初始化時發生問題</translation>
 </message>
@@ -2749,7 +2850,7 @@
 <translation>核心已編譯，沒有 XVBA 的支援，但它已編譯應用程式，安裝不匹配</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-179"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-182"/>
 <source>Video _display:</source>
 <translation>影片 顯示:</translation>
 </message>
@@ -2765,7 +2866,7 @@
 <translation>去除垂直方向塊狀色斑</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+1143"/>
+ <location filename="../../common/gui_main.cpp" line="+1210"/>
 <source>Errors found in %u frames</source>
 <translation>在 %u 幀中發現錯誤</translation>
 </message>
@@ -2795,7 +2896,7 @@
 <translation>自由型 2</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-629"/>
+ <location filename="../../common/gui_main.cpp" line="-667"/>
 <location line="+21"/>
 <source>Cutting</source>
 <translation>剪下</translation>
@@ -2811,7 +2912,7 @@
 <translation>幾秒鐘</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+475"/>
+ <location filename="../../common/gui_save.cpp" line="+484"/>
 <source>File %s has been successfully saved.</source>
 <translation>檔案 %s 已經成功地儲存。</translation>
 </message>
@@ -2841,7 +2942,7 @@
 <translation>前往時間點</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-210"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-209"/>
 <source>Multi-threading</source>
 <translation>多線程</translation>
 </message>
@@ -2871,17 +2972,17 @@
 <translation>取消標記</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+230"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
 <source>Default port to use</source>
 <translation>製作影片要使用預設埠(Avidemux)</translation>
 </message>
 <message>
- <location line="-147"/>
+ <location line="-150"/>
 <source>_Message level:</source>
 <translation>訊息等級:</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+629"/>
+ <location filename="../../common/gui_main.cpp" line="+667"/>
 <source>You can&apos;t remove all frames</source>
 <translation>你不&apos;能移除所有的幀</translation>
 </message>
@@ -2891,12 +2992,12 @@
 <translation>進階(&amp;A)</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-128"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-123"/>
 <source>Enable openGl support</source>
 <translation>啟用openGl支援</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-912"/>
+ <location filename="../../common/gui_main.cpp" line="-980"/>
 <source>tinyPy script is not enabled in this build</source>
 <translation>在生成中未啟用 tinyPy 腳本</translation>
 </message>
@@ -2906,7 +3007,7 @@
 <translation>無法安裝編解碼器，位元率太低？</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-518"/>
+ <location filename="../../common/gui_save.cpp" line="-527"/>
 <source>Output file</source>
 <translation>輸出檔案</translation>
 </message>
@@ -2943,7 +3044,7 @@
 <translation>取消編輯(&amp;C)</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+1231"/>
+ <location filename="../../common/gui_main.cpp" line="+1299"/>
 <source>Failed to connect to avsproxy.
 Is it running ?</source>
 <translation>無法連線到 avs代理，
@@ -2976,7 +3077,8 @@
 <translation>另存圖片(&amp;S)</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+285"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+280"/>
+ <location line="+3"/>
 <source>Preferences</source>
 <translation>首選項-偏好設定</translation>
 </message>
@@ -2996,9 +3098,8 @@
 <translation>正在儲存音訊</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-221"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
- <translation>在 .mp4 對 MP3 使用選擇對象標籤</translation>
+ <translation type="vanished">在 .mp4 對 MP3 使用選擇對象標籤</translation>
 </message>
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-29"/>
@@ -3011,7 +3112,7 @@
 <translation>開啟應用程式Log(&amp;L)</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+96"/>
+ <location filename="../../common/gui_save.cpp" line="+95"/>
 <source>Function not implemented
 </source>
 <translation>函數尚未執行
@@ -3024,7 +3125,7 @@
 <translation>濾鏡器(&amp;F)</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-21"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-244"/>
 <source>_lavc threads:</source>
 <translation>lavc 線程:</translation>
 </message>
@@ -3039,7 +3140,7 @@
 <translation>灰階</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+195"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+194"/>
 <source>Refresh Rate Cap (ms)</source>
 <translation>重整速率上限 (ms)</translation>
 </message>
@@ -3080,7 +3181,7 @@
 <translation>AvsProxy</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-181"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-180"/>
 <source>_Playback priority:</source>
 <translation>倒帶優先次序:</translation>
 </message>
@@ -3091,7 +3192,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="-1"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+105"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+104"/>
 <source>_Horizontal deblocking</source>
 <translation>去除水平方向塊狀色斑</translation>
 </message>
@@ -3121,7 +3222,7 @@
 <translation>2通</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-838"/>
+ <location filename="../../common/gui_main.cpp" line="-839"/>
 <source>Could not open the file</source>
 <translation>無法開啟此檔案</translation>
 </message>
@@ -3156,12 +3257,12 @@
 <translation>系統語言</translation>
 </message>
 <message>
- <location line="-107"/>
+ <location line="-103"/>
 <source>XVideo (best)</source>
 <translation>XVideo (最好)</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+287"/>
+ <location filename="../../common/gui_main.cpp" line="+285"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
@@ -3173,8 +3274,8 @@
 <translation>音訊編碼器</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-164"/>
- <location line="+320"/>
+ <location filename="../../common/gui_main.cpp" line="-162"/>
+ <location line="+321"/>
 <source>Something bad happened (II)</source>
 <translation>不幸的事情發生 (II)</translation>
 </message>
@@ -3184,7 +3285,7 @@
 <translation>儲存失敗</translation>
 </message>
 <message>
- <location line="-217"/>
+ <location line="-216"/>
 <location line="+2"/>
 <source>Select File to Save Audio</source>
 <translation>選擇檔案來儲存音訊</translation>
@@ -3210,9 +3311,8 @@
 <translation>外掛-音訊(ADM)</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+503"/>
 <source>Cannot get tinyPÿ script engine</source>
- <translation>不能獲得tinyPÿ腳本引擎</translation>
+ <translation type="vanished">不能獲得tinyPÿ腳本引擎</translation>
 </message>
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+6"/>
@@ -3225,7 +3325,7 @@
 <translation>模式決定</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-532"/>
+ <location filename="../../common/gui_save.cpp" line="-29"/>
 <source>Queue job to jobList</source>
 <translation>工作清單</translation>
 </message>
@@ -3235,12 +3335,12 @@
 <translation>內部開啟錯誤中 0x%x</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-880"/>
+ <location filename="../../common/gui_main.cpp" line="-918"/>
 <source>Are you sure?</source>
 <translation>確定嗎?</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <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>
@@ -3264,7 +3364,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_toolkit/automation.cpp" line="+238"/>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+234"/>
 <source>Permission Error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3313,7 +3413,7 @@
 <context>
 <name>asciiView</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
 <source>Ascii View</source>
 <translation>1.5-ASCII視圖(美國資訊交換標準代碼)</translation>
 </message>
@@ -3986,13 +4086,13 @@
 <message>
 <location line="-1"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
- <location line="+90"/>
+ <location line="+87"/>
 <source>Contrast</source>
 <translation>3.2-對比</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
- <location line="+90"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
+ <location line="+87"/>
 <source>Brightness</source>
 <translation>亮度</translation>
 </message>
@@ -4118,7 +4218,7 @@
 </translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+323"/>
 <source>Size: </source>
 <translation type="unfinished"></translation>
 </message>
@@ -6498,7 +6598,7 @@
 <context>
 <name>lavcodec</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+516"/>
 <source>_Bitrate:</source>
 <translation>位元率:</translation>
 </message>
@@ -6738,12 +6838,12 @@
 <context>
 <name>matroskademuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+481"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+477"/>
 <source>Matroska clusters</source>
 <translation>Matroska 集群</translation>
 </message>
 <message>
- <location line="-433"/>
+ <location line="-431"/>
 <source>Matroska Images</source>
 <translation>Matroska 圖像</translation>
 </message>
@@ -6942,7 +7042,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+827"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+818"/>
 <source>Problem reading SVQ3 headers</source>
 <translation>讀取 SVQ3 檔頭時發生問題</translation>
 </message>
@@ -6956,6 +7056,26 @@
 </message>
 <message>
 <location line="+2"/>
+ <source>No optimization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Move index to the beginning of the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use fragmentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Optimize for Streaming</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Force aspect ratio</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6990,7 +7110,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+207"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+223"/>
 <source>Saving PSP</source>
 <translation>儲存 PSP</translation>
 </message>
@@ -7000,17 +7120,16 @@
 <translation>儲存 mp4</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="-10"/>
 <source>Use alternate MP3 tag</source>
- <translation>使用備用的 MP3 標記</translation>
+ <translation type="vanished">使用備用的 MP3 標記</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="-139"/>
+ <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="+13"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+3"/>
 <source>MP4 Muxer</source>
 <translation>複合器</translation>
 </message>
@@ -7194,7 +7313,7 @@
 <context>
 <name>navigate</name>
 <message>
- <location filename="../../common/gui_navigate.cpp" line="+501"/>
+ <location filename="../../common/gui_navigate.cpp" line="+494"/>
 <source>Seek</source>
 <translation>尋求</translation>
 </message>
@@ -7209,7 +7328,7 @@
 <translation>轉到上一幀(關鍵幀或I幀)</translation>
 </message>
 <message>
- <location line="-69"/>
+ <location line="-64"/>
 <source>Cannot go to next keyframe</source>
 <translation>轉到下一幀(關鍵幀或I幀)</translation>
 </message>
@@ -7277,7 +7396,7 @@
 <translation>不正常的標頭</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
 <source>Unpacking bitstream</source>
 <translation>解壓位元流</translation>
 </message>
@@ -7424,9 +7543,8 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+80"/>
 <source>Error</source>
- <translation>錯誤</translation>
+ <translation type="vanished">錯誤</translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
@@ -7434,27 +7552,32 @@
 <translation>正在索引</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+0"/>
 <source>This file&apos;s index has been created with an older version of avidemux.
 Please delete the idx2 file and reopen.</source>
- <translation>用舊版本的剪切建立此檔&apos;案索引，請刪除 idx2 檔，然後重新打開。</translation>
+ <translation type="vanished">用舊版本的剪切建立此檔&apos;案索引，請刪除 idx2 檔，然後重新打開。</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+42"/>
+ <location line="+42"/>
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>qaudiotracks</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+510"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+517"/>
 <source>copy</source>
 <translation>複製</translation>
 </message>
 <message>
- <location line="-354"/>
- <location line="+152"/>
+ <location line="-363"/>
+ <location line="+161"/>
 <source>Error</source>
 <translation>錯誤</translation>
 </message>
@@ -7479,7 +7602,7 @@
 <translation>....增加音訊軌</translation>
 </message>
 <message>
- <location line="-342"/>
+ <location line="-351"/>
 <source>Select audio file</source>
 <translation>將選擇音訊檔案</translation>
 </message>
@@ -7489,7 +7612,7 @@
 <translation>不能使用該檔作為音訊軌道</translation>
 </message>
 <message>
- <location line="+278"/>
+ <location line="+287"/>
 <source> from video</source>
 <translation> 來至影片</translation>
 </message>
@@ -7543,18 +7666,18 @@
 <name>qfile</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+128"/>
- <location line="+105"/>
+ <location line="+106"/>
 <source> files (*.</source>
 <translation> 檔案 (*.</translation>
 </message>
 <message>
- <location line="-188"/>
- <location line="+141"/>
+ <location line="-189"/>
+ <location line="+142"/>
 <source>All files (*.*)</source>
 <translation>所有檔案 (*.*)</translation>
 </message>
 <message>
- <location line="-34"/>
+ <location line="-35"/>
 <source>Overwrite file </source>
 <translation>覆寫檔案 </translation>
 </message>
@@ -7562,34 +7685,34 @@
 <context>
 <name>qgui2</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+2050"/>
+ <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+2068"/>
 <source>%c-%s (%02d)</source>
 <translation>%c-%s (%02d)</translation>
 </message>
 <message>
- <location line="-917"/>
+ <location line="-924"/>
 <source>Set start marker</source>
 <translation>設定開始標記</translation>
 </message>
 <message>
- <location line="-675"/>
+ <location line="-686"/>
 <source>Recent Projects</source>
 <translation>最近使用的 專案(&amp;P)</translation>
 </message>
 <message>
- <location line="+1330"/>
+ <location line="+1348"/>
 <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="-661"/>
+ <location line="-668"/>
 <source>Go to previous keyframe</source>
 <translation>轉到上一幀(關鍵幀或I幀)</translation>
 </message>
 <message>
- <location line="-915"/>
+ <location line="-926"/>
 <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>
@@ -7599,7 +7722,7 @@
 <translation>最近使用的 檔案(&amp;F)</translation>
 </message>
 <message>
- <location line="+673"/>
+ <location line="+684"/>
 <source>Go to next keyframe</source>
 <translation>轉到下一幀(關鍵幀或I幀)</translation>
 </message>
@@ -7644,12 +7767,12 @@
 <translation>轉到上一幀</translation>
 </message>
 <message>
- <location line="+1263"/>
+ <location line="+1270"/>
 <source> (%d track(s))</source>
 <translation> (%d 軌(s))</translation>
 </message>
 <message>
- <location line="-1260"/>
+ <location line="-1267"/>
 <source>Go to next frame</source>
 <translation>轉到下一幀</translation>
 </message>
@@ -7721,7 +7844,7 @@
 </message>
 <message>
 <location line="+88"/>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Sure!</source>
 <translation>確定!</translation>
 </message>
@@ -7731,7 +7854,7 @@
 <translation>確定要刪除所有工作?</translation>
 </message>
 <message>
- <location line="-78"/>
+ <location line="-79"/>
 <source>End Time</source>
 <translation>終了時間</translation>
 </message>
@@ -7761,12 +7884,12 @@
 <translation>已成功</translation>
 </message>
 <message>
- <location line="+126"/>
+ <location line="+128"/>
 <source>This script has already been successfully executed.</source>
 <translation>這個腳本已經成功執行。</translation>
 </message>
 <message>
- <location line="-126"/>
+ <location line="-128"/>
 <source>Running</source>
 <translation>正在執行</translation>
 </message>
@@ -7786,12 +7909,12 @@
 <translation>刪除工作</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+15"/>
 <source>Delete *all* job</source>
 <translation>刪除*所有*工作</translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Already done</source>
 <translation>已經完成</translation>
 </message>
@@ -7807,7 +7930,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+680"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+676"/>
 <source>Add</source>
 <translation>加入</translation>
 </message>
@@ -7860,7 +7983,7 @@
 <context>
 <name>qprocessing</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+159"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+163"/>
 <source>_Resume</source>
 <translation>恢復</translation>
 </message>
@@ -8017,7 +8140,7 @@
 <context>
 <name>qtalert</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+38"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+39"/>
 <location line="+25"/>
 <location line="+25"/>
 <source>Info</source>
@@ -8029,8 +8152,8 @@
 <translation>警告</translation>
 </message>
 <message>
- <location line="+129"/>
- <location line="+30"/>
+ <location line="+134"/>
+ <location line="+33"/>
 <source>Question</source>
 <translation>問題</translation>
 </message>
@@ -8040,8 +8163,8 @@
 <translation>問題?</translation>
 </message>
 <message>
- <location line="-72"/>
- <location line="+30"/>
+ <location line="-78"/>
+ <location line="+31"/>
 <source>Confirmation</source>
 <translation>答覆</translation>
 </message>
@@ -8913,31 +9036,35 @@
 <context>
 <name>tsdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
 <source>Error</source>
- <translation>錯誤</translation>
+ <translation type="vanished">錯誤</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+198"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+91"/>
+ <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"/>
 <source>Indexing</source>
 <translation>正在索引</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+0"/>
 <source>This file&apos;s index has been created with an older version of avidemux.
 Please delete the idx2 file and reopen.</source>
- <translation>這是用舊版本Avidemux建立的索引檔 &apos;案，請刪除 idx2 檔，然後重新打開。</translation>
+ <translation type="vanished">這是用舊版本Avidemux建立的索引檔 &apos;案，請刪除 idx2 檔，然後重新打開。</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="-10"/>
+ <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"/>
 <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"/>
+ <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>
+ </message>
 </context>
 <context>
 <name>twolame</name>
@@ -9291,24 +9418,24 @@
 <context>
 <name>x264</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+637"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+643"/>
 <source>MB</source>
 <translation>MB</translation>
 </message>
 <message>
- <location line="-459"/>
+ <location line="-465"/>
 <source>none</source>
 <translation>無</translation>
 </message>
 <message>
- <location line="+610"/>
- <location line="+69"/>
+ <location line="+616"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation>錯誤</translation>
 </message>
 <message>
- <location line="-144"/>
+ <location line="-145"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Macroblock-Tree optimisation will automatically be disabled.
 
 Do you wish to continue?</source>
@@ -9325,32 +9452,32 @@
 <translation>目標影片大小:</translation>
 </message>
 <message>
- <location line="+239"/>
+ <location line="+240"/>
 <source>Do you really want to delete the </source>
 <translation>你準備希望刪除這 </translation>
 </message>
 <message>
- <location line="-87"/>
+ <location line="-88"/>
 <source>Cannot load preset</source>
 <translation>無法載入預設定</translation>
 </message>
 <message>
- <location line="+89"/>
+ <location line="+90"/>
 <source>Delete</source>
 <translation>刪除</translation>
 </message>
 <message>
- <location line="-666"/>
+ <location line="-668"/>
 <source>Custom</source>
 <translation>自訂</translation>
 </message>
 <message>
- <location line="+646"/>
+ <location line="+648"/>
 <source>Cannot save preset</source>
 <translation>無法儲存預設定</translation>
 </message>
 <message>
- <location line="-230"/>
+ <location line="-231"/>
 <source>Quantiser:</source>
 <translation>量化器:</translation>
 </message>
@@ -9366,17 +9493,16 @@
 <translation>kbit/s</translation>
 </message>
 <message>
- <location line="+172"/>
 <source>my profile</source>
- <translation>我的設定檔</translation>
+ <translation type="vanished">我的設定檔</translation>
 </message>
 <message>
- <location line="+34"/>
+ <location line="+207"/>
 <source>Replace the following preset ?:</source>
 <translation>替代以下的預設定嗎?:</translation>
 </message>
 <message>
- <location line="-226"/>
+ <location line="-227"/>
 <source>Target Bitrate:</source>
 <translation>目標位元速率：</translation>
 </message>
@@ -9398,7 +9524,7 @@
 <translation>品質:</translation>
 </message>
 <message>
- <location line="+240"/>
+ <location line="+241"/>
 <source>Cannot delete custom profile</source>
 <translation>不能刪除自訂的設定檔</translation>
 </message>
@@ -9408,14 +9534,14 @@
 <translation>複寫</translation>
 </message>
 <message>
- <location line="-133"/>
+ <location line="-134"/>
 <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>宏塊樹優化需要平差自適應量化(AQ)來啟用，平差自適應量化(AQ)將自動啟用，您要繼續嗎？</translation>
 </message>
 <message>
- <location line="+162"/>
+ <location line="+163"/>
 <source>Delete preset</source>
 <translation>刪除預設定</translation>
 </message>
@@ -10631,24 +10757,24 @@
 <context>
 <name>x265</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+594"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+600"/>
 <source>MB</source>
 <translation>MB</translation>
 </message>
 <message>
- <location line="-410"/>
+ <location line="-416"/>
 <source>none</source>
 <translation>無</translation>
 </message>
 <message>
- <location line="+568"/>
- <location line="+69"/>
+ <location line="+574"/>
+ <location line="+70"/>
 <location line="+14"/>
 <source>Error</source>
 <translation>錯誤</translation>
 </message>
 <message>
- <location line="-124"/>
+ <location line="-125"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Macroblock-Tree optimisation will automatically be disabled.
 
 Do you wish to continue?</source>
@@ -10665,32 +10791,32 @@
 <translation>目標影片大小:</translation>
 </message>
 <message>
- <location line="+246"/>
+ <location line="+247"/>
 <source>Do you really want to delete the </source>
 <translation>你打算刪除 </translation>
 </message>
 <message>
- <location line="-87"/>
+ <location line="-88"/>
 <source>Cannot load preset</source>
 <translation>不能載入預設定</translation>
 </message>
 <message>
- <location line="+89"/>
+ <location line="+90"/>
 <source>Delete</source>
 <translation>刪除</translation>
 </message>
 <message>
- <location line="-624"/>
+ <location line="-626"/>
 <source>Custom</source>
 <translation>自訂</translation>
 </message>
 <message>
- <location line="+604"/>
+ <location line="+606"/>
 <source>Cannot save preset</source>
 <translation>無法儲存預設定</translation>
 </message>
 <message>
- <location line="-237"/>
+ <location line="-238"/>
 <source>Quantiser:</source>
 <translation>量化值:</translation>
 </message>
@@ -10706,12 +10832,12 @@
 <translation>kbit/s</translation>
 </message>
 <message>
- <location line="+213"/>
+ <location line="+214"/>
 <source>Replace the following preset ?:</source>
 <translation>要替代以下預設定?:</translation>
 </message>
 <message>
- <location line="-234"/>
+ <location line="-235"/>
 <source>Target Bitrate:</source>
 <translation>目標位元率：</translation>
 </message>
@@ -10733,7 +10859,7 @@
 <translation>品質:</translation>
 </message>
 <message>
- <location line="+247"/>
+ <location line="+248"/>
 <source>Cannot delete custom profile</source>
 <translation>不能刪除自訂的設定檔</translation>
 </message>
@@ -10743,14 +10869,14 @@
 <translation>複寫</translation>
 </message>
 <message>
- <location line="-113"/>
+ <location line="-114"/>
 <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>宏塊優化需要平差自適應量化(AQ)來啟用，平差自適應量化(AQ)將自動啟用，您要繼續嗎？</translation>
 </message>
 <message>
- <location line="+142"/>
+ <location line="+143"/>
 <source>Delete preset</source>
 <translation>刪除預設定</translation>
 </message>
@@ -12052,57 +12178,88 @@
 <context>
 <name>yadif</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
 <source>Yadif</source>
 <translation>2.1-亞迪夫(yadif)濾鏡器</translation>
 </message>
 <message>
- <location line="+69"/>
+ <location line="+68"/>
+ <source>Frame : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Temporal &amp; spatial check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Field : Skip spatial temporal check</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Deint all</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Deint interlaced</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>_Deint:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
 <source>yadif</source>
 <translation>yadif</translation>
 </message>
 <message>
- <location line="-8"/>
+ <location line="-16"/>
 <source>Top field first</source>
 <translation>頂部首先掃描</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+13"/>
 <source>_Order:</source>
 <translation>命令:</translation>
 </message>
 <message>
- <location line="-1"/>
+ <location line="-2"/>
 <source>_Mode:</source>
 <translation>模式:</translation>
 </message>
 <message>
- <location line="-63"/>
+ <location line="-85"/>
 <source>Yadif, port of avisynth version (c) Fizick.</source>
 <translation>Yadif阜，Avisynth出口商Fizick版本(c).</translation>
 </message>
 <message>
- <location line="+53"/>
 <source>Temporal &amp; spatial check</source>
- <translation>時間l &amp; 空間檢查</translation>
+ <translation type="vanished">時間l &amp; 空間檢查</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Bob, temporal &amp; spatial check</source>
- <translation>振動，空間 &amp; 時間檢查</translation>
+ <translation type="vanished">振動，空間 &amp; 時間檢查</translation>
 </message>
 <message>
- <location line="+2"/>
 <source>Bob, skip spatial temporal check</source>
- <translation>振動，略過空間時間檢查</translation>
+ <translation type="vanished">振動，略過空間時間檢查</translation>
 </message>
 <message>
- <location line="-1"/>
 <source>Skip spatial temporal check</source>
- <translation>略過空間時間檢查</translation>
+ <translation type="vanished">略過空間時間檢查</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+75"/>
 <source>Bottom field first</source>
 <translation>底部首先掃描</translation>
 </message>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/qtbase_ca.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/qtbase_ca.ts Changed

@@ -1009,7 +1009,7 @@
 </message>
 <message>
 <source>Show </source>
- <translation>Mostra</translation>
+ <translation>Mostra </translation>
 </message>
 <message>
 <source>&amp;Rename</source>
@@ -1150,7 +1150,7 @@
 </message>
 <message>
 <source>%1 KB</source>
- <translation type="vanished">%1 KB</translation>
+ <translation type="vanished">%1 kB</translation>
 </message>
 <message>
 <source>%1 bytes</source>
@@ -1246,11 +1246,11 @@
 </message>
 <message>
 <source>Extra Light</source>
- <translation>Extra fi</translation>
+ <translation>Extrafi</translation>
 </message>
 <message>
 <source>Extra Bold</source>
- <translation>Extra negreta</translation>
+ <translation>Extranegreta</translation>
 </message>
 <message>
 <source>Extra</source>
@@ -1989,17 +1989,13 @@
 </message>
 <message>
 <source>missing section data. This is not a library.</source>
- <translation>manca la secció «data». Això no es cap biblioteca.</translation>
+ <translation>manca la secció «data». Això no és cap biblioteca.</translation>
 </message>
 <message>
 <source>Plugin verification data mismatch in &apos;%1&apos;</source>
 <translation type="vanished">Error de verificació de dades del connector a «%1»</translation>
 </message>
 <message>
- <source>Out of memory while loading plugin &apos;%1&apos;.</source>
- <translation>Sense memòria en carregar el connector «%1».</translation>
- </message>
- <message>
 <source>Failed to extract plugin meta data from &apos;%1&apos;</source>
 <translation>Ha fallat en extreure les metadades del connector des de «%1»</translation>
 </message>
@@ -2824,7 +2820,7 @@
 <name>QPSQLResult</name>
 <message>
 <source>Query results lost - probably discarded on executing another SQL query.</source>
- <translation>S&apos;han perdut els resultats de la consulta - probablement s&apos;han descartat en executar una altra consulta SQL.</translation>
+ <translation>S&apos;han perdut els resultats de la consulta - probablement descartats en executar una altra consulta SQL.</translation>
 </message>
 <message>
 <source>Unable to create query</source>
@@ -2832,7 +2828,7 @@
 </message>
 <message>
 <source>Unable to get result</source>
- <translation>No s&apos;ha pogut obtenir el resultat</translation>
+ <translation>No s&apos;ha pogut obtenir els resultats</translation>
 </message>
 <message>
 <source>Unable to send query</source>
@@ -3632,11 +3628,11 @@
 </message>
 <message>
 <source>Invalid Pages Definition</source>
- <translation>Definició no vàlida de pàgina</translation>
+ <translation>Definició no vàlida de les pàgines</translation>
 </message>
 <message>
 <source>%1 does not follow the correct syntax. Please use &apos;,&apos; to separate ranges and pages, &apos;-&apos; to define ranges and make sure ranges do not intersect with each other.</source>
- <translation>%1 no segueix la sintaxi correcta. Useu «,» per separarar intervals i pàgines, «-» per definir intervals i assegureu-vos que els intervals no intersequen entre ells.</translation>
+ <translation>%1 no segueix la sintaxi correcta. Useu «,» per separar intervals i pàgines, «-» per definir intervals, i assegureu-vos que els intervals no se sobreposen entre ells.</translation>
 </message>
 <message>
 <source>Print to File (PDF)</source>
@@ -3786,7 +3782,7 @@
 </message>
 <message>
 <source>There are conflicts in some advanced options. Do you want to fix them?</source>
- <translation>Hi ha conflictes a diverses opcions avançades. Voleu arreglar-los?</translation>
+ <translation>Hi ha conflictes a les opcions avançades. Els voleu solucionar?</translation>
 </message>
 </context>
 <context>
@@ -3805,7 +3801,7 @@
 </message>
 <message>
 <source>There are conflicts in some options. Please fix them.</source>
- <translation>Hi ha conflictes a diverses opcions. Esmeneu-los.</translation>
+ <translation>Hi ha conflictes a diverses opcions. Si us plau, solucioneu-los.</translation>
 </message>
 </context>
 <context>
@@ -3900,7 +3896,7 @@
 </message>
 <message>
 <source>Specify pages or ranges separated by commas. Ranges are specified by two numbers separated by a hyphen. E.g: 3,5-7,9 prints pages 3, 5, 6, 7 and 9.</source>
- <translation>Especifique les pàgines o intervals separats per comes. Els intervals s&apos;especifiquen amb dos nombres separats per un guió. P. ex: 3,5-7,9 imprimeix les pàgines 3, 5, 6, 7 i 9.</translation>
+ <translation>Especifiqueu les pàgines o intervals separats per comes. Els intervals s&apos;especifiquen amb dos nombres separats per un guió. P. ex: 3,5-7,9 imprimeix les pàgines 3, 5, 6, 7 i 9.</translation>
 </message>
 </context>
 <context>
@@ -4209,7 +4205,7 @@
 </message>
 <message>
 <source>PCRE does not support \L, \l, \N{name}, \U, or \u</source>
- <translation>PCRE not accepta \L, \l, \N{nom}, \U, ni \u</translation>
+ <translation>PCRE no accepta \L, \l, \N{nom}, \U, ni \u</translation>
 </message>
 <message>
 <source>number after (?C is &gt; 255</source>
@@ -4317,7 +4313,7 @@
 </message>
 <message>
 <source>different names for subpatterns of the same number are not allowed</source>
- <translation>no es permeten noms diferents per subpatrons dels mateix nombre</translation>
+ <translation>no es permeten noms diferents per subpatrons del mateix nombre</translation>
 </message>
 <message>
 <source>(*MARK) must have an argument</source>
@@ -4409,7 +4405,7 @@
 </message>
 <message>
 <source>unrecognised compile-time option bit(s)</source>
- <translation>bit/s no reconegut/s d&apos;opció en temps de compilació </translation>
+ <translation>bit/s no reconegut/s d&apos;opció en temps de compilació</translation>
 </message>
 <message>
 <source>missing ) after (?# comment</source>
@@ -4437,7 +4433,7 @@
 </message>
 <message>
 <source>this version of PCRE2 does not have Unicode support</source>
- <translation>aquesta versió del PCRE2 no implementa el Unicode</translation>
+ <translation>aquesta versió del PCRE2 no implementa l&apos;Unicode</translation>
 </message>
 <message>
 <source>parentheses are too deeply nested (stack check)</source>
@@ -4445,7 +4441,7 @@
 </message>
 <message>
 <source>character code point value in \x{} or \o{} is too large</source>
- <translation>el valor del codi de caràcter de coma en \x{} o \o{} es massa gran</translation>
+ <translation>el valor del codi de caràcter de coma en \x{} o \o{} és massa gran</translation>
 </message>
 <message>
 <source>\C is not allowed in a lookbehind assertion</source>
@@ -4513,11 +4509,11 @@
 </message>
 <message>
 <source>character code point value in \u.... sequence is too large</source>
- <translation>el valor del codi de caràcter de coma a una seqüència en \u.... es massa gran</translation>
+ <translation>el valor del codi de caràcter de coma a una seqüència en \u.... és massa gran</translation>
 </message>
 <message>
 <source>digits missing in \x{} or \o{}</source>
- <translation>manquen els dígits a\x{} o \o{} </translation>
+ <translation>manquen els dígits a\x{} o \o{}</translation>
 </message>
 <message>
 <source>syntax error in (?(VERSION condition</source>
@@ -4713,11 +4709,11 @@
 </message>
 <message>
 <source>too much recursion for DFA matching</source>
- <translation>hi ha massa recursió per a la coincidència DFA</translation>
+ <translation>hi ha massa recursivitat per a la coincidència DFA</translation>
 </message>
 <message>
 <source>backreference condition or recursion test is not supported for DFA matching</source>
- <translation>la condició de referència cap enrere o la prova de recursió no estan admeses a la coincidència DFA</translation>
+ <translation>la condició de referència cap enrere o la prova de recursivitat no estan admeses a la coincidència DFA</translation>
 </message>
 <message>
 <source>function is not supported for DFA matching</source>
@@ -4765,7 +4761,7 @@
 </message>
 <message>
 <source>nested recursion at the same subject position</source>
- <translation>recursió imbricada en la mateixa posició del subjecte</translation>
+ <translation>recursivitat imbricada a la mateixa posició del subjecte</translation>
 </message>
 <message>
 <source>recursion limit exceeded</source>
@@ -5141,7 +5137,7 @@
 </message>
 <message>
 <source>ScrollLock</source>
- <translation>BloqDespl</translation>
+ <translation>Bloq Despl</translation>
 </message>
 <message>
 <source>Menu</source>
@@ -5181,7 +5177,7 @@
 </message>
 <message>
 <source>Bass Boost</source>
- <translation>Potencia de greus</translation>
+ <translation>Potència de greus</translation>
 </message>
 <message>
 <source>Bass Up</source>
@@ -6508,11 +6504,11 @@
 </message>
 <message>
 <source>Error while setting the minimal protocol version</source>
- <translation>Error en determinar la versió mínim del protocol</translation>
+ <translation>Error en definir la versió mínima del protocol</translation>
 </message>
 <message>
 <source>Error while setting the maximum protocol version</source>
- <translation>Error en determinar la versió màxima del protocol</translation>
+ <translation>Error en definir la versió màxima del protocol</translation>
 </message>
 <message>
 <source>Invalid or empty cipher list (%1)</source>
@@ -6548,11 +6544,11 @@
 </message>
 <message>
 <source>Expecting QByteArray for %1</source>
- <translation>S&apos;esperava un QByteArray per %1</translation>
+ <translation>S&apos;esperava QByteArray per %1</translation>
 </message>
 <message>
 <source>An error occurred attempting to set %1 to %2</source>
- <translation></translation>
+ <translation>S&apos;ha produït un error en intentar establir %1 a %2</translation>
 </message>
 <message>
 <source>Wrong value for %1 (%2)</source>
@@ -6876,6 +6872,10 @@
 <translation>Profunditat de la imatge no vàlida</translation>
 </message>
 <message>
+ <source>Image size exceeds limit</source>
+ <translation>La mida de la imatge excedeix el límit</translation>
+ </message>
+ <message>
 <source>Could not seek to image read footer</source>
 <translation>No s&apos;ha pogut cercar el peu de lectura de la imatge</translation>
 </message>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/qtbase_de.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/qtbase_de.ts Changed

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/qtbase_pl.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/qtbase_pl.ts Changed

@@ -743,11 +743,11 @@
 <message>
 <source>Float</source>
 <extracomment>Accessible name for button undocking a dock widget (floating state)</extracomment>
- <translation>Zwolnij</translation>
+ <translation>Uwolnij</translation>
 </message>
 <message>
 <source>Undocks and re-attaches the dock widget</source>
- <translation>Zwalnia i ponownie dokuje widżet</translation>
+ <translation>Uwalnia i ponownie dokuje widżet</translation>
 </message>
 <message>
 <source>Close</source>
@@ -756,7 +756,7 @@
 </message>
 <message>
 <source>Closes the dock widget</source>
- <translation>Zamyka zadokowany widżet</translation>
+ <translation type="unfinished"></translation>
 </message>
 </context>
 <context>
@@ -3926,7 +3926,7 @@
 </message>
 <message>
 <source>invalid escape sequence in character class</source>
- <translation>nieprawidłowa sekwencja ucieczki w klasie znaków</translation>
+ <translation>niepoprawna sekwencja specjalna w klasie znakowej</translation>
 </message>
 <message>
 <source>range out of order in character class</source>
@@ -4794,7 +4794,7 @@
 </message>
 <message>
 <source>Home</source>
- <translation>Home</translation>
+ <translation>Katalog domowy</translation>
 </message>
 <message>
 <source>End</source>
@@ -6379,8 +6379,7 @@
 </message>
 <message>
 <source>Home</source>
- <translatorcomment>Keyboard button name</translatorcomment>
- <translation>Home</translation>
+ <translation>Katalog domowy</translation>
 </message>
 <message>
 <source>Cache</source>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/qtbase_ru.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/qtbase_ru.ts Changed

@@ -9,10 +9,41 @@
 </message>
 </context>
 <context>
+ <name>MAC_APPLICATION_MENU</name>
+ <message>
+ <source>About %1</source>
+ <translation>О %1</translation>
+ </message>
+ <message>
+ <source>Preferences...</source>
+ <translation>Настройки...</translation>
+ </message>
+ <message>
+ <source>Services</source>
+ <translation>Службы</translation>
+ </message>
+ <message>
+ <source>Hide %1</source>
+ <translation>Скрыть %1</translation>
+ </message>
+ <message>
+ <source>Hide Others</source>
+ <translation>Скрыть другое</translation>
+ </message>
+ <message>
+ <source>Show All</source>
+ <translation>Показать всё</translation>
+ </message>
+ <message>
+ <source>Quit %1</source>
+ <translation>Выйти из %1</translation>
+ </message>
+</context>
+<context>
 <name>QAbstractSocket</name>
 <message>
 <source>Socket operation timed out</source>
- <translation>Время операции истекло</translation>
+ <translation>Время на операцию истекло</translation>
 </message>
 <message>
 <source>Operation on socket is not supported</source>
@@ -158,6 +189,25 @@
 </message>
 </context>
 <context>
+ <name>QAndroidPlatformTheme</name>
+ <message>
+ <source>Yes</source>
+ <translation>Да</translation>
+ </message>
+ <message>
+ <source>Yes to All</source>
+ <translation>Да для всех</translation>
+ </message>
+ <message>
+ <source>No</source>
+ <translation>Нет</translation>
+ </message>
+ <message>
+ <source>No to All</source>
+ <translation>Нет для всех</translation>
+ </message>
+</context>
+<context>
 <name>QApplication</name>
 <message>
 <source>Executable &apos;%1&apos; requires Qt %2, found Qt %3.</source>
@@ -169,6 +219,69 @@
 </message>
 </context>
 <context>
+ <name>QCocoaMenuItem</name>
+ <message>
+ <source>About Qt</source>
+ <translation>О Qt</translation>
+ </message>
+ <message>
+ <source>About</source>
+ <translatorcomment>здесь и далее (до exit включительно) слова используются для определения пункта меню по началу его надписи (caption).</translatorcomment>
+ <translation>О </translation>
+ </message>
+ <message>
+ <source>Config</source>
+ <translation>Конфигурация</translation>
+ </message>
+ <message>
+ <source>Preference</source>
+ <translation>Предпочтени</translation>
+ </message>
+ <message>
+ <source>Options</source>
+ <translation>Параметры</translation>
+ </message>
+ <message>
+ <source>Setting</source>
+ <translation>Настройк</translation>
+ </message>
+ <message>
+ <source>Setup</source>
+ <translation>Параметр</translation>
+ </message>
+ <message>
+ <source>Quit</source>
+ <translation>Выйти</translation>
+ </message>
+ <message>
+ <source>Exit</source>
+ <translation>Выход</translation>
+ </message>
+ <message>
+ <source>Cut</source>
+ <translation>Вырезать</translation>
+ </message>
+ <message>
+ <source>Copy</source>
+ <translation>Копировать</translation>
+ </message>
+ <message>
+ <source>Paste</source>
+ <translation>Вставить</translation>
+ </message>
+ <message>
+ <source>Select All</source>
+ <translation>Выделить всё</translation>
+ </message>
+</context>
+<context>
+ <name>QCocoaTheme</name>
+ <message>
+ <source>Don&apos;t Save</source>
+ <translation>Не сохранять</translation>
+ </message>
+</context>
+<context>
 <name>QColorDialog</name>
 <message>
 <source>Hu&amp;e:</source>
@@ -241,22 +354,22 @@
 </message>
 <message>
 <source>Open the combo box selection popup</source>
- <translation>Открыть выпадающий список</translation>
+ <translation>Открыть раскрывающийся список</translation>
 </message>
 </context>
 <context>
 <name>QCommandLineParser</name>
 <message>
 <source>Displays version information.</source>
- <translation>Отобразить информацию о версии.</translation>
+ <translation>Показать сведения о версии.</translation>
 </message>
 <message>
 <source>Displays this help.</source>
- <translation>Отобразить эту справку.</translation>
+ <translation>Показать эту справку.</translation>
 </message>
 <message>
 <source>Unknown option &apos;%1&apos;.</source>
- <translation>Неизвестный параметр &apos;%1&apos;.</translation>
+ <translation>Неизвестный параметр «%1».</translation>
 </message>
 <message>
 <source>Unknown options: %1.</source>
@@ -264,11 +377,11 @@
 </message>
 <message>
 <source>Missing value after &apos;%1&apos;.</source>
- <translation>Отсутствует значение после &apos;%1&apos;.</translation>
+ <translation>Отсутствует значение после «%1».</translation>
 </message>
 <message>
 <source>Unexpected value after &apos;%1&apos;.</source>
- <translation>Неожиданное значение после &apos;%1&apos;.</translation>
+ <translation>Неожиданное значение после «%1».</translation>
 </message>
 <message>
 <source>[options]</source>
@@ -386,7 +499,7 @@
 <message>
 <source>Unclassified</source>
 <comment>CUPS Banner page</comment>
- <translation>Открытая информация</translation>
+ <translation>Без ограничения доступа</translation>
 </message>
 <message>
 <source>Confidential</source>
@@ -396,7 +509,7 @@
 <message>
 <source>Classified</source>
 <comment>CUPS Banner page</comment>
- <translation>Ограниченный доступ</translation>
+ <translation>С ограничением доступа</translation>
 </message>
 <message>
 <source>Secret</source>
@@ -714,7 +827,7 @@
 </message>
 <message>
 <source>To start a handshake, DTLS server requires non-empty datagram (client hello)</source>
- <translation>Сервер DTLS требует непустую датаграмму (client hello) для начала квитирования</translation>
+ <translation>Серверу DTLS требуется непустая датаграмма (client hello) для начала квитирования</translation>
 </message>
 <message>
 <source>Cannot start handshake, already done/in progress</source>
@@ -817,7 +930,7 @@
 </message>
 <message>
 <source>Fatal Error:</source>
- <translation>Фатальная ошибка:</translation>
+ <translation>Неустранимая ошибка:</translation>
 </message>
 <message>
 <source>Information:</source>
@@ -836,7 +949,7 @@
 <name>QFile</name>
 <message>
 <source>Destination file is the same file.</source>
- <translation>Файл назначения такой же, что и исходный.</translation>
+ <translation>Файл назначения совпадает с исходным файлом.</translation>
 </message>
 <message>
 <source>Source file does not exist.</source>
@@ -848,7 +961,7 @@
 </message>
 <message>
 <source>Error while renaming: %1</source>
- <translation>Возникла ошибка при переименовании: %1</translation>
+ <translation>Ошибка переименования: %1</translation>
 </message>
 <message>
 <source>Unable to restore from %1: %2</source>
@@ -1028,7 +1141,7 @@
 <source>%1 already exists.
 Do you want to replace it?</source>
 <translation>%1 уже существует.
-Хотите заменить его?</translation>
+Заменить его?</translation>
 </message>
 <message>
 <source>%1
@@ -1050,11 +1163,11 @@
 <source>&apos;%1&apos; is write protected.
 Do you want to delete it anyway?</source>
 <translation>«%1» защищён от записи.
-Действительно желаете удалить?</translation>
+Действительно удалить?</translation>
 </message>
 <message>
 <source>Are you sure you want to delete &apos;%1&apos;?</source>
- <translation>Желаете удалить «%1»?</translation>
+ <translation>Действительно удалить «%1»?</translation>
 </message>
 <message>
 <source>Could not delete directory.</source>
@@ -1179,11 +1292,11 @@
 <name>QFontDatabase</name>
 <message>
 <source>Bold</source>
- <translation>Жирный</translation>
+ <translation>Полужирный</translation>
 </message>
 <message>
 <source>Demi Bold</source>
- <translation>Полужирный</translation>
+ <translation>Плотный</translation>
 </message>
 <message>
 <source>Black</source>
@@ -1214,11 +1327,11 @@
 </message>
 <message>
 <source>Extra Light</source>
- <translation>Очень тонкий</translation>
+ <translation>Сверхсветлый</translation>
 </message>
 <message>
 <source>Extra Bold</source>
- <translation>Очень жирный</translation>
+ <translation>Жирный</translation>
 </message>
 <message>
 <source>Extra</source>
@@ -1472,7 +1585,7 @@
 <message>
 <source>Uploading file failed:
 %1</source>
- <translation>Не удалось отгрузить файл:
+ <translation>Не удалось передать файл:
 %1</translation>
 </message>
 <message>
@@ -1579,11 +1692,11 @@
 </message>
 <message>
 <source>Proxy requires authentication</source>
- <translation>Прокси-сервер требует аутентификацию</translation>
+ <translation>Прокси-сервер запрашивает аутентификацию</translation>
 </message>
 <message>
 <source>Host requires authentication</source>
- <translation>Узел требует аутентификацию</translation>
+ <translation>Узел запрашивает аутентификацию</translation>
 </message>
 <message>
 <source>Data corrupted</source>
@@ -1827,7 +1940,7 @@
 </message>
 <message>
 <source>unterminated object</source>
- <translation>Незавершённый объект</translation>
+ <translation>незавершённый объект</translation>
 </message>
 <message>
 <source>missing name separator</source>
@@ -1886,7 +1999,7 @@
 <name>QKeySequenceEdit</name>
 <message>
 <source>Press shortcut</source>
- <translation>Нажмите сочетание клавиш</translation>
+ <translation>Нажмите комбинацию клавиш</translation>
 </message>
 <message>
 <source>%1, ...</source>
@@ -1918,7 +2031,7 @@
 </message>
 <message>
 <source>odd endianness</source>
- <translation>странный порядок байт</translation>
+ <translation>странный порядок байтов</translation>
 </message>
 <message>
 <source>unexpected e_shsize</source>
@@ -1938,11 +2051,11 @@
 </message>
 <message>
 <source>shstrtab section header seems to be at %1</source>
- <translation>заголовок секции shstrtab кажется должен быть с %1</translation>
+ <translation>заголовок секции shstrtab, похоже, находится в позиции %1</translation>
 </message>
 <message>
 <source>string table seems to be at %1</source>
- <translation>таблица строк кажется должна быть с %1</translation>
+ <translation>таблица строк, похоже, находится в позиции %1</translation>
 </message>
 <message>
 <source>section name %1 of %2 behind end of file</source>
@@ -1958,7 +2071,7 @@
 </message>
 <message>
 <source>Failed to extract plugin meta data from &apos;%1&apos;</source>
- <translation>Не удалось извлечь мета-данные модуля из «%1»</translation>
+ <translation>Не удалось извлечь метаданные модуля из «%1»</translation>
 </message>
 <message>
 <source>The shared library was not found.</source>
@@ -1966,7 +2079,7 @@
 </message>
 <message>
 <source>The file &apos;%1&apos; is not a valid Qt plugin.</source>
- <translation>Файл «%1» ― не является корректным модулем Qt.</translation>
+ <translation>Файл «%1» не является корректным модулем Qt.</translation>
 </message>
 <message>
 <source>The plugin &apos;%1&apos; uses incompatible Qt library. (%2.%3.%4) [%5]</source>
@@ -2022,7 +2135,7 @@
 </message>
 <message>
 <source>&apos;%1&apos; is not a Qt plugin</source>
- <translation>«%1» не плагин Qt</translation>
+ <translation>«%1» не является модулем Qt</translation>
 </message>
 </context>
 <context>
@@ -2060,74 +2173,74 @@
 <name>QLocalServer</name>
 <message>
 <source>%1: Name error</source>
- <translation>%1: Некорректное имя</translation>
+ <translation>%1: некорректное имя</translation>
 </message>
 <message>
 <source>%1: Permission denied</source>
- <translation>%1: Доступ запрещён</translation>
+ <translation>%1: доступ запрещён</translation>
 </message>
 <message>
 <source>%1: Address in use</source>
- <translation>%1: Адрес используется</translation>
+ <translation>%1: адрес используется</translation>
 </message>
 <message>
 <source>%1: Unknown error %2</source>
- <translation>%1: Неизвестная ошибка %2</translation>
+ <translation>%1: неизвестная ошибка %2</translation>
 </message>
 </context>
 <context>
 <name>QLocalSocket</name>
 <message>
 <source>%1: Connection refused</source>
- <translation>%1: Отказано в соединении</translation>
+ <translation>%1: отказано в соединении</translation>
 </message>
 <message>
 <source>%1: Remote closed</source>
- <translation>%1: Закрыто удаленной стороной</translation>
+ <translation>%1: закрыто удалённой стороной</translation>
 </message>
 <message>
 <source>%1: Invalid name</source>
- <translation>%1: Некорректное имя</translation>
+ <translation>%1: некорректное имя</translation>
 </message>
 <message>
 <source>%1: Socket access error</source>
- <translation>%1: Ошибка обращения к сокету</translation>
+ <translation>%1: ошибка обращения к сокету</translation>
 </message>
 <message>
 <source>%1: Socket resource error</source>
- <translation>%1: Ошибка выделения ресурсов сокета</translation>
+ <translation>%1: ошибка выделения ресурсов сокета</translation>
 </message>
 <message>
 <source>%1: Socket operation timed out</source>
- <translation>%1: Время на операцию с сокетом истекло</translation>
+ <translation>%1: время на операцию с сокетом истекло</translation>
 </message>
 <message>
 <source>%1: Datagram too large</source>
- <translation>%1: Датаграмма слишком большая</translation>
+ <translation>%1: датаграмма слишком большая</translation>
 </message>
 <message>
 <source>%1: Connection error</source>
- <translation>%1: Ошибка соединения</translation>
+ <translation>%1: ошибка соединения</translation>
 </message>
 <message>
 <source>%1: The socket operation is not supported</source>
- <translation>%1: Операция с сокетом не поддерживается</translation>
+ <translation>%1: операция с сокетом не поддерживается</translation>
 </message>
 <message>
 <source>%1: Operation not permitted when socket is in this state</source>
- <translation>%1: Операция не разрешена, когда сокет в этом состоянии</translation>
+ <translation>%1: операция не разрешена, когда сокет в этом состоянии</translation>
 </message>
 <message>
 <source>%1: Unknown error</source>
- <translation>%1: Неизвестная ошибка</translation>
+ <translation>%1: неизвестная ошибка</translation>
 </message>
 <message>
 <source>%1: Unknown error %2</source>
- <translation>%1: Неизвестная ошибка %2</translation>
+ <translation>%1: неизвестная ошибка %2</translation>
 </message>
 <message>
 <source>%1: Access denied</source>
- <translation>%1: Доступ запрещён</translation>
+ <translation>%1: доступ запрещён</translation>
 </message>
 <message>
 <source>Trying to connect while connection is in progress</source>
@@ -2301,14 +2414,15 @@
 <translation>Скрыть подробности...</translation>
 </message>
 <message>
- <source>&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across all major desktop operating systems. It is also available for embedded Linux and other embedded and mobile operating systems.&lt;/p&gt;&lt;p&gt;Qt is available under three different licensing options designed to accommodate the needs of our various users.&lt;/p&gt;&lt;p&gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 3.&lt;/p&gt;&lt;p&gt;Qt licensed under the GNU LGPL version 3 is appropriate for the development of Qt&amp;nbsp;applications provided you can comply with the terms and conditions of the GNU LGPL version 3.&lt;/p&gt;&lt;p&gt;Please see &lt;a href=&quot;http://%2/&quot;&gt;%2&lt;/a&gt; for an overview of Qt licensing.&lt;/p&gt;&lt;p&gt;Copyright (C) %1 The Qt Company Ltd and other contributors.&lt;/p&gt;&lt;p&gt;Qt and the Qt logo are trademarks of The Qt Company Ltd.&lt;/p&gt;&lt;p&gt;Qt is The Qt Company Ltd product developed as an open source project. See &lt;a href=&quot;http://%3/&quot;&gt;%3&lt;/a&gt; for more information.&lt;/p&gt;</source>
- <translation>&lt;p&gt;Qt ― это инструментарий для разработки кроссплатформенных приложений на C++.&lt;/p&gt;&lt;p&gt;Qt предоставляет совместимость на уровне исходных текстов для всех популярных настольных операционных систем. Также Qt доступна для встраиваемого Linux и других мобильных операционных систем.&lt;/p&gt;&lt;p&gt;Qt доступна под тремя различными лицензиями, разработанными для удовлетворения различных требований.&lt;/p&gt;&lt;p&gt;Qt под нашей коммерческой лицензией предназначена для развития проприетарного/коммерческого программного обеспечения, когда Вы не желаете предоставлять исходные тексты третьим сторонам, или в случае невозможности принятия условий лицензий GNU LGPL версии 3.&lt;/p&gt;&lt;p&gt;Qt под лицензией GNU LGPL версии 3 предназначена для разработки программного обеспечения удовлетворяющего условиям лицензии GNU LGPL версии 3.&lt;/p&gt;&lt;p&gt;Подробнее с лицензированием Qt можно ознакомиться на сайте &lt;a href=&quot;http://%2/&quot;&gt;%2&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Copyright (C) %1 The Qt Company Ltd and other contributors.&lt;/p&gt;&lt;p&gt;Qt и логотип Qt являются товарными знаками The Qt Company Ltd.&lt;/p&gt;&lt;p&gt;Qt ― продукт компании Qt Company Ltd, разрабатываемый как проект с открытым исходным кодом. &lt;/p&gt;&lt;p&gt;Более подробную информацию можно найти на сайте &lt;a href=&quot;http://%3/&quot;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
- </message>
- <message>
 <source>&lt;h3&gt;About Qt&lt;/h3&gt;&lt;p&gt;This program uses Qt version %1.&lt;/p&gt;</source>
 <translation>&lt;h3&gt;О Qt&lt;/h3&gt;&lt;p&gt;Данная программа использует Qt версии %1.&lt;/p&gt;</translation>
 </message>
 <message>
+ <source>&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across all major desktop operating systems. It is also available for embedded Linux and other embedded and mobile operating systems.&lt;/p&gt;&lt;p&gt;Qt is available under multiple licensing options designed to accommodate the needs of our various users.&lt;/p&gt;&lt;p&gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of GNU (L)GPL.&lt;/p&gt;&lt;p&gt;Qt licensed under GNU (L)GPL is appropriate for the development of Qt&amp;nbsp;applications provided you can comply with the terms and conditions of the respective licenses.&lt;/p&gt;&lt;p&gt;Please see &lt;a href=&quot;http://%2/&quot;&gt;%2&lt;/a&gt; for an overview of Qt licensing.&lt;/p&gt;&lt;p&gt;Copyright (C) %1 The Qt Company Ltd and other contributors.&lt;/p&gt;&lt;p&gt;Qt and the Qt logo are trademarks of The Qt Company Ltd.&lt;/p&gt;&lt;p&gt;Qt is The Qt Company Ltd product developed as an open source project. See &lt;a href=&quot;http://%3/&quot;&gt;%3&lt;/a&gt; for more information.&lt;/p&gt;</source>
+ <extracomment>Leave this text untranslated or include a verbatim copy of it below and note that it is the authoritative version in case of doubt.</extracomment>
+ <translation>&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across all major desktop operating systems. It is also available for embedded Linux and other embedded and mobile operating systems.&lt;/p&gt;&lt;p&gt;Qt is available under multiple licensing options designed to accommodate the needs of our various users.&lt;/p&gt;&lt;p&gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of GNU (L)GPL.&lt;/p&gt;&lt;p&gt;Qt licensed under GNU (L)GPL is appropriate for the development of Qt&amp;nbsp;applications provided you can comply with the terms and conditions of the respective licenses.&lt;/p&gt;&lt;p&gt;Please see &lt;a href=&quot;http://%2/&quot;&gt;%2&lt;/a&gt; for an overview of Qt licensing.&lt;/p&gt;&lt;p&gt;Copyright (C) %1 The Qt Company Ltd and other contributors.&lt;/p&gt;&lt;p&gt;Qt and the Qt logo are trademarks of The Qt Company Ltd.&lt;/p&gt;&lt;p&gt;Qt is The Qt Company Ltd product developed as an open source project. See &lt;a href=&quot;http://%3/&quot;&gt;%3&lt;/a&gt; for more information.&lt;/p&gt;</translation>
+ </message>
+ <message>
 <source>About Qt</source>
 <translation>О Qt</translation>
 </message>
@@ -2317,7 +2431,7 @@
 <name>QNativeSocketEngine</name>
 <message>
 <source>Unable to initialize non-blocking socket</source>
- <translation>Невозможно инициализировать не-блочный сокет</translation>
+ <translation>Невозможно инициализировать неблокирующий сокет</translation>
 </message>
 <message>
 <source>Unable to initialize broadcast socket</source>
@@ -2409,7 +2523,7 @@
 </message>
 <message>
 <source>Operation on non-socket</source>
- <translation>Операция с не-сокетом</translation>
+ <translation>Операция над объектом, не являющимся сокетом</translation>
 </message>
 <message>
 <source>The proxy type is invalid for this operation</source>
@@ -2454,7 +2568,7 @@
 </message>
 <message>
 <source>Socket error on %1: %2</source>
- <translation>Ошика сокета для %1: %2</translation>
+ <translation>Ошибка сокета для %1: %2</translation>
 </message>
 <message>
 <source>Remote host closed the connection prematurely on %1</source>
@@ -2477,7 +2591,7 @@
 </message>
 <message>
 <source>Cannot open %1: Path is a directory</source>
- <translation>Невозможно открыть %1: Указан путь к каталогу</translation>
+ <translation>Невозможно открыть %1: это каталог</translation>
 </message>
 <message>
 <source>Read error reading from %1: %2</source>
@@ -2492,7 +2606,7 @@
 </message>
 <message>
 <source>Cannot open %1: is a directory</source>
- <translation>Невозможно открыть %1: Указан путь к каталогу</translation>
+ <translation>Невозможно открыть %1: это каталог</translation>
 </message>
 <message>
 <source>Logging in to %1 failed: authentication required</source>
@@ -2504,7 +2618,7 @@
 </message>
 <message>
 <source>Error while uploading %1: %2</source>
- <translation>Ошибка в процессе отгрузки %1: %2</translation>
+ <translation>Ошибка в процессе передачи %1: %2</translation>
 </message>
 </context>
 <context>
@@ -2656,7 +2770,7 @@
 </message>
 <message>
 <source>Unable to connect - Driver doesn&apos;t support all functionality required</source>
- <translation>Невозможно соединиться ― Драйвер не поддерживает требуемый функционал</translation>
+ <translation>Невозможно подключиться — драйвер не полностью поддерживает необходимый функционал</translation>
 </message>
 <message>
 <source>Unable to disable autocommit</source>
@@ -2683,7 +2797,7 @@
 </message>
 <message>
 <source>QODBCResult::reset: Unable to set &apos;SQL_CURSOR_STATIC&apos; as statement attribute. Please check your ODBC driver configuration</source>
- <translation>QODBCResult::reset: Невозможно установить «SQL_CURSOR_STATIC» атрибутом выражение. Проверьте настройки драйвера ODBC</translation>
+ <translation>QODBCResult::reset: невозможно установить «SQL_CURSOR_STATIC» атрибутом выражения. Проверьте настройки драйвера ODBC</translation>
 </message>
 <message>
 <source>Unable to execute statement</source>
@@ -2852,7 +2966,7 @@
 </message>
 <message>
 <source>Points (pt)</source>
- <translation>Точки (пт)</translation>
+ <translation>Пункты (пт)</translation>
 </message>
 <message>
 <source>Pica (P̸)</source>
@@ -3558,7 +3672,7 @@
 </message>
 <message>
 <source>%1 does not follow the correct syntax. Please use &apos;,&apos; to separate ranges and pages, &apos;-&apos; to define ranges and make sure ranges do not intersect with each other.</source>
- <translation>%1 имеет некорректный синтаксис. Используйте «,» для разделения страниц и диапазонов, а «-» для определения диапазонов. Пересекающиеся диапазоны недопустимы.</translation>
+ <translation>%1 имеет некорректный синтаксис. Используйте «,» для разделения страниц и диапазонов, а «-» — для определения диапазонов. Пересекающиеся диапазоны недопустимы.</translation>
 </message>
 <message>
 <source>Duplex Settings Conflicts</source>
@@ -3578,7 +3692,7 @@
 </message>
 <message>
 <source>Write PDF file</source>
- <translation>Запись файл PDF</translation>
+ <translation>Запись файла PDF</translation>
 </message>
 <message>
 <source>Print To File ...</source>
@@ -3600,13 +3714,13 @@
 <source>%1 already exists.
 Do you want to overwrite it?</source>
 <translation>%1 уже существует.
-Хотите заменить его?</translation>
+Заменить его?</translation>
 </message>
 <message>
 <source>Options &apos;Pages Per Sheet&apos; and &apos;Page Set&apos; cannot be used together.
 Please turn one of those options off.</source>
 <translation>Параметры «Страниц на листе» и «Список страниц» не могут использоваться одновременно.
-Выключите один из них.</translation>
+Отключите один из них.</translation>
 </message>
 <message>
 <source>The &apos;From&apos; value cannot be greater than the &apos;To&apos; value.</source>
@@ -3839,7 +3953,7 @@
 </message>
 <message>
 <source>Specify pages or ranges separated by commas. Ranges are specified by two numbers separated by a hyphen. E.g: 3,5-7,9 prints pages 3, 5, 6, 7 and 9.</source>
- <translation>Укажите страницы или диапазоны разделённые запятыми. Диапазоны задаются двумя числами, разделёнными дефисом. Например: при указании 3,5-7,9 будут напечатаны страницы 3, 5, 6, 7 и 9.</translation>
+ <translation>Укажите страницы или диапазоны, разделяя их запятыми. Диапазоны задаются двумя числами, разделёнными дефисом. Например: при указании 3,5-7,9 будут напечатаны страницы 3, 5, 6, 7 и 9.</translation>
 </message>
 </context>
 <context>
@@ -3998,7 +4112,7 @@
 </message>
 <message>
 <source>unrecognized character follows \</source>
- <translation>не опознан символ следующий за \</translation>
+ <translation>не опознан символ, следующий за \</translation>
 </message>
 <message>
 <source>numbers out of order in {} quantifier</source>
@@ -4026,11 +4140,11 @@
 </message>
 <message>
 <source>unrecognized character after (? or (?-</source>
- <translation>не опознан символ следующий за (? или (?-</translation>
+ <translation>не опознан символ, следующий за (? или (?-</translation>
 </message>
 <message>
 <source>POSIX named classes are supported only within a class</source>
- <translation>классы именованные в стиле POSIX поддерживаются только внутри класса</translation>
+ <translation>классы, именованные в стиле POSIX, поддерживаются только внутри класса</translation>
 </message>
 <message>
 <source>reference to non-existent subpattern</source>
@@ -4038,7 +4152,7 @@
 </message>
 <message>
 <source>regular expression is too large</source>
- <translation>Регулярное выражение слишком велико</translation>
+ <translation>регулярное выражение слишком большое</translation>
 </message>
 <message>
 <source>internal error: code overflow</source>
@@ -4106,7 +4220,7 @@
 </message>
 <message>
 <source>\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number</source>
- <translation>за \g должно следовать число или название/число заключённое в фигурные/угловые скобки или кавычки</translation>
+ <translation>за \g должно следовать число или название/число, заключённое в фигурные/угловые скобки или кавычки</translation>
 </message>
 <message>
 <source>a numbered reference must not be zero</source>
@@ -4138,7 +4252,7 @@
 </message>
 <message>
 <source>\k is not followed by a braced, angle-bracketed, or quoted name</source>
- <translation>за \k должно следовать название заключённое в фигурные/угловые скобки или кавычки</translation>
+ <translation>за \k должно следовать название, заключённое в фигурные/угловые скобки или кавычки</translation>
 </message>
 <message>
 <source>internal error: unknown opcode in find_fixedlength()</source>
@@ -4178,7 +4292,7 @@
 </message>
 <message>
 <source>group name must start with a non-digit</source>
- <translation>имя группы должно начинаться с нецифры</translation>
+ <translation>имя группы не должно начинаться с цифры</translation>
 </message>
 <message>
 <source>quantifier does not follow a repeatable item</source>
@@ -4210,7 +4324,7 @@
 </message>
 <message>
 <source>letter or underscore expected after (?&lt; or (?&apos;</source>
- <translation>после (?&lt; или (?&apos; требуется буква или подчеркивание</translation>
+ <translation>после (?&lt; или (?&apos; требуется буква или подчёркивание</translation>
 </message>
 <message>
 <source>assertion expected after (?( or (?(?C)</source>
@@ -4222,7 +4336,7 @@
 </message>
 <message>
 <source>this version of PCRE2 does not have Unicode support</source>
- <translation>эта версия PCRE2 не поддерживает юникод</translation>
+ <translation>эта версия PCRE2 не поддерживает Unicode</translation>
 </message>
 <message>
 <source>parentheses are too deeply nested (stack check)</source>
@@ -4258,15 +4372,15 @@
 </message>
 <message>
 <source>subpattern name is too long (maximum 10000 characters)</source>
- <translation>название подшаблона слишком велико (ограничено в 10000 символов)</translation>
+ <translation>название подшаблона слишком велико (ограничено 10000 символов)</translation>
 </message>
 <message>
 <source>too many named subpatterns (maximum 256)</source>
- <translation>слишком много именованых подшаблонов (ограничено 256)</translation>
+ <translation>слишком много именованных подшаблонов (ограничено 256)</translation>
 </message>
 <message>
 <source>octal value is greater than \377 in 8-bit non-UTF-8 mode</source>
- <translation>восьмиричное число больше \377 в 8-ми битном не UTF-8 режиме</translation>
+ <translation>восьмеричное число больше \377 в 8-битном не UTF-8 режиме</translation>
 </message>
 <message>
 <source>internal error: unknown newline setting</source>
@@ -4286,7 +4400,7 @@
 </message>
 <message>
 <source>SPARE ERROR</source>
- <translation type="unfinished">ОШИБКА SPARE</translation>
+ <translation>ОШИБКА SPARE</translation>
 </message>
 <message>
 <source>using UTF is disabled by the application</source>
@@ -4314,11 +4428,11 @@
 </message>
 <message>
 <source>missing terminating delimiter for callout with string argument</source>
- <translation>отстутствует конечный разделитель для вызова со строковым параметром</translation>
+ <translation>отсутствует конечный разделитель для вызова со строковым параметром</translation>
 </message>
 <message>
 <source>unrecognized string delimiter follows (?C</source>
- <translation>не опознан строковый разделитель следующий за (?C</translation>
+ <translation>не опознан строковый разделитель, следующий за (?C</translation>
 </message>
 <message>
 <source>using \C is disabled by the application</source>
@@ -4354,51 +4468,51 @@
 </message>
 <message>
 <source>UTF-8 error: 1 byte missing at end</source>
- <translation>ошибка UTF-8: недостаточно 1 байта в конце</translation>
+ <translation>ошибка UTF-8: не хватает 1 байта в конце</translation>
 </message>
 <message>
 <source>UTF-8 error: 2 bytes missing at end</source>
- <translation>ошибка UTF-8: недостаточно 2 байт в конце</translation>
+ <translation>ошибка UTF-8: не хватает 2 байт в конце</translation>
 </message>
 <message>
 <source>UTF-8 error: 3 bytes missing at end</source>
- <translation>ошибка UTF-8: недостаточно 3 байт в конце</translation>
+ <translation>ошибка UTF-8: не хватает 3 байт в конце</translation>
 </message>
 <message>
 <source>UTF-8 error: 4 bytes missing at end</source>
- <translation>ошибка UTF-8: недостаточно 4 байт в конце</translation>
+ <translation>ошибка UTF-8: не хватает 4 байт в конце</translation>
 </message>
 <message>
 <source>UTF-8 error: 5 bytes missing at end</source>
- <translation>ошибка UTF-8: недостаточно 5 байт в конце</translation>
+ <translation>ошибка UTF-8: не хватает 5 байт в конце</translation>
 </message>
 <message>
 <source>UTF-8 error: byte 2 top bits not 0x80</source>
- <translation>ошибка UTF-8: во 2 байте старшие биты не 0x80</translation>
+ <translation>ошибка UTF-8: во 2-м байте старшие биты не 0x80</translation>
 </message>
 <message>
 <source>UTF-8 error: byte 3 top bits not 0x80</source>
- <translation>ошибка UTF-8: во 3 байте старшие биты не 0x80</translation>
+ <translation>ошибка UTF-8: в 3-м байте старшие биты не 0x80</translation>
 </message>
 <message>
 <source>UTF-8 error: byte 4 top bits not 0x80</source>
- <translation>ошибка UTF-8: во 4 байте старшие биты не 0x80</translation>
+ <translation>ошибка UTF-8: в 4-м байте старшие биты не 0x80</translation>
 </message>
 <message>
 <source>UTF-8 error: byte 5 top bits not 0x80</source>
- <translation>ошибка UTF-8: во 5 байте старшие биты не 0x80</translation>
+ <translation>ошибка UTF-8: в 5-м байте старшие биты не 0x80</translation>
 </message>
 <message>
 <source>UTF-8 error: byte 6 top bits not 0x80</source>
- <translation>ошибка UTF-8: во 6 байте старшие биты не 0x80</translation>
+ <translation>ошибка UTF-8: в 6-м байте старшие биты не 0x80</translation>
 </message>
 <message>
 <source>UTF-8 error: 5-byte character is not allowed (RFC 3629)</source>
- <translation>ошибка UTF-8: 5-ти байтовые символы недопустимы (RFC 3629)</translation>
+ <translation>ошибка UTF-8: 5-байтовые символы недопустимы (RFC 3629)</translation>
 </message>
 <message>
 <source>UTF-8 error: 6-byte character is not allowed (RFC 3629)</source>
- <translation>ошибка UTF-8: 6-ти байтовые символы недопустимы (RFC 3629)</translation>
+ <translation>ошибка UTF-8: 6-байтовые символы недопустимы (RFC 3629)</translation>
 </message>
 <message>
 <source>UTF-8 error: code points greater than 0x10ffff are not defined</source>
@@ -4499,23 +4613,23 @@
 </message>
 <message>
 <source>too much recursion for DFA matching</source>
- <translation>слишком большая рекурсия для ДКА поиска</translation>
+ <translation>слишком большая рекурсия для ДКА-поиска</translation>
 </message>
 <message>
 <source>backreference condition or recursion test is not supported for DFA matching</source>
- <translation>условие обратной ссылки или рекурсивный тест не поддерживается ДКА поиска</translation>
+ <translation>условие обратной ссылки или рекурсивный тест не поддерживаются для ДКА-поиска</translation>
 </message>
 <message>
 <source>function is not supported for DFA matching</source>
- <translation>функция не поддерживается ДКА поиска</translation>
+ <translation>функция не поддерживается для ДКА-поиска</translation>
 </message>
 <message>
 <source>pattern contains an item that is not supported for DFA matching</source>
- <translation>шаблон содержит элемент, неподдерживаемый ДКА поиска</translation>
+ <translation>шаблон содержит элемент, неподдерживаемый для ДКА-поиска</translation>
 </message>
 <message>
 <source>workspace size exceeded in DFA matching</source>
- <translation>превышен размер рабочей области ДКА поиска</translation>
+ <translation>превышен размер рабочей области ДКА-поиска</translation>
 </message>
 <message>
 <source>internal error - pattern overwritten?</source>
@@ -4821,7 +4935,7 @@
 </message>
 <message>
 <source>%1: not attached</source>
- <translation>%1: не приложенный</translation>
+ <translation>%1: не прикреплён</translation>
 </message>
 <message>
 <source>%1: invalid size</source>
@@ -4961,7 +5075,7 @@
 </message>
 <message>
 <source>Volume Mute</source>
- <translation>Выключить звук</translation>
+ <translation>Отключить звук</translation>
 </message>
 <message>
 <source>Volume Up</source>
@@ -5231,7 +5345,7 @@
 </message>
 <message>
 <source>Display</source>
- <translation>Display</translation>
+ <translation>Показать</translation>
 </message>
 <message>
 <source>DOS</source>
@@ -5243,7 +5357,7 @@
 </message>
 <message>
 <source>Spreadsheet</source>
- <translation>Электронная таблицы</translation>
+ <translation>Электронная таблица</translation>
 </message>
 <message>
 <source>Browser</source>
@@ -5279,7 +5393,7 @@
 </message>
 <message>
 <source>Menu PB</source>
- <translation type="unfinished"></translation>
+ <translation>Кнопка меню</translation>
 </message>
 <message>
 <source>My Sites</source>
@@ -5319,11 +5433,11 @@
 </message>
 <message>
 <source>Rotation PB</source>
- <translation type="unfinished"></translation>
+ <translation>Кнопка поворота</translation>
 </message>
 <message>
 <source>Rotation KB</source>
- <translation type="unfinished"></translation>
+ <translation>Поворот экрана</translation>
 </message>
 <message>
 <source>Save</source>
@@ -5371,7 +5485,7 @@
 </message>
 <message>
 <source>XFer</source>
- <translation type="unfinished"></translation>
+ <translation>XFer</translation>
 </message>
 <message>
 <source>Zoom In</source>
@@ -5391,7 +5505,7 @@
 </message>
 <message>
 <source>WebCam</source>
- <translation>Вэб-камера</translation>
+ <translation>Веб-камера</translation>
 </message>
 <message>
 <source>Mail Forward</source>
@@ -5459,7 +5573,7 @@
 </message>
 <message>
 <source>Hibernate</source>
- <translation>Усыпить</translation>
+ <translation>Перейти в сон</translation>
 </message>
 <message>
 <source>Media Rewind</source>
@@ -5475,7 +5589,7 @@
 </message>
 <message>
 <source>Microphone Mute</source>
- <translation>Выключить микрофон</translation>
+ <translation>Отключить микрофон</translation>
 </message>
 <message>
 <source>Red</source>
@@ -5555,7 +5669,7 @@
 </message>
 <message>
 <source>Caps Lock</source>
- <translation>Верний регистр</translation>
+ <translation>Верхний регистр</translation>
 </message>
 <message>
 <source>Num Lock</source>
@@ -5595,19 +5709,19 @@
 </message>
 <message>
 <source>Context1</source>
- <translation type="unfinished"></translation>
+ <translation>Контекст1</translation>
 </message>
 <message>
 <source>Context2</source>
- <translation type="unfinished"></translation>
+ <translation>Контекст2</translation>
 </message>
 <message>
 <source>Context3</source>
- <translation type="unfinished"></translation>
+ <translation>Контекст3</translation>
 </message>
 <message>
 <source>Context4</source>
- <translation type="unfinished"></translation>
+ <translation>Контекст4</translation>
 </message>
 <message>
 <source>Call</source>
@@ -5654,11 +5768,11 @@
 </message>
 <message>
 <source>Muhenkan</source>
- <translation type="unfinished"></translation>
+ <translation>Мухенкан</translation>
 </message>
 <message>
 <source>Henkan</source>
- <translation type="unfinished"></translation>
+ <translation>Хенкан</translation>
 </message>
 <message>
 <source>Romaji</source>
@@ -5678,39 +5792,39 @@
 </message>
 <message>
 <source>Zenkaku</source>
- <translation type="unfinished"></translation>
+ <translation>Дзенкаку</translation>
 </message>
 <message>
 <source>Hankaku</source>
- <translation type="unfinished"></translation>
+ <translation>Ханкаку</translation>
 </message>
 <message>
 <source>Zenkaku Hankaku</source>
- <translation type="unfinished"></translation>
+ <translation>Дзенкаку Ханкаку</translation>
 </message>
 <message>
 <source>Touroku</source>
- <translation type="unfinished"></translation>
+ <translation>Туроку</translation>
 </message>
 <message>
 <source>Massyo</source>
- <translation type="unfinished"></translation>
+ <translation>Масё</translation>
 </message>
 <message>
 <source>Kana Lock</source>
- <translation type="unfinished"></translation>
+ <translation>Lock Кана</translation>
 </message>
 <message>
 <source>Kana Shift</source>
- <translation type="unfinished"></translation>
+ <translation>Shift Кана</translation>
 </message>
 <message>
 <source>Eisu Shift</source>
- <translation type="unfinished"></translation>
+ <translation>Shift Эйсу</translation>
 </message>
 <message>
 <source>Eisu toggle</source>
- <translation type="unfinished"></translation>
+ <translation>Включить/отключить Эйсу</translation>
 </message>
 <message>
 <source>Code input</source>
@@ -5726,47 +5840,47 @@
 </message>
 <message>
 <source>Hangul</source>
- <translation>Хангул</translation>
+ <translation>Хангыль</translation>
 </message>
 <message>
 <source>Hangul Start</source>
- <translation type="unfinished"></translation>
+ <translation>Хангыль начало</translation>
 </message>
 <message>
 <source>Hangul End</source>
- <translation type="unfinished"></translation>
+ <translation>Хангыль конец</translation>
 </message>
 <message>
 <source>Hangul Hanja</source>
- <translation type="unfinished"></translation>
+ <translation>Хангыль ханча</translation>
 </message>
 <message>
 <source>Hangul Jamo</source>
- <translation type="unfinished"></translation>
+ <translation>Хангыль чамо</translation>
 </message>
 <message>
 <source>Hangul Romaja</source>
- <translation type="unfinished"></translation>
+ <translation>Хангыль ромажи</translation>
 </message>
 <message>
 <source>Hangul Jeonja</source>
- <translation type="unfinished"></translation>
+ <translation>Хангыль чонча</translation>
 </message>
 <message>
 <source>Hangul Banja</source>
- <translation type="unfinished"></translation>
+ <translation>Хангыль банча</translation>
 </message>
 <message>
 <source>Hangul PreHanja</source>
- <translation type="unfinished"></translation>
+ <translation>Хангыль преханча</translation>
 </message>
 <message>
 <source>Hangul PostHanja</source>
- <translation type="unfinished"></translation>
+ <translation>Хангыль постханча</translation>
 </message>
 <message>
 <source>Hangul Special</source>
- <translation type="unfinished"></translation>
+ <translation>Хангыль специальный</translation>
 </message>
 <message>
 <source>Cancel</source>
@@ -5794,15 +5908,15 @@
 </message>
 <message>
 <source>Touchpad Toggle</source>
- <translation>Переключение тачпада</translation>
+ <translation>Переключение сенсорной панели</translation>
 </message>
 <message>
 <source>Touchpad On</source>
- <translation>Включение тачпада</translation>
+ <translation>Включение сенсорной панели</translation>
 </message>
 <message>
 <source>Touchpad Off</source>
- <translation>Выключение тачпада</translation>
+ <translation>Отключение сенсорной панели</translation>
 </message>
 <message>
 <source>Ctrl</source>
@@ -6119,7 +6233,7 @@
 <message>
 <source>combo box</source>
 <extracomment>Role of an accessible object</extracomment>
- <translation>выпадающий список</translation>
+ <translation>раскрывающийся список</translation>
 </message>
 <message>
 <source>progress bar</source>
@@ -6164,7 +6278,7 @@
 <message>
 <source>button with drop down</source>
 <extracomment>Role of an accessible object</extracomment>
- <translation>кнопка с выпадающим меню</translation>
+ <translation>кнопка с раскрывающимся меню</translation>
 </message>
 <message>
 <source>button menu</source>
@@ -6174,7 +6288,7 @@
 <message>
 <source>button with drop down grid</source>
 <extracomment>Role of an accessible object - a button that expands a grid.</extracomment>
- <translation>кнопка с выпадающей таблицей</translation>
+ <translation>кнопка с раскрывающейся таблицей</translation>
 </message>
 <message>
 <source>space</source>
@@ -6204,7 +6318,7 @@
 <message>
 <source>web document</source>
 <extracomment>Role of an accessible object</extracomment>
- <translation>web-документ</translation>
+ <translation>веб-документ</translation>
 </message>
 <message>
 <source>paragraph</source>
@@ -6852,6 +6966,21 @@
 </message>
 </context>
 <context>
+ <name>QWindowsDirect2DIntegration</name>
+ <message>
+ <source>Qt cannot load the direct2d platform plugin because the Direct2D version on this system is too old. The minimum system requirement for this platform plugin is Windows 7 SP1 with Platform Update.
+
+The minimum Direct2D version required is %1. The Direct2D version on this system is %2.</source>
+ <translation>Qt не может загрузить модуль платформы direct2d, так как версия Direct2D в системе слишком старая. Требуется минимум Windows 7 SP1 с обновлением платформы (Platform Update).
+
+Необходим Direct2D версии не ниже %1, в системе же установлен Direct2D версии %2.</translation>
+ </message>
+ <message>
+ <source>Cannot load direct2d platform plugin</source>
+ <translation>Невозможно загрузить модуль платформы direct2d</translation>
+ </message>
+</context>
+<context>
 <name>QWizard</name>
 <message>
 <source>Go Back</source>
@@ -6922,7 +7051,7 @@
 </message>
 <message>
 <source>tag mismatch</source>
- <translation>тэг не совпадает</translation>
+ <translation>тег не совпадает</translation>
 </message>
 <message>
 <source>error occurred while parsing content</source>
@@ -6934,7 +7063,7 @@
 </message>
 <message>
 <source>invalid name for processing instruction</source>
- <translation>некорректное имя директивы разбора</translation>
+ <translation>некорректное имя инструкции по обработке</translation>
 </message>
 <message>
 <source>version expected while reading the XML declaration</source>
@@ -7045,7 +7174,7 @@
 </message>
 <message>
 <source>%1 is an invalid encoding name.</source>
- <translation>%1 ― не является корректным названием кодировки.</translation>
+ <translation>%1 не является корректным названием кодировки.</translation>
 </message>
 <message>
 <source>Encoding %1 is unsupported</source>
@@ -7097,7 +7226,7 @@
 </message>
 <message>
 <source>Unexpected &apos;%1&apos;.</source>
- <translation>Неожиданное «%1».</translation>
+ <translation>Неожиданный «%1».</translation>
 </message>
 <message>
 <source>Expected character data.</source>
@@ -7109,7 +7238,7 @@
 </message>
 <message>
 <source>Start tag expected.</source>
- <translation>Требуется открывающий тэг.</translation>
+ <translation>Требуется открывающий тег.</translation>
 </message>
 <message>
 <source>NDATA in parameter entity declaration.</source>
@@ -7121,11 +7250,11 @@
 </message>
 <message>
 <source>%1 is an invalid processing instruction name.</source>
- <translation>%1 не является корректным названием обрабатываемой инструкции.</translation>
+ <translation>%1 не является корректным названием инструкции по обработке.</translation>
 </message>
 <message>
 <source>Invalid processing instruction name.</source>
- <translation>Некорректное название обрабатываемой инструкции.</translation>
+ <translation>Некорректное имя инструкции по обработке.</translation>
 </message>
 <message>
 <source>%1 is an invalid PUBLIC identifier.</source>
@@ -7137,7 +7266,7 @@
 </message>
 <message>
 <source>Opening and ending tag mismatch.</source>
- <translation>Открывающий тэг не совпадает с закрывающим.</translation>
+ <translation>Открывающий тег не совпадает с закрывающим.</translation>
 </message>
 <message>
 <source>Entity &apos;%1&apos; not declared.</source>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/qtbase_zh_TW.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/qtbase_zh_TW.ts Changed

@@ -1,2413 +1,2924 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="zh_TW">
+<TS version="2.1" language="zh_TW">
 <context>
- <name>QWidget</name>
+ <name>CloseButton</name>
 <message>
- <source>*</source>
- <translation>+</translation>
+ <source>Close Tab</source>
+ <translation>關閉分頁</translation>
 </message>
 </context>
 <context>
- <name>QShortcut</name>
+ <name>MAC_APPLICATION_MENU</name>
 <message>
- <source>+</source>
- <translation>+</translation>
+ <source>About %1</source>
+ <translation>關於 %1</translation>
 </message>
 <message>
- <source>No</source>
- <translation>否</translation>
+ <source>Preferences...</source>
+ <translation>偏好設定…</translation>
 </message>
 <message>
- <source>Up</source>
- <translation>上鍵</translation>
+ <source>Services</source>
+ <translation>服務</translation>
 </message>
 <message>
- <source>Alt</source>
- <translation>Alt</translation>
+ <source>Hide %1</source>
+ <translation>隱藏 %1</translation>
 </message>
 <message>
- <source>F%1</source>
- <translation>F%1</translation>
+ <source>Hide Others</source>
+ <translation>隱藏其他</translation>
 </message>
 <message>
- <source>Del</source>
- <translation>Del</translation>
+ <source>Show All</source>
+ <translation>顯示全部</translation>
 </message>
 <message>
- <source>End</source>
- <translation>End</translation>
+ <source>Quit %1</source>
+ <translation>結束 %1</translation>
 </message>
+</context>
+<context>
+ <name>Print Device Input Slot</name>
 <message>
- <source>Esc</source>
- <translation>Esc</translation>
+ <source>Automatic</source>
+ <translation>自動</translation>
 </message>
+</context>
+<context>
+ <name>Print Device Output Bin</name>
 <message>
- <source>Ins</source>
- <translation>Ins</translation>
+ <source>Automatic</source>
+ <translation>自動</translation>
 </message>
+</context>
+<context>
+ <name>QAbstractSocket</name>
 <message>
- <source>Tab</source>
- <translation>Tab</translation>
+ <source>Socket operation timed out</source>
+ <translation>Socket 操作逾時</translation>
 </message>
 <message>
- <source>Yes</source>
- <translation>是</translation>
+ <source>Operation on socket is not supported</source>
+ <translation>不支援於 Socket 上操作</translation>
 </message>
 <message>
- <source>Back</source>
- <translation>返回</translation>
+ <source>Host not found</source>
+ <translation>找不到主機</translation>
 </message>
 <message>
- <source>Call</source>
- <translation>呼叫</translation>
+ <source>Connection refused</source>
+ <translation>連線被拒</translation>
 </message>
 <message>
- <source>Ctrl</source>
- <translation>Ctrl</translation>
+ <source>Connection timed out</source>
+ <translation>連線逾時</translation>
 </message>
 <message>
- <source>Down</source>
- <translation>下鍵</translation>
+ <source>Trying to connect while connection is in progress</source>
+ <translation>嘗試在連線時連線</translation>
 </message>
 <message>
- <source>Flip</source>
- <translation>反轉</translation>
+ <source>Socket is not connected</source>
+ <translation>未連線 Socket</translation>
 </message>
 <message>
- <source>Help</source>
- <translation>說明</translation>
+ <source>Network unreachable</source>
+ <translation>無法連到網路</translation>
 </message>
+</context>
+<context>
+ <name>QAbstractSpinBox</name>
 <message>
- <source>Home</source>
- <translation>Home</translation>
+ <source>&amp;Select All</source>
+ <translation>全部選擇(&amp;S)</translation>
 </message>
 <message>
- <source>Left</source>
- <translation>左鍵</translation>
+ <source>&amp;Step up</source>
+ <translation>單步向上(&amp;S)</translation>
 </message>
 <message>
- <source>Menu</source>
- <translation>選單</translation>
+ <source>Step &amp;down</source>
+ <translation>單步向下(&amp;D)</translation>
 </message>
+</context>
+<context>
+ <name>QAccessibleActionInterface</name>
 <message>
- <source>Meta</source>
- <translation>Meta</translation>
+ <source>Press</source>
+ <translation>按下</translation>
 </message>
 <message>
- <source>PgUp</source>
- <translation>PgUp</translation>
+ <source>Increase</source>
+ <translation>增加</translation>
 </message>
 <message>
- <source>Stop</source>
- <translation>停止</translation>
+ <source>Decrease</source>
+ <translation>減少</translation>
 </message>
 <message>
- <source>Enter</source>
- <translation>Enter</translation>
+ <source>ShowMenu</source>
+ <translation>顯示選單</translation>
 </message>
 <message>
- <source>Pause</source>
- <translation>Pause</translation>
+ <source>SetFocus</source>
+ <translation>設定焦點</translation>
 </message>
 <message>
- <source>Print</source>
- <translation>Print</translation>
+ <source>Toggle</source>
+ <translation>切換</translation>
 </message>
 <message>
- <source>Right</source>
- <translation>右鍵</translation>
+ <source>Scroll Left</source>
+ <translation>往左捲動</translation>
 </message>
 <message>
- <source>Shift</source>
- <translation>Shift</translation>
+ <source>Scroll Right</source>
+ <translation>往右捲動</translation>
 </message>
 <message>
- <source>Space</source>
- <translation>空白鍵</translation>
+ <source>Scroll Up</source>
+ <translation>往上捲動</translation>
 </message>
 <message>
- <source>Media Record</source>
- <translation>媒體錄音</translation>
+ <source>Scroll Down</source>
+ <translation>往下捲動</translation>
 </message>
 <message>
- <source>Print Screen</source>
- <translation>列印螢幕</translation>
+ <source>Previous Page</source>
+ <translation>上一頁</translation>
 </message>
 <message>
- <source>Treble Down</source>
- <translation>Treble Down</translation>
+ <source>Next Page</source>
+ <translation>下一頁</translation>
 </message>
 <message>
- <source>Scroll Lock</source>
- <translation>捲軸鎖定</translation>
+ <source>Triggers the action</source>
+ <translation>觸發動作</translation>
 </message>
 <message>
- <source>Volume Down</source>
- <translation>音量降低</translation>
+ <source>Increase the value</source>
+ <translation>增加值</translation>
 </message>
 <message>
- <source>Volume Mute</source>
- <translation>靜音</translation>
+ <source>Decrease the value</source>
+ <translation>減少值</translation>
 </message>
 <message>
- <source>Media Previous</source>
- <translation>媒體前一首</translation>
+ <source>Shows the menu</source>
+ <translation>顯示選單</translation>
 </message>
 <message>
- <source>Home Page</source>
- <translation>首頁</translation>
+ <source>Sets the focus</source>
+ <translation>設定焦點</translation>
 </message>
 <message>
- <source>Volume Up</source>
- <translation>音量提高</translation>
+ <source>Toggles the state</source>
+ <translation>切換狀態</translation>
 </message>
 <message>
- <source>Launch (6)</source>
- <translation>啟動（6）</translation>
+ <source>Scrolls to the left</source>
+ <translation>捲動到左邊</translation>
 </message>
 <message>
- <source>Launch (7)</source>
- <translation>啟動（7）</translation>
+ <source>Scrolls to the right</source>
+ <translation>捲動到右邊</translation>
 </message>
 <message>
- <source>Launch (8)</source>
- <translation>啟動（8）</translation>
+ <source>Scrolls up</source>
+ <translation>往上捲動</translation>
 </message>
 <message>
- <source>Launch (9)</source>
- <translation>啟動（9）</translation>
+ <source>Scrolls down</source>
+ <translation>往下捲動</translation>
 </message>
 <message>
- <source>Launch (2)</source>
- <translation>啟動（2）</translation>
+ <source>Goes back a page</source>
+ <translation>回到前一頁</translation>
 </message>
 <message>
- <source>Launch (3)</source>
- <translation>啟動（3）</translation>
+ <source>Goes to the next page</source>
+ <translation>前往下一頁</translation>
 </message>
+</context>
+<context>
+ <name>QAndroidPlatformTheme</name>
 <message>
- <source>Launch (4)</source>
- <translation>啟動（4）</translation>
+ <source>Yes</source>
+ <translation>是</translation>
 </message>
 <message>
- <source>Launch (5)</source>
- <translation>啟動（5）</translation>
+ <source>Yes to All</source>
+ <translation>全部皆是</translation>
 </message>
 <message>
- <source>Launch (0)</source>
- <translation>啟動（0）</translation>
+ <source>No</source>
+ <translation>否</translation>
 </message>
 <message>
- <source>Launch (1)</source>
- <translation>啟動（1）</translation>
+ <source>No to All</source>
+ <translation>全部皆否</translation>
 </message>
+</context>
+<context>
+ <name>QApplication</name>
 <message>
- <source>Launch (F)</source>
- <translation>啟動（F）</translation>
+ <source>Executable &apos;%1&apos; requires Qt %2, found Qt %3.</source>
+ <translation>執行檔「%1」需要 Qt %2，但只找到 Qt %3。</translation>
 </message>
 <message>
- <source>Launch (B)</source>
- <translation>啟動（B）</translation>
+ <source>Incompatible Qt Library Error</source>
+ <translation>Qt 函式庫不相容錯誤</translation>
 </message>
+</context>
+<context>
+ <name>QCocoaMenuItem</name>
 <message>
- <source>Launch (C)</source>
- <translation>啟動（C）</translation>
+ <source>About Qt</source>
+ <translation>關於 Qt</translation>
 </message>
 <message>
- <source>Launch (D)</source>
- <translation>啟動（D）</translation>
+ <source>About</source>
+ <translation>關於</translation>
 </message>
 <message>
- <source>Launch (E)</source>
- <translation>啟動（E）</translation>
+ <source>Config</source>
+ <translation>設定</translation>
 </message>
 <message>
- <source>Launch (A)</source>
- <translation>啟動（A）</translation>
+ <source>Preference</source>
+ <translation>偏好設定</translation>
 </message>
 <message>
- <source>Delete</source>
- <translation>刪除</translation>
+ <source>Options</source>
+ <translation>選項</translation>
 </message>
 <message>
- <source>Escape</source>
- <translation>Escape</translation>
+ <source>Setting</source>
+ <translation>設定</translation>
 </message>
 <message>
- <source>Hangup</source>
- <translation>掛斷</translation>
+ <source>Setup</source>
+ <translation>設定</translation>
 </message>
 <message>
- <source>Insert</source>
- <translation>插入</translation>
+ <source>Quit</source>
+ <translation>離開</translation>
 </message>
 <message>
- <source>Bass Boost</source>
- <translation>重低音</translation>
+ <source>Exit</source>
+ <translation>離開</translation>
 </message>
 <message>
- <source>PgDown</source>
- <translation>PgDown</translation>
+ <source>Cut</source>
+ <translation>剪下</translation>
 </message>
 <message>
- <source>Return</source>
- <translation>Return</translation>
+ <source>Copy</source>
+ <translation>複製</translation>
 </message>
 <message>
- <source>Search</source>
- <translation>搜尋</translation>
+ <source>Paste</source>
+ <translation>貼上</translation>
 </message>
 <message>
- <source>Select</source>
- <translation>選擇</translation>
+ <source>Select All</source>
+ <translation>全部選擇</translation>
 </message>
+</context>
+<context>
+ <name>QCocoaTheme</name>
 <message>
- <source>SysReq</source>
- <translation>SysReq</translation>
+ <source>Don&apos;t Save</source>
+ <translation>不要儲存</translation>
 </message>
+</context>
+<context>
+ <name>QColorDialog</name>
 <message>
- <source>NumLock</source>
- <translation>數字鎖定</translation>
+ <source>Hu&amp;e:</source>
+ <translation>色調(&amp;E)：</translation>
 </message>
 <message>
- <source>ScrollLock</source>
- <translation>捲軸鎖定</translation>
+ <source>&amp;Sat:</source>
+ <translation>飽和度(&amp;S)：</translation>
 </message>
 <message>
- <source>Context1</source>
- <translation>內文1</translation>
+ <source>&amp;Val:</source>
+ <translation>亮度(&amp;V)：</translation>
 </message>
 <message>
- <source>Context2</source>
- <translation>內文2</translation>
+ <source>&amp;Red:</source>
+ <translation>紅(&amp;R)：</translation>
 </message>
 <message>
- <source>Context3</source>
- <translation>內文3</translation>
+ <source>&amp;Green:</source>
+ <translation>綠(&amp;G)：</translation>
 </message>
 <message>
- <source>Context4</source>
- <translation>內文4</translation>
+ <source>Bl&amp;ue:</source>
+ <translation>藍(&amp;U)：</translation>
 </message>
 <message>
- <source>Page Up</source>
- <translation>往上一頁</translation>
+ <source>A&amp;lpha channel:</source>
+ <translation>Alpha 色頻(&amp;L)：</translation>
 </message>
 <message>
- <source>Open URL</source>
- <translation>開啟網址</translation>
+ <source>&amp;HTML:</source>
+ <translation>&amp;HTML：</translation>
 </message>
 <message>
- <source>Caps Lock</source>
- <translation>大寫鎖定</translation>
+ <source>Cursor at %1, %2
+Press ESC to cancel</source>
+ <translation>游標在 %1, %2 位置
+按下 ESC 取消</translation>
 </message>
 <message>
- <source>System Request</source>
- <translation>系統要求 SysRq</translation>
+ <source>Select Color</source>
+ <translation>選擇顏色</translation>
 </message>
 <message>
- <source>CapsLock</source>
- <translation>大寫鎖定</translation>
+ <source>&amp;Basic colors</source>
+ <translation>基本顏色(&amp;B)</translation>
 </message>
 <message>
- <source>Backtab</source>
- <translation>Backtab</translation>
+ <source>&amp;Custom colors</source>
+ <translation>自訂顏色(&amp;C)</translation>
 </message>
 <message>
- <source>Bass Up</source>
- <translation>Bass Up</translation>
+ <source>&amp;Add to Custom Colors</source>
+ <translation>新增到自訂顏色(&amp;A)</translation>
 </message>
 <message>
- <source>Refresh</source>
- <translation>刷新</translation>
+ <source>&amp;Pick Screen Color</source>
+ <translation>擷取螢幕顏色(&amp;P)</translation>
 </message>
+</context>
+<context>
+ <name>QComboBox</name>
 <message>
- <source>Launch Mail</source>
- <translation>啟動郵件程式</translation>
+ <source>Open the combo box selection popup</source>
+ <translation>打開下拉式方塊的選取區塊彈出視窗</translation>
 </message>
 <message>
- <source>Backspace</source>
- <translation>Backspace</translation>
+ <source>False</source>
+ <translation>假 (False)</translation>
 </message>
 <message>
- <source>Bass Down</source>
- <translation>Bass Down</translation>
+ <source>True</source>
+ <translation>真 (True)</translation>
 </message>
+</context>
+<context>
+ <name>QCommandLineParser</name>
 <message>
- <source>Standby</source>
- <translation>待命</translation>
+ <source>Displays version information.</source>
+ <translation>顯示版本資訊。</translation>
 </message>
 <message>
- <source>Treble Up</source>
- <translation>Treble Up</translation>
+ <source>Displays this help.</source>
+ <translation>顯示此說明。</translation>
 </message>
 <message>
- <source>Num Lock</source>
- <translation>數字鎖定</translation>
+ <source>Unknown option &apos;%1&apos;.</source>
+ <translation>未知選項「%1」。</translation>
 </message>
 <message>
- <source>Number Lock</source>
- <translation>數字鎖定</translation>
+ <source>Unknown options: %1.</source>
+ <translation>未知選項：%1。</translation>
 </message>
 <message>
- <source>Favorites</source>
- <translation>我的最愛</translation>
+ <source>Missing value after &apos;%1&apos;.</source>
+ <translation>缺少「%1」後的值。</translation>
 </message>
 <message>
- <source>Forward</source>
- <translation>往前</translation>
+ <source>Unexpected value after &apos;%1&apos;.</source>
+ <translation>「%1」後發現非預期的值。</translation>
 </message>
 <message>
- <source>Page Down</source>
- <translation>往下一頁</translation>
+ <source>[options]</source>
+ <translation>[選項]</translation>
 </message>
 <message>
- <source>Media Play</source>
- <translation>媒體播放</translation>
+ <source>Usage: %1</source>
+ <translation>用法：%1</translation>
 </message>
 <message>
- <source>Media Stop</source>
- <translation>媒體停止</translation>
+ <source>Options:</source>
+ <translation>選項：</translation>
 </message>
 <message>
- <source>Media Next</source>
- <translation>媒體下一首</translation>
+ <source>Arguments:</source>
+ <translation>參數：</translation>
 </message>
+</context>
+<context>
+ <name>QCoreApplication</name>
 <message>
- <source>Launch Media</source>
- <translation>啟動媒體程式</translation>
+ <source>%1: key is empty</source>
+ <comment>QSystemSemaphore</comment>
+ <translation>%1：鍵值是空的</translation>
+ </message>
+ <message>
+ <source>%1: unable to make key</source>
+ <comment>QSystemSemaphore</comment>
+ <translation>%1：無法建立鍵值</translation>
+ </message>
+ <message>
+ <source>%1: ftok failed</source>
+ <comment>QSystemSemaphore</comment>
+ <translation>%1：ftok 失敗</translation>
 </message>
 </context>
 <context>
- <name>QPrintDialog</name>
+ <name>QCupsJobWidget</name>
 <message>
- <source>A0</source>
- <translation>A0</translation>
+ <source>Job</source>
+ <translation>作業</translation>
 </message>
 <message>
- <source>A1</source>
- <translation>A1</translation>
+ <source>Job Control</source>
+ <translation>作業控制</translation>
 </message>
 <message>
- <source>A2</source>
- <translation>A2</translation>
+ <source>Scheduled printing:</source>
+ <translation>排定列印：</translation>
 </message>
 <message>
- <source>A3</source>
- <translation>A3</translation>
+ <source>Billing information:</source>
+ <translation>付款資訊：</translation>
 </message>
 <message>
- <source>A4</source>
- <translation>A4</translation>
+ <source>Job priority:</source>
+ <translation>作業優先級：</translation>
 </message>
 <message>
- <source>A5</source>
- <translation>A5</translation>
+ <source>Banner Pages</source>
+ <translation>橫幅頁面</translation>
 </message>
 <message>
- <source>A6</source>
- <translation>A6</translation>
+ <source>End:</source>
+ <comment>Banner page at end</comment>
+ <translation>結尾：</translation>
 </message>
 <message>
- <source>A7</source>
- <translation>A7</translation>
+ <source>Start:</source>
+ <comment>Banner page at start</comment>
+ <translation>開始：</translation>
 </message>
 <message>
- <source>A8</source>
- <translation>A8</translation>
+ <source>Print Immediately</source>
+ <translation>立即列印</translation>
 </message>
 <message>
- <source>A9</source>
- <translation>A9</translation>
+ <source>Hold Indefinitely</source>
+ <translation>立即暫停列印</translation>
 </message>
 <message>
- <source>B0</source>
- <translation>B0</translation>
+ <source>Day (06:00 to 17:59)</source>
+ <translation>早上 (06:00 到 17:59)</translation>
 </message>
 <message>
- <source>B1</source>
- <translation>B1</translation>
+ <source>Night (18:00 to 05:59)</source>
+ <translation>晚上 (18:00 到 05:59)</translation>
 </message>
 <message>
- <source>B2</source>
- <translation>B2</translation>
+ <source>Second Shift (16:00 to 23:59)</source>
+ <translation>第二輪班 (16:00 到 23:59)</translation>
 </message>
 <message>
- <source>B3</source>
- <translation>B3</translation>
+ <source>Third Shift (00:00 to 07:59)</source>
+ <translation>第三輪班 (00:00 到 07:59)</translation>
 </message>
 <message>
- <source>B4</source>
- <translation>B4</translation>
+ <source>Weekend (Saturday to Sunday)</source>
+ <translation>假日（週六到週日）</translation>
 </message>
 <message>
- <source>B5</source>
- <translation>B5</translation>
+ <source>Specific Time</source>
+ <translation>指定時間</translation>
 </message>
 <message>
- <source>B6</source>
- <translation>B6</translation>
+ <source>None</source>
+ <comment>CUPS Banner page</comment>
+ <translation>無</translation>
 </message>
 <message>
- <source>B7</source>
- <translation>B7</translation>
+ <source>Standard</source>
+ <comment>CUPS Banner page</comment>
+ <translation>標準</translation>
 </message>
 <message>
- <source>B8</source>
- <translation>B8</translation>
+ <source>Unclassified</source>
+ <comment>CUPS Banner page</comment>
+ <translation>未分類</translation>
 </message>
 <message>
- <source>B9</source>
- <translation>B9</translation>
+ <source>Confidential</source>
+ <comment>CUPS Banner page</comment>
+ <translation>機密</translation>
 </message>
 <message>
- <source>OK</source>
- <translation>確定</translation>
+ <source>Classified</source>
+ <comment>CUPS Banner page</comment>
+ <translation>已分類</translation>
 </message>
 <message>
- <source>B10</source>
- <translation>B10</translation>
+ <source>Secret</source>
+ <comment>CUPS Banner page</comment>
+ <translation>機密</translation>
 </message>
 <message>
- <source>C5E</source>
- <translation>C5E</translation>
+ <source>Top Secret</source>
+ <comment>CUPS Banner page</comment>
+ <translation>高度機密</translation>
 </message>
+</context>
+<context>
+ <name>QCupsPrinterSupport</name>
 <message>
- <source>DLE</source>
- <translation>DLE</translation>
+ <source>Authentication Needed</source>
+ <translation>需要驗證</translation>
 </message>
 <message>
- <source>A6 (105 x 148 mm)</source>
- <translation>A6 (105 x 148 mm)</translation>
+ <source>Authentication needed to use %1.</source>
+ <translation>使用 %1 需要驗證。</translation>
 </message>
 <message>
- <source>Legal (8.5 x 14 inches, 216 x 356 mm)</source>
- <translation>Legal (8.5 x 14 英吋, 216 x 356 mm)</translation>
+ <source>Authentication needed to use %1 on %2.</source>
+ <translation>要使用 %2 上的 %1 需要驗證。</translation>
 </message>
 <message>
- <source>Folio</source>
- <translation>Folio</translation>
+ <source>Username:</source>
+ <translation>使用者名稱：</translation>
 </message>
 <message>
- <source>Legal</source>
- <translation>Legal</translation>
+ <source>Password:</source>
+ <translation>密碼：</translation>
 </message>
+</context>
+<context>
+ <name>QDB2Driver</name>
 <message>
- <source>Print all</source>
- <translation>全部列印</translation>
+ <source>Unable to connect</source>
+ <translation>無法連線</translation>
 </message>
 <message>
- <source>Print</source>
- <translation>列印</translation>
+ <source>Unable to commit transaction</source>
+ <translation>無法提交處理事項</translation>
 </message>
 <message>
- <source>&amp;Options &lt;&lt;</source>
- <translation>操作 (&amp;O) &lt;&lt;</translation>
+ <source>Unable to rollback transaction</source>
+ <translation>無法回退處理事項</translation>
 </message>
 <message>
- <source>&amp;Options &gt;&gt;</source>
- <translation>操作 (&amp;O) &gt;&gt;</translation>
+ <source>Unable to set autocommit</source>
+ <translation>無法設定自動提交</translation>
 </message>
+</context>
+<context>
+ <name>QDB2Result</name>
 <message>
- <source>B6 (125 x 176 mm)</source>
- <translation>B6 (125 x 176 mm)</translation>
+ <source>Unable to execute statement</source>
+ <translation>無法執行陳述</translation>
 </message>
 <message>
- <source>B8 (62 x 88 mm)</source>
- <translation>B8 (62 x 88 mm)</translation>
+ <source>Unable to prepare statement</source>
+ <translation>無法準備陳述</translation>
 </message>
 <message>
- <source>A8 (52 x 74 mm)</source>
- <translation>A8 (52 x 74 mm)</translation>
+ <source>Unable to bind variable</source>
+ <translation>無法結合變數</translation>
 </message>
 <message>
- <source>B9 (44 x 62 mm)</source>
- <translation>B9 (44 x 62 mm)</translation>
+ <source>Unable to fetch record %1</source>
+ <translation>無法抓取紀錄 %1</translation>
 </message>
 <message>
- <source>A9 (37 x 52 mm)</source>
- <translation>A9 (37 x 52 mm)</translation>
+ <source>Unable to fetch next</source>
+ <translation>無法抓取下一筆</translation>
 </message>
 <message>
- <source>B0 (1000 x 1414 mm)</source>
- <translation>B0 (1000 x 1414 mm)</translation>
+ <source>Unable to fetch first</source>
+ <translation>無法抓取第一筆</translation>
 </message>
+</context>
+<context>
+ <name>QDBusTrayIcon</name>
 <message>
- <source>A5 (148 x 210 mm)</source>
- <translation>A5 (148 x 210 mm)</translation>
+ <source>OK</source>
+ <translation>確定</translation>
 </message>
+</context>
+<context>
+ <name>QDateTimeParser</name>
 <message>
- <source>Tabloid (279 x 432 mm)</source>
- <translation>Tabloid (279 x 432 mm)</translation>
+ <source>AM</source>
+ <translation>上午</translation>
 </message>
 <message>
- <source>B10 (31 x 44 mm)</source>
- <translation>B10 (31 x 44 mm)</translation>
+ <source>am</source>
+ <translation>上午</translation>
 </message>
 <message>
- <source>B2 (500 x 707 mm)</source>
- <translation>B2 (500 x 707 mm)</translation>
+ <source>PM</source>
+ <translation>下午</translation>
 </message>
 <message>
- <source>&amp;Print</source>
- <translation>列印(&amp;P)</translation>
+ <source>pm</source>
+ <translation>下午</translation>
 </message>
+</context>
+<context>
+ <name>QDialog</name>
 <message>
- <source>A3 (297 x 420 mm)</source>
- <translation>A3 (297 x 420 mm)</translation>
+ <source>What&apos;s This?</source>
+ <translation>這是什麼？</translation>
 </message>
+</context>
+<context>
+ <name>QDialogButtonBox</name>
 <message>
- <source>Print selection</source>
- <translation>列印選擇區</translation>
+ <source>OK</source>
+ <translation>確定</translation>
 </message>
+</context>
+<context>
+ <name>QDirModel</name>
 <message>
- <source>Print to File (Postscript)</source>
- <translation>列印到檔案（Postscript）</translation>
+ <source>Name</source>
+ <translation>名稱</translation>
 </message>
 <message>
- <source>B4 (250 x 353 mm)</source>
- <translation>B4 (250 x 353 mm)</translation>
+ <source>Size</source>
+ <translation>大小</translation>
 </message>
 <message>
- <source>%1 already exists.
-Do you want to overwrite it?</source>
- <translation>%1 已存在。
-您要覆寫它嗎?</translation>
+ <source>Kind</source>
+ <comment>Match OS X Finder</comment>
+ <translation>種類</translation>
 </message>
 <message>
- <source>A1 (594 x 841 mm)</source>
- <translation>A1 (594 x 841 mm)</translation>
+ <source>Type</source>
+ <comment>All other platforms</comment>
+ <translation>型態</translation>
 </message>
 <message>
- <source>Custom</source>
- <translation>自訂</translation>
+ <source>Date Modified</source>
+ <translation>變更日期</translation>
 </message>
+</context>
+<context>
+ <name>QDnsLookup</name>
 <message>
- <source>B1 (707 x 1000 mm)</source>
- <translation>B1 (707 x 1000 mm)</translation>
+ <source>Operation cancelled</source>
+ <translation>已取消動作</translation>
 </message>
+</context>
+<context>
+ <name>QDnsLookupRunnable</name>
 <message>
- <source>Folio (210 x 330 mm)</source>
- <translation>對開 (210 x 330 mm)</translation>
+ <source>IPv6 addresses for nameservers are currently not supported</source>
+ <translation>目前不支援名稱伺服器的 IPv6 位址</translation>
 </message>
 <message>
- <source>Ledger</source>
- <translation>Ledger</translation>
+ <source>Invalid domain name</source>
+ <translation>網域名稱無效</translation>
 </message>
 <message>
- <source>Letter</source>
- <translation>Letter</translation>
+ <source>Not yet supported on Android</source>
+ <translation>尚未支援 Android</translation>
 </message>
 <message>
- <source>DLE (110 x 220 mm)</source>
- <translation>DLE (110 x 220 mm)</translation>
+ <source>Resolver functions not found</source>
+ <translation>找不到解析器函式</translation>
 </message>
 <message>
- <source>C5E (163 x 229 mm)</source>
- <translation>C5E (163 x 229 mm)</translation>
+ <source>Resolver initialization failed</source>
+ <translation>解析器初始化失敗</translation>
 </message>
 <message>
- <source>B5 (176 x 250 mm, 6.93 x 9.84 inches)</source>
- <translation>B5 (176 x 250 mm, 6.93 x 9.84 英吋)</translation>
+ <source>Server could not process query</source>
+ <translation>伺服器無法處理查詢</translation>
 </message>
 <message>
- <source>Print range</source>
- <translation>列印範圍</translation>
+ <source>Server failure</source>
+ <translation>伺服器失敗</translation>
 </message>
 <message>
- <source>File exists</source>
- <translation>檔案已存在</translation>
+ <source>Non existent domain</source>
+ <translation>不存在的網域</translation>
 </message>
 <message>
- <source>Write %1 file</source>
- <translation>寫入 %1 檔案</translation>
+ <source>Server refused to answer</source>
+ <translation>伺服器拒絕回答</translation>
 </message>
 <message>
- <source>A0 (841 x 1189 mm)</source>
- <translation>A0 (841 x 1189 mm)</translation>
+ <source>Invalid reply received</source>
+ <translation>接收到無效回應</translation>
 </message>
 <message>
- <source>Local file</source>
- <translation>本地端檔案</translation>
+ <source>Could not expand domain name</source>
+ <translation>無法展開網域名稱</translation>
 </message>
 <message>
- <source>locally connected</source>
- <translation>本地連接</translation>
+ <source>Invalid IPv4 address record</source>
+ <translation>無效的 IPv4 位址記錄</translation>
 </message>
 <message>
- <source>Ledger (432 x 279 mm)</source>
- <translation>Ledger (432 x 279 mm)</translation>
+ <source>Invalid IPv6 address record</source>
+ <translation>無效的 IPv6 位址記錄</translation>
 </message>
 <message>
- <source>Aliases: %1</source>
- <translation>別名：%1</translation>
+ <source>Invalid canonical name record</source>
+ <translation>無效的 CNAME 記錄</translation>
 </message>
 <message>
- <source>Print to File (PDF)</source>
- <translation>列印到檔案（PDF）</translation>
+ <source>Invalid name server record</source>
+ <translation>無效的 NS 記錄</translation>
 </message>
 <message>
- <source>Print To File ...</source>
- <translation>列印到檔案...</translation>
+ <source>Invalid pointer record</source>
+ <translation>無效的指向 (Pointer) 記錄</translation>
 </message>
 <message>
- <source>US Common #10 Envelope (105 x 241 mm)</source>
- <translation>US 常用 10 號信封 (105x241 mm)</translation>
+ <source>Invalid mail exchange record</source>
+ <translation>無效的 MX 記錄</translation>
 </message>
 <message>
- <source>Tabloid</source>
- <translation>Tabloid</translation>
+ <source>Invalid service record</source>
+ <translation>無效的 SRV 記錄</translation>
 </message>
 <message>
- <source>A4 (210 x 297 mm, 8.26 x 11.7 inches)</source>
- <translation>A4 (210 x 297 mm, 8.26 x 11.7 英吋)</translation>
+ <source>Invalid text record</source>
+ <translation>無效的 TXT 記錄</translation>
 </message>
 <message>
- <source>Executive</source>
- <translation>Executive</translation>
+ <source>Resolver library can&apos;t be loaded: No runtime library loading support</source>
+ <translation>無法載入解析器函式庫：沒有載入執行函式庫的支援</translation>
 </message>
 <message>
- <source>unknown</source>
- <translation>未知</translation>
+ <source>No hostname given</source>
+ <translation>未提供主機</translation>
 </message>
 <message>
- <source>&lt;qt&gt;Do you want to overwrite it?&lt;/qt&gt;</source>
- <translation>&lt;qt&gt;您要覆寫它嗎？&lt;/qt&gt;</translation>
+ <source>Invalid hostname</source>
+ <translation>主機無效</translation>
 </message>
 <message>
- <source>Executive (7.5 x 10 inches, 191 x 254 mm)</source>
- <translation>Executive (7.5 x 10 英吋, 191 x 254 mm)</translation>
+ <source>Host %1 could not be found.</source>
+ <translation>找不到 %1 網域。</translation>
 </message>
 <message>
- <source>Letter (8.5 x 11 inches, 216 x 279 mm)</source>
- <translation>Letter (8.5 x 11 英吋, 216 x 279 mm)</translation>
+ <source>Unknown error</source>
+ <translation>未知錯誤</translation>
 </message>
+</context>
+<context>
+ <name>QDockWidget</name>
 <message>
- <source>The &apos;From&apos; value cannot be greater than the &apos;To&apos; value.</source>
- <translation>起始數值不能大於結束數值。</translation>
+ <source>Float</source>
+ <extracomment>Accessible name for button undocking a dock widget (floating state)</extracomment>
+ <translation>浮動</translation>
 </message>
 <message>
- <source>US Common #10 Envelope</source>
- <translation>US Common #10 Envelope</translation>
+ <source>Undocks and re-attaches the dock widget</source>
+ <translation>取消 Dock 並重新加上 Dock 小工具</translation>
 </message>
 <message>
- <source>%1 is a directory.
-Please choose a different file name.</source>
- <translation>%1 是一個目錄。
-請選擇其他檔名。</translation>
+ <source>Close</source>
+ <extracomment>Accessible name for button closing a dock widget</extracomment>
+ <translation>關閉</translation>
 </message>
 <message>
- <source>File %1 is not writable.
-Please choose a different file name.</source>
- <translation>檔案 %1 無法寫入。
-請選擇其它檔名。</translation>
+ <source>Closes the dock widget</source>
+ <translation>關閉 Dock 小工具</translation>
 </message>
+</context>
+<context>
+ <name>QDtls</name>
 <message>
- <source>B3 (353 x 500 mm)</source>
- <translation>B3 (353 x 500 mm)</translation>
+ <source>Invalid (empty) secret</source>
+ <translation>無效（空白）密碼</translation>
 </message>
 <message>
- <source>A7 (74 x 105 mm)</source>
- <translation>A7 (74 x 105 mm)</translation>
+ <source>Multicast and broadcast addresses are not supported</source>
+ <translation>不支援群播和廣播位址</translation>
 </message>
 <message>
- <source>A2 (420 x 594 mm)</source>
- <translation>A2 (420 x 594 mm)</translation>
+ <source>Cannot set peer after handshake started</source>
+ <translation>無法在交握開始後設定端點</translation>
 </message>
 <message>
- <source>B7 (88 x 125 mm)</source>
- <translation>B7 (88 x 125 mm)</translation>
+ <source>Invalid address</source>
+ <translation>位址無效</translation>
 </message>
-</context>
-<context>
- <name>QDateTimeEdit</name>
 <message>
- <source>AM</source>
- <translation>AM</translation>
+ <source>Cannot set verification name after handshake started</source>
+ <translation>無法在開始交握之後設定認證名稱</translation>
 </message>
 <message>
- <source>PM</source>
- <translation>PM</translation>
+ <source>Cannot set configuration after handshake started</source>
+ <translation>無法在開始握手後設定組態</translation>
 </message>
 <message>
- <source>am</source>
- <translation>am</translation>
+ <source>Cannot start/continue handshake, invalid handshake state</source>
+ <translation>無法開始或繼續交握，原因：無效的交握狀態</translation>
 </message>
 <message>
- <source>pm</source>
- <translation>pm</translation>
+ <source>Invalid (nullptr) socket</source>
+ <translation>無效 (nullptr) socket</translation>
 </message>
-</context>
-<context>
- <name>Q3TabDialog</name>
 <message>
- <source>OK</source>
- <translation>確定</translation>
+ <source>To start a handshake you must set peer&apos;s address and port first</source>
+ <translation>開始交握前必須先設定端點位址與連線埠</translation>
 </message>
 <message>
- <source>Help</source>
- <translation>說明</translation>
+ <source>To start a handshake, DTLS server requires non-empty datagram (client hello)</source>
+ <translation>要開始交握前 DTLS 伺服器需要非空白資料塊 (client hello)</translation>
 </message>
 <message>
- <source>Apply</source>
- <translation>套用</translation>
+ <source>Cannot start handshake, already done/in progress</source>
+ <translation>無法開始交握，原因：已經完成或正在進行交握程序</translation>
 </message>
 <message>
- <source>Cancel</source>
- <translation>取消</translation>
+ <source>A valid QUdpSocket and non-empty datagram are needed to continue the handshake</source>
+ <translation>需要有效的 QUdpSocket 和非空白資料塊才能開始交握</translation>
 </message>
 <message>
- <source>Defaults</source>
- <translation>預設</translation>
+ <source>Cannot continue handshake, not in InProgress state</source>
+ <translation>無法繼續交握，原因：非 InProgress 狀態</translation>
 </message>
-</context>
-<context>
- <name>QAxSelect</name>
 <message>
- <source>OK</source>
- <translation>確定</translation>
+ <source>Cannot resume, not in VerificationError state</source>
+ <translation>無法重新開始，原因：非 VerificationError 狀態</translation>
 </message>
 <message>
- <source>COM &amp;Object:</source>
- <translation>COM &amp;物件:</translation>
+ <source>No handshake in progress, nothing to abort</source>
+ <translation>沒有正在進行中的交握，因此不用終止</translation>
 </message>
 <message>
- <source>&amp;Cancel</source>
- <translation>&amp;取消</translation>
+ <source>Cannot send shutdown alert, not encrypted</source>
+ <translation>無法傳送關閉警報，原因：未加密</translation>
 </message>
 <message>
- <source>Select ActiveX Control</source>
- <translation>選擇 ActiveX 控制</translation>
+ <source>Cannot write a datagram, not in encrypted state</source>
+ <translation>無法寫入資料塊，原因：非已加密狀態</translation>
 </message>
-</context>
-<context>
- <name>QDialogButtonBox</name>
 <message>
- <source>OK</source>
- <translation>確定</translation>
+ <source>Cannot read a datagram, not in encrypted state</source>
+ <translation>無法讀取資料塊，原因：非已加密狀態</translation>
 </message>
 <message>
- <source>&amp;OK</source>
- <translation>&amp;確定</translation>
+ <source>%1 failed</source>
+ <extracomment>%1: Some function</extracomment>
+ <translation>%1 失敗</translation>
 </message>
 <message>
- <source>&amp;No</source>
- <translation>&amp;否</translation>
+ <source>Invalid SslMode, SslServerMode or SslClientMode expected</source>
+ <translation>無效的 SslMode，應該為 SslServerMode 或 SslClientMode</translation>
 </message>
 <message>
- <source>&amp;Yes</source>
- <translation>&amp;是</translation>
+ <source>Invalid protocol version, DTLS protocol expected</source>
+ <translation>無效的協定版本，期望 DTLS 協定</translation>
 </message>
 <message>
- <source>Help</source>
- <translation>說明</translation>
+ <source>BIO_ADD_new failed, cannot start handshake</source>
+ <translation>BIO_ADD_new 失敗，無法開始交握</translation>
 </message>
 <message>
- <source>Open</source>
- <translation>開啟</translation>
+ <source>Cannot start the handshake, verified client hello expected</source>
+ <translation>無法開始交握，原因：沒有期望的已驗證 client hello</translation>
 </message>
 <message>
- <source>Save</source>
- <translation>儲存</translation>
+ <source>Peer verification failed</source>
+ <translation>端對端驗證失敗</translation>
 </message>
 <message>
- <source>&amp;Save</source>
- <translation>&amp;儲存</translation>
+ <source>The DTLS connection has been closed</source>
+ <translation>DTLS 連線已被關閉</translation>
 </message>
 <message>
- <source>Abort</source>
- <translation>中止</translation>
+ <source>Error while writing: %1</source>
+ <translation>寫入時發生錯誤：%1</translation>
 </message>
 <message>
- <source>Apply</source>
- <translation>套用</translation>
+ <source>The DTLS connection has been shutdown</source>
+ <translation>DTLS 連線已被關閉</translation>
 </message>
 <message>
- <source>Close</source>
- <translation>關閉</translation>
+ <source>Error while reading: %1</source>
+ <translation>讀取時發生錯誤：%1</translation>
 </message>
 <message>
- <source>Reset</source>
- <translation>重置</translation>
+ <source>Cannot set remote after handshake started</source>
+ <translation>無法在開始交握後設定遠端位置</translation>
 </message>
 <message>
- <source>Retry</source>
- <translation>重試</translation>
+ <source>Unsupported protocol</source>
+ <translation>不支援的通訊協定</translation>
 </message>
 <message>
- <source>Restore Defaults</source>
- <translation>回復預設值</translation>
+ <source>To start a handshake you must set remote address and port first</source>
+ <translation>要開始交握前必須先設定遠端位址和通訊埠</translation>
 </message>
 <message>
- <source>&amp;Close</source>
- <translation>&amp;關閉</translation>
+ <source>Not in VerificationError state, nothing to abort</source>
+ <translation>非 VerificationError 狀態，沒有需要終止的項目</translation>
 </message>
+</context>
+<context>
+ <name>QDtlsClientVerifier</name>
 <message>
- <source>Cancel</source>
- <translation>取消</translation>
+ <source>A valid UDP socket, non-empty datagram, valid address/port were expected</source>
+ <translation>期望有效的 UDP socket、非空白的資料塊和有效的位址與連線埠</translation>
 </message>
 <message>
- <source>Ignore</source>
- <translation>忽略</translation>
+ <source>BIO_ADDR_new failed, ignoring client hello</source>
+ <translation>BIO_ADDR_new 失敗，忽略 client hello</translation>
 </message>
+</context>
+<context>
+ <name>QErrorMessage</name>
 <message>
- <source>Close without Saving</source>
- <translation>關閉而不儲存</translation>
+ <source>Debug Message:</source>
+ <translation>除錯訊息：</translation>
 </message>
 <message>
- <source>N&amp;o to All</source>
- <translation>全部&amp;回答否</translation>
+ <source>Warning:</source>
+ <translation>警告：</translation>
 </message>
 <message>
- <source>Save All</source>
- <translation>全部儲存</translation>
+ <source>Critical Error:</source>
+ <translation>嚴重錯誤：</translation>
 </message>
 <message>
- <source>&amp;Cancel</source>
- <translation>&amp;取消</translation>
+ <source>Fatal Error:</source>
+ <translation>嚴重錯誤：</translation>
 </message>
 <message>
- <source>Discard</source>
- <translation>丟棄</translation>
+ <source>Information:</source>
+ <translation>資訊：</translation>
 </message>
 <message>
- <source>Yes to &amp;All</source>
- <translation>全部&amp;回答是</translation>
+ <source>&amp;Show this message again</source>
+ <translation>再次顯示此訊息(&amp;S)</translation>
 </message>
 <message>
- <source>Don&apos;t Save</source>
- <translation>不要&apos;儲存</translation>
+ <source>&amp;OK</source>
+ <translation>確定(&amp;O)</translation>
 </message>
 </context>
 <context>
- <name>QMessageBox</name>
+ <name>QFile</name>
 <message>
- <source>OK</source>
- <translation>確定</translation>
+ <source>Destination file is the same file.</source>
+ <translation>目標檔案為相同檔案。</translation>
 </message>
 <message>
- <source>Help</source>
- <translation>說明</translation>
+ <source>Source file does not exist.</source>
+ <translation>來源檔案不存在。</translation>
 </message>
 <message>
- <source>Show Details...</source>
- <translation>顯示詳情...</translation>
+ <source>Destination file exists</source>
+ <translation>目標檔案存在</translation>
 </message>
 <message>
- <source>&lt;p&gt;This program uses Qt Open Source Edition version %1.&lt;/p&gt;&lt;p&gt;Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.&lt;/p&gt;&lt;p&gt;Please see &lt;a href=&quot;http://qtsoftware.com/company/model/&quot;&gt;qtsoftware.com/company/model/&lt;/a&gt; for an overview of Qt licensing.&lt;/p&gt;</source>
- <translation>&lt;p&gt;這個程式使用了 Qt 開放源碼版本 %1。&lt;/p&gt;&lt;p&gt;Qt 開放源碼版本是專門為了開發開放源碼應用程式使用的版本。若是您要開發專利私有（封閉）軟體，您需要 Qt 的商業授權。&lt;/p&gt;&lt;p&gt;Qt 的授權概要請參考 &lt;a href=&quot;http://qtsoftware.com/company/model/&quot;&gt;qtsoftware.com/company/model/&lt;/a&gt;。&lt;/p&gt;</translation>
+ <source>Error while renaming: %1</source>
+ <translation>重新命名時發生錯誤：%1</translation>
 </message>
 <message>
- <source>About Qt</source>
- <translation>關於 Qt</translation>
+ <source>Unable to restore from %1: %2</source>
+ <translation>無法從 %1 還原：%2</translation>
 </message>
 <message>
- <source>Hide Details...</source>
- <translation>隱藏詳情...</translation>
+ <source>Will not rename sequential file using block copy</source>
+ <translation>將不會使用區塊複製重新命名順序檔案</translation>
 </message>
 <message>
- <source>&lt;h3&gt;About Qt&lt;/h3&gt;%1&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.&lt;/p&gt;&lt;p&gt;Qt is a Nokia product. See &lt;a href=&quot;http://qtsoftware.com/qt/&quot;&gt;qtsoftware.com/qt/&lt;/a&gt; for more information.&lt;/p&gt;</source>
- <translation>&lt;h3&gt;關於 Qt&lt;/h3&gt;%1&lt;p&gt;Qt 為一個跨平台的 C++ 開發工具。&lt;/p&gt;&lt;p&gt;Qt 提供各平台相容機制，只要寫一份程式碼，就可以在 MS&amp;nbsp;Windows、Mac&amp;nbsp;OS&amp;nbsp;X、Linux 與各主要的商業 Unix 平台上編譯。Qt 也有用於嵌入式 Linux 與 Windows CE 的版本。&lt;/p&gt;&lt;p&gt;Qt 為 Nokia 的產品。詳情請參考 &lt;a href=&quot;http://qtsoftware.com/qt/&quot;&gt;qtsoftware.com/qt/&lt;/a&gt;。&lt;/p&gt;</translation>
+ <source>Cannot remove source file</source>
+ <translation>無法移除來源檔案</translation>
 </message>
 <message>
- <source>&lt;p&gt;This program uses Qt version %1.&lt;/p&gt;</source>
- <translation>&lt;p&gt; 這個程式使用 Qt 版本 %1&lt;/p&gt;</translation>
+ <source>Cannot open destination file: %1</source>
+ <translation>無法開啟目標檔案：%1</translation>
 </message>
-</context>
-<context>
- <name>QSql</name>
 <message>
- <source>No</source>
- <translation>否</translation>
+ <source>Cannot open %1 for input</source>
+ <translation>無法開啟 %1 供輸入</translation>
 </message>
 <message>
- <source>Yes</source>
- <translation>是</translation>
+ <source>Cannot open for output: %1</source>
+ <translation>無法開啟供輸出檔案：%1</translation>
 </message>
 <message>
- <source>Cancel</source>
- <translation>取消</translation>
+ <source>Failure to write block</source>
+ <translation>寫入區塊時失敗</translation>
 </message>
 <message>
- <source>Delete</source>
- <translation>刪除</translation>
+ <source>Cannot create %1 for output</source>
+ <translation>無法建立 %1 供輸出</translation>
 </message>
 <message>
- <source>Insert</source>
- <translation>插入</translation>
+ <source>Cannot open for output</source>
+ <translation>無法開啟以供輸出</translation>
 </message>
+</context>
+<context>
+ <name>QFileDevice</name>
 <message>
- <source>Update</source>
- <translation>更新</translation>
+ <source>No file engine available or engine does not support UnMapExtension</source>
+ <translation>沒有能用的檔案引擎或引擎不支援 UnMapExtension</translation>
 </message>
 <message>
- <source>Delete this record?</source>
- <translation>要刪除這筆紀錄嗎?</translation>
+ <source>No file engine available</source>
+ <translation>沒有能用的檔案引擎</translation>
 </message>
+</context>
+<context>
+ <name>QFileDialog</name>
 <message>
- <source>Save edits?</source>
- <translation>要儲存編輯過的內容嗎?</translation>
+ <source>All Files (*)</source>
+ <translation>所有檔案 (*)</translation>
 </message>
 <message>
- <source>Confirm</source>
- <translation>確認</translation>
+ <source>Look in:</source>
+ <translation>尋找於：</translation>
 </message>
 <message>
- <source>Cancel your edits?</source>
- <translation>要取消編輯嗎?</translation>
+ <source>Back</source>
+ <translation>返回</translation>
 </message>
-</context>
-<context>
- <name>QPrintSettingsOutput</name>
 <message>
- <source>to</source>
- <translation>到</translation>
+ <source>Go back</source>
+ <translation>返回</translation>
 </message>
 <message>
- <source>Form</source>
- <translation>表單</translation>
+ <source>Alt+Left</source>
+ <translation>Alt+Left</translation>
 </message>
 <message>
- <source>None</source>
- <translation>無</translation>
+ <source>Forward</source>
+ <translation>往前</translation>
 </message>
 <message>
- <source>Color</source>
- <translation>顏色</translation>
+ <source>Go forward</source>
+ <translation>往前</translation>
 </message>
 <message>
- <source>Print all</source>
- <translation>全部列印</translation>
+ <source>Alt+Right</source>
+ <translation>Alt+Right</translation>
 </message>
 <message>
- <source>Selection</source>
- <translation>選擇區</translation>
+ <source>Parent Directory</source>
+ <translation>父目錄</translation>
 </message>
 <message>
- <source>Long side</source>
- <translation>長邊</translation>
+ <source>Go to the parent directory</source>
+ <translation>前往父目錄</translation>
 </message>
 <message>
- <source>Copies</source>
- <translation>份數</translation>
+ <source>Alt+Up</source>
+ <translation>Alt+Up</translation>
 </message>
 <message>
- <source>Print range</source>
- <translation>列印範圍</translation>
+ <source>Create New Folder</source>
+ <translation>建立新資料夾</translation>
 </message>
 <message>
- <source>Color Mode</source>
- <translation>顏色模式</translation>
+ <source>Create a New Folder</source>
+ <translation>建立新資料夾</translation>
 </message>
 <message>
- <source>Options</source>
- <translation>選項</translation>
+ <source>List View</source>
+ <translation>列表檢視</translation>
 </message>
 <message>
- <source>Output Settings</source>
- <translation>輸出設定</translation>
+ <source>Change to list view mode</source>
+ <translation>切換到列表檢視模式</translation>
 </message>
 <message>
- <source>Reverse</source>
- <translation>反向</translation>
+ <source>Detail View</source>
+ <translation>詳細檢視</translation>
 </message>
 <message>
- <source>Grayscale</source>
- <translation>灰階</translation>
+ <source>Change to detail view mode</source>
+ <translation>切換到詳細檢視模式</translation>
 </message>
 <message>
- <source>Short side</source>
- <translation>短邊</translation>
+ <source>Sidebar</source>
+ <translation>側邊欄</translation>
 </message>
 <message>
- <source>Collate</source>
- <translation>校對</translation>
+ <source>List of places and bookmarks</source>
+ <translation>位置與書籤列表</translation>
 </message>
 <message>
- <source>Copies:</source>
- <translation>份數:</translation>
+ <source>Files</source>
+ <translation>檔案</translation>
 </message>
 <message>
- <source>Pages from</source>
- <translation>指定頁面：從</translation>
+ <source>Files of type:</source>
+ <translation>檔案型態：</translation>
 </message>
 <message>
- <source>Duplex Printing</source>
- <translation>雙工列印</translation>
+ <source>Find Directory</source>
+ <translation>尋找資料夾</translation>
 </message>
-</context>
-<context>
- <name>QPrintPreviewDialog</name>
 <message>
- <source>%1%</source>
- <translation>%1%</translation>
+ <source>Open</source>
+ <translation>開啟</translation>
 </message>
 <message>
- <source>Print Preview</source>
- <translation>列印預覽</translation>
+ <source>Save As</source>
+ <translation>另存新檔</translation>
 </message>
 <message>
- <source>Close</source>
- <translation>關閉</translation>
+ <source>Directory:</source>
+ <translation>目錄：</translation>
 </message>
 <message>
- <source>Print</source>
- <translation>列印</translation>
+ <source>File &amp;name:</source>
+ <translation>檔名(&amp;N)：</translation>
 </message>
 <message>
- <source>Fit page</source>
- <translation>符合頁面</translation>
+ <source>&amp;Open</source>
+ <translation>開啟(&amp;O)</translation>
 </message>
 <message>
- <source>Zoom in</source>
- <translation>放大</translation>
+ <source>&amp;Choose</source>
+ <translation>選擇(&amp;C)</translation>
 </message>
 <message>
- <source>Landscape</source>
- <translation>橫向</translation>
+ <source>&amp;Save</source>
+ <translation>儲存(&amp;S)</translation>
 </message>
 <message>
- <source>Zoom out</source>
- <translation>縮小</translation>
+ <source>Show </source>
+ <translation>顯示 </translation>
 </message>
 <message>
- <source>Fit width</source>
- <translation>符合寬度</translation>
+ <source>&amp;Rename</source>
+ <translation>重新命名(&amp;R)</translation>
 </message>
 <message>
- <source>Portrait</source>
- <translation>縱向</translation>
+ <source>&amp;Delete</source>
+ <translation>刪除(&amp;D)</translation>
 </message>
 <message>
- <source>Page Setup</source>
- <translation>頁面設定</translation>
+ <source>Show &amp;hidden files</source>
+ <translation>顯示隱藏檔案(&amp;H)</translation>
 </message>
 <message>
- <source>Page setup</source>
- <translation>列印設定</translation>
+ <source>&amp;New Folder</source>
+ <translation>新增資料夾(&amp;N)</translation>
 </message>
 <message>
- <source>Show overview of all pages</source>
- <translation>顯示所有頁面預覽</translation>
+ <source>All files (*)</source>
+ <translation>所有檔案(*)</translation>
 </message>
 <message>
- <source>First page</source>
- <translation>第一頁</translation>
+ <source>Directories</source>
+ <translation>資料夾</translation>
 </message>
 <message>
- <source>Last page</source>
- <translation>最後一頁</translation>
+ <source>%1
+Directory not found.
+Please verify the correct directory name was given.</source>
+ <translation>%1
+找不到目錄。
+請檢查提供的目錄名稱是否正確。</translation>
 </message>
 <message>
- <source>Show single page</source>
- <translation>顯示單一頁面</translation>
+ <source>%1 already exists.
+Do you want to replace it?</source>
+ <translation>%1 已存在。
+是否取代？</translation>
 </message>
 <message>
- <source>Export to PDF</source>
- <translation>匯出到 PDF 檔</translation>
+ <source>%1
+File not found.
+Please verify the correct file name was given.</source>
+ <translation>%1
+找不到檔案。
+請檢查提供的檔名是否正確。</translation>
 </message>
 <message>
- <source>Previous page</source>
- <translation>前一頁</translation>
+ <source>New Folder</source>
+ <translation>新資料夾</translation>
 </message>
 <message>
- <source>Next page</source>
- <translation>下一頁</translation>
+ <source>Delete</source>
+ <translation>刪除</translation>
 </message>
 <message>
- <source>Show facing pages</source>
- <translation>顯示封面</translation>
+ <source>&apos;%1&apos; is write protected.
+Do you want to delete it anyway?</source>
+ <translation>「%1」有寫入保護。
+仍然刪除？</translation>
 </message>
 <message>
- <source>Export to PostScript</source>
- <translation>匯出到 PostScript 檔</translation>
+ <source>Are you sure you want to delete &apos;%1&apos;?</source>
+ <translation>確定刪除「%1」？</translation>
 </message>
-</context>
-<context>
- <name>Q3FileDialog</name>
 <message>
- <source>&amp;OK</source>
- <translation>&amp;確定</translation>
+ <source>Could not delete directory.</source>
+ <translation>無法刪除資料夾。</translation>
 </message>
 <message>
- <source>&amp;No</source>
- <translation>&amp;否</translation>
+ <source>Recent Places</source>
+ <translation>最近開啟位置</translation>
 </message>
 <message>
- <source>Dir</source>
- <translation>目錄</translation>
+ <source>Remove</source>
+ <translation>移除</translation>
 </message>
 <message>
- <source>&amp;Yes</source>
- <translation>&amp;是</translation>
+ <source>My Computer</source>
+ <translation>我的電腦</translation>
 </message>
 <message>
- <source>Back</source>
- <translation>返回</translation>
+ <source>Drive</source>
+ <translation>硬碟</translation>
 </message>
 <message>
- <source>Date</source>
- <translation>日期</translation>
+ <source>%1 File</source>
+ <extracomment>%1 is a file name suffix, for example txt</extracomment>
+ <translation>%1 檔案</translation>
 </message>
 <message>
 <source>File</source>
 <translation>檔案</translation>
 </message>
 <message>
- <source>Name</source>
- <translation>名稱</translation>
+ <source>File Folder</source>
+ <comment>Match Windows Explorer</comment>
+ <translation>檔案資料夾</translation>
 </message>
 <message>
- <source>Open</source>
- <translation>開啟</translation>
+ <source>Folder</source>
+ <comment>All other platforms</comment>
+ <translation>資料夾</translation>
+ </message>
+ <message>
+ <source>Alias</source>
+ <comment>OS X Finder</comment>
+ <translation>別名</translation>
+ </message>
+ <message>
+ <source>Shortcut</source>
+ <comment>All other platforms</comment>
+ <translation>捷徑</translation>
+ </message>
+ <message>
+ <source>Unknown</source>
+ <translation>未知</translation>
+ </message>
+</context>
+<context>
+ <name>QFileSystemModel</name>
+ <message>
+ <source>&lt;b&gt;The name &quot;%1&quot; cannot be used.&lt;/b&gt;&lt;p&gt;Try using another name, with fewer characters or no punctuation marks.</source>
+ <translation>&lt;b&gt;不能使用名稱「%1」。&lt;/b&gt;&lt;p&gt;嘗試使用字數較少或沒有標點符號的另一名稱。</translation>
+ </message>
+ <message>
+ <source>Invalid filename</source>
+ <translation>檔名無效</translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation>名稱</translation>
 </message>
 <message>
 <source>Size</source>
 <translation>大小</translation>
 </message>
 <message>
- <source>Sort</source>
- <translation>排序</translation>
+ <source>Kind</source>
+ <comment>Match OS X Finder</comment>
+ <translation>種類</translation>
 </message>
 <message>
 <source>Type</source>
+ <comment>All other platforms</comment>
 <translation>型態</translation>
 </message>
 <message>
- <source>&amp;Open</source>
- <translation>&amp;開啟</translation>
+ <source>Date Modified</source>
+ <translation>修改日期</translation>
 </message>
 <message>
- <source>&amp;Save</source>
- <translation>&amp;儲存</translation>
+ <source>My Computer</source>
+ <translation>我的電腦</translation>
 </message>
 <message>
- <source>Error</source>
- <translation>錯誤</translation>
+ <source>Computer</source>
+ <translation>電腦</translation>
 </message>
+</context>
+<context>
+ <name>QFontDatabase</name>
 <message>
- <source>Open </source>
- <translation>開啟 </translation>
+ <source>Normal</source>
+ <comment>The Normal or Regular font weight</comment>
+ <translation>正常</translation>
 </message>
 <message>
- <source>Write: %1</source>
- <translation>寫入：%1</translation>
+ <source>Bold</source>
+ <translation>粗體</translation>
 </message>
 <message>
- <source>Sort by &amp;Size</source>
- <translation>依大小&amp;排序</translation>
+ <source>Demi Bold</source>
+ <translation>半粗體</translation>
 </message>
 <message>
- <source>Sort by &amp;Date</source>
- <translation>依日期&amp;排序</translation>
+ <source>Medium</source>
+ <comment>The Medium font weight</comment>
+ <translation>中等粗體</translation>
 </message>
 <message>
- <source>Sort by &amp;Name</source>
- <translation>依名稱&amp;排序</translation>
+ <source>Black</source>
+ <translation>黑體</translation>
 </message>
 <message>
- <source>New Folder 1</source>
- <translation>新資料夾 1</translation>
+ <source>Light</source>
+ <translation>細體</translation>
 </message>
 <message>
- <source>the directory</source>
- <translation>此目錄</translation>
+ <source>Thin</source>
+ <translation>極細體</translation>
 </message>
 <message>
- <source>File &amp;type:</source>
- <translation>檔案&amp;型態:</translation>
+ <source>Extra Light</source>
+ <translation>極細體</translation>
 </message>
 <message>
- <source>File &amp;name:</source>
- <translation>檔&amp;名:</translation>
+ <source>Extra Bold</source>
+ <translation>極粗體</translation>
 </message>
 <message>
- <source>Delete %1</source>
- <translation>刪除 %1</translation>
+ <source>Extra</source>
+ <extracomment>The word for &quot;Extra&quot; as in &quot;Extra Bold, Extra Thin&quot; used as a pattern for string searches</extracomment>
+ <translation>極體 (Extra)</translation>
 </message>
 <message>
- <source>Cancel</source>
- <translation>取消</translation>
+ <source>Demi</source>
+ <extracomment>The word for &quot;Demi&quot; as in &quot;Demi Bold&quot; used as a pattern for string searches</extracomment>
+ <translation>半體</translation>
 </message>
 <message>
- <source>R&amp;eload</source>
- <translation>重&amp;新載入</translation>
+ <source>Italic</source>
+ <translation>斜體</translation>
 </message>
 <message>
- <source>New Folder</source>
- <translation>新資料夾</translation>
+ <source>Oblique</source>
+ <translation>傾斜體</translation>
 </message>
 <message>
- <source>&amp;Unsorted</source>
- <translation>未&amp;排序</translation>
+ <source>Any</source>
+ <translation>不指定</translation>
 </message>
 <message>
- <source>Look &amp;in:</source>
- <translation>尋找&amp;於:</translation>
+ <source>Latin</source>
+ <translation>拉丁</translation>
 </message>
 <message>
- <source>Preview File Contents</source>
- <translation>預覽檔案內容</translation>
+ <source>Greek</source>
+ <translation>希臘</translation>
 </message>
 <message>
- <source>New Folder %1</source>
- <translation>新資料夾 %1</translation>
+ <source>Cyrillic</source>
+ <translation>斯拉夫</translation>
 </message>
 <message>
- <source>Read-write</source>
- <translation>可讀寫</translation>
+ <source>Armenian</source>
+ <translation>亞美尼亞</translation>
 </message>
 <message>
- <source>Read-only</source>
- <translation>唯讀</translation>
+ <source>Hebrew</source>
+ <translation>希伯來</translation>
 </message>
 <message>
- <source>Copy or Move a File</source>
- <translation>複製或移動檔案</translation>
+ <source>Arabic</source>
+ <translation>阿拉伯</translation>
 </message>
 <message>
- <source>&lt;qt&gt;Are you sure you wish to delete %1 &quot;%2&quot;?&lt;/qt&gt;</source>
- <translation>&lt;qt&gt;您確定要刪除 %1 &quot;%2&quot; 嗎？&lt;/qt&gt;</translation>
+ <source>Syriac</source>
+ <translation>敘利亞</translation>
 </message>
 <message>
- <source>Find Directory</source>
- <translation>尋找目錄</translation>
+ <source>Thaana</source>
+ <translation>塔納文</translation>
 </message>
 <message>
- <source>Attributes</source>
- <translation>屬性</translation>
+ <source>Devanagari</source>
+ <translation>梵文</translation>
 </message>
 <message>
- <source>Show &amp;hidden files</source>
- <translation>顯示&amp;隱藏檔</translation>
+ <source>Bengali</source>
+ <translation>孟加拉</translation>
 </message>
 <message>
- <source>Save As</source>
- <translation>另存新檔</translation>
+ <source>Gurmukhi</source>
+ <translation>古爾穆基字</translation>
 </message>
 <message>
- <source>Inaccessible</source>
- <translation>無法存取</translation>
+ <source>Gujarati</source>
+ <translation>古吉拉特語</translation>
 </message>
 <message>
- <source>%1
-File not found.
-Check path and filename.</source>
- <translation>%1
-找不到檔案。
-請檢查路徑與檔名。</translation>
+ <source>Oriya</source>
+ <translation>奧里亞語</translation>
 </message>
 <message>
- <source>List View</source>
- <translation>列表檢視</translation>
+ <source>Tamil</source>
+ <translation>坦米爾</translation>
 </message>
 <message>
- <source>Special</source>
- <translation>特殊節點</translation>
+ <source>Telugu</source>
+ <translation>泰盧固語</translation>
 </message>
 <message>
- <source>Write-only</source>
- <translation>唯寫</translation>
+ <source>Kannada</source>
+ <translation>坎達那</translation>
 </message>
 <message>
- <source>the symlink</source>
- <translation>此符號連結</translation>
+ <source>Malayalam</source>
+ <translation>馬來語</translation>
 </message>
 <message>
- <source>&amp;Delete</source>
- <translation>&amp;刪除</translation>
+ <source>Sinhala</source>
+ <translation>錫蘭</translation>
 </message>
 <message>
- <source>All Files (*)</source>
- <translation>所有檔案 (*)</translation>
+ <source>Thai</source>
+ <translation>泰語</translation>
 </message>
 <message>
- <source>Directories</source>
- <translation>目錄</translation>
+ <source>Lao</source>
+ <translation>寮國</translation>
 </message>
 <message>
- <source>Symlink to Special</source>
- <translation>到特殊節點的符號連結</translation>
+ <source>Tibetan</source>
+ <translation>西藏</translation>
 </message>
 <message>
- <source>Select a Directory</source>
- <translation>請選擇一個目錄</translation>
+ <source>Myanmar</source>
+ <translation>緬甸</translation>
 </message>
 <message>
- <source>All Files (*.*)</source>
- <translation>所有檔案 (*.*)</translation>
+ <source>Georgian</source>
+ <translation>喬治亞</translation>
 </message>
 <message>
- <source>Read: %1</source>
- <translation>讀取：%1</translation>
+ <source>Khmer</source>
+ <translation>高棉</translation>
 </message>
 <message>
- <source>&amp;Rename</source>
- <translation>&amp;重新命名</translation>
+ <source>Simplified Chinese</source>
+ <translation>簡體中文</translation>
 </message>
 <message>
- <source>Directory:</source>
- <translation>目錄:</translation>
+ <source>Traditional Chinese</source>
+ <translation>繁體中文</translation>
 </message>
 <message>
- <source>One directory up</source>
- <translation>往上一層目錄</translation>
+ <source>Japanese</source>
+ <translation>日語</translation>
 </message>
 <message>
- <source>Preview File Info</source>
- <translation>預覽檔案資訊</translation>
+ <source>Korean</source>
+ <translation>韓語</translation>
 </message>
 <message>
- <source>the file</source>
- <translation>此檔案</translation>
+ <source>Vietnamese</source>
+ <translation>越南</translation>
 </message>
 <message>
- <source>Create New Folder</source>
- <translation>建立新資料夾</translation>
+ <source>Symbol</source>
+ <translation>符號</translation>
 </message>
 <message>
- <source>Symlink to File</source>
- <translation>到檔案的符號連結</translation>
+ <source>Ogham</source>
+ <translation>歐甘文</translation>
 </message>
 <message>
- <source>Symlink to Directory</source>
- <translation>到目錄的符號連結</translation>
+ <source>Runic</source>
+ <translation>盧恩文</translation>
 </message>
 <message>
- <source>Detail View</source>
- <translation>詳細檢視</translation>
+ <source>N&apos;Ko</source>
+ <translation>西非書面語</translation>
 </message>
 </context>
 <context>
- <name>QErrorMessage</name>
+ <name>QFontDialog</name>
+ <message>
+ <source>Select Font</source>
+ <translation>選擇字型</translation>
+ </message>
+ <message>
+ <source>&amp;Font</source>
+ <translation>字型(&amp;F)</translation>
+ </message>
+ <message>
+ <source>Font st&amp;yle</source>
+ <translation>字型樣式(&amp;Y)</translation>
+ </message>
+ <message>
+ <source>&amp;Size</source>
+ <translation>大小(&amp;S)</translation>
+ </message>
+ <message>
+ <source>Effects</source>
+ <translation>效果</translation>
+ </message>
+ <message>
+ <source>Stri&amp;keout</source>
+ <translation>刪除線(&amp;K)</translation>
+ </message>
+ <message>
+ <source>&amp;Underline</source>
+ <translation>底線(&amp;U)</translation>
+ </message>
+ <message>
+ <source>Sample</source>
+ <translation>範例</translation>
+ </message>
+ <message>
+ <source>Wr&amp;iting System</source>
+ <translation>文字系統(&amp;I)</translation>
+ </message>
+</context>
+<context>
+ <name>QFtp</name>
+ <message>
+ <source>Not connected</source>
+ <translation>未連線</translation>
+ </message>
+ <message>
+ <source>Host %1 not found</source>
+ <translation>找不到主機 %1</translation>
+ </message>
+ <message>
+ <source>Connection refused to host %1</source>
+ <translation>連線到主機 %1 被拒</translation>
+ </message>
+ <message>
+ <source>Connection timed out to host %1</source>
+ <translation>連線到主機 %1 逾時</translation>
+ </message>
+ <message>
+ <source>Connected to host %1</source>
+ <translation>已連線到主機 %1</translation>
+ </message>
+ <message>
+ <source>Data Connection refused</source>
+ <translation>資料連線被拒</translation>
+ </message>
+ <message>
+ <source>Unknown error</source>
+ <translation>未知錯誤</translation>
+ </message>
+ <message>
+ <source>Connecting to host failed:
+%1</source>
+ <translation>連線到主機失敗：
+%1</translation>
+ </message>
+ <message>
+ <source>Login failed:
+%1</source>
+ <translation>登入失敗：
+%1</translation>
+ </message>
+ <message>
+ <source>Listing directory failed:
+%1</source>
+ <translation>列出目錄失敗：
+%1</translation>
+ </message>
+ <message>
+ <source>Changing directory failed:
+%1</source>
+ <translation>變更目錄失敗：
+%1</translation>
+ </message>
+ <message>
+ <source>Downloading file failed:
+%1</source>
+ <translation>下載檔案失敗：
+%1</translation>
+ </message>
+ <message>
+ <source>Uploading file failed:
+%1</source>
+ <translation>上傳檔案失敗：
+%1</translation>
+ </message>
+ <message>
+ <source>Removing file failed:
+%1</source>
+ <translation>移除檔案失敗：
+%1</translation>
+ </message>
+ <message>
+ <source>Creating directory failed:
+%1</source>
+ <translation>建立目錄失敗：
+%1</translation>
+ </message>
+ <message>
+ <source>Removing directory failed:
+%1</source>
+ <translation>移除目錄失敗：
+%1</translation>
+ </message>
+ <message>
+ <source>Connection closed</source>
+ <translation>連線已關閉</translation>
+ </message>
+</context>
+<context>
+ <name>QGnomeTheme</name>
 <message>
 <source>&amp;OK</source>
- <translation>&amp;確定</translation>
+ <translation>確定(&amp;O)</translation>
 </message>
 <message>
- <source>Fatal Error:</source>
- <translation>嚴重錯誤:</translation>
+ <source>&amp;Save</source>
+ <translation>儲存(&amp;S)</translation>
 </message>
 <message>
- <source>&amp;Show this message again</source>
- <translation>&amp;再度顯示此訊息</translation>
+ <source>&amp;Cancel</source>
+ <translation>取消(&amp;C)</translation>
 </message>
 <message>
- <source>Debug Message:</source>
- <translation>除錯訊息:</translation>
+ <source>&amp;Close</source>
+ <translation>關閉(&amp;C)</translation>
 </message>
 <message>
- <source>Warning:</source>
- <translation>警告:</translation>
+ <source>Close without Saving</source>
+ <translation>關閉而不儲存</translation>
 </message>
 </context>
 <context>
- <name>QPrintWidget</name>
+ <name>QGuiApplication</name>
 <message>
- <source>...</source>
- <translation>...</translation>
+ <source>QT_LAYOUT_DIRECTION</source>
+ <comment>Translate this string to the string &apos;LTR&apos; in left-to-right languages or to &apos;RTL&apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment>
+ <translation>QT_LAYOUT_DIRECTION</translation>
 </message>
+</context>
+<context>
+ <name>QHostInfo</name>
 <message>
- <source>Form</source>
- <translation>表單</translation>
+ <source>No host name given</source>
+ <translation>未指定主機</translation>
 </message>
 <message>
- <source>Type:</source>
- <translation>型態:</translation>
+ <source>Unknown error</source>
+ <translation>未知錯誤</translation>
 </message>
+</context>
+<context>
+ <name>QHostInfoAgent</name>
 <message>
- <source>&amp;Name:</source>
- <translation>&amp;名稱:</translation>
+ <source>No host name given</source>
+ <translation>未指定主機</translation>
 </message>
 <message>
- <source>Output &amp;file:</source>
- <translation>&amp;輸出檔案:</translation>
+ <source>Invalid hostname</source>
+ <translation>主機名稱無效</translation>
 </message>
 <message>
- <source>P&amp;roperties</source>
- <translation>屬&amp;性</translation>
+ <source>Unknown address type</source>
+ <translation>未知的位址型態</translation>
 </message>
 <message>
- <source>Preview</source>
- <translation>預覽</translation>
+ <source>Host not found</source>
+ <translation>找不到主機</translation>
 </message>
 <message>
- <source>Printer</source>
- <translation>印表機</translation>
+ <source>Unknown error (%1)</source>
+ <translation>未知錯誤 (%1)</translation>
 </message>
+</context>
+<context>
+ <name>QHttp</name>
 <message>
- <source>Location:</source>
- <translation>位置:</translation>
+ <source>Host %1 not found</source>
+ <translation>找不到主機 %1</translation>
+ </message>
+ <message>
+ <source>Connection refused</source>
+ <translation>連線被拒</translation>
+ </message>
+ <message>
+ <source>Connection closed</source>
+ <translation>連線已關閉</translation>
+ </message>
+ <message>
+ <source>Proxy requires authentication</source>
+ <translation>代理伺服器需要驗證</translation>
+ </message>
+ <message>
+ <source>Host requires authentication</source>
+ <translation>主機需要驗證</translation>
+ </message>
+ <message>
+ <source>Data corrupted</source>
+ <translation>資料已損毀</translation>
+ </message>
+ <message>
+ <source>Unknown protocol specified</source>
+ <translation>指定了未知的協定</translation>
+ </message>
+ <message>
+ <source>SSL handshake failed</source>
+ <translation>SSL 交握失敗</translation>
+ </message>
+ <message>
+ <source>Too many redirects</source>
+ <translation>跳轉太多次</translation>
+ </message>
+ <message>
+ <source>Insecure redirect</source>
+ <translation>不安全的跳轉</translation>
 </message>
 </context>
 <context>
- <name>QFontDatabase</name>
+ <name>QHttpSocketEngine</name>
 <message>
- <source>Any</source>
- <translation>任何</translation>
+ <source>Did not receive HTTP response from proxy</source>
+ <translation>未從代理伺服器接收到 HTTP 回應</translation>
 </message>
 <message>
- <source>Lao</source>
- <translation>寮國</translation>
+ <source>Error parsing authentication request from proxy</source>
+ <translation>解析從代理伺服器傳來的驗證要求時發生錯誤</translation>
 </message>
 <message>
- <source>Bold</source>
- <translation>粗體</translation>
+ <source>Authentication required</source>
+ <translation>需要驗證</translation>
 </message>
 <message>
- <source>Demi</source>
- <translation>半體</translation>
+ <source>Proxy denied connection</source>
+ <translation>代理伺服器拒絕連線</translation>
 </message>
 <message>
- <source>Thai</source>
- <translation>泰語</translation>
+ <source>Error communicating with HTTP proxy</source>
+ <translation>與 HTTP 代理伺服器通訊時發生錯誤</translation>
 </message>
 <message>
- <source>Black</source>
- <translation>黑體</translation>
+ <source>Proxy server not found</source>
+ <translation>找不到代理伺服器</translation>
 </message>
 <message>
- <source>Greek</source>
- <translation>希臘</translation>
+ <source>Proxy connection refused</source>
+ <translation>代理伺服器連線被拒</translation>
 </message>
 <message>
- <source>Khmer</source>
- <translation>高棉</translation>
+ <source>Proxy server connection timed out</source>
+ <translation>代理伺服器連線逾時</translation>
 </message>
 <message>
- <source>Latin</source>
- <translation>拉丁</translation>
+ <source>Proxy connection closed prematurely</source>
+ <translation>代理伺服器連線不正常關閉</translation>
 </message>
+</context>
+<context>
+ <name>QIBaseDriver</name>
 <message>
- <source>Light</source>
- <translation>輕體</translation>
+ <source>Error opening database</source>
+ <translation>開啟資料庫發生錯誤</translation>
 </message>
 <message>
- <source>Ogham</source>
- <translation>歐甘</translation>
+ <source>Could not start transaction</source>
+ <translation>無法開始處理事項</translation>
 </message>
 <message>
- <source>Oriya</source>
- <translation>Oriya</translation>
+ <source>Unable to commit transaction</source>
+ <translation>無法提交處理事項</translation>
 </message>
 <message>
- <source>Runic</source>
- <translation>盧恩</translation>
+ <source>Unable to rollback transaction</source>
+ <translation>無法回退處理事項</translation>
 </message>
+</context>
+<context>
+ <name>QIBaseResult</name>
 <message>
- <source>Tamil</source>
- <translation>坦米爾</translation>
+ <source>Unable to create BLOB</source>
+ <translation>無法建立 BLOB</translation>
 </message>
 <message>
- <source>Cyrillic</source>
- <translation>斯拉夫</translation>
+ <source>Unable to write BLOB</source>
+ <translation>無法寫入 BLOB</translation>
 </message>
 <message>
- <source>Kannada</source>
- <translation>坎達那</translation>
+ <source>Unable to open BLOB</source>
+ <translation>無法開啟 BLOB</translation>
 </message>
 <message>
- <source>Malayalam</source>
- <translation>馬來語</translation>
+ <source>Unable to read BLOB</source>
+ <translation>無法讀取 BLOB</translation>
 </message>
 <message>
- <source>Simplified Chinese</source>
- <translation>簡體中文</translation>
+ <source>Could not find array</source>
+ <translation>找不到陣列</translation>
 </message>
 <message>
- <source>Demi Bold</source>
- <translation>半粗體</translation>
+ <source>Could not get array data</source>
+ <translation>無法取得陣列資料</translation>
 </message>
 <message>
- <source>Arabic</source>
- <translation>阿拉伯</translation>
+ <source>Could not get query info</source>
+ <translation>無法取得查詢資訊</translation>
 </message>
 <message>
- <source>Hebrew</source>
- <translation>希伯來</translation>
+ <source>Could not start transaction</source>
+ <translation>無法開始處理事項</translation>
 </message>
 <message>
- <source>Myanmar</source>
- <translation>緬甸</translation>
+ <source>Unable to commit transaction</source>
+ <translation>無法提交處理事項</translation>
 </message>
 <message>
- <source>Italic</source>
- <translation>斜體</translation>
+ <source>Could not allocate statement</source>
+ <translation>無法分配陳述</translation>
 </message>
 <message>
- <source>Korean</source>
- <translation>韓語</translation>
+ <source>Could not prepare statement</source>
+ <translation>無法準備陳述</translation>
 </message>
 <message>
- <source>Normal</source>
- <translation>正常</translation>
+ <source>Could not describe input statement</source>
+ <translation>無法描述輸入陳述</translation>
 </message>
 <message>
- <source>Oblique</source>
- <translation>傾斜體</translation>
+ <source>Could not describe statement</source>
+ <translation>無法描述陳述</translation>
 </message>
 <message>
- <source>Telugu</source>
- <translation>Telugu</translation>
+ <source>Unable to close statement</source>
+ <translation>無法關閉陳述</translation>
 </message>
 <message>
- <source>Thaana</source>
- <translation>Thaana</translation>
+ <source>Unable to execute query</source>
+ <translation>無法執行查詢</translation>
 </message>
 <message>
- <source>Symbol</source>
- <translation>符號</translation>
+ <source>Could not fetch next item</source>
+ <translation>無法抓取下一個項目</translation>
 </message>
 <message>
- <source>Syriac</source>
- <translation>敘利亞</translation>
+ <source>Could not get statement info</source>
+ <translation>無法取得陳述資訊</translation>
 </message>
+</context>
+<context>
+ <name>QIODevice</name>
 <message>
- <source>Devanagari</source>
- <translation>Devanagari</translation>
+ <source>file to open is a directory</source>
+ <translation>要打開的檔案是個資料夾</translation>
 </message>
 <message>
- <source>Japanese</source>
- <translation>日語</translation>
+ <source>Unknown error</source>
+ <translation>未知錯誤</translation>
 </message>
 <message>
- <source>Bengali</source>
- <translation>孟加拉</translation>
+ <source>Permission denied</source>
+ <translation>權限不足</translation>
 </message>
 <message>
- <source>Armenian</source>
- <translation>亞美尼亞</translation>
+ <source>Too many open files</source>
+ <translation>開啟過多檔案</translation>
 </message>
 <message>
- <source>Sinhala</source>
- <translation>錫蘭</translation>
+ <source>No such file or directory</source>
+ <translation>找不到該檔案或目錄</translation>
 </message>
 <message>
- <source>Tibetan</source>
- <translation>西藏</translation>
+ <source>No space left on device</source>
+ <translation>裝置上已無空間</translation>
 </message>
+</context>
+<context>
+ <name>QImageReader</name>
 <message>
- <source>Vietnamese</source>
- <translation>越南</translation>
+ <source>Invalid device</source>
+ <translation>裝置無效</translation>
 </message>
 <message>
- <source>Gujarati</source>
- <translation>Gujarati</translation>
+ <source>File not found</source>
+ <translation>找不到檔案</translation>
 </message>
 <message>
- <source>Traditional Chinese</source>
- <translation>繁體中文</translation>
+ <source>Unsupported image format</source>
+ <translation>不支援的影像格式</translation>
 </message>
 <message>
- <source>Georgian</source>
- <translation>喬治亞</translation>
+ <source>Unable to read image data</source>
+ <translation>無法讀取影像資料</translation>
 </message>
 <message>
- <source>Gurmukhi</source>
- <translation>Gurmukhi</translation>
+ <source>Unknown error</source>
+ <translation>未知錯誤</translation>
 </message>
 </context>
 <context>
- <name>QWebPage</name>
+ <name>QImageWriter</name>
 <message>
- <source>Cut</source>
- <translation>剪下</translation>
+ <source>Unknown error</source>
+ <translation>未知錯誤</translation>
 </message>
 <message>
- <source>LTR</source>
- <translation>左到右</translation>
+ <source>Device is not set</source>
+ <translation>未設定裝置</translation>
 </message>
 <message>
- <source>RTL</source>
- <translation>右到左</translation>
+ <source>Cannot open device for writing: %1</source>
+ <translation>無法開啟供寫入裝置：%1</translation>
 </message>
 <message>
- <source>Top</source>
- <translation>頂端</translation>
+ <source>Device not writable</source>
+ <translation>無法寫入裝置</translation>
 </message>
 <message>
- <source>Bold</source>
- <translation>粗體</translation>
+ <source>Unsupported image format</source>
+ <translation>不支援的影像格式</translation>
 </message>
 <message>
- <source>Copy</source>
- <translation>複製</translation>
+ <source>Image is empty</source>
+ <translation>影像是空白的</translation>
 </message>
+</context>
+<context>
+ <name>QInputDialog</name>
 <message>
- <source>Stop</source>
- <translation>停止</translation>
+ <source>Enter a value:</source>
+ <translation>請輸入一個值：</translation>
 </message>
+</context>
+<context>
+ <name>QJsonParseError</name>
 <message>
- <source>Open Frame</source>
- <translation>開啟框架</translation>
+ <source>no error occurred</source>
+ <translation>沒有發生錯誤</translation>
 </message>
 <message>
- <source>Open Image</source>
- <translation>開啟影像</translation>
+ <source>unterminated object</source>
+ <translation>物件沒有結尾</translation>
 </message>
 <message>
- <source>Fonts</source>
- <translation>字型</translation>
+ <source>missing name separator</source>
+ <translation>遺失名稱分割字元</translation>
 </message>
 <message>
- <source>Paste</source>
- <translation>貼上</translation>
+ <source>unterminated array</source>
+ <translation>陣列沒有結尾</translation>
 </message>
 <message>
- <source>Reset</source>
- <translation>重置</translation>
+ <source>missing value separator</source>
+ <translation>遺失值分隔字元</translation>
 </message>
 <message>
- <source>Inspect</source>
- <translation>查驗</translation>
+ <source>illegal value</source>
+ <translation>值無效</translation>
 </message>
 <message>
- <source>Select to the start of the block</source>
- <translation>選擇到這一個區塊的起頭</translation>
+ <source>invalid termination by number</source>
+ <translation>無效的數字結尾</translation>
 </message>
 <message>
- <source>Move the cursor to the end of the block</source>
- <translation>移動游標到這一個區塊的結尾</translation>
+ <source>illegal number</source>
+ <translation>數字無效</translation>
 </message>
 <message>
- <source>Select to the start of the line</source>
- <translation>選擇到這一行的起頭</translation>
+ <source>invalid escape sequence</source>
+ <translation>無效的跳脫序列</translation>
 </message>
 <message>
- <source>Look Up In Dictionary</source>
- <translation>在字典裡搜尋</translation>
+ <source>invalid UTF8 string</source>
+ <translation>無效的 UTF-8 字串</translation>
 </message>
 <message>
- <source>Search The Web</source>
- <translation>搜尋站台</translation>
+ <source>unterminated string</source>
+ <translation>字串沒有結尾</translation>
 </message>
 <message>
- <source>Check Spelling While Typing</source>
- <translation>打字時立即檢查拼字</translation>
+ <source>object is missing after a comma</source>
+ <translation>逗號後缺少物件</translation>
 </message>
 <message>
- <source>Add To Dictionary</source>
- <translation>新增到字典</translation>
+ <source>too deeply nested document</source>
+ <translation>過深巢狀文件</translation>
 </message>
 <message>
- <source>Delete to the start of the word</source>
- <translation>刪除到此單字的起頭</translation>
+ <source>too large document</source>
+ <translation>過大文件</translation>
 </message>
 <message>
- <source>Recent searches</source>
- <translation>最近的搜尋</translation>
+ <source>garbage at the end of the document</source>
+ <translation>文件結尾有無用資料</translation>
 </message>
+</context>
+<context>
+ <name>QKeySequenceEdit</name>
 <message>
- <source>Move the cursor to the next word</source>
- <translation>移動游標到下一個單字</translation>
+ <source>Press shortcut</source>
+ <translation>點擊快速鍵</translation>
 </message>
 <message>
- <source>Move the cursor to the next line</source>
- <translation>移動游標到下一行</translation>
+ <source>%1, ...</source>
+ <extracomment>This text is an &quot;unfinished&quot; shortcut, expands like &quot;Ctrl+A, ...&quot;</extracomment>
+ <translation>%1、…</translation>
 </message>
+</context>
+<context>
+ <name>QLibrary</name>
 <message>
- <source>JavaScript Alert - %1</source>
- <translation>JavaScript 警告 ─ %1</translation>
+ <source>&apos;%1&apos; is not an ELF object (%2)</source>
+ <translation>「%1」不是個 ELF 物件 (%2)</translation>
 </message>
 <message>
- <source>Scroll down</source>
- <translation>往下捲軸</translation>
+ <source>file too small</source>
+ <translation>檔案過小</translation>
 </message>
 <message>
- <source>Scroll here</source>
- <translation>在此捲軸</translation>
+ <source>&apos;%1&apos; is not an ELF object</source>
+ <translation>「%1」不是個 ELF 物件</translation>
 </message>
 <message>
- <source>Scroll left</source>
- <translation>往左捲軸</translation>
+ <source>&apos;%1&apos; is an invalid ELF object (%2)</source>
+ <translation>「%1」是個無效 ELF 物件 (%2)</translation>
 </message>
 <message>
- <source>Move the cursor to the start of the block</source>
- <translation>移動游標到這一個區塊的起頭</translation>
+ <source>odd cpu architecture</source>
+ <translation>異常 CPU 架構</translation>
 </message>
 <message>
- <source>Text Direction</source>
- <translation>文字方向</translation>
+ <source>wrong cpu architecture</source>
+ <translation>錯誤 CPU 架構</translation>
 </message>
 <message>
- <source>Bottom</source>
- <translation>底端</translation>
+ <source>odd endianness</source>
+ <translation>異常位元組順序</translation>
 </message>
 <message>
- <source>Ignore</source>
- <translation>忽略</translation>
+ <source>unexpected e_shsize</source>
+ <translation>非預期的 e_shsize</translation>
 </message>
 <message>
- <source>Italic</source>
- <translation>斜體</translation>
+ <source>unexpected e_shentsize</source>
+ <translation>非預期的 e_shentsize</translation>
+ </message>
+ <message numerus="yes">
+ <source>announced %n section(s), each %1 byte(s), exceed file size</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
 </message>
 <message>
- <source>Move the cursor to the end of the line</source>
- <translation>移動游標到這一行的結尾</translation>
+ <source>shstrtab section header seems to be at %1</source>
+ <translation>shstrtab 區段的標頭看起來在 %1</translation>
 </message>
 <message>
- <source>Move the cursor to the start of the line</source>
- <translation>移動游標到這一行的起頭</translation>
+ <source>string table seems to be at %1</source>
+ <translation>字串表格看起來在 %1</translation>
 </message>
 <message>
- <source>Reload</source>
- <translation>重新載入</translation>
+ <source>section name %1 of %2 behind end of file</source>
+ <translation>%2 的區段名稱 %1 在檔案結尾之後</translation>
 </message>
 <message>
- <source>JavaScript Confirm - %1</source>
- <translation>JavaScript 確認 ─ %1</translation>
+ <source>empty .rodata. not a library.</source>
+ <translation>空的 .rodata. 非函式庫。</translation>
 </message>
 <message>
- <source>Submit</source>
- <translation>提交</translation>
+ <source>missing section data. This is not a library.</source>
+ <translation>遺失區段資料。非函式庫。</translation>
 </message>
 <message>
- <source>Web Inspector - %2</source>
- <translation>網站查驗器─%2</translation>
+ <source>Failed to extract plugin meta data from &apos;%1&apos;</source>
+ <translation>無法從「%1」擷取外掛程式中繼資料</translation>
 </message>
 <message>
- <source>Page up</source>
- <translation>頁面上方</translation>
+ <source>The shared library was not found.</source>
+ <translation>找不到共享函式庫。</translation>
 </message>
 <message>
- <source>Spelling</source>
- <translation>拼字</translation>
+ <source>The file &apos;%1&apos; is not a valid Qt plugin.</source>
+ <translation>檔案「%1」不是有效的 Qt 外掛程式。</translation>
 </message>
 <message>
- <source>Outline</source>
- <translation>外框線</translation>
+ <source>The plugin &apos;%1&apos; uses incompatible Qt library. (%2.%3.%4) [%5]</source>
+ <translation>外掛程式「%1」使用不相容的 Qt 函式庫。(%2.%3.%4) [%5]</translation>
 </message>
 <message>
- <source>Check Grammar With Spelling</source>
- <translation>檢查拼字與文法</translation>
+ <source>The plugin &apos;%1&apos; uses incompatible Qt library. (Cannot mix debug and release libraries.)</source>
+ <translation>外掛程式「%1」使用不相容的 Qt 函式庫。（不能將除錯與釋出版本的函式庫混在一起。）</translation>
 </message>
 <message>
- <source>No file selected</source>
- <translation>未選取任何檔案</translation>
+ <source>Unknown error</source>
+ <translation>未知錯誤</translation>
 </message>
 <message>
- <source>Ignore</source>
- <comment>Ignore Grammar context menu item</comment>
- <translation>忽略</translation>
+ <source>Cannot load library %1: %2</source>
+ <translation>無法載入函式庫 %1：%2</translation>
 </message>
 <message>
- <source>Save Image</source>
- <translation>儲存影像</translation>
+ <source>Cannot unload library %1: %2</source>
+ <translation>無法卸載函式庫 %1：%2</translation>
 </message>
 <message>
- <source>Save Link...</source>
- <translation>儲存連結...</translation>
+ <source>Cannot resolve symbol &quot;%1&quot; in %2: %3</source>
+ <translation>無法解析 %2 內的符號「%1」：%3</translation>
 </message>
 <message>
- <source>No recent searches</source>
- <translation>沒有最近的搜尋</translation>
+ <source>&apos;%1&apos; is not a valid Mach-O binary (%2)</source>
+ <translation>「%1」為無效 Mach-O 二進位資料 (%2)</translation>
 </message>
 <message>
- <source>Page right</source>
- <translation>頁面右方</translation>
+ <source>file is corrupt</source>
+ <translation>檔案已損壞</translation>
 </message>
 <message>
- <source>Move the cursor to the start of the document</source>
- <translation>移動游標到這一個文件的起頭</translation>
+ <source>no suitable architecture in fat binary</source>
+ <translation>找不到 fat 二進位資料中適合的架構</translation>
 </message>
 <message>
- <source>Move the cursor to the next character</source>
- <translation>移動游標到下一個字元</translation>
+ <source>invalid magic %1</source>
+ <translation>無效的 Magic %1</translation>
 </message>
 <message>
- <source>JavaScript Prompt - %1</source>
- <translation>JavaScript 提示 ─ %1</translation>
+ <source>wrong architecture</source>
+ <translation>架構錯誤</translation>
 </message>
 <message>
- <source>Copy Link</source>
- <translation>複製連結</translation>
+ <source>not a dynamic library</source>
+ <translation>非動態函式庫</translation>
 </message>
 <message>
- <source>Select to the previous line</source>
- <translation>選擇到前一行</translation>
+ <source>&apos;%1&apos; is not a Qt plugin</source>
+ <translation>「%1」非 Qt 外掛程式</translation>
 </message>
 <message>
- <source>Select to the previous word</source>
- <translation>選擇到前一個單字</translation>
+ <source>Out of memory while loading plugin &apos;%1&apos;.</source>
+ <translation>載入外掛程式「%1」時發生記憶體不足問題。</translation>
 </message>
+</context>
+<context>
+ <name>QLineEdit</name>
 <message>
- <source>Check Spelling</source>
- <translation>檢查拼字</translation>
+ <source>&amp;Undo</source>
+ <translation>復原(&amp;U)</translation>
 </message>
 <message>
- <source>Select to the next character</source>
- <translation>選擇到下一個字元</translation>
+ <source>&amp;Redo</source>
+ <translation>重做(&amp;R)</translation>
 </message>
 <message>
- <source>Show Spelling and Grammar</source>
- <translation>顯示拼字與文法</translation>
+ <source>Cu&amp;t</source>
+ <translation>剪下(&amp;T)</translation>
 </message>
 <message>
- <source>Delete to the end of the word</source>
- <translation>刪除到此單字的結尾</translation>
+ <source>&amp;Copy</source>
+ <translation>複製(&amp;C)</translation>
 </message>
 <message>
- <source>Direction</source>
- <translation>方向</translation>
+ <source>&amp;Paste</source>
+ <translation>貼上(&amp;P)</translation>
 </message>
 <message>
- <source>Select to the end of the line</source>
- <translation>選擇到這一行的結尾</translation>
+ <source>Delete</source>
+ <translation>刪除</translation>
 </message>
 <message>
- <source>Submit</source>
- <comment>Submit (input element) alt text for &lt;input&gt; elements with no alt, title, or value</comment>
- <translation>提交</translation>
+ <source>Select All</source>
+ <translation>全部選擇</translation>
 </message>
+</context>
+<context>
+ <name>QLocalServer</name>
 <message>
- <source>Choose File</source>
- <translation>選擇檔案</translation>
+ <source>%1: Name error</source>
+ <translation>%1：名稱錯誤</translation>
 </message>
 <message>
- <source>Scroll up</source>
- <translation>往上捲軸</translation>
+ <source>%1: Permission denied</source>
+ <translation>%1：存取被拒</translation>
 </message>
 <message>
- <source>Clear recent searches</source>
- <translation>清除最近的搜尋</translation>
+ <source>%1: Address in use</source>
+ <translation>%1：位址使用中</translation>
 </message>
 <message>
- <source>Select to the start of the document</source>
- <translation>選擇到這一個文件的起頭</translation>
+ <source>%1: Unknown error %2</source>
+ <translation>%1：未知的錯誤 %2</translation>
 </message>
+</context>
+<context>
+ <name>QLocalSocket</name>
 <message>
- <source>Default</source>
- <translation>預設</translation>
+ <source>%1: Connection refused</source>
+ <translation>%1：連線被拒</translation>
 </message>
 <message>
- <source>Underline</source>
- <translation>底線</translation>
+ <source>%1: Remote closed</source>
+ <translation>%1：遠端已關閉</translation>
 </message>
 <message>
- <source>Move the cursor to the previous character</source>
- <translation>移動游標到前一個字元</translation>
+ <source>%1: Invalid name</source>
+ <translation>%1：名稱無效</translation>
 </message>
 <message>
- <source>Copy Image</source>
- <translation>複製影像</translation>
+ <source>%1: Socket access error</source>
+ <translation>%1：Socket 存取錯誤</translation>
 </message>
 <message>
- <source>Select to the end of the document</source>
- <translation>選擇到這一個文件的結尾</translation>
+ <source>%1: Socket resource error</source>
+ <translation>%1：Socket 資源錯誤</translation>
 </message>
 <message>
- <source>Select to the end of the block</source>
- <translation>選擇到這一個區塊的結尾</translation>
+ <source>%1: Socket operation timed out</source>
+ <translation>%1：Socket 操作逾時</translation>
 </message>
 <message>
- <source>Scroll right</source>
- <translation>往右捲軸</translation>
+ <source>%1: Datagram too large</source>
+ <translation>%1：資料塊過大</translation>
 </message>
 <message>
- <source>No Guesses Found</source>
- <translation>找不到可能的內容</translation>
+ <source>%1: Connection error</source>
+ <translation>%1：連線錯誤</translation>
 </message>
 <message>
- <source>Open Link</source>
- <translation>開啟連結</translation>
+ <source>%1: The socket operation is not supported</source>
+ <translation>%1：不支援 socket 操作</translation>
 </message>
 <message>
- <source>Bad HTTP request</source>
- <translation>不良的 HTTP 請求</translation>
+ <source>%1: Operation not permitted when socket is in this state</source>
+ <translation>%1：當 socket 在此狀態時不允許操作</translation>
 </message>
 <message>
- <source>Unknown</source>
- <translation>未知</translation>
+ <source>%1: Unknown error</source>
+ <translation>%1：未知的錯誤</translation>
 </message>
 <message>
- <source>Move the cursor to the previous word</source>
- <translation>移動游標到前一個單字</translation>
+ <source>Trying to connect while connection is in progress</source>
+ <translation>嘗試在連線時連線</translation>
 </message>
 <message>
- <source>Move the cursor to the previous line</source>
- <translation>移動游標到前一行</translation>
+ <source>%1: Unknown error %2</source>
+ <translation>%1：未知的錯誤 %2</translation>
 </message>
- <message numerus="yes">
- <source>%n file(s)</source>
- <translation>
- <numerusform>%n 個檔案</numerusform>
- </translation>
+ <message>
+ <source>%1: Access denied</source>
+ <translation>%1：存取被拒</translation>
 </message>
+</context>
+<context>
+ <name>QMYSQLDriver</name>
 <message>
- <source>Left edge</source>
- <translation>左邊緣</translation>
+ <source>Unable to allocate a MYSQL object</source>
+ <translation>無法分配個 MySQL 物件</translation>
 </message>
 <message>
- <source>Go Forward</source>
- <translation>往前</translation>
+ <source>Unable to open database &apos;%1&apos;</source>
+ <translation>無法開啟資料庫「%1」</translation>
 </message>
 <message>
- <source>Page down</source>
- <translation>頁面下方</translation>
+ <source>Unable to connect</source>
+ <translation>無法連線</translation>
 </message>
 <message>
- <source>Page left</source>
- <translation>頁面左方</translation>
+ <source>Unable to begin transaction</source>
+ <translation>無法開始處理事項</translation>
 </message>
 <message>
- <source>This is a searchable index. Enter search keywords: </source>
- <translation>這是可搜尋的索引。請輸入關鍵字: </translation>
+ <source>Unable to commit transaction</source>
+ <translation>無法提交處理事項</translation>
 </message>
 <message>
- <source>Select to the previous character</source>
- <translation>選擇到前一個字元</translation>
+ <source>Unable to rollback transaction</source>
+ <translation>無法回退處理事項</translation>
 </message>
+</context>
+<context>
+ <name>QMYSQLResult</name>
 <message>
- <source>Go Back</source>
- <translation>往回</translation>
+ <source>Unable to fetch data</source>
+ <translation>無法抓取資料</translation>
 </message>
 <message>
- <source>Open in New Window</source>
- <translation>在新視窗開啟</translation>
+ <source>Unable to execute query</source>
+ <translation>無法執行查詢</translation>
 </message>
 <message>
- <source>Right edge</source>
- <translation>右邊緣</translation>
+ <source>Unable to store result</source>
+ <translation>無法儲存結果</translation>
+ </message>
+ <message>
+ <source>Unable to execute next query</source>
+ <translation>無法執行下一個查詢</translation>
 </message>
 <message>
- <source>Move the cursor to the end of the document</source>
- <translation>移動游標到這一個文件的結尾</translation>
+ <source>Unable to store next result</source>
+ <translation>無法儲存下一個結果</translation>
 </message>
 <message>
- <source>Hide Spelling and Grammar</source>
- <translation>隱藏拼字與文法</translation>
+ <source>Unable to prepare statement</source>
+ <translation>無法準備陳述</translation>
 </message>
 <message>
- <source>%1 (%2x%3 pixels)</source>
- <translation>%1（%2x%3 像素）</translation>
+ <source>Unable to reset statement</source>
+ <translation>無法重設陳述</translation>
 </message>
 <message>
- <source>Select to the next word</source>
- <translation>選擇到下一個單字</translation>
+ <source>Unable to bind value</source>
+ <translation>無法結合值</translation>
 </message>
 <message>
- <source>Select to the next line</source>
- <translation>選擇到下一行</translation>
+ <source>Unable to execute statement</source>
+ <translation>無法執行陳述</translation>
+ </message>
+ <message>
+ <source>Unable to bind outvalues</source>
+ <translation>無法結合輸出值</translation>
+ </message>
+ <message>
+ <source>Unable to store statement results</source>
+ <translation>無法儲存陳述結果</translation>
 </message>
 </context>
 <context>
- <name>QScrollBar</name>
+ <name>QMdiArea</name>
 <message>
- <source>Top</source>
- <translation>頂端</translation>
+ <source>(Untitled)</source>
+ <translation>（未命名）</translation>
 </message>
+</context>
+<context>
+ <name>QMdiSubWindow</name>
 <message>
- <source>Scroll down</source>
- <translation>往下捲軸</translation>
+ <source>- [%1]</source>
+ <translation>- [%1]</translation>
 </message>
 <message>
- <source>Scroll here</source>
- <translation>在此捲軸</translation>
+ <source>%1 - [%2]</source>
+ <translation>%1 - [%2]</translation>
 </message>
 <message>
- <source>Scroll left</source>
- <translation>往左捲軸</translation>
+ <source>Minimize</source>
+ <translation>最小化</translation>
 </message>
 <message>
- <source>Line up</source>
- <translation>對上排列</translation>
+ <source>Maximize</source>
+ <translation>最大化</translation>
 </message>
 <message>
- <source>Line down</source>
- <translation>對下排列</translation>
+ <source>Unshade</source>
+ <translation>取消遮蔽</translation>
 </message>
 <message>
- <source>Bottom</source>
- <translation>底端</translation>
+ <source>Shade</source>
+ <translation>遮蔽</translation>
 </message>
 <message>
- <source>Page up</source>
- <translation>頁面上方</translation>
+ <source>Restore Down</source>
+ <translation>向下恢復</translation>
 </message>
 <message>
- <source>Position</source>
- <translation>位置</translation>
+ <source>Restore</source>
+ <translation>回復</translation>
 </message>
 <message>
- <source>Page right</source>
- <translation>頁面右方</translation>
+ <source>Close</source>
+ <translation>關閉</translation>
 </message>
 <message>
- <source>Scroll up</source>
- <translation>往上捲軸</translation>
+ <source>Help</source>
+ <translation>說明</translation>
 </message>
 <message>
- <source>Scroll right</source>
- <translation>往右捲軸</translation>
+ <source>Menu</source>
+ <translation>選單</translation>
 </message>
 <message>
- <source>Left edge</source>
- <translation>左邊緣</translation>
+ <source>&amp;Restore</source>
+ <translation>還原(&amp;R)</translation>
 </message>
 <message>
- <source>Page down</source>
- <translation>頁面下方</translation>
+ <source>&amp;Move</source>
+ <translation>移動(&amp;M)</translation>
 </message>
 <message>
- <source>Page left</source>
- <translation>頁面左方</translation>
+ <source>&amp;Size</source>
+ <translation>大小(&amp;S)</translation>
 </message>
 <message>
- <source>Right edge</source>
- <translation>右邊緣</translation>
+ <source>Mi&amp;nimize</source>
+ <translation>最小化(&amp;N)</translation>
+ </message>
+ <message>
+ <source>Ma&amp;ximize</source>
+ <translation>最大化(&amp;X)</translation>
+ </message>
+ <message>
+ <source>Stay on &amp;Top</source>
+ <translation>留在頂端(&amp;T)</translation>
+ </message>
+ <message>
+ <source>&amp;Close</source>
+ <translation>關閉(&amp;C)</translation>
 </message>
 </context>
 <context>
- <name>QInputContext</name>
+ <name>QMessageBox</name>
 <message>
- <source>XIM</source>
- <translation>XIM</translation>
+ <source>Show Details...</source>
+ <translation>顯示詳情...</translation>
 </message>
 <message>
- <source>Windows input method</source>
- <translation>Windows 輸入法</translation>
+ <source>Hide Details...</source>
+ <translation>隱藏詳情...</translation>
+ </message>
+ <message>
+ <source>&lt;h3&gt;About Qt&lt;/h3&gt;&lt;p&gt;This program uses Qt version %1.&lt;/p&gt;</source>
+ <translation>&lt;h3&gt;關於 Qt&lt;/h3&gt;&lt;p&gt;此程式使用 Qt %1 版。&lt;/p&gt;</translation>
 </message>
 <message>
- <source>XIM input method</source>
- <translation>XIM 輸入法</translation>
+ <source>&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across all major desktop operating systems. It is also available for embedded Linux and other embedded and mobile operating systems.&lt;/p&gt;&lt;p&gt;Qt is available under multiple licensing options designed to accommodate the needs of our various users.&lt;/p&gt;&lt;p&gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of GNU (L)GPL.&lt;/p&gt;&lt;p&gt;Qt licensed under GNU (L)GPL is appropriate for the development of Qt&amp;nbsp;applications provided you can comply with the terms and conditions of the respective licenses.&lt;/p&gt;&lt;p&gt;Please see &lt;a href=&quot;http://%2/&quot;&gt;%2&lt;/a&gt; for an overview of Qt licensing.&lt;/p&gt;&lt;p&gt;Copyright (C) %1 The Qt Company Ltd and other contributors.&lt;/p&gt;&lt;p&gt;Qt and the Qt logo are trademarks of The Qt Company Ltd.&lt;/p&gt;&lt;p&gt;Qt is The Qt Company Ltd product developed as an open source project. See &lt;a href=&quot;http://%3/&quot;&gt;%3&lt;/a&gt; for more information.&lt;/p&gt;</source>
+ <extracomment>Leave this text untranslated or include a verbatim copy of it below and note that it is the authoritative version in case of doubt.</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>About Qt</source>
+ <translation>關於 Qt</translation>
 </message>
 <message>
- <source>Mac OS X input method</source>
- <translation>Mac OS X 輸入法</translation>
+ <source>&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across all major desktop operating systems. It is also available for embedded Linux and other embedded and mobile operating systems.&lt;/p&gt;&lt;p&gt;Qt is available under three different licensing options designed to accommodate the needs of our various users.&lt;/p&gt;&lt;p&gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 3.&lt;/p&gt;&lt;p&gt;Qt licensed under the GNU LGPL version 3 is appropriate for the development of Qt&amp;nbsp;applications provided you can comply with the terms and conditions of the GNU LGPL version 3.&lt;/p&gt;&lt;p&gt;Please see &lt;a href=&quot;http://%2/&quot;&gt;%2&lt;/a&gt; for an overview of Qt licensing.&lt;/p&gt;&lt;p&gt;Copyright (C) %1 The Qt Company Ltd and other contributors.&lt;/p&gt;&lt;p&gt;Qt and the Qt logo are trademarks of The Qt Company Ltd.&lt;/p&gt;&lt;p&gt;Qt is The Qt Company Ltd product developed as an open source project. See &lt;a href=&quot;http://%3/&quot;&gt;%3&lt;/a&gt; for more information.&lt;/p&gt;</source>
+ <translation>&lt;p&gt;Qt 是個用於跨平台應用程式開發的工具箱。&lt;/p&gt;
+&lt;p&gt;Qt 提供了可移植單一來源以能在目前主流的桌面作業系統跨平台。其也支援嵌入式 Linux 和其他嵌入和行動作業系統。&lt;/p&gt;
+&lt;p&gt;Qt 可以用於三個不同的授權選項，以接納各個使用者的需求。&lt;/p&gt;
+&lt;p&gt;使用我們的商業授權條款授權的 Qt 適合拿來開發不希望公開源碼給第三方的專有或商業軟體，或者是無法完全遵守 GNU LGPL 第三版條款的軟體。&lt;/p&gt;
+&lt;p&gt;使用 GNU LGPL 第三版授權的 Qt 適合拿來開發能遵守 LGPL 授權條款與條件的 Qt 應用程式。&lt;/p&gt;
+&lt;p&gt;請參閱 &lt;a href=&quot;http://%2/&quot;&gt;%2&lt;/a&gt; 取得 Qt 授權概覽。&lt;/p&gt;
+&lt;p&gt;版權所有 (C) %1 Qt 公司與其他貢獻者。&lt;/p&gt;
+&lt;p&gt;Qt 與其圖示皆為 Qt 公司的商標。&lt;/p&gt;
+&lt;p&gt;Qt 是 Qt 公司開發的開源專案，參閱 &lt;a href=&quot;http://%3/&quot;&gt;%3&lt;/a&gt; 取得更多資訊。&lt;/p&gt;</translation>
 </message>
 </context>
 <context>
- <name>QFileDialog</name>
+ <name>QNativeSocketEngine</name>
 <message>
- <source>Back</source>
- <translation>返回</translation>
+ <source>Unable to initialize non-blocking socket</source>
+ <translation>無法初始化非阻塞性 socket</translation>
 </message>
 <message>
- <source>File</source>
- <translation>檔案</translation>
+ <source>Unable to initialize broadcast socket</source>
+ <translation>無法初始化廣播 socket</translation>
 </message>
 <message>
- <source>Open</source>
- <translation>開啟</translation>
+ <source>Attempt to use IPv6 socket on a platform with no IPv6 support</source>
+ <translation>試圖在不支援 IPv6 的平台上使用 IPv6 socket</translation>
 </message>
 <message>
- <source>&amp;Open</source>
- <translation>&amp;開啟</translation>
+ <source>The remote host closed the connection</source>
+ <translation>遠端主機關閉了連線</translation>
 </message>
 <message>
- <source>&amp;Save</source>
- <translation>&amp;儲存</translation>
+ <source>Network operation timed out</source>
+ <translation>網路操作逾時</translation>
 </message>
 <message>
- <source>Drive</source>
- <translation>磁碟</translation>
+ <source>Out of resources</source>
+ <translation>資源不足</translation>
 </message>
 <message>
- <source>Show </source>
- <translation>顯示 </translation>
+ <source>Unsupported socket operation</source>
+ <translation>不支援的 socket 操作</translation>
 </message>
 <message>
- <source>&apos;%1&apos; is write protected.
-Do you want to delete it anyway?</source>
- <translation>&apos;%1&apos; 有寫入保護。
-您確定要刪除它嗎?</translation>
+ <source>Protocol type not supported</source>
+ <translation>不支援的協定型態</translation>
 </message>
 <message>
- <source>File &amp;name:</source>
- <translation>檔&amp;名:</translation>
+ <source>Invalid socket descriptor</source>
+ <translation>無效的 socket 描述</translation>
 </message>
 <message>
- <source>New Folder</source>
- <translation>新資料夾</translation>
+ <source>Host unreachable</source>
+ <translation>無法連線到主機</translation>
 </message>
 <message>
- <source>Parent Directory</source>
- <translation>父目錄</translation>
+ <source>Network unreachable</source>
+ <translation>無法連線網路</translation>
 </message>
 <message>
- <source>&amp;New Folder</source>
- <translation>&amp;新增資料夾</translation>
+ <source>Permission denied</source>
+ <translation>權限被拒</translation>
 </message>
 <message>
- <source>Remove</source>
- <translation>移除</translation>
+ <source>Connection timed out</source>
+ <translation>連線逾時</translation>
 </message>
 <message>
- <source>My Computer</source>
- <translation>我的電腦</translation>
+ <source>Connection refused</source>
+ <translation>連線被拒</translation>
 </message>
 <message>
- <source>Look in:</source>
- <translation>尋找:</translation>
+ <source>The bound address is already in use</source>
+ <translation>已經使用結合位址</translation>
 </message>
 <message>
- <source>Files of type:</source>
- <translation>檔案型態:</translation>
+ <source>The address is not available</source>
+ <translation>無法取得位址</translation>
 </message>
 <message>
- <source>Find Directory</source>
- <translation>尋找目錄</translation>
+ <source>The address is protected</source>
+ <translation>此位址被受保護</translation>
 </message>
 <message>
- <source>Show &amp;hidden files</source>
- <translation>顯示&amp;隱藏檔</translation>
+ <source>Datagram was too large to send</source>
+ <translation>資料塊過大無法送出</translation>
 </message>
 <message>
- <source>Are sure you want to delete &apos;%1&apos;?</source>
- <translation>您確定要刪除&apos;%1&apos;</translation>
+ <source>Unable to send a message</source>
+ <translation>無法送出訊息</translation>
 </message>
 <message>
- <source>Save As</source>
- <translation>另存新檔</translation>
+ <source>Unable to receive a message</source>
+ <translation>無法接收訊息</translation>
 </message>
 <message>
- <source>%1
-Directory not found.
-Please verify the correct directory name was given.</source>
- <translation>%1
-找不到目錄。
-請檢查目錄名稱是否正確。</translation>
+ <source>Unable to write</source>
+ <translation>無法寫入</translation>
 </message>
 <message>
- <source>List View</source>
- <translation>列表檢視</translation>
+ <source>Network error</source>
+ <translation>網路錯誤</translation>
 </message>
 <message>
- <source>&amp;Choose</source>
- <translation>&amp;選擇</translation>
+ <source>Another socket is already listening on the same port</source>
+ <translation>另一個 socket 已經在監聽同一個連接埠</translation>
 </message>
 <message>
- <source>&amp;Delete</source>
- <translation>&amp;刪除</translation>
+ <source>Operation on non-socket</source>
+ <translation>於非 socket 操作</translation>
 </message>
 <message>
- <source>All Files (*)</source>
- <translation>所有檔案 (*)</translation>
+ <source>The proxy type is invalid for this operation</source>
+ <translation>此代理伺服器型態對此操作無效</translation>
 </message>
 <message>
- <source>Directories</source>
- <translation>目錄</translation>
+ <source>Temporary error</source>
+ <translation>暫時性錯誤</translation>
 </message>
 <message>
- <source>All Files (*.*)</source>
- <translation>所有檔案 (*.*)</translation>
+ <source>Network dropped connection on reset</source>
+ <translation>網路在重設時斷開連線</translation>
 </message>
 <message>
- <source>&amp;Rename</source>
- <translation>&amp;重新命名</translation>
+ <source>Connection reset by peer</source>
+ <translation>連線被端點重設</translation>
 </message>
 <message>
- <source>Could not delete directory.</source>
- <translation>無法刪除目錄。</translation>
+ <source>Unknown error</source>
+ <translation>未知錯誤</translation>
 </message>
+</context>
+<context>
+ <name>QNetworkAccessCacheBackend</name>
 <message>
- <source>Directory:</source>
- <translation>目錄:</translation>
+ <source>Error opening %1</source>
+ <translation>開啟 %1 發生錯誤</translation>
 </message>
+</context>
+<context>
+ <name>QNetworkAccessDataBackend</name>
 <message>
- <source>Unknown</source>
- <translation>未知</translation>
+ <source>Invalid URI: %1</source>
+ <translation>網址無效：%1</translation>
 </message>
+</context>
+<context>
+ <name>QNetworkAccessDebugPipeBackend</name>
 <message>
- <source>%1 already exists.
-Do you want to replace it?</source>
- <translation>%1 已存在
-您要取代它嗎?</translation>
+ <source>Write error writing to %1: %2</source>
+ <translation>寫到 %1 時發生錯誤：%2</translation>
 </message>
 <message>
- <source>Forward</source>
- <translation>往前</translation>
+ <source>Socket error on %1: %2</source>
+ <translation>%1 上發生 socket 錯誤：%2</translation>
 </message>
 <message>
- <source>Recent Places</source>
- <translation>最近的地方</translation>
+ <source>Remote host closed the connection prematurely on %1</source>
+ <translation>於 %1 上過早關閉了遠端主機的連線</translation>
 </message>
+</context>
+<context>
+ <name>QNetworkAccessFileBackend</name>
 <message>
- <source>Create New Folder</source>
- <translation>建立新資料夾</translation>
+ <source>Request for opening non-local file %1</source>
+ <translation>要求開啟非本地端檔案 %1</translation>
 </message>
 <message>
- <source>Detail View</source>
- <translation>詳細檢視</translation>
+ <source>Error opening %1: %2</source>
+ <translation>開啟 %1 發生錯誤：%2</translation>
 </message>
 <message>
- <source>%1
-File not found.
-Please verify the correct file name was given.</source>
- <translation>%1
-找不到檔案。
-請檢查檔名是否正確。</translation>
+ <source>Write error writing to %1: %2</source>
+ <translation>寫到 %1 時發生錯誤：%2</translation>
+ </message>
+ <message>
+ <source>Cannot open %1: Path is a directory</source>
+ <translation>無法開啟 %1：此路徑是一個目錄</translation>
+ </message>
+ <message>
+ <source>Read error reading from %1: %2</source>
+ <translation>從 %1 讀取錯誤：%2</translation>
 </message>
 </context>
 <context>
- <name>Q3TextEdit</name>
+ <name>QNetworkAccessFtpBackend</name>
 <message>
- <source>Cu&amp;t</source>
- <translation>剪&amp;下</translation>
+ <source>No suitable proxy found</source>
+ <translation>找不到合適的代理伺服器</translation>
 </message>
 <message>
- <source>&amp;Copy</source>
- <translation>&amp;複製</translation>
+ <source>Cannot open %1: is a directory</source>
+ <translation>無法開啟 %1：是個目錄</translation>
 </message>
 <message>
- <source>&amp;Redo</source>
- <translation>&amp;重做</translation>
+ <source>Logging in to %1 failed: authentication required</source>
+ <translation>登入 %1 失敗：需要驗證</translation>
 </message>
 <message>
- <source>&amp;Undo</source>
- <translation>&amp;復原</translation>
+ <source>Error while downloading %1: %2</source>
+ <translation>下載 %1 時發生錯誤：%2</translation>
 </message>
 <message>
- <source>Clear</source>
- <translation>清除</translation>
+ <source>Error while uploading %1: %2</source>
+ <translation>上傳 %1 時發生錯誤：%2</translation>
 </message>
+</context>
+<context>
+ <name>QNetworkAccessManager</name>
 <message>
- <source>Paste</source>
- <translation>貼上</translation>
+ <source>Network access is disabled.</source>
+ <translation>已停用網路存取支援。</translation>
+ </message>
+</context>
+<context>
+ <name>QNetworkReply</name>
+ <message>
+ <source>Error transferring %1 - server replied: %2</source>
+ <translation>傳輸 %1 錯誤 - 伺服器回應：%2</translation>
 </message>
 <message>
- <source>Select All</source>
- <translation>全部選擇</translation>
+ <source>Network session error.</source>
+ <translation>網路階段錯誤。</translation>
+ </message>
+ <message>
+ <source>Background request not allowed.</source>
+ <translation>不允許背景請求。</translation>
+ </message>
+ <message>
+ <source>backend start error.</source>
+ <translation>後端啟動錯誤。</translation>
+ </message>
+ <message>
+ <source>Temporary network failure.</source>
+ <translation>暫時性網路失敗。</translation>
+ </message>
+ <message>
+ <source>Protocol &quot;%1&quot; is unknown</source>
+ <translation>未知的協定「%1」</translation>
 </message>
 </context>
 <context>
- <name>QLineEdit</name>
+ <name>QNetworkReplyHttpImpl</name>
 <message>
- <source>Cu&amp;t</source>
- <translation>剪&amp;下</translation>
+ <source>Operation canceled</source>
+ <translation>已取消動作</translation>
 </message>
 <message>
- <source>&amp;Copy</source>
- <translation>&amp;複製</translation>
+ <source>No suitable proxy found</source>
+ <translation>找不到合適的代理伺服器</translation>
 </message>
+</context>
+<context>
+ <name>QNetworkReplyImpl</name>
 <message>
- <source>&amp;Redo</source>
- <translation>&amp;重做</translation>
+ <source>Operation canceled</source>
+ <translation>已取消動作</translation>
 </message>
+</context>
+<context>
+ <name>QNetworkSession</name>
 <message>
- <source>&amp;Undo</source>
- <translation>&amp;復原</translation>
+ <source>Invalid configuration.</source>
+ <translation>無效的設定。</translation>
+ </message>
+</context>
+<context>
+ <name>QNetworkSessionPrivateImpl</name>
+ <message>
+ <source>Unknown session error.</source>
+ <translation>未知階段錯誤。</translation>
 </message>
 <message>
- <source>&amp;Paste</source>
- <translation>&amp;貼上</translation>
+ <source>The session was aborted by the user or system.</source>
+ <translation>此階段被使用者或系統終止。</translation>
 </message>
 <message>
- <source>Delete</source>
- <translation>刪除</translation>
+ <source>The requested operation is not supported by the system.</source>
+ <translation>系統不支援請求的動作。</translation>
 </message>
 <message>
- <source>Select All</source>
- <translation>全部選擇</translation>
+ <source>The specified configuration cannot be used.</source>
+ <translation>無法使用指定的組態設定。</translation>
+ </message>
+ <message>
+ <source>Roaming was aborted or is not possible.</source>
+ <translation>漫遊被終止或不可用。</translation>
 </message>
 </context>
 <context>
- <name>QTextControl</name>
+ <name>QOCIDriver</name>
 <message>
- <source>Cu&amp;t</source>
- <translation>剪&amp;下</translation>
+ <source>Unable to initialize</source>
+ <comment>QOCIDriver</comment>
+ <translation>無法初始化</translation>
 </message>
 <message>
- <source>&amp;Copy</source>
- <translation>&amp;複製</translation>
+ <source>Unable to logon</source>
+ <translation>無法登入</translation>
 </message>
 <message>
- <source>&amp;Redo</source>
- <translation>&amp;重做</translation>
+ <source>Unable to begin transaction</source>
+ <translation>無法開始處理事項</translation>
 </message>
 <message>
- <source>&amp;Undo</source>
- <translation>&amp;復原</translation>
+ <source>Unable to commit transaction</source>
+ <translation>無法提交處理事項</translation>
 </message>
 <message>
- <source>&amp;Paste</source>
- <translation>&amp;貼上</translation>
+ <source>Unable to rollback transaction</source>
+ <translation>無法回退處理事項</translation>
 </message>
+</context>
+<context>
+ <name>QOCIResult</name>
 <message>
- <source>Delete</source>
- <translation>刪除</translation>
+ <source>Unable to bind column for batch execute</source>
+ <translation>無法結合用於批次執行的欄位</translation>
 </message>
 <message>
- <source>Select All</source>
- <translation>全部選擇</translation>
+ <source>Unable to execute batch statement</source>
+ <translation>無法執行批次陳述</translation>
 </message>
 <message>
- <source>Copy &amp;Link Location</source>
- <translation>複製&amp;連結位址</translation>
+ <source>Unable to goto next</source>
+ <translation>無法跳到下一個</translation>
+ </message>
+ <message>
+ <source>Unable to alloc statement</source>
+ <translation>無法分配陳述</translation>
+ </message>
+ <message>
+ <source>Unable to prepare statement</source>
+ <translation>無法準備陳述</translation>
+ </message>
+ <message>
+ <source>Unable to get statement type</source>
+ <translation>無法取得陳述型態</translation>
+ </message>
+ <message>
+ <source>Unable to bind value</source>
+ <translation>無法結合值</translation>
+ </message>
+ <message>
+ <source>Unable to execute statement</source>
+ <translation>無法執行陳述</translation>
 </message>
 </context>
 <context>
- <name>QDockWidget</name>
+ <name>QODBCDriver</name>
+ <message>
+ <source>Unable to connect</source>
+ <translation>無法連線</translation>
+ </message>
 <message>
- <source>Dock</source>
- <translation>嵌入</translation>
+ <source>Unable to connect - Driver doesn&apos;t support all functionality required</source>
+ <translation>無法連線 - 驅動不支援全部所需功能</translation>
 </message>
 <message>
- <source>Close</source>
- <translation>關閉</translation>
+ <source>Unable to disable autocommit</source>
+ <translation>無法停用自動提交功能</translation>
 </message>
 <message>
- <source>Float</source>
- <translation>飄浮</translation>
+ <source>Unable to commit transaction</source>
+ <translation>無法提交處理事項</translation>
+ </message>
+ <message>
+ <source>Unable to rollback transaction</source>
+ <translation>無法回退處理事項</translation>
+ </message>
+ <message>
+ <source>Unable to enable autocommit</source>
+ <translation>無法啟用自動提交功能</translation>
 </message>
 </context>
 <context>
- <name>QDialog</name>
+ <name>QODBCResult</name>
 <message>
- <source>Done</source>
- <translation>完成</translation>
+ <source>QODBCResult::reset: Unable to set &apos;SQL_CURSOR_STATIC&apos; as statement attribute. Please check your ODBC driver configuration</source>
+ <translation>QODBCResult::reset: 無法將「SQL_CURSOR_STATIC」設定為陳述屬性。請檢查您的 ODBC 驅動程式設定</translation>
 </message>
 <message>
- <source>What&apos;s This?</source>
- <translation>這是&apos;什麼?</translation>
+ <source>Unable to execute statement</source>
+ <translation>無法執行陳述</translation>
+ </message>
+ <message>
+ <source>Unable to fetch</source>
+ <translation>無法抓取</translation>
+ </message>
+ <message>
+ <source>Unable to fetch next</source>
+ <translation>無法抓取下一筆</translation>
+ </message>
+ <message>
+ <source>Unable to fetch first</source>
+ <translation>無法抓取第一筆</translation>
+ </message>
+ <message>
+ <source>Unable to fetch previous</source>
+ <translation>無法抓取前一筆</translation>
+ </message>
+ <message>
+ <source>Unable to fetch last</source>
+ <translation>無法抓取最後一筆</translation>
+ </message>
+ <message>
+ <source>Unable to prepare statement</source>
+ <translation>無法準備陳述</translation>
+ </message>
+ <message>
+ <source>Unable to bind variable</source>
+ <translation>無法結合變數</translation>
 </message>
 </context>
 <context>
- <name>QWizard</name>
+ <name>QPSQLDriver</name>
 <message>
- <source>Done</source>
- <translation>完成</translation>
+ <source>Unable to connect</source>
+ <translation>無法連線</translation>
 </message>
 <message>
- <source>Help</source>
- <translation>說明</translation>
+ <source>Could not begin transaction</source>
+ <translation>無法開始處理事項</translation>
 </message>
 <message>
- <source>&amp;Help</source>
- <translation>&amp;說明</translation>
+ <source>Could not commit transaction</source>
+ <translation>無法提交處理事項</translation>
 </message>
 <message>
- <source>&amp;Next</source>
- <translation>&amp;下一個</translation>
+ <source>Could not rollback transaction</source>
+ <translation>無法回退處理事項</translation>
 </message>
 <message>
- <source>Cancel</source>
- <translation>取消</translation>
+ <source>Unable to subscribe</source>
+ <translation>無法訂閱</translation>
 </message>
 <message>
- <source>Commit</source>
- <translation>提交</translation>
+ <source>Unable to unsubscribe</source>
+ <translation>無法取消訂閱</translation>
 </message>
+</context>
+<context>
+ <name>QPSQLResult</name>
 <message>
- <source>Continue</source>
- <translation>繼續</translation>
+ <source>Query results lost - probably discarded on executing another SQL query.</source>
+ <translation>查詢結果遺失 - 可能是在執行其他 SQL 查詢時被丟棄。</translation>
 </message>
 <message>
- <source>&amp;Finish</source>
- <translation>&amp;完成</translation>
+ <source>Unable to create query</source>
+ <translation>無法建立查詢</translation>
 </message>
 <message>
- <source>&amp;Next &gt;</source>
- <translation>&amp;下一個 &gt;＞</translation>
+ <source>Unable to get result</source>
+ <translation>無法取得查詢</translation>
 </message>
 <message>
- <source>Go Back</source>
- <translation>往回</translation>
+ <source>Unable to send query</source>
+ <translation>無法傳送查詢</translation>
 </message>
 <message>
- <source>&lt; &amp;Back</source>
- <translation>＜&lt; &amp;返回</translation>
+ <source>Unable to prepare statement</source>
+ <translation>無法準備陳述</translation>
 </message>
 </context>
 <context>
@@ -2417,3617 +2928,4627 @@
 <translation>表單</translation>
 </message>
 <message>
- <source>bottom margin</source>
- <translation>下緣</translation>
- </message>
- <message>
 <source>Paper</source>
 <translation>紙張</translation>
 </message>
 <message>
- <source>Paper source:</source>
- <translation>紙張來源:</translation>
+ <source>Page size:</source>
+ <translation>頁面大小：</translation>
 </message>
 <message>
- <source>Centimeters (cm)</source>
- <translation>公分</translation>
+ <source>Width:</source>
+ <translation>寬度：</translation>
 </message>
 <message>
- <source>right margin</source>
- <translation>右緣</translation>
+ <source>Height:</source>
+ <translation>高度：</translation>
 </message>
 <message>
- <source>Margins</source>
- <translation>邊緣</translation>
+ <source>Paper source:</source>
+ <translation>紙張來源：</translation>
+ </message>
+ <message>
+ <source>Orientation</source>
+ <translation>方向</translation>
+ </message>
+ <message>
+ <source>Portrait</source>
+ <translation>直印</translation>
 </message>
 <message>
 <source>Landscape</source>
- <translation>橫向</translation>
+ <translation>橫印</translation>
 </message>
 <message>
- <source>Width:</source>
- <translation>寬度:</translation>
+ <source>Reverse landscape</source>
+ <translation>反向橫印</translation>
 </message>
 <message>
- <source>Orientation</source>
- <translation>方向</translation>
+ <source>Reverse portrait</source>
+ <translation>反向直印</translation>
 </message>
 <message>
- <source>Portrait</source>
- <translation>縱向</translation>
+ <source>Margins</source>
+ <translation>邊緣</translation>
 </message>
 <message>
 <source>top margin</source>
- <translation>上緣</translation>
+ <translation>上邊緣</translation>
 </message>
 <message>
 <source>left margin</source>
- <translation>左緣</translation>
+ <translation>左邊緣</translation>
 </message>
 <message>
- <source>Page size:</source>
- <translation>紙張大小:</translation>
+ <source>right margin</source>
+ <translation>右邊緣</translation>
 </message>
 <message>
- <source>Reverse portrait</source>
- <translation>反序縱向</translation>
+ <source>bottom margin</source>
+ <translation>下邊緣</translation>
+ </message>
+ <message>
+ <source>Page Layout</source>
+ <translation>頁面配置</translation>
+ </message>
+ <message>
+ <source>Page order:</source>
+ <translation>頁面順序：</translation>
+ </message>
+ <message>
+ <source>Pages per sheet:</source>
+ <translation>每張紙包含頁數：</translation>
 </message>
 <message>
 <source>Millimeters (mm)</source>
- <translation>公厘</translation>
+ <translation>毫米 (mm)</translation>
+ </message>
+ <message>
+ <source>Inches (in)</source>
+ <translation>英吋 (in)</translation>
 </message>
 <message>
 <source>Points (pt)</source>
- <translation>點</translation>
+ <translation>點 (pt)</translation>
 </message>
 <message>
- <source>Inches (in)</source>
- <translation>英吋</translation>
+ <source>Pica (P̸)</source>
+ <translation>派卡 (P̸)</translation>
 </message>
 <message>
- <source>Reverse landscape</source>
- <translation>反序橫向</translation>
+ <source>Didot (DD)</source>
+ <translation>迪多 (DD)</translation>
 </message>
 <message>
- <source>Height:</source>
- <translation>高度:</translation>
+ <source>Cicero (CC)</source>
+ <translation>西塞羅 (CC)</translation>
 </message>
-</context>
-<context>
- <name>QPrintPropertiesWidget</name>
 <message>
- <source>Form</source>
- <translation>表單</translation>
+ <source>Custom</source>
+ <translation>自訂</translation>
 </message>
 <message>
- <source>Page</source>
- <translation>頁面</translation>
+ <source>mm</source>
+ <extracomment>Unit &apos;Millimeter&apos;</extracomment>
+ <translation>mm</translation>
 </message>
 <message>
- <source>Advanced</source>
- <translation>進階</translation>
+ <source>pt</source>
+ <extracomment>Unit &apos;Points&apos;</extracomment>
+ <translation>pt</translation>
+ </message>
+ <message>
+ <source>in</source>
+ <extracomment>Unit &apos;Inch&apos;</extracomment>
+ <translation>in</translation>
+ </message>
+ <message>
+ <source>P̸</source>
+ <extracomment>Unit &apos;Pica&apos;</extracomment>
+ <translation>P̸</translation>
+ </message>
+ <message>
+ <source>DD</source>
+ <extracomment>Unit &apos;Didot&apos;</extracomment>
+ <translation>DD</translation>
+ </message>
+ <message>
+ <source>CC</source>
+ <extracomment>Unit &apos;Cicero&apos;</extracomment>
+ <translation>CC</translation>
 </message>
 </context>
 <context>
- <name>QMdiSubWindow</name>
+ <name>QPageSize</name>
 <message>
- <source>Help</source>
- <translation>說明</translation>
+ <source>Custom (%1mm x %2mm)</source>
+ <extracomment>Custom size name in millimeters</extracomment>
+ <translation>自訂 (%1mm x %2mm)</translation>
 </message>
 <message>
- <source>Menu</source>
- <translation>選單</translation>
+ <source>Custom (%1pt x %2pt)</source>
+ <extracomment>Custom size name in points</extracomment>
+ <translation>自訂 (%1pt x %2pt)</translation>
 </message>
 <message>
- <source>&amp;Move</source>
- <translation>&amp;移動</translation>
+ <source>Custom (%1in x %2in)</source>
+ <extracomment>Custom size name in inches</extracomment>
+ <translation>自訂 (%1in x %2in)</translation>
 </message>
 <message>
- <source>&amp;Size</source>
- <translation>&amp;大小</translation>
+ <source>Custom (%1pc x %2pc)</source>
+ <extracomment>Custom size name in picas</extracomment>
+ <translation>自訂 (%1pc x %2pc)</translation>
 </message>
 <message>
- <source>Close</source>
- <translation>關閉</translation>
+ <source>Custom (%1DD x %2DD)</source>
+ <extracomment>Custom size name in didots</extracomment>
+ <translation>自訂 (%1DD x %2DD)</translation>
 </message>
 <message>
- <source>Minimize</source>
- <translation>最小化</translation>
+ <source>Custom (%1CC x %2CC)</source>
+ <extracomment>Custom size name in ciceros</extracomment>
+ <translation>自訂 (%1CC x %2CC)</translation>
 </message>
 <message>
- <source>Shade</source>
- <translation>遮蔽</translation>
+ <source>%1 x %2 in</source>
+ <extracomment>Page size in &apos;Inch&apos;.</extracomment>
+ <translation>%1 x %2 in</translation>
 </message>
 <message>
- <source>Stay on &amp;Top</source>
- <translation>留在&amp;頂端</translation>
+ <source>A0</source>
+ <translation>A0</translation>
 </message>
 <message>
- <source>&amp;Close</source>
- <translation>&amp;關閉</translation>
+ <source>A1</source>
+ <translation>A1</translation>
 </message>
 <message>
- <source>- [%1]</source>
- <translation>- [%1]</translation>
+ <source>A2</source>
+ <translation>A2</translation>
 </message>
 <message>
- <source>%1 - [%2]</source>
- <translation>%1 - [%2]</translation>
+ <source>A3</source>
+ <translation>A3</translation>
 </message>
 <message>
- <source>&amp;Restore</source>
- <translation>&amp;回復</translation>
+ <source>A4</source>
+ <translation>A4</translation>
 </message>
 <message>
- <source>Restore</source>
- <translation>回復</translation>
+ <source>A5</source>
+ <translation>A5</translation>
 </message>
 <message>
- <source>Maximize</source>
- <translation>最大化</translation>
+ <source>A6</source>
+ <translation>A6</translation>
 </message>
 <message>
- <source>Unshade</source>
- <translation>取消遮蔽</translation>
+ <source>A7</source>
+ <translation>A7</translation>
 </message>
 <message>
- <source>Mi&amp;nimize</source>
- <translation>最小&amp;化</translation>
+ <source>A8</source>
+ <translation>A8</translation>
 </message>
 <message>
- <source>Ma&amp;ximize</source>
- <translation>最大&amp;化</translation>
+ <source>A9</source>
+ <translation>A9</translation>
 </message>
 <message>
- <source>Restore Down</source>
- <translation>向下恢復</translation>
+ <source>A10</source>
+ <translation>A10</translation>
 </message>
-</context>
-<context>
- <name>QObject</name>
 <message>
- <source>Home</source>
- <translation>首頁</translation>
+ <source>B0</source>
+ <translation>B0</translation>
 </message>
 <message>
- <source>Protocol error: packet of size 0 received</source>
- <translation>協定錯誤：接收到大小為 0 的封包</translation>
+ <source>B1</source>
+ <translation>B1</translation>
 </message>
 <message>
- <source>Invalid URI: %1</source>
- <translation>不合法的網址：%1</translation>
+ <source>B2</source>
+ <translation>B2</translation>
 </message>
 <message>
- <source>Socket error on %1: %2</source>
- <translation>%1 上發生 socket 錯誤：%2</translation>
+ <source>B3</source>
+ <translation>B3</translation>
 </message>
 <message>
- <source>No host name given</source>
- <translation>未指定主機</translation>
+ <source>B4</source>
+ <translation>B4</translation>
 </message>
 <message>
- <source>Read error reading from %1: %2</source>
- <translation>從 %1 讀取錯誤：%2</translation>
+ <source>B5</source>
+ <translation>B5</translation>
 </message>
 <message>
- <source>Remote host closed the connection prematurely on %1</source>
- <translation>於 %1 上遠端主機關閉了不正常的連線</translation>
+ <source>B6</source>
+ <translation>B6</translation>
 </message>
 <message>
- <source>Operation not supported on %1</source>
- <translation>在 %1 上不支援此操作</translation>
+ <source>B7</source>
+ <translation>B7</translation>
 </message>
 <message>
- <source>Write error writing to %1: %2</source>
- <translation>寫入 %1 時發生錯誤：%2</translation>
+ <source>B8</source>
+ <translation>B8</translation>
 </message>
-</context>
-<context>
- <name>QDirModel</name>
 <message>
- <source>Kind</source>
- <translation>種類</translation>
+ <source>B9</source>
+ <translation>B9</translation>
 </message>
 <message>
- <source>Name</source>
- <translation>名稱</translation>
+ <source>B10</source>
+ <translation>B10</translation>
 </message>
 <message>
- <source>Size</source>
- <translation>大小</translation>
+ <source>Executive (7.5 x 10 in)</source>
+ <translation>Executive (7.5 x 10 in)</translation>
 </message>
 <message>
- <source>Type</source>
- <translation>型態</translation>
+ <source>Executive (7.25 x 10.5 in)</source>
+ <translation>Executive (7.25 x 10.5 in)</translation>
 </message>
 <message>
- <source>Date Modified</source>
- <translation>變更日期</translation>
+ <source>Folio (8.27 x 13 in)</source>
+ <translation>Folio (8.27 x 13 in)</translation>
 </message>
-</context>
-<context>
- <name>QFileSystemModel</name>
 <message>
- <source>Kind</source>
- <translation>種類</translation>
+ <source>Legal</source>
+ <translation>Legal</translation>
 </message>
 <message>
- <source>Name</source>
- <translation>名稱</translation>
+ <source>Letter / ANSI A</source>
+ <translation>信封 / ANSI A</translation>
 </message>
 <message>
- <source>Size</source>
- <translation>大小</translation>
+ <source>Tabloid / ANSI B</source>
+ <translation>小報 / ANSI B</translation>
 </message>
 <message>
- <source>Type</source>
- <translation>型態</translation>
+ <source>Ledger / ANSI B</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 GB</source>
- <translation>%1 GB</translation>
+ <source>Custom</source>
+ <translation>自訂</translation>
 </message>
 <message>
- <source>%1 KB</source>
- <translation>%1 KB</translation>
+ <source>A3 Extra</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 MB</source>
- <translation>%1 MB</translation>
+ <source>A4 Extra</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 TB</source>
- <translation>%1 TB</translation>
+ <source>A4 Plus</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>&lt;b&gt;The name &quot;%1&quot; can not be used.&lt;/b&gt;&lt;p&gt;Try using another name, with fewer characters or no punctuations marks.</source>
- <translation>&lt;b&gt;無法使用名稱 &quot;%1&quot;。&lt;/b&gt;&lt;p&gt;請使用其它名稱，字元數少一點，或是不要有標點符號。</translation>
+ <source>A4 Small</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 bytes</source>
- <translation>%1 位元組</translation>
+ <source>A5 Extra</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>My Computer</source>
- <translation>我的電腦</translation>
+ <source>B5 Extra</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Computer</source>
- <translation>電腦</translation>
+ <source>JIS B0</source>
+ <translation>JIS B0</translation>
 </message>
 <message>
- <source>Invalid filename</source>
- <translation>不合法的檔名</translation>
+ <source>JIS B1</source>
+ <translation>JIS B1</translation>
 </message>
 <message>
- <source>Date Modified</source>
- <translation>變更日期</translation>
+ <source>JIS B2</source>
+ <translation>JIS B2</translation>
 </message>
-</context>
-<context>
- <name>QDoubleSpinBox</name>
 <message>
- <source>Less</source>
- <translation>較少</translation>
+ <source>JIS B3</source>
+ <translation>JIS B3</translation>
 </message>
 <message>
- <source>More</source>
- <translation>更多</translation>
+ <source>JIS B4</source>
+ <translation>JIS B4</translation>
 </message>
-</context>
-<context>
- <name>QSpinBox</name>
 <message>
- <source>Less</source>
- <translation>較少</translation>
+ <source>JIS B5</source>
+ <translation>JIS B5</translation>
 </message>
 <message>
- <source>More</source>
- <translation>更多</translation>
+ <source>JIS B6</source>
+ <translation>JIS B6</translation>
 </message>
-</context>
-<context>
- <name>QPPDOptionsModel</name>
 <message>
- <source>Name</source>
- <translation>名稱</translation>
+ <source>JIS B7</source>
+ <translation>JIS B7</translation>
 </message>
 <message>
- <source>Value</source>
- <translation>值</translation>
+ <source>JIS B8</source>
+ <translation>JIS B8</translation>
 </message>
-</context>
-<context>
- <name>QComboBox</name>
 <message>
- <source>Open</source>
- <translation>開啟</translation>
+ <source>JIS B9</source>
+ <translation>JIS B9</translation>
 </message>
 <message>
- <source>True</source>
- <translation>真</translation>
+ <source>JIS B10</source>
+ <translation>JIS B10</translation>
 </message>
 <message>
- <source>Close</source>
- <translation>關閉</translation>
+ <source>ANSI C</source>
+ <translation>ANSI C</translation>
 </message>
 <message>
- <source>False</source>
- <translation>假</translation>
+ <source>ANSI D</source>
+ <translation>ANSI D</translation>
+ </message>
+ <message>
+ <source>ANSI E</source>
+ <translation>ANSI E</translation>
+ </message>
+ <message>
+ <source>Legal Extra</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Letter Extra</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Letter Plus</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Letter Small</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Tabloid Extra</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Architect A</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Architect B</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Architect C</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Architect D</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Architect E</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Note</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Quarto</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Statement</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Super A</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Super B</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Postcard</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Double Postcard</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>PRC 16K</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>PRC 32K</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>PRC 32K Big</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Fan-fold US (14.875 x 11 in)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Fan-fold German (8.5 x 12 in)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Fan-fold German Legal (8.5 x 13 in)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Envelope B4</source>
+ <translation>信封型 B4</translation>
+ </message>
+ <message>
+ <source>Envelope B5</source>
+ <translation>信封型 B5</translation>
+ </message>
+ <message>
+ <source>Envelope B6</source>
+ <translation>信封型 B6</translation>
+ </message>
+ <message>
+ <source>Envelope C0</source>
+ <translation>信封型 C0</translation>
+ </message>
+ <message>
+ <source>Envelope C1</source>
+ <translation>信封型 C1</translation>
+ </message>
+ <message>
+ <source>Envelope C2</source>
+ <translation>信封型 C2</translation>
+ </message>
+ <message>
+ <source>Envelope C3</source>
+ <translation>信封型 C3</translation>
+ </message>
+ <message>
+ <source>Envelope C4</source>
+ <translation>信封型 C4</translation>
+ </message>
+ <message>
+ <source>Envelope C5</source>
+ <translation>信封型 C5</translation>
+ </message>
+ <message>
+ <source>Envelope C6</source>
+ <translation>信封型 C6</translation>
+ </message>
+ <message>
+ <source>Envelope C65</source>
+ <translation>信封型 C65</translation>
+ </message>
+ <message>
+ <source>Envelope C7</source>
+ <translation>信封型 C7</translation>
+ </message>
+ <message>
+ <source>Envelope DL</source>
+ <translation>信封型 DL</translation>
+ </message>
+ <message>
+ <source>Envelope US 9</source>
+ <translation>信封型 US 9</translation>
+ </message>
+ <message>
+ <source>Envelope US 10</source>
+ <translation>信封型 US 10</translation>
+ </message>
+ <message>
+ <source>Envelope US 11</source>
+ <translation>信封型 US 11</translation>
+ </message>
+ <message>
+ <source>Envelope US 12</source>
+ <translation>信封型 US 12</translation>
+ </message>
+ <message>
+ <source>Envelope US 14</source>
+ <translation>信封型 US 14</translation>
+ </message>
+ <message>
+ <source>Envelope Monarch</source>
+ <translation>信封型 Monarch</translation>
+ </message>
+ <message>
+ <source>Envelope Personal</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Envelope Chou 3</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Envelope Chou 4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Envelope Invite</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Envelope Italian</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Envelope Kaku 2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Envelope Kaku 3</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Envelope PRC 1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Envelope PRC 2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Envelope PRC 3</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Envelope PRC 4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Envelope PRC 5</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Envelope PRC 6</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Envelope PRC 7</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Envelope PRC 8</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Envelope PRC 9</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Envelope PRC 10</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Envelope You 4</source>
+ <translation type="unfinished"></translation>
 </message>
 </context>
 <context>
- <name>QMenu</name>
+ <name>QPlatformTheme</name>
+ <message>
+ <source>OK</source>
+ <translation>確定</translation>
+ </message>
+ <message>
+ <source>Save</source>
+ <translation>儲存</translation>
+ </message>
+ <message>
+ <source>Save All</source>
+ <translation>全部儲存</translation>
+ </message>
 <message>
 <source>Open</source>
 <translation>開啟</translation>
 </message>
 <message>
+ <source>&amp;Yes</source>
+ <translation>是(&amp;Y)</translation>
+ </message>
+ <message>
+ <source>Yes to &amp;All</source>
+ <translation>全部皆是(&amp;A)</translation>
+ </message>
+ <message>
+ <source>&amp;No</source>
+ <translation>否(&amp;N)</translation>
+ </message>
+ <message>
+ <source>N&amp;o to All</source>
+ <translation>全部皆否(&amp;O)</translation>
+ </message>
+ <message>
+ <source>Abort</source>
+ <translation>終止</translation>
+ </message>
+ <message>
+ <source>Retry</source>
+ <translation>重試</translation>
+ </message>
+ <message>
+ <source>Ignore</source>
+ <translation>忽略</translation>
+ </message>
+ <message>
 <source>Close</source>
 <translation>關閉</translation>
 </message>
 <message>
- <source>Execute</source>
- <translation>執行</translation>
+ <source>Cancel</source>
+ <translation>取消</translation>
 </message>
-</context>
-<context>
- <name>QPushButton</name>
 <message>
- <source>Open</source>
- <translation>開啟</translation>
+ <source>Discard</source>
+ <translation>丟棄</translation>
 </message>
-</context>
-<context>
- <name>QToolButton</name>
 <message>
- <source>Open</source>
- <translation>開啟</translation>
+ <source>Help</source>
+ <translation>說明</translation>
 </message>
 <message>
- <source>Press</source>
- <translation>按下</translation>
+ <source>Apply</source>
+ <translation>套用</translation>
 </message>
-</context>
-<context>
- <name>QUndoGroup</name>
 <message>
- <source>Redo</source>
- <translation>重做</translation>
+ <source>Reset</source>
+ <translation>重設</translation>
 </message>
 <message>
- <source>Undo</source>
- <translation>復原</translation>
+ <source>Restore Defaults</source>
+ <translation>還原到預設值</translation>
 </message>
 </context>
 <context>
- <name>QUndoStack</name>
+ <name>QPluginLoader</name>
 <message>
- <source>Redo</source>
- <translation>重做</translation>
+ <source>The plugin was not loaded.</source>
+ <translation>未載入外掛程式。</translation>
 </message>
 <message>
- <source>Undo</source>
- <translation>復原</translation>
+ <source>Unknown error</source>
+ <translation>未知錯誤</translation>
 </message>
 </context>
 <context>
- <name>Q3DataTable</name>
+ <name>QPrintDialog</name>
 <message>
- <source>True</source>
- <translation>真</translation>
+ <source>Print</source>
+ <translation>列印</translation>
 </message>
 <message>
- <source>False</source>
- <translation>假</translation>
+ <source>Left to Right, Top to Bottom</source>
+ <translation>左至右，上到下</translation>
 </message>
 <message>
- <source>Delete</source>
- <translation>刪除</translation>
+ <source>Left to Right, Bottom to Top</source>
+ <translation>左至右，下到上</translation>
 </message>
 <message>
- <source>Insert</source>
- <translation>插入</translation>
+ <source>Right to Left, Bottom to Top</source>
+ <translation>右至左，下到上</translation>
 </message>
 <message>
- <source>Update</source>
- <translation>更新</translation>
+ <source>Right to Left, Top to Bottom</source>
+ <translation>右至左，上到下</translation>
 </message>
-</context>
-<context>
- <name>QSslSocket</name>
 <message>
- <source>Error creating SSL session: %1</source>
- <translation>建立 SSL 工作階段時發生錯誤：%1</translation>
+ <source>Bottom to Top, Left to Right</source>
+ <translation>下到上，左到右</translation>
 </message>
 <message>
- <source>Error creating SSL session, %1</source>
- <translation>建立 SSL 工作階段時發生錯誤：%1</translation>
+ <source>Bottom to Top, Right to Left</source>
+ <translation>下到上，右到左</translation>
 </message>
 <message>
- <source>Cannot provide a certificate with no key, %1</source>
- <translation>沒有金鑰無法提供憑證：%1</translation>
+ <source>Top to Bottom, Left to Right</source>
+ <translation>上到下，左到右</translation>
 </message>
 <message>
- <source>Unable to write data: %1</source>
- <translation>無法寫入資料：%1</translation>
+ <source>Top to Bottom, Right to Left</source>
+ <translation>上到下，右到左</translation>
 </message>
 <message>
- <source>Error during SSL handshake: %1</source>
- <translation>SSL 同步時發生錯誤：%1</translation>
+ <source>1 (1x1)</source>
+ <translation>1 (1x1)</translation>
 </message>
 <message>
- <source>Error loading local certificate, %1</source>
- <translation>載入本地憑證時發生錯誤：%1</translation>
+ <source>2 (2x1)</source>
+ <translation>2 (2x1)</translation>
 </message>
 <message>
- <source>Invalid or empty cipher list (%1)</source>
- <translation>不合法或空白的加密清單（%1）</translation>
+ <source>4 (2x2)</source>
+ <translation>4 (2x2)</translation>
 </message>
 <message>
- <source>Private key does not certificate public key, %1</source>
- <translation>私密金鑰無法認證公開金鑰，%1</translation>
+ <source>6 (2x3)</source>
+ <translation>6 (2x3)</translation>
 </message>
 <message>
- <source>Error creating SSL context (%1)</source>
- <translation>建立 SSL 內文時發生錯誤（%1）</translation>
+ <source>9 (3x3)</source>
+ <translation>9 (3x3)</translation>
 </message>
 <message>
- <source>Error while reading: %1</source>
- <translation>讀取時發生錯誤：%1</translation>
+ <source>16 (4x4)</source>
+ <translation>16 (4x4)</translation>
 </message>
 <message>
- <source>Error loading private key, %1</source>
- <translation>載入私鑰時發生錯誤：%1</translation>
+ <source>All Pages</source>
+ <translation>全部頁面</translation>
+ </message>
+ <message>
+ <source>Odd Pages</source>
+ <translation>奇數頁</translation>
+ </message>
+ <message>
+ <source>Even Pages</source>
+ <translation>偶數頁</translation>
+ </message>
+ <message>
+ <source>&amp;Options &gt;&gt;</source>
+ <translation>選項(&amp;O) &gt;&gt;</translation>
+ </message>
+ <message>
+ <source>&amp;Print</source>
+ <translation>列印(&amp;P)</translation>
+ </message>
+ <message>
+ <source>&amp;Options &lt;&lt;</source>
+ <translation>選項(&amp;O) &lt;&lt;</translation>
+ </message>
+ <message>
+ <source>Invalid Pages Definition</source>
+ <translation>無效頁面定義</translation>
+ </message>
+ <message>
+ <source>%1 does not follow the correct syntax. Please use &apos;,&apos; to separate ranges and pages, &apos;-&apos; to define ranges and make sure ranges do not intersect with each other.</source>
+ <translation>%1 沒遵循正確語法。請使用「,」分隔範圍與頁面、「-」定義範圍並確保範圍沒有相交。</translation>
+ </message>
+ <message>
+ <source>Duplex Settings Conflicts</source>
+ <translation>雙面設定衝突</translation>
+ </message>
+ <message>
+ <source>There are conflicts in duplex settings. Do you want to fix them?</source>
+ <translation>在雙面設定中發現衝突選項，是否修復？</translation>
+ </message>
+ <message>
+ <source>Print to File (PDF)</source>
+ <translation>列印到檔案（PDF）</translation>
+ </message>
+ <message>
+ <source>Local file</source>
+ <translation>本地端檔案</translation>
+ </message>
+ <message>
+ <source>Write PDF file</source>
+ <translation>寫入 PDF 檔案</translation>
+ </message>
+ <message>
+ <source>Print To File ...</source>
+ <translation>列印到檔案...</translation>
+ </message>
+ <message>
+ <source>%1 is a directory.
+Please choose a different file name.</source>
+ <translation>%1 是個目錄。
+請選擇其他檔名。</translation>
+ </message>
+ <message>
+ <source>File %1 is not writable.
+Please choose a different file name.</source>
+ <translation>檔案 %1 無法寫入。
+請選擇其它檔名。</translation>
+ </message>
+ <message>
+ <source>%1 already exists.
+Do you want to overwrite it?</source>
+ <translation>%1 已存在。
+是否覆寫？</translation>
+ </message>
+ <message>
+ <source>Options &apos;Pages Per Sheet&apos; and &apos;Page Set&apos; cannot be used together.
+Please turn one of those options off.</source>
+ <translation>不能同時使用「每張紙包含頁數」與「頁面設定」選項。
+請關閉其中一個選項。</translation>
+ </message>
+ <message>
+ <source>The &apos;From&apos; value cannot be greater than the &apos;To&apos; value.</source>
+ <translation>「起始」值不能大於「結束」值。</translation>
+ </message>
+ <message>
+ <source>OK</source>
+ <translation>確定</translation>
+ </message>
+ <message>
+ <source>Automatic</source>
+ <translation>自動</translation>
 </message>
 </context>
 <context>
- <name>QLocalSocket</name>
+ <name>QPrintPreviewDialog</name>
 <message>
- <source>%1: Connection error</source>
- <translation>%1：連線錯誤</translation>
+ <source>Page Setup</source>
+ <translation>頁面設定</translation>
 </message>
 <message>
- <source>%1: Connection refused</source>
- <translation>%1：連線被拒</translation>
+ <source>%1%</source>
+ <translation>%1%</translation>
 </message>
 <message>
- <source>%1: Unknown error %2</source>
- <translation>%1：未知的錯誤 %2</translation>
+ <source>Print Preview</source>
+ <translation>列印預覽</translation>
 </message>
 <message>
- <source>%1: Socket access error</source>
- <translation>%1：Socket 位址錯誤</translation>
+ <source>Next page</source>
+ <translation>下一頁</translation>
 </message>
 <message>
- <source>%1: Socket resource error</source>
- <translation>%1：Socket 資源錯誤</translation>
+ <source>Previous page</source>
+ <translation>上一頁</translation>
 </message>
 <message>
- <source>%1: The socket operation is not supported</source>
- <translation>%1：socket 操作未支援</translation>
+ <source>First page</source>
+ <translation>第一頁</translation>
 </message>
 <message>
- <source>%1: Invalid name</source>
- <translation>%1：不合法的名稱</translation>
+ <source>Last page</source>
+ <translation>最後一頁</translation>
 </message>
 <message>
- <source>%1: Unknown error</source>
- <translation>%1：未知的錯誤</translation>
+ <source>Fit width</source>
+ <translation>符合寬度</translation>
 </message>
 <message>
- <source>%1: Socket operation timed out</source>
- <translation>%1：Socket 操作逾時</translation>
+ <source>Fit page</source>
+ <translation>符合頁面</translation>
 </message>
 <message>
- <source>%1: Datagram too large</source>
- <translation>%1：資料包過大</translation>
+ <source>Zoom in</source>
+ <translation>放大</translation>
 </message>
 <message>
- <source>%1: Remote closed</source>
- <translation>%1：遠端已關閉</translation>
+ <source>Zoom out</source>
+ <translation>縮小</translation>
+ </message>
+ <message>
+ <source>Portrait</source>
+ <translation>直印</translation>
+ </message>
+ <message>
+ <source>Landscape</source>
+ <translation>橫印</translation>
+ </message>
+ <message>
+ <source>Show single page</source>
+ <translation>顯示單一頁面</translation>
+ </message>
+ <message>
+ <source>Show facing pages</source>
+ <translation>顯示封面</translation>
+ </message>
+ <message>
+ <source>Show overview of all pages</source>
+ <translation>顯示所有頁面預覽</translation>
+ </message>
+ <message>
+ <source>Print</source>
+ <translation>列印</translation>
+ </message>
+ <message>
+ <source>Page setup</source>
+ <translation>列印設定</translation>
+ </message>
+ <message>
+ <source>Export to PDF</source>
+ <translation>匯出到 PDF 檔</translation>
 </message>
 </context>
 <context>
- <name>QtXmlPatterns</name>
+ <name>QPrintPropertiesDialog</name>
 <message>
- <source>A comment cannot contain %1</source>
- <translation>註解不能包含 %1</translation>
+ <source>Printer Properties</source>
+ <translation>列印機屬性</translation>
 </message>
 <message>
- <source>Version %1 is not supported. The supported XQuery version is 1.0.</source>
- <translation>版本 %1 未支援。支援的 XQuery 版本為 1.0。</translation>
+ <source>Job Options</source>
+ <translation>作業選項</translation>
 </message>
 <message>
- <source>The root node of the second argument to function %1 must be a document node. %2 is not a document node.</source>
- <translation>函式 %1 的第二個參數的根節點必須是文件節點。%2 不是文件節點。</translation>
+ <source>Page Setup Conflicts</source>
+ <translation>頁面設定衝突</translation>
 </message>
 <message>
- <source>The parameter %1 is required, but no corresponding %2 is supplied.</source>
- <translation>需要參數 %1，但是沒有提供相關的 %2。</translation>
+ <source>There are conflicts in page setup options. Do you want to fix them?</source>
+ <translation>頁面設定中發現衝突選項，是否修復？</translation>
 </message>
 <message>
- <source>Namespace declarations must occur before function, variable, and option declarations.</source>
- <translation>命名空間宣告必須在函式、變數與選項宣告之前。</translation>
+ <source>Advanced Option Conflicts</source>
+ <translation>進階選項衝突</translation>
 </message>
 <message>
- <source>empty</source>
- <translation>空白</translation>
+ <source>There are conflicts in some advanced options. Do you want to fix them?</source>
+ <translation>部份進階選項發現衝突，是否修復？</translation>
 </message>
+</context>
+<context>
+ <name>QPrintPropertiesWidget</name>
 <message>
- <source>The namespace URI cannot be the empty string when binding to a prefix, %1.</source>
- <translation>要與前置字串 %1 結合的命名空間網址不能是空字串。</translation>
+ <source>Form</source>
+ <translation>表單</translation>
 </message>
 <message>
- <source>A comment cannot end with a %1.</source>
- <translation>註解不能以 %1 做結尾。</translation>
+ <source>Page</source>
+ <translation>頁面</translation>
 </message>
 <message>
- <source>Top level stylesheet elements must be in a non-null namespace, which %1 isn&apos;t.</source>
- <translation>頂層樣式表元素必須是非空白的命名空間，而 %1 不是。</translation>
+ <source>Advanced</source>
+ <translation>進階</translation>
 </message>
 <message>
- <source>Integer division (%1) by zero (%2) is undefined.</source>
- <translation>整數除法 %1 除以零（%2）的行為未定義。</translation>
+ <source>There are conflicts in some options. Please fix them.</source>
+ <translation>部份選項發生衝突，請修復這些問題。</translation>
 </message>
+</context>
+<context>
+ <name>QPrintSettingsOutput</name>
 <message>
- <source>A library module cannot be evaluated directly. It must be imported from a main module.</source>
- <translation>不能直接計算函式模組。必須要從主模組匯入。</translation>
+ <source>Form</source>
+ <translation>表單</translation>
 </message>
 <message>
- <source>Time %1:%2:%3.%4 is invalid.</source>
- <translation>時間 %1:%2:%3.%4 不合法。</translation>
+ <source>Copies</source>
+ <translation>份數</translation>
 </message>
 <message>
- <source>Attribute %1 cannot appear on the element %2. Only the standard attributes can appear.</source>
- <translation>屬性 %1 不能出現在元素 %2。只能有標準屬性。</translation>
+ <source>Print range</source>
+ <translation>列印範圍</translation>
 </message>
 <message>
- <source>A value of type %1 must contain an even number of digits. The value %2 does not.</source>
- <translation>型態 %1 的值必須包含偶數個數字。數值 %2 未符合此條件。</translation>
+ <source>Print all</source>
+ <translation>全部列印</translation>
 </message>
 <message>
- <source>Modulus division (%1) by zero (%2) is undefined.</source>
- <translation>餘數除法 %1 除以零（%2）的行為未定義。</translation>
+ <source>Pages from</source>
+ <translation>指定頁面從</translation>
 </message>
 <message>
- <source>No function with signature %1 is available</source>
- <translation>沒有簽章為 %1 的函式可使用</translation>
+ <source>to</source>
+ <translation>到</translation>
 </message>
 <message>
- <source>None of the pragma expressions are supported. Therefore, a fallback expression must be present</source>
- <translation>未支援 pragma 敘述。因次，必須有預設的敘述</translation>
+ <source>Pages</source>
+ <translation>頁面</translation>
 </message>
 <message>
- <source>In the replacement string, %1 can only be used to escape itself or %2, not %3</source>
- <translation>在取代字串中，%1 只能用於自身或 %2 的脫逸，而非 %3</translation>
+ <source>Specify pages or ranges separated by commas. Ranges are specified by two numbers separated by a hyphen. E.g: 3,5-7,9 prints pages 3, 5, 6, 7 and 9.</source>
+ <translation>使用逗號分隔頁面或頁面範圍。頁面範圍使用 (數字)-(數字) 的形式指定，例如 3,5-7,9 列印第三、五、六、七和九頁。</translation>
 </message>
 <message>
- <source>The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character.</source>
- <translation>在 %2 內的代碼點 %1（編碼 %3）是一個不合法的 XML 字元。</translation>
+ <source>Current Page</source>
+ <translation>目前頁面</translation>
 </message>
 <message>
- <source>Network timeout.</source>
- <translation>網路逾時。</translation>
+ <source>Selection</source>
+ <translation>選擇區塊</translation>
 </message>
 <message>
- <source>No casting is possible with %1 as the target type.</source>
- <translation>不能轉換到 %1 型態。</translation>
+ <source>Page Set:</source>
+ <translation>頁面設定：</translation>
 </message>
 <message>
- <source>The Schema Import feature is not supported, and therefore %1 declarations cannot occur.</source>
- <translation>機制匯入功能未支援，因此有 %1 個宣告無法達成。</translation>
+ <source>Output Settings</source>
+ <translation>輸出設定</translation>
 </message>
 <message>
- <source>Attribute %1 and %2 are mutually exclusive.</source>
- <translation>屬性 %1 與 %2 彼此互斥。</translation>
+ <source>Copies:</source>
+ <translation>份數：</translation>
 </message>
 <message>
- <source>Parse error: %1</source>
- <translation>剖析錯誤：%1</translation>
+ <source>Collate</source>
+ <translation>校對</translation>
 </message>
 <message>
- <source>If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified.</source>
- <translation>如果第一個參數是空序列，或是長度為 0 的字串（沒有命名空間），則無法指定前置字串。但是您指定了 %1。</translation>
+ <source>Reverse</source>
+ <translation>反向</translation>
 </message>
 <message>
- <source>In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching.</source>
- <translation>在 XSL-T 樣式內，函式 %1 的第一個參數必須是文字或變數參考，以便用於比對。</translation>
+ <source>Options</source>
+ <translation>選項</translation>
 </message>
 <message>
- <source>At least one component must be present.</source>
- <translation>必須表達至少一個組件。</translation>
+ <source>Color Mode</source>
+ <translation>顏色模式</translation>
 </message>
 <message>
- <source>In a namespace constructor, the value for a namespace value cannot be an empty string.</source>
- <translation>在命名空間建構子中，命名空間的值不能是空字串。</translation>
+ <source>Color</source>
+ <translation>顏色</translation>
 </message>
 <message>
- <source>An attribute by name %1 has already been created.</source>
- <translation>名為 %1 的屬性已被建立。</translation>
+ <source>Grayscale</source>
+ <translation>灰階</translation>
 </message>
 <message>
- <source>An argument by name %1 has already been declared. Every argument name must be unique.</source>
- <translation>名稱為 %1 的參數已被宣告。每個參數名稱必須唯一。</translation>
+ <source>Duplex Printing</source>
+ <translation>雙面列印</translation>
 </message>
 <message>
- <source>%1 is an invalid flag for regular expressions. Valid flags are:</source>
- <translation>%1 是正規表示式中不合法的旗標。合法的旗標有:</translation>
+ <source>None</source>
+ <translation>無</translation>
 </message>
 <message>
- <source>At least one %1-element must occur inside %2.</source>
- <translation>至少一個元素 %1 要出現在 %2 之內。</translation>
+ <source>Long side</source>
+ <translation>長邊</translation>
 </message>
 <message>
- <source>Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported.</source>
- <translation>只支援 Unicode Codepoint Collation（%1）。%2 未支援。</translation>
+ <source>Short side</source>
+ <translation>短邊</translation>
 </message>
+</context>
+<context>
+ <name>QPrintWidget</name>
 <message>
- <source>Matches are case insensitive</source>
- <translation>比對為區分大小寫</translation>
+ <source>Form</source>
+ <translation>表單</translation>
 </message>
 <message>
- <source>The name of an extension expression must be in a namespace.</source>
- <translation>延伸敘述的名稱必須在命名空間內。</translation>
+ <source>Printer</source>
+ <translation>印表機</translation>
 </message>
 <message>
- <source>Each name of a template parameter must be unique; %1 is duplicated.</source>
- <translation>每個樣本參數的名稱必須唯一；%1 已經被使用。</translation>
+ <source>&amp;Name:</source>
+ <translation>名稱(&amp;N)：</translation>
 </message>
 <message>
- <source>At least one mode must be specified in the %1-attribute on element %2.</source>
- <translation>在元素 %2 的 %1 屬性中至少要指定一個模式。</translation>
+ <source>P&amp;roperties</source>
+ <translation>屬性(&amp;R)</translation>
 </message>
 <message>
- <source>%1 matches newline characters</source>
- <translation>%1 符合了換行字元</translation>
+ <source>Location:</source>
+ <translation>位置：</translation>
 </message>
 <message>
- <source>Year %1 is invalid because it begins with %2.</source>
- <translation>年份 %1 不合法，因為是從 %2 開始的。</translation>
+ <source>Preview</source>
+ <translation>預覽</translation>
 </message>
 <message>
- <source>The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5.</source>
- <translation>呼叫 %1 的第二個參數不能是 %2 型態。必須是 %3、%4 或 %5 型態。</translation>
+ <source>Type:</source>
+ <translation>型態：</translation>
 </message>
 <message>
- <source>Element %1 cannot have children.</source>
- <translation>元素 %1 不能有子元素。</translation>
+ <source>Output &amp;file:</source>
+ <translation>輸出檔案(&amp;F)：</translation>
 </message>
 <message>
- <source>Attribute %1 cannot appear on the element %2. Only %3 is allowed, and the standard attributes.</source>
- <translation>屬性 %1 不能出現在元素 %2。只能有 %3 以及標準屬性。</translation>
+ <source>...</source>
+ <translation>…</translation>
 </message>
+</context>
+<context>
+ <name>QProcess</name>
 <message>
- <source>Only one %1-element can appear.</source>
- <translation>只能出現一個元素 %1。</translation>
+ <source>Process failed to start</source>
+ <translation>啟動程序失敗</translation>
 </message>
 <message>
- <source>The name for a computed attribute cannot have the namespace URI %1 with the local name %2.</source>
- <translation>在已計算屬性的名稱不能同時有命名空間網址 %1 與本地端名稱 %2。</translation>
+ <source>Process crashed</source>
+ <translation>程序已當機</translation>
 </message>
 <message>
- <source>A positional predicate must evaluate to a single numeric value.</source>
- <translation>位置謂詞必須能計算出單一的數值。</translation>
+ <source>Process operation timed out</source>
+ <translation>程序操作逾時</translation>
 </message>
 <message>
- <source>Element %1 can&apos;t be serialized because it appears outside the document element.</source>
- <translation>元素 %1 無法序列化，因為似乎是在文件元素之外。</translation>
+ <source>Error reading from process</source>
+ <translation>從程序讀取時發生錯誤</translation>
 </message>
 <message>
- <source>%1 and %2 match the start and end of a line.</source>
- <translation>%1 與 %2 符合了一行的開始與結尾。</translation>
+ <source>Error writing to process</source>
+ <translation>寫到程序時發生錯誤</translation>
 </message>
 <message>
- <source>Running an XSL-T 1.0 stylesheet with a 2.0 processor.</source>
- <translation>使用 2.0 處理器執行 XSL-T 1.0 樣式表中。</translation>
+ <source>No program defined</source>
+ <translation>未定義程式</translation>
 </message>
 <message>
- <source>A stylesheet function must have a prefixed name.</source>
- <translation>樣式表函式必須有前置名稱。</translation>
+ <source>Could not open input redirection for reading</source>
+ <translation>無法開啟供讀取的重新導向輸入</translation>
 </message>
 <message>
- <source>%1 cannot be retrieved</source>
- <translation>%1 無法取得</translation>
+ <source>Resource error (fork failure): %1</source>
+ <translation>資源錯誤（fork 失敗）：%1</translation>
 </message>
 <message>
- <source>It&apos;s not possible to cast the value %1 of type %2 to %3</source>
- <translation>無法&apos;轉換型態 %2 的數值 %1 到 %3</translation>
+ <source>Could not open output redirection for writing</source>
+ <translation>無法開啟供寫入的輸出重新導向</translation>
 </message>
 <message>
- <source>The value of the XSL-T version attribute must be a value of type %1, which %2 isn&apos;t.</source>
- <translation>XLS-T 版本屬性的值必須是型態 %1 的值，而 %2 不&apos;是。</translation>
+ <source>Process failed to start: %1</source>
+ <translation>程序啟動失敗：%1</translation>
 </message>
+</context>
+<context>
+ <name>QProgressDialog</name>
 <message>
- <source>The prefix %1 cannot be bound.</source>
- <translation>前置字串 %1 不能被結合。</translation>
+ <source>Cancel</source>
+ <translation>取消</translation>
 </message>
+</context>
+<context>
+ <name>QRegExp</name>
 <message>
- <source>The prefix must be a valid %1, which %2 is not.</source>
- <translation>前置字串必須是合法的 %1，但 %2 不是。</translation>
+ <source>no error occurred</source>
+ <translation>未發生錯誤</translation>
 </message>
 <message>
- <source>The keyword %1 cannot occur with any other mode name.</source>
- <translation>關鍵字 %1 不能與任何其它模式名稱一起存在。</translation>
+ <source>disabled feature used</source>
+ <translation>使用的已停用功能</translation>
 </message>
 <message>
- <source>Type error in cast, expected %1, received %2.</source>
- <translation>轉換型態錯誤，應為 %1 但接收到 %2。</translation>
+ <source>bad char class syntax</source>
+ <translation>無效的字元類別於法</translation>
 </message>
 <message>
- <source>%1 is not a valid numeric literal.</source>
- <translation>%1 不是合法的數值。</translation>
+ <source>bad lookahead syntax</source>
+ <translation>無效的先行斷言 (lookahead) 語法</translation>
 </message>
- <message numerus="yes">
- <source>%1 takes at most %n argument(s). %2 is therefore invalid.</source>
- <translation>
- <numerusform>%1 最多只能有 %n 個參數，因此 %2 是不合法的。</numerusform>
- </translation>
+ <message>
+ <source>lookbehinds not supported, see QTBUG-2371</source>
+ <translation>不支援後行斷言 (lookbehind)，請見 QTBUG-2371</translation>
 </message>
 <message>
- <source>Circularity detected</source>
- <translation>偵測到環狀</translation>
+ <source>bad repetition syntax</source>
+ <translation>無效的重覆語法</translation>
 </message>
 <message>
- <source>A variable by name %1 has already been declared.</source>
- <translation>名為 %1 的變數已被宣告。</translation>
+ <source>invalid octal value</source>
+ <translation>無效的八進位值</translation>
 </message>
 <message>
- <source>The prefix %1 can not be bound. By default, it is already bound to the namespace %2.</source>
- <translation>前置字串 %1 不能被結合。預設它已與命名空間 %2 結合。</translation>
+ <source>missing left delim</source>
+ <translation>缺少左分隔符號</translation>
 </message>
 <message>
- <source>An %1-attribute must have a valid %2 as value, which %3 isn&apos;t.</source>
- <translation>屬性 %1 必須以合法的 %2 為值，而 %3 是不&apos;合法的。</translation>
+ <source>unexpected end</source>
+ <translation>非預期結尾</translation>
 </message>
 <message>
- <source>If element %1 has no attribute %2, it cannot have attribute %3 or %4.</source>
- <translation>若元素 %1 沒有屬性 %2，則也不能有屬性 %3 或 %4。</translation>
+ <source>met internal limit</source>
+ <translation>遇到內部限制</translation>
 </message>
 <message>
- <source>A function already exists with the signature %1.</source>
- <translation>已經有簽章為 %1 的函式存在。</translation>
+ <source>invalid interval</source>
+ <translation>間隔無效</translation>
 </message>
 <message>
- <source>When casting to %1 from %2, the source value cannot be %3.</source>
- <translation>從 %2 轉換型態為 %1 的時候，來源數值不能是 %3。</translation>
+ <source>invalid category</source>
+ <translation>類別無效</translation>
 </message>
+</context>
+<context>
+ <name>QRegularExpression</name>
 <message>
- <source>Attribute %1 can&apos;t be serialized because it appears at the top level.</source>
- <translation>屬性元素 %1 無法序列化，因為似乎是在頂層。</translation>
+ <source>no error</source>
+ <translation>沒有錯誤</translation>
 </message>
 <message>
- <source>No comparisons can be done involving the type %1.</source>
- <translation>包含型態 %1 時不能做比較。</translation>
+ <source>\ at end of pattern</source>
+ <translation>\ 在 pattern 尾端出現</translation>
 </message>
 <message>
- <source>No value is available for the external variable by name %1.</source>
- <translation>名為 %1 的外部變數沒有可用的值。</translation>
+ <source>\c at end of pattern</source>
+ <translation>\c 在 pattern 尾端出現</translation>
 </message>
 <message>
- <source>The value of attribute %1 must of type %2, which %3 isn&apos;t.</source>
- <translation>屬性 %1 的值必須為型態 %2，但 %3 不&apos;是。</translation>
+ <source>unrecognized character follows \</source>
+ <translation>有個未知的字元於 \ 之後</translation>
 </message>
 <message>
- <source>The item %1 did not match the required type %2.</source>
- <translation>項目 %1 未符合需要的型態 %2。</translation>
+ <source>numbers out of order in {} quantifier</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Element %1 cannot have a sequence constructor.</source>
- <translation>元素 %1不能有序列建構子。</translation>
+ <source>number too big in {} quantifier</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>When attribute %1 is present on %2, a sequence constructor cannot be used.</source>
- <translation>當屬性 %1 出現在 %2 內時，不能使用序列建構子。</translation>
+ <source>missing terminating ] for character class</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>one or more</source>
- <translation>一個以上</translation>
+ <source>invalid escape sequence in character class</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2.</source>
- <translation>編碼 %1 不合法。必須只能包含拉丁字元，不含空白，並且要符合正規表示式 %2。</translation>
+ <source>range out of order in character class</source>
+ <translation type="unfinished"></translation>
 </message>
- <message numerus="yes">
- <source>%1 requires at least %n argument(s). %2 is therefore invalid.</source>
- <translation>
- <numerusform>%1 至少需要 %n 個參數，因此 %2 是不合法的。</numerusform>
- </translation>
+ <message>
+ <source>quantifier does not follow a repeatable item</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid.</source>
- <translation>處理指令的目標名稱不能是任何大小寫組合的 %1。因此，%2 是不合法的值。</translation>
+ <source>internal error: unexpected repeat</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The focus is undefined.</source>
- <translation>焦點未定義。</translation>
+ <source>unrecognized character after (? or (?-</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 is an unknown schema type.</source>
- <translation>%1 是未知的機制型態。</translation>
+ <source>POSIX named classes are supported only within a class</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The value for attribute %1 on element %2 must either be %3 or %4, not %5.</source>
- <translation>元素 %2 內屬性 %1 的值必須是 %3 或 %4，而不是 %5。</translation>
+ <source>POSIX collating elements are not supported</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>In the replacement string, %1 must be followed by at least one digit when not escaped.</source>
- <translation>在取代字串中，在未脫逸的情形下 %1 必須至少跟著一位數字。</translation>
+ <source>missing closing parenthesis</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can.</source>
- <translation>在 XSL-T 樣式內，不能用 %1 軸，只能用 %2 或 %3。</translation>
+ <source>reference to non-existent subpattern</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this)</source>
- <translation>使用者定義函式的命名空間不能為空白（請試著用預先定義的前置字串 %1）</translation>
+ <source>pattern passed as NULL</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The first operand in an integer division, %1, cannot be infinity (%2).</source>
- <translation>整數除法的第一個運算對象 %1 不能是無限大（%2）。</translation>
+ <source>unrecognised compile-time option bit(s)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 is not a valid value of type %2.</source>
- <translation>%1 不是合法的 %2 型態的值。</translation>
+ <source>missing ) after (?# comment</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed.</source>
- <translation>將型態 %1 乘以 %2 或 %3（正或負無限大）是不允許的。</translation>
+ <source>parentheses are too deeply nested</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The variable %1 is unused</source>
- <translation>變數 %1 未使用</translation>
+ <source>regular expression is too large</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The %1-axis is unsupported in XQuery</source>
- <translation>XQuery 中未支援 %1 軸</translation>
+ <source>failed to allocate heap memory</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>A direct element constructor is not well-formed. %1 is ended with %2.</source>
- <translation>直接元素建構器沒有完整產生。%1 以 %2 結束。</translation>
+ <source>unmatched closing parenthesis</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed.</source>
- <translation>將型態 %1 除以 %2 或 %3（正或負零）是不允許的。</translation>
+ <source>internal error: code overflow</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Attribute %1 cannot have the value %2.</source>
- <translation>屬性 %1 的值不能為 %2。</translation>
+ <source>letter or underscore expected after (?&lt; or (?&apos;</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>It will not be possible to retrieve %1.</source>
- <translation>無法取得 %1。</translation>
+ <source>lookbehind assertion is not fixed length</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>In an XSL-T pattern, function %1 cannot have a third argument.</source>
- <translation>在 XSL-T 樣式內，函式 %1 的不能有第三個參數。</translation>
+ <source>malformed number or name after (?(</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The namespace URI in the name for a computed attribute cannot be %1.</source>
- <translation>在已計算屬性的名稱的命名空間網址不能是 %1。</translation>
+ <source>conditional group contains more than two branches</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3.</source>
- <translation>%1 不是一個合法的處理指令的目標名稱。必須是 %2 的值，例如 %3。</translation>
+ <source>assertion expected after (?( or (?(?C)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works.</source>
- <translation>%1 是複數型態，無法轉換成複數型態。然而，轉換為原型態，如 %2 是可行的。</translation>
+ <source>(?R or (?[+-]digits must be followed by )</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>zero or one</source>
- <translation>0 或 1 個</translation>
+ <source>unknown POSIX class name</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>No operand in an integer division, %1, can be %2.</source>
- <translation>整數除法沒有運作對象，%1，可以是 %2。</translation>
+ <source>internal error in pcre2_study(): should not occur</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The element with local name %1 does not exist in XSL-T.</source>
- <translation>有本地名稱 %1 的元素在 XSL-T 內不存在。</translation>
+ <source>this version of PCRE2 does not have Unicode support</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Two namespace declaration attributes have the same name: %1.</source>
- <translation>有兩個命名空間宣告的屬性有相同的名稱：%1。</translation>
+ <source>parentheses are too deeply nested (stack check)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values.</source>
- <translation>實際布林值（Effective Boolean）無法用在兩個或兩個以上的原數值（atomic value）的計算。</translation>
+ <source>character code point value in \x{} or \o{} is too large</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 is an invalid %2</source>
- <translation>%1 是不合法的 %2</translation>
+ <source>invalid condition (?(0)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration.</source>
- <translation>呼叫 %1 的第一個參數不能是 %2 型態。必須是數值型態，xs.yearMonthDuration 或 xs.dayTimeDuration。</translation>
+ <source>\C is not allowed in a lookbehind assertion</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Division (%1) by zero (%2) is undefined.</source>
- <translation>除法 %1 除以零（%2）的行為未定義。</translation>
+ <source>PCRE does not support \L, \l, \N{name}, \U, or \u</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>No template by name %1 exists.</source>
- <translation>沒有名為 %1 的樣本存在。</translation>
+ <source>number after (?C is greater than 255</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The attribute %1 must appear on element %2.</source>
- <translation>屬性 %1 必須在元素 %2 內出現。</translation>
+ <source>closing parenthesis for (?C expected</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>An attribute by name %1 has already appeared on this element.</source>
- <translation>名為 %1 的屬性已出現在此元素。</translation>
+ <source>invalid escape sequence in (*VERB) name</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The default collection is undefined</source>
- <translation>預設的收藏未定義</translation>
+ <source>unrecognized character after (?P</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Only the prefix %1 can be bound to %2 and vice versa.</source>
- <translation>只有前置字串 %1 能與 %2 結合。反之亦然。</translation>
+ <source>syntax error in subpattern name (missing terminator)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Value %1 of type %2 exceeds maximum (%3).</source>
- <translation>型態 %2 的數值 %1 已超過最大值（%3）。</translation>
+ <source>two named subpatterns have the same name (PCRE2_DUPNAMES not set)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Whitespace characters are removed, except when they appear in character classes</source>
- <translation>空白字元已移除，除非它們出現在字元類別</translation>
+ <source>group name must start with a non-digit</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Casting to %1 is not possible because it is an abstract type, and can therefore never be instantiated.</source>
- <translation>無法轉換到 %1 因為它是一個抽象型態，不能被實體化。</translation>
+ <source>this version of PCRE2 does not have support for \P, \p, or \X</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Operator %1 cannot be used on type %2.</source>
- <translation>操作元 %1 不能用於型態 %2。</translation>
+ <source>malformed \P or \p sequence</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases.</source>
- <translation>命名空間 %1 已被保留，因此使用者定義函式不能使用它。請試試預定義前置字串 %2。</translation>
+ <source>unknown property name after \P or \p</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The target namespace of a %1 cannot be empty.</source>
- <translation>%1 的目標命名空間不能是空的。</translation>
+ <source>subpattern name is too long (maximum 10000 characters)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 must be followed by %2 or %3, not at the end of the replacement string.</source>
- <translation>%1 後面必須跟著 %2 或 %3，而非取代字串的結尾。</translation>
+ <source>too many named subpatterns (maximum 256)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 is an invalid namespace URI.</source>
- <translation>%1 是不合法的命名空間網址。</translation>
+ <source>invalid range in character class</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The attribute %1 cannot appear on %2, when it is a child of %3.</source>
- <translation>屬性 %1 不能出現在 %2，因為它是 %3 的子元素。</translation>
+ <source>octal value is greater than \377 in 8-bit non-UTF-8 mode</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The attribute %1 can only appear on the first %2 element.</source>
- <translation>屬性 %1 只能出現在前 %2 個元素內。</translation>
+ <source>internal error: overran compiling workspace</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Element %1 must have either a %2-attribute or a sequence constructor.</source>
- <translation>元素 %1 必須至少有一個屬性 %2 或一個序列建構子。</translation>
+ <source>internal error: previously-checked referenced subpattern not found</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Module imports must occur before function, variable, and option declarations.</source>
- <translation>模組匯入必須在函式、變數與選項宣告之前。</translation>
+ <source>DEFINE group contains more than one branch</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Day %1 is outside the range %2..%3.</source>
- <translation>日期 %1 已超出 %2 到 %3 的範圍。</translation>
+ <source>missing opening brace after \o</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 contains octets which are disallowed in the requested encoding %2.</source>
- <translation>%1 包含了在要求的編碼 %2 內不允許的八進位值。</translation>
+ <source>internal error: unknown newline setting</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor.</source>
- <translation>當需要參數時，不能透過屬性 %1 或序列建構子提供預設值。</translation>
+ <source>\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching.</source>
- <translation>在 XSL-T 樣式內，函式 %1 的第一個參數必須是字串，以便用於比對。</translation>
+ <source>a numbered reference must not be zero</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Text nodes are not allowed at this location.</source>
- <translation>文字節點不能在此位置。</translation>
+ <source>an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type.</source>
- <translation>型態 %1 的值不能是謂詞（predicate）。謂詞必須是數值型態，或是實際布林值。</translation>
+ <source>(*VERB) not recognized or malformed</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 is not a valid name for a processing-instruction.</source>
- <translation>%1 不是處理指令的合法名稱。</translation>
+ <source>number is too big</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 was called.</source>
- <translation>%1 已被呼叫。</translation>
+ <source>subpattern name expected</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>It&apos;s not possible to add attributes after any other kind of node.</source>
- <translation>不能在&apos;任何其它種類的節點後面加入屬性。</translation>
+ <source>digit expected after (?+</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>At least one %1-element must occur before %2.</source>
- <translation>至少一個元素 %1 要出現在 %2 之前。</translation>
+ <source>non-octal character in \o{} (closing brace missing?)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization).</source>
- <translation>未支援常態化表單 %1。支援的表單有 %2、%3、%4、%5，以及無（也就是空字串，未常態化）。</translation>
+ <source>different names for subpatterns of the same number are not allowed</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed.</source>
- <translation>轉換為型態 %1 或其衍生型態時，來源數值必須是相同型態，或者是字串。型態 %2 是不被允許的。</translation>
+ <source>(*MARK) must have an argument</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>A parameter in a function cannot be declared to be a tunnel.</source>
- <translation>函式內的參數不能被宣告為通道（tunnel）。</translation>
+ <source>non-hex character in \x{} (closing brace missing?)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>XSL-T attributes on XSL-T elements must be in the null namespace, not in the XSL-T namespace which %1 is.</source>
- <translation>XSL-T 元素內的 XSL-T 屬性必須放在空（null）的命名空間，而不是像 %1 在 XSL-T 命名空間。</translation>
+ <source>\c must be followed by a printable ASCII character</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2</source>
- <translation>在函式模組中的使用者定義函式的命名空間必須與模組的命名空間相同。也就是，應該為 %1 而不是 %2</translation>
+ <source>\c must be followed by a letter or one of [\]^_?</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Day %1 is invalid for month %2.</source>
- <translation>月份 %2 中沒有日期 %1。</translation>
+ <source>\k is not followed by a braced, angle-bracketed, or quoted name</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Overflow: Can&apos;t represent date %1.</source>
- <translation>溢位：無法&apos;表示日期 %1。</translation>
+ <source>internal error: unknown opcode in find_fixedlength()</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>In a simplified stylesheet module, attribute %1 must be present.</source>
- <translation>在簡化的樣式表模組中，屬性 %1 必須存在。</translation>
+ <source>\N is not supported in a class</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Unknown XSL-T attribute %1.</source>
- <translation>未知的 XSL-T 屬性 %1。</translation>
+ <source>SPARE ERROR</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>It is not possible to redeclare prefix %1.</source>
- <translation>無法重宣告前置字串 %1。</translation>
+ <source>disallowed Unicode code point (&gt;= 0xd800 &amp;&amp; &lt;= 0xdfff)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>exactly one</source>
- <translation>剛好一個</translation>
+ <source>using UTF is disabled by the application</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 is an invalid regular expression pattern: %2</source>
- <translation>%1 是不合法的正規表示式樣式：%2</translation>
+ <source>using UCP is disabled by the application</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Element %1 is not allowed at this location.</source>
- <translation>元素 %1 不能在此位置。</translation>
+ <source>name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The Schema Validation Feature is not supported. Hence, %1-expressions may not be used.</source>
- <translation>未支援機制確認功能。%1 敘述無法使用。</translation>
+ <source>character code point value in \u.... sequence is too large</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>At least one %1 element must appear as child of %2.</source>
- <translation>%2 必須至少有一個子元素 %1。</translation>
+ <source>digits missing in \x{} or \o{}</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>This processor is not Schema-aware and therefore %1 cannot be used.</source>
- <translation>此處理器不是 Schema-aware，因此不能使用 %1。</translation>
+ <source>syntax error in (?(VERSION condition</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Attribute %1 cannot appear on the element %2. Allowed is %3, and the standard attributes.</source>
- <translation>屬性 %1 不能出現在元素 %2。只能有 %3 以及標準屬性。</translation>
+ <source>internal error: unknown opcode in auto_possessify()</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Dividing a value of type %1 by %2 (not-a-number) is not allowed.</source>
- <translation>將型態 %1 除以 %2（非數值）是不允許的。</translation>
+ <source>missing terminating delimiter for callout with string argument</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Required cardinality is %1; got cardinality %2.</source>
- <translation>需要的基數為 %1；得到的是 %2。</translation>
+ <source>unrecognized string delimiter follows (?C</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>A construct was encountered which only is allowed in XQuery.</source>
- <translation>遇到了建構，實際上只能允許在 XQuery 內。</translation>
+ <source>using \C is disabled by the application</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>No function by name %1 is available.</source>
- <translation>沒有名為 %1 的函式。</translation>
+ <source>(?| and/or (?J: or (?x: parentheses are too deeply nested</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The URI cannot have a fragment</source>
- <translation>URI 不能有片段</translation>
+ <source>using \C is disabled in this PCRE2 library</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 is not an atomic type. Casting is only possible to atomic types.</source>
- <translation>%1 不是一個原型態。只能轉換為原型態。</translation>
+ <source>regular expression is too complicated</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The first argument to %1 cannot be of type %2.</source>
- <translation>呼叫 %1 的第一個參數不能是 %2 型態。</translation>
+ <source>lookbehind assertion is too long</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The namespace URI must be a constant and cannot use enclosed expressions.</source>
- <translation>命名空間網址必須是常數，並且不能使用封閉敘述。</translation>
+ <source>pattern string is longer than the limit set by the application</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Prefix %1 is already declared in the prolog.</source>
- <translation>前置字串 %1 已在 prolog 中宣告。</translation>
+ <source>no match</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Ambiguous rule match.</source>
- <translation>不明確的規則符合。</translation>
+ <source>partial match</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Promoting %1 to %2 may cause loss of precision.</source>
- <translation>將 %1 抬升為 %2 可能會失去精確度。</translation>
+ <source>UTF-8 error: 1 byte missing at end</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching.</source>
- <translation>在 XSL-T 樣式內，只有函式 %1，%2 可以用於比對。%3 不行。</translation>
+ <source>UTF-8 error: 2 bytes missing at end</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>A default namespace declaration must occur before function, variable, and option declarations.</source>
- <translation>預設的命名空間宣告必須在函式、變數與選項宣告之前。</translation>
+ <source>UTF-8 error: 3 bytes missing at end</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Operator %1 cannot be used on atomic values of type %2 and %3.</source>
- <translation>操作元 %1 不能用於型態 %2 與 %3 的原數值。</translation>
+ <source>UTF-8 error: 4 bytes missing at end</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The module import feature is not supported</source>
- <translation>模組匯入功能未支援</translation>
+ <source>UTF-8 error: 5 bytes missing at end</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The parameter %1 is passed, but no corresponding %2 exists.</source>
- <translation>參數 %1 已傳送，但找不到相關的 %2。</translation>
+ <source>UTF-8 error: byte 2 top bits not 0x80</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>A value of type %1 cannot have an Effective Boolean Value.</source>
- <translation>型態 %1 不能有實際布林值。</translation>
+ <source>UTF-8 error: byte 3 top bits not 0x80</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The data of a processing instruction cannot contain the string %1</source>
- <translation>處理指令的資料不能包含字串 %1</translation>
+ <source>UTF-8 error: byte 4 top bits not 0x80</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; </source>
- <translation>時間 24:%1:%2.%3 不合法。小時為 24 則分、秒與毫秒都必須是 0; </translation>
+ <source>UTF-8 error: byte 5 top bits not 0x80</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>A template by name %1 has already been declared.</source>
- <translation>名為 %1 的屬性已被宣告。</translation>
+ <source>UTF-8 error: byte 6 top bits not 0x80</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>It is not possible to bind to the prefix %1</source>
- <translation>無法與前置字串 %1 結合</translation>
+ <source>UTF-8 error: 5-byte character is not allowed (RFC 3629)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Value %1 of type %2 is below minimum (%3).</source>
- <translation>型態 %2 的數值 %1 已低過最小值（%3）。</translation>
+ <source>UTF-8 error: 6-byte character is not allowed (RFC 3629)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Required type is %1, but %2 was found.</source>
- <translation>需要的型態為 %1，但找到 %2。</translation>
+ <source>UTF-8 error: code points greater than 0x10ffff are not defined</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 is an unsupported encoding.</source>
- <translation>%1 是個未被支援的編碼。</translation>
+ <source>UTF-8 error: code points 0xd800-0xdfff are not defined</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The name of an option must have a prefix. There is no default namespace for options.</source>
- <translation>選項名稱必須有前置字串。沒有選項的預設命名空間。</translation>
+ <source>UTF-8 error: overlong 2-byte sequence</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Element %1 must come last.</source>
- <translation>元素 %1 必須最後出現。</translation>
+ <source>UTF-8 error: overlong 3-byte sequence</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Attribute %1 cannot appear on the element %2. Allowed is %3, %4, and the standard attributes.</source>
- <translation>屬性 %1 不能出現在元素 %2。只能有 %3，%4 以及標準屬性。</translation>
+ <source>UTF-8 error: overlong 4-byte sequence</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>No namespace binding exists for the prefix %1 in %2</source>
- <translation>在 %2 的前置字串 %1 沒有結合命名空間</translation>
+ <source>UTF-8 error: overlong 5-byte sequence</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The name %1 does not refer to any schema type.</source>
- <translation>名稱 %1 未指向任何機制型態。</translation>
+ <source>UTF-8 error: overlong 6-byte sequence</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared).</source>
- <translation>前置字串 %1 只能與 %2 結合（也就是說，要預先定義）。</translation>
+ <source>UTF-8 error: isolated byte with 0x80 bit set</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The initialization of variable %1 depends on itself</source>
- <translation>變數 %1 的初始化與自身相依</translation>
+ <source>UTF-8 error: illegal byte (0xfe or 0xff)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place.</source>
- <translation>屬性點不能做為文件點的子節點。因此，屬性 %1 的位置不合適。</translation>
+ <source>UTF-16 error: missing low surrogate at end</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Month %1 is outside the range %2..%3.</source>
- <translation>月份 %1 已超出 %2 到 %3 的範圍。</translation>
+ <source>UTF-16 error: invalid low surrogate</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide.</source>
- <translation>與 for 敘述結合的變數名稱必須與位置變數不同。因此，有兩個名為 %1 的變數衝突了。</translation>
+ <source>UTF-16 error: isolated low surrogate</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>No namespace binding exists for the prefix %1</source>
- <translation>前置字串 %1 沒有結合命名空間</translation>
+ <source>UTF-32 error: code points 0xd800-0xdfff are not defined</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>An %1-attribute with value %2 has already been declared.</source>
- <translation>已宣告屬性 %1 的值為 %2。</translation>
+ <source>UTF-32 error: code points greater than 0x10ffff are not defined</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 is not valid as a value of type %2.</source>
- <translation>%1 不是合法的 %2 型態的值。</translation>
+ <source>bad data value</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>zero or more</source>
- <translation>0 個以上</translation>
+ <source>patterns do not all use the same character tables</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported.</source>
- <translation>%1 不是範圍內屬性宣告。注意機制匯入功能未支援。</translation>
+ <source>magic number missing</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal.</source>
- <translation>當函式 %1 用於樣式比對時，參數必須是變數參考或字串。</translation>
+ <source>pattern compiled in wrong mode: 8/16/32-bit error</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 is an invalid template mode name.</source>
- <translation>%1 不是合法的樣本模式名稱。</translation>
+ <source>bad offset value</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>At least one time component must appear after the %1-delimiter.</source>
- <translation>在分隔符 %1 後必須至少有一個時間組件。</translation>
+ <source>bad option value</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Overflow: Date can&apos;t be represented.</source>
- <translation>溢位：無法&apos;表示日期。</translation>
+ <source>invalid replacement string</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Operator %1 is not available between atomic values of type %2 and %3.</source>
- <translation>操作元 %1 不能用於型態 %2 與 %3 的原數值。</translation>
+ <source>bad offset into UTF string</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>A zone offset must be in the range %1..%2 inclusive. %3 is out of range.</source>
- <translation>區域位移必須是在 %1 到 %2 範圍之內。%3 已超出範圍。</translation>
+ <source>callout error code</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 is not a valid XML 1.0 character.</source>
- <translation>%1 不是合法的 XML 1.0 字元。</translation>
+ <source>invalid data in workspace for DFA restart</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5.</source>
- <translation>呼叫 %1 的第一個參數不能是 %2 型態。必須是 %3、%4 或 %5 型態。</translation>
+ <source>too much recursion for DFA matching</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>%1 is not a whole number of minutes.</source>
- <translation>%1 不是分鐘的數值。</translation>
+ <source>backreference condition or recursion test is not supported for DFA matching</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Failure when casting from %1 to %2: %3</source>
- <translation>從 %1 轉換到 %2 時失敗：%3</translation>
+ <source>function is not supported for DFA matching</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>It is not possible to cast from %1 to %2.</source>
- <translation>不能從 %1 轉換到 %2。</translation>
+ <source>pattern contains an item that is not supported for DFA matching</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>No variable by name %1 exists</source>
- <translation>沒有名為 %1 的變數存在</translation>
+ <source>workspace size exceeded in DFA matching</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared).</source>
- <translation>命名空間 %1 只能與 %2 結合（也就是說，要預先定義）。</translation>
+ <source>internal error - pattern overwritten?</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The second operand in a division, %1, cannot be zero (%2).</source>
- <translation>整數除法的第二個運算對象 %1 不能是零（%2）。</translation>
+ <source>bad JIT option</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Only one %1 declaration can occur in the query prolog.</source>
- <translation>只有一個 %1 宣告可以在查詢中。</translation>
+ <source>JIT stack limit reached</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Element %1 must have at least one of the attributes %2 or %3.</source>
- <translation>元素 %1 必須至少有屬性 %2 或 %3 其中一個。</translation>
+ <source>match limit exceeded</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same.</source>
- <translation>如果兩個值都有區域位移，則必須是相同的區域位移。%1 與 %2 並不相同。</translation>
+ <source>no more memory</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>No external functions are supported. All supported functions can be used directly, without first declaring them as external</source>
- <translation>未支援外部函式。所有支援的含式可以直接使用而不需要先宣告為外部函式</translation>
+ <source>unknown substring</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two.</source>
- <translation>路徑的最後一步必須是節點或原值，而不能在兩者之間。</translation>
+ <source>non-unique substring name</source>
+ <translation type="unfinished"></translation>
 </message>
-</context>
-<context>
- <name>QFontDialog</name>
 <message>
- <source>&amp;Font</source>
- <translation>&amp;字型</translation>
+ <source>NULL argument passed</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>&amp;Size</source>
- <translation>&amp;大小</translation>
+ <source>nested recursion at the same subject position</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Sample</source>
- <translation>範例</translation>
+ <source>recursion limit exceeded</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Font st&amp;yle</source>
- <translation>字型樣&amp;式</translation>
+ <source>requested value is not available</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Wr&amp;iting System</source>
- <translation>寫&amp;入系統</translation>
+ <source>requested value is not set</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Select Font</source>
- <translation>選擇字型</translation>
+ <source>offset limit set without PCRE2_USE_OFFSET_LIMIT</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>&amp;Underline</source>
- <translation>&amp;底線</translation>
+ <source>bad escape sequence in replacement string</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Effects</source>
- <translation>效果</translation>
+ <source>expected closing curly bracket in replacement string</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Stri&amp;keout</source>
- <translation>刪&amp;除線</translation>
+ <source>bad substitution in replacement string</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>match with end before start is not supported</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>too many replacements (more than INT_MAX)</source>
+ <translation type="unfinished"></translation>
 </message>
 </context>
 <context>
- <name>Q3Wizard</name>
+ <name>QSQLite2Driver</name>
 <message>
- <source>&amp;Help</source>
- <translation>&amp;說明</translation>
+ <source>Error opening database</source>
+ <translation>開啟資料庫發生錯誤</translation>
 </message>
 <message>
- <source>&amp;Cancel</source>
- <translation>&amp;取消</translation>
+ <source>Unable to begin transaction</source>
+ <translation>無法開始處理事項</translation>
 </message>
 <message>
- <source>&amp;Finish</source>
- <translation>&amp;完成</translation>
+ <source>Unable to commit transaction</source>
+ <translation>無法提交處理事項</translation>
 </message>
 <message>
- <source>&amp;Next &gt;</source>
- <translation>&amp;下一個 &gt;＞</translation>
+ <source>Unable to rollback transaction</source>
+ <translation>無法回退處理事項</translation>
 </message>
+</context>
+<context>
+ <name>QSQLite2Result</name>
 <message>
- <source>&lt; &amp;Back</source>
- <translation>＜&lt; &amp;返回</translation>
+ <source>Unable to fetch results</source>
+ <translation>無法抓取結果</translation>
+ </message>
+ <message>
+ <source>Unable to execute statement</source>
+ <translation>無法執行陳述</translation>
 </message>
 </context>
 <context>
- <name>QWorkspace</name>
+ <name>QSQLiteDriver</name>
 <message>
- <source>&amp;Move</source>
- <translation>&amp;移動</translation>
+ <source>Error opening database</source>
+ <translation>開啟資料庫發生錯誤</translation>
 </message>
 <message>
- <source>&amp;Size</source>
- <translation>&amp;大小</translation>
+ <source>Error closing database</source>
+ <translation>關閉資料庫發生錯誤</translation>
 </message>
 <message>
- <source>Close</source>
- <translation>關閉</translation>
+ <source>Unable to begin transaction</source>
+ <translation>無法開始處理事項</translation>
 </message>
 <message>
- <source>Minimize</source>
- <translation>最小化</translation>
+ <source>Unable to commit transaction</source>
+ <translation>無法提交處理事項</translation>
 </message>
 <message>
- <source>Stay on &amp;Top</source>
- <translation>留在&amp;頂端</translation>
+ <source>Unable to rollback transaction</source>
+ <translation>無法回退處理事項</translation>
 </message>
+</context>
+<context>
+ <name>QSQLiteResult</name>
 <message>
- <source>&amp;Close</source>
- <translation>&amp;關閉</translation>
+ <source>Unable to fetch row</source>
+ <translation>無法抓取列</translation>
 </message>
 <message>
- <source>%1 - [%2]</source>
- <translation>%1 - [%2]</translation>
+ <source>No query</source>
+ <translation>沒有查詢</translation>
 </message>
 <message>
- <source>Sh&amp;ade</source>
- <translation>遮&amp;蔽)</translation>
+ <source>Unable to execute statement</source>
+ <translation>無法執行陳述</translation>
 </message>
 <message>
- <source>&amp;Restore</source>
- <translation>&amp;回復</translation>
+ <source>Unable to execute multiple statements at a time</source>
+ <translation>不能同時執行多個陳述</translation>
 </message>
 <message>
- <source>&amp;Unshade</source>
- <translation>&amp;取消遮蔽</translation>
+ <source>Unable to reset statement</source>
+ <translation>無法重設陳述</translation>
 </message>
 <message>
- <source>Mi&amp;nimize</source>
- <translation>最小&amp;化</translation>
+ <source>Unable to bind parameters</source>
+ <translation>無法結合參數</translation>
 </message>
 <message>
- <source>Ma&amp;ximize</source>
- <translation>最大&amp;化</translation>
+ <source>Parameter count mismatch</source>
+ <translation>參數數量不符合</translation>
 </message>
+</context>
+<context>
+ <name>QSaveFile</name>
 <message>
- <source>Restore Down</source>
- <translation>向下恢復</translation>
+ <source>Existing file %1 is not writable</source>
+ <translation>存在檔案 %1 無法寫入</translation>
+ </message>
+ <message>
+ <source>Filename refers to a directory</source>
+ <translation>檔案名稱對應到一個目錄</translation>
+ </message>
+ <message>
+ <source>QSaveFile cannot open &apos;%1&apos; without direct write fallback enabled: path contains an Alternate Data Stream specifier</source>
+ <translation>QSaveFile 無法在沒啟用直接寫入 fallback 的情況下開啟「%1」：位置包含了一個備用檔案串流說明符</translation>
+ </message>
+ <message>
+ <source>Writing canceled by application</source>
+ <translation>被應用程式取消寫入程序</translation>
 </message>
 </context>
 <context>
- <name>QColorDialog</name>
+ <name>QScrollBar</name>
 <message>
- <source>&amp;Red:</source>
- <translation>&amp;紅:</translation>
+ <source>Scroll here</source>
+ <translation>在此捲動</translation>
 </message>
 <message>
- <source>&amp;Sat:</source>
- <translation>&amp;飽和度:</translation>
+ <source>Left edge</source>
+ <translation>左邊緣</translation>
 </message>
 <message>
- <source>&amp;Val:</source>
- <translation>&amp;亮度:</translation>
+ <source>Top</source>
+ <translation>頂端</translation>
 </message>
 <message>
- <source>Hu&amp;e:</source>
- <translation>色&amp;調:</translation>
+ <source>Right edge</source>
+ <translation>右邊緣</translation>
 </message>
 <message>
- <source>Select Color</source>
- <translation>選擇顏色</translation>
+ <source>Bottom</source>
+ <translation>底端</translation>
 </message>
 <message>
- <source>&amp;Add to Custom Colors</source>
- <translation>&amp;新增到自訂顏色</translation>
+ <source>Page left</source>
+ <translation>頁面左方</translation>
 </message>
 <message>
- <source>Bl&amp;ue:</source>
- <translation>藍&amp;色):</translation>
+ <source>Page up</source>
+ <translation>頁面上方</translation>
 </message>
 <message>
- <source>&amp;Green:</source>
- <translation>綠&amp;色):</translation>
+ <source>Page right</source>
+ <translation>頁面右方</translation>
 </message>
 <message>
- <source>&amp;Basic colors</source>
- <translation>&amp;基本顏色</translation>
+ <source>Page down</source>
+ <translation>頁面下方</translation>
 </message>
 <message>
- <source>&amp;Custom colors</source>
- <translation>&amp;自訂顏色</translation>
+ <source>Scroll left</source>
+ <translation>往左捲動</translation>
 </message>
 <message>
- <source>A&amp;lpha channel:</source>
- <translation>&amp;Alpha 色版:</translation>
+ <source>Scroll up</source>
+ <translation>往上捲動</translation>
+ </message>
+ <message>
+ <source>Scroll right</source>
+ <translation>往右捲動</translation>
+ </message>
+ <message>
+ <source>Scroll down</source>
+ <translation>往下捲動</translation>
 </message>
 </context>
 <context>
- <name>QSharedMemory</name>
+ <name>QSctpSocket</name>
 <message>
- <source>%1: system-imposed size restrictions</source>
- <translation>%1：系統大小限制</translation>
+ <source>The remote host closed the connection</source>
+ <translation>遠端主機關閉了連線</translation>
 </message>
+</context>
+<context>
+ <name>QSharedMemory</name>
 <message>
- <source>%1: unix key file doesn&apos;t exists</source>
- <translation>%1：unix 鍵值檔不&apos;存在</translation>
+ <source>%1: unable to set key on lock</source>
+ <translation>%1：無法設定鎖定鍵</translation>
 </message>
 <message>
- <source>%1: doesn&apos;t exists</source>
- <translation>%1：不&apos;存在</translation>
+ <source>%1: create size is less then 0</source>
+ <translation>%1：建立大小小於 0</translation>
 </message>
 <message>
- <source>%1: key is empty</source>
- <translation>%1：鍵值是空的</translation>
+ <source>%1: unable to lock</source>
+ <translation>%1：無法鎖定</translation>
 </message>
 <message>
- <source>%1: key error</source>
- <translation>%1：鍵值錯誤</translation>
+ <source>%1: unable to unlock</source>
+ <translation>%1：無法解鎖</translation>
 </message>
 <message>
- <source>%1: create size is less then 0</source>
- <translation>%1：建立大小小於 0</translation>
+ <source>%1: key is empty</source>
+ <translation>%1：鍵值是空的</translation>
 </message>
 <message>
- <source>%1: already exists</source>
- <translation>%1：已存在</translation>
+ <source>%1: bad name</source>
+ <translation>%1：無效名稱</translation>
 </message>
 <message>
- <source>%1: unknown error %2</source>
- <translation>%1：未知的錯誤 %2</translation>
+ <source>%1: UNIX key file doesn&apos;t exist</source>
+ <translation>%1：UNIX 金鑰檔案不存在</translation>
 </message>
 <message>
- <source>%1: invalid size</source>
- <translation>%1：不合法的大小</translation>
+ <source>%1: ftok failed</source>
+ <translation>%1：ftok 失敗</translation>
 </message>
 <message>
 <source>%1: unable to make key</source>
 <translation>%1：無法產生鍵值</translation>
 </message>
 <message>
- <source>%1: unable to set key on lock</source>
- <translation>%1：無法設定鍵值</translation>
+ <source>%1: system-imposed size restrictions</source>
+ <translation>%1：系統強制大小限制</translation>
 </message>
 <message>
- <source>%1: unable to unlock</source>
- <translation>%1：無法解除鎖定</translation>
+ <source>%1: not attached</source>
+ <translation>%1：未附加</translation>
 </message>
 <message>
 <source>%1: permission denied</source>
 <translation>%1：存取被拒</translation>
 </message>
 <message>
- <source>%1: ftok failed</source>
- <translation>%1：ftok 失敗</translation>
+ <source>%1: already exists</source>
+ <translation>%1：已存在</translation>
+ </message>
+ <message>
+ <source>%1: doesn&apos;t exist</source>
+ <translation>%1：不存在</translation>
 </message>
 <message>
 <source>%1: out of resources</source>
 <translation>%1：資源不足</translation>
 </message>
 <message>
- <source>%1: not attached</source>
- <translation>%1：未附加</translation>
+ <source>%1: unknown error %2</source>
+ <translation>%1：未知的錯誤 %2</translation>
 </message>
 <message>
- <source>%1: size query failed</source>
- <translation>%1：大小查詢失敗</translation>
+ <source>%1: invalid size</source>
+ <translation>%1：大小無效</translation>
 </message>
 <message>
- <source>%1: unable to lock</source>
- <translation>%1：無法鎖定</translation>
+ <source>%1: key error</source>
+ <translation>%1：鍵值錯誤</translation>
+ </message>
+ <message>
+ <source>%1: size query failed</source>
+ <translation>%1：大小查詢失敗</translation>
 </message>
 </context>
 <context>
- <name>QXmlStream</name>
+ <name>QShortcut</name>
 <message>
- <source>Reference to unparsed entity &apos;%1&apos;.</source>
- <translation>參考到未剖析的實體 &apos;%1&apos;1。</translation>
+ <source>Space</source>
+ <extracomment>This and all following &quot;incomprehensible&quot; strings in QShortcut context are key names. Please use the localized names appearing on actual keyboards or whatever is commonly used.</extracomment>
+ <translation>空白鍵</translation>
 </message>
 <message>
- <source>Unexpected character &apos;%1&apos; in public id literal.</source>
- <translation>在公開代碼字元中&apos;%1&apos;遇到非預期的字元 %1。</translation>
+ <source>Esc</source>
+ <translation>Esc</translation>
 </message>
 <message>
- <source>Illegal namespace declaration.</source>
- <translation>不合法的命名空間宣告。</translation>
+ <source>Tab</source>
+ <translation>Tab</translation>
 </message>
 <message>
- <source>Invalid XML character.</source>
- <translation>不合法的 XML 字元。</translation>
+ <source>Backtab</source>
+ <translation>Backtab</translation>
 </message>
 <message>
- <source>Expected character data.</source>
- <translation>預期的字元資料。</translation>
+ <source>Backspace</source>
+ <translation>Backspace</translation>
 </message>
 <message>
- <source>Standalone accepts only yes or no.</source>
- <translation>獨立實體只接受 yes 或 no。</translation>
+ <source>Return</source>
+ <translation>Return</translation>
 </message>
 <message>
- <source>Invalid XML version string.</source>
- <translation>不合法的 XML 版本字串。</translation>
+ <source>Enter</source>
+ <translation>Enter</translation>
 </message>
 <message>
- <source>Invalid processing instruction name.</source>
- <translation>不合法的處理指令名稱。</translation>
+ <source>Ins</source>
+ <translation>插入鍵 (Ins)</translation>
 </message>
 <message>
- <source>Namespace prefix &apos;%1&apos; not declared</source>
- <translation>命名空間的前置字串&apos;%1&apos;未宣告</translation>
+ <source>Del</source>
+ <translation>刪除鍵 (Del)</translation>
 </message>
 <message>
- <source>Entity &apos;%1&apos; not declared.</source>
- <translation>實體 %1 &apos;%1&apos;未宣告。</translation>
+ <source>Pause</source>
+ <translation>暫停鍵 (Pause)</translation>
 </message>
 <message>
- <source>%1 is an invalid processing instruction name.</source>
- <translation>%1 是不合法的處理指令名稱。</translation>
+ <source>Print</source>
+ <translation>Print</translation>
 </message>
 <message>
- <source>The standalone pseudo attribute must appear after the encoding.</source>
- <translation>獨立的虛擬屬性必須在編碼之後出現。</translation>
+ <source>SysReq</source>
+ <translation>SysReq</translation>
 </message>
 <message>
- <source>Sequence &apos;]]&gt;&apos; not allowed in content.</source>
- <translation>在內文中&apos;]]&gt;&apos;不允許有序列。</translation>
+ <source>Home</source>
+ <translation>Home</translation>
 </message>
 <message>
- <source>%1 is an invalid encoding name.</source>
- <translation>%1 為不合法的編碼名稱。</translation>
+ <source>End</source>
+ <translation>End</translation>
 </message>
 <message>
- <source>, but got &apos;</source>
- <translation>，但是看到的是 &apos;</translation>
+ <source>Left</source>
+ <translation>左鍵</translation>
 </message>
 <message>
- <source>Start tag expected.</source>
- <translation>預期應有開始標籤。</translation>
+ <source>Up</source>
+ <translation>上鍵</translation>
 </message>
 <message>
- <source>Invalid character reference.</source>
- <translation>不合法的字元參考。</translation>
+ <source>Right</source>
+ <translation>右鍵</translation>
 </message>
 <message>
- <source>Reference to external entity &apos;%1&apos; in attribute value.</source>
- <translation>在屬性值中 &apos;%1&apos;參考到外部實體 %1。</translation>
+ <source>Down</source>
+ <translation>下鍵</translation>
 </message>
 <message>
- <source>Expected </source>
- <translation>預期應為 </translation>
+ <source>PgUp</source>
+ <translation>PgUp</translation>
 </message>
 <message>
- <source>Invalid document.</source>
- <translation>不合法的文件。</translation>
+ <source>PgDown</source>
+ <translation>PgDown</translation>
 </message>
 <message>
- <source>Opening and ending tag mismatch.</source>
- <translation>開啟與結束的標籤不對稱。</translation>
+ <source>CapsLock</source>
+ <translation>大寫鎖定</translation>
 </message>
 <message>
- <source>Encountered incorrectly encoded content.</source>
- <translation>遇到不正確的編碼內容。</translation>
+ <source>NumLock</source>
+ <translation>數字鎖定</translation>
 </message>
 <message>
- <source>Invalid attribute in XML declaration.</source>
- <translation>XML 宣告中有不合法的屬性。</translation>
+ <source>ScrollLock</source>
+ <translation>捲動鎖定</translation>
 </message>
 <message>
- <source>Attribute redefined.</source>
- <translation>屬性重定義。</translation>
+ <source>Menu</source>
+ <translation>選單</translation>
 </message>
 <message>
- <source>%1 is an invalid PUBLIC identifier.</source>
- <translation>%1 為不合法的 PUBLIC 識別子。</translation>
+ <source>Help</source>
+ <translation>說明</translation>
 </message>
 <message>
- <source>Extra content at end of document.</source>
- <translation>文件尾端有多餘的內容。</translation>
+ <source>Back</source>
+ <translation>返回</translation>
 </message>
 <message>
- <source>Invalid XML name.</source>
- <translation>不合法的 XML 名稱。</translation>
+ <source>Forward</source>
+ <translation>往前</translation>
 </message>
 <message>
- <source>Premature end of document.</source>
- <translation>文件結尾不正確。</translation>
+ <source>Stop</source>
+ <translation>停止</translation>
 </message>
 <message>
- <source>XML declaration not at start of document.</source>
- <translation>XML 宣告沒有在文件開始處。</translation>
+ <source>Refresh</source>
+ <translation>重新整理</translation>
 </message>
 <message>
- <source>Recursive entity detected.</source>
- <translation>偵測到遞迴實體。</translation>
+ <source>Volume Down</source>
+ <translation>音量降低</translation>
 </message>
 <message>
- <source>Unsupported XML version.</source>
- <translation>未支援的 XML 版本。</translation>
+ <source>Volume Mute</source>
+ <translation>靜音</translation>
 </message>
 <message>
- <source>Unexpected &apos;</source>
- <translation>非預期 &apos;</translation>
+ <source>Volume Up</source>
+ <translation>音量加大</translation>
 </message>
 <message>
- <source>Invalid entity value.</source>
- <translation>不合法的實體值。</translation>
+ <source>Bass Boost</source>
+ <translation>重低音</translation>
 </message>
 <message>
- <source>Encoding %1 is unsupported</source>
- <translation>編碼 %1 不支援</translation>
+ <source>Bass Up</source>
+ <translation>Bass Up</translation>
 </message>
 <message>
- <source>NDATA in parameter entity declaration.</source>
- <translation>在參數實體宣告有 NDATA。</translation>
+ <source>Bass Down</source>
+ <translation>Bass Down</translation>
 </message>
-</context>
-<context>
- <name>QProcess</name>
 <message>
- <source>Error writing to process</source>
- <translation>寫入行程時發生錯誤</translation>
+ <source>Treble Up</source>
+ <translation>Treble Up</translation>
 </message>
 <message>
- <source>Resource error (fork failure): %1</source>
- <translation>資源錯誤（fork 失敗）：%1</translation>
+ <source>Treble Down</source>
+ <translation>Treble Down</translation>
 </message>
 <message>
- <source>Error reading from process</source>
- <translation>從行程讀取時發生錯誤</translation>
+ <source>Media Play</source>
+ <translation>播放媒體</translation>
 </message>
 <message>
- <source>Process failed to start</source>
- <translation>啟動行程失敗</translation>
+ <source>Media Stop</source>
+ <translation>停止媒體</translation>
 </message>
 <message>
- <source>Could not open input redirection for reading</source>
- <translation>無法開啟輸入導向以讀取</translation>
+ <source>Media Previous</source>
+ <translation>上一個媒體</translation>
 </message>
 <message>
- <source>Could not open output redirection for writing</source>
- <translation>無法開啟輸出導向以寫入</translation>
+ <source>Media Next</source>
+ <translation>下一個媒體</translation>
 </message>
 <message>
- <source>Process operation timed out</source>
- <translation>行程操作逾時</translation>
+ <source>Media Record</source>
+ <translation>錄製媒體</translation>
 </message>
 <message>
- <source>Process crashed</source>
- <translation>行程已崩潰</translation>
+ <source>Media Pause</source>
+ <extracomment>Media player pause button</extracomment>
+ <translation>暫停媒體</translation>
 </message>
-</context>
-<context>
- <name>QNativeSocketEngine</name>
 <message>
- <source>The proxy type is invalid for this operation</source>
- <translation>代理伺服器型態無法支援此操作</translation>
+ <source>Toggle Media Play/Pause</source>
+ <extracomment>Media player button to toggle between playing and paused</extracomment>
+ <translation>切換播放／暫停媒體</translation>
 </message>
 <message>
- <source>Network operation timed out</source>
- <translation>網路操作逾時</translation>
+ <source>Home Page</source>
+ <translation>首頁</translation>
 </message>
 <message>
- <source>The remote host closed the connection</source>
- <translation>遠端主機關閉了連線</translation>
+ <source>Favorites</source>
+ <translation>最愛</translation>
 </message>
 <message>
- <source>Invalid socket descriptor</source>
- <translation>不合法的 socket 描述子</translation>
+ <source>Search</source>
+ <translation>搜尋</translation>
 </message>
 <message>
- <source>Host unreachable</source>
- <translation>無法連線到主機</translation>
+ <source>Standby</source>
+ <translation>待命</translation>
 </message>
 <message>
- <source>Protocol type not supported</source>
- <translation>協定型態未支援</translation>
+ <source>Open URL</source>
+ <translation>開啟網址</translation>
 </message>
 <message>
- <source>Datagram was too large to send</source>
- <translation>資料過大無法送出</translation>
+ <source>Launch Mail</source>
+ <translation>啟動郵件程式</translation>
 </message>
 <message>
- <source>Attempt to use IPv6 socket on a platform with no IPv6 support</source>
- <translation>試圖在沒有 IPv6 支援的平台上使用 IPv6 socket</translation>
+ <source>Launch Media</source>
+ <translation>啟動媒體程式</translation>
 </message>
 <message>
- <source>Unable to receive a message</source>
- <translation>無法接收訊息</translation>
+ <source>Launch (0)</source>
+ <translation>啟動 (0)</translation>
 </message>
 <message>
- <source>Permission denied</source>
- <translation>權限不足</translation>
+ <source>Launch (1)</source>
+ <translation>啟動 (1)</translation>
 </message>
 <message>
- <source>Connection refused</source>
- <translation>連線被拒</translation>
+ <source>Launch (2)</source>
+ <translation>啟動 (2)</translation>
 </message>
 <message>
- <source>Unable to write</source>
- <translation>無法寫入</translation>
+ <source>Launch (3)</source>
+ <translation>啟動 (3)</translation>
 </message>
 <message>
- <source>Another socket is already listening on the same port</source>
- <translation>另一個 socket 已經在監聽同一個連接埠</translation>
+ <source>Launch (4)</source>
+ <translation>啟動 (4)</translation>
 </message>
 <message>
- <source>Unable to send a message</source>
- <translation>無法送出訊息</translation>
+ <source>Launch (5)</source>
+ <translation>啟動 (5)</translation>
 </message>
 <message>
- <source>The bound address is already in use</source>
- <translation>結合的位址已經在使用中</translation>
+ <source>Launch (6)</source>
+ <translation>啟動 (6)</translation>
 </message>
 <message>
- <source>Connection timed out</source>
- <translation>連線逾時</translation>
+ <source>Launch (7)</source>
+ <translation>啟動 (7)</translation>
 </message>
 <message>
- <source>Network error</source>
- <translation>網路錯誤</translation>
+ <source>Launch (8)</source>
+ <translation>啟動 (8)</translation>
 </message>
 <message>
- <source>Unsupported socket operation</source>
- <translation>未支援的 socket 操作</translation>
+ <source>Launch (9)</source>
+ <translation>啟動 (9)</translation>
 </message>
 <message>
- <source>Operation on non-socket</source>
- <translation>對非 socket 操作</translation>
+ <source>Launch (A)</source>
+ <translation>啟動 (A)</translation>
 </message>
 <message>
- <source>Unable to initialize broadcast socket</source>
- <translation>無法初始化廣播 socket</translation>
+ <source>Launch (B)</source>
+ <translation>啟動 (B)</translation>
 </message>
 <message>
- <source>Unknown error</source>
- <translation>未知的錯誤</translation>
+ <source>Launch (C)</source>
+ <translation>啟動 (C)</translation>
 </message>
 <message>
- <source>Unable to initialize non-blocking socket</source>
- <translation>無法初始化非阻擋性 socket</translation>
+ <source>Launch (D)</source>
+ <translation>啟動 (D)</translation>
 </message>
 <message>
- <source>The address is protected</source>
- <translation>此位址已被保護</translation>
+ <source>Launch (E)</source>
+ <translation>啟動 (E)</translation>
 </message>
 <message>
- <source>Network unreachable</source>
- <translation>無法使用網路</translation>
+ <source>Launch (F)</source>
+ <translation>啟動 (F)</translation>
 </message>
 <message>
- <source>The address is not available</source>
- <translation>無法取得位址</translation>
+ <source>Monitor Brightness Up</source>
+ <translation>提高顯示器亮度</translation>
 </message>
 <message>
- <source>Out of resources</source>
- <translation>資源不足</translation>
+ <source>Monitor Brightness Down</source>
+ <translation>降低顯示器亮度</translation>
 </message>
-</context>
-<context>
- <name>QNetworkAccessFtpBackend</name>
 <message>
- <source>No suitable proxy found</source>
- <translation>找不到合適的代理伺服器</translation>
+ <source>Keyboard Light On/Off</source>
+ <translation>開啟／關閉鍵盤燈光</translation>
 </message>
 <message>
- <source>Error while downloading %1: %2</source>
- <translation>下載 %1 時發生錯誤：%2</translation>
+ <source>Keyboard Brightness Up</source>
+ <translation>提高鍵盤亮度</translation>
 </message>
 <message>
- <source>Error while uploading %1: %2</source>
- <translation>上傳 %1 時發生錯誤：%2</translation>
+ <source>Keyboard Brightness Down</source>
+ <translation>降低鍵盤亮度</translation>
 </message>
 <message>
- <source>Cannot open %1: is a directory</source>
- <translation>無法開啟 %1：是一個目錄</translation>
+ <source>Power Off</source>
+ <translation>電源關閉</translation>
 </message>
 <message>
- <source>Logging in to %1 failed: authentication required</source>
- <translation>登入 %1 失敗：需要認證</translation>
+ <source>Wake Up</source>
+ <translation>喚醒</translation>
 </message>
-</context>
-<context>
- <name>QNetworkAccessHttpBackend</name>
 <message>
- <source>No suitable proxy found</source>
- <translation>找不到合適的代理伺服器</translation>
+ <source>Eject</source>
+ <translation>退出</translation>
 </message>
-</context>
-<context>
- <name>QCheckBox</name>
 <message>
- <source>Check</source>
- <translation>勾選</translation>
+ <source>Screensaver</source>
+ <translation>螢幕保護程式</translation>
 </message>
 <message>
- <source>Toggle</source>
- <translation>切換</translation>
+ <source>WWW</source>
+ <translation>網際網路</translation>
 </message>
 <message>
- <source>Uncheck</source>
- <translation>取消勾選</translation>
+ <source>Sleep</source>
+ <translation>睡眠</translation>
 </message>
-</context>
-<context>
- <name>QRadioButton</name>
 <message>
- <source>Check</source>
- <translation>勾選</translation>
+ <source>LightBulb</source>
+ <translation>燈泡</translation>
+ </message>
+ <message>
+ <source>Shop</source>
+ <translation>商店</translation>
+ </message>
+ <message>
+ <source>History</source>
+ <translation>歷史紀錄</translation>
+ </message>
+ <message>
+ <source>Add Favorite</source>
+ <translation>加到最愛</translation>
+ </message>
+ <message>
+ <source>Hot Links</source>
+ <translation>熱門連結</translation>
+ </message>
+ <message>
+ <source>Adjust Brightness</source>
+ <translation>調整亮度</translation>
+ </message>
+ <message>
+ <source>Finance</source>
+ <translation>股市</translation>
+ </message>
+ <message>
+ <source>Community</source>
+ <translation>社群</translation>
+ </message>
+ <message>
+ <source>Media Rewind</source>
+ <translation>倒帶媒體</translation>
+ </message>
+ <message>
+ <source>Back Forward</source>
+ <translation>向後向前</translation>
+ </message>
+ <message>
+ <source>Application Left</source>
+ <translation>應用程式向左</translation>
+ </message>
+ <message>
+ <source>Application Right</source>
+ <translation>應用程式向右</translation>
+ </message>
+ <message>
+ <source>Book</source>
+ <translation>書籍</translation>
+ </message>
+ <message>
+ <source>CD</source>
+ <translation>CD 光碟</translation>
+ </message>
+ <message>
+ <source>Calculator</source>
+ <translation>計算機</translation>
+ </message>
+ <message>
+ <source>Clear</source>
+ <translation>清除</translation>
+ </message>
+ <message>
+ <source>Clear Grab</source>
+ <translation>清除痕跡</translation>
 </message>
-</context>
-<context>
- <name>Q3TitleBar</name>
 <message>
 <source>Close</source>
 <translation>關閉</translation>
 </message>
 <message>
- <source>Minimize</source>
- <translation>最小化</translation>
+ <source>Copy</source>
+ <translation>複製</translation>
 </message>
 <message>
- <source>Puts a minimized back to normal</source>
- <translation>將最小化視窗放回原大小</translation>
+ <source>Cut</source>
+ <translation>剪下</translation>
 </message>
 <message>
- <source>Displays the name of the window and contains controls to manipulate it</source>
- <translation>顯示視窗名稱，並包含操作它的控制元件</translation>
+ <source>Display</source>
+ <translation>顯示器</translation>
 </message>
 <message>
- <source>Makes the window full screen</source>
- <translation>將視窗放大到全畫面</translation>
+ <source>DOS</source>
+ <translation>DOS</translation>
 </message>
 <message>
- <source>System</source>
- <translation>系統</translation>
+ <source>Documents</source>
+ <translation>文件</translation>
 </message>
 <message>
- <source>Maximize</source>
- <translation>最大化</translation>
+ <source>Spreadsheet</source>
+ <translation>試算表</translation>
 </message>
 <message>
- <source>Contains commands to manipulate the window</source>
- <translation>包含要操作此視窗的指令</translation>
+ <source>Browser</source>
+ <translation>瀏覽器</translation>
 </message>
 <message>
- <source>Restore up</source>
- <translation>向上恢復</translation>
+ <source>Game</source>
+ <translation>遊戲</translation>
 </message>
 <message>
- <source>Closes the window</source>
- <translation>關閉視窗</translation>
+ <source>Go</source>
+ <translation>前往</translation>
 </message>
 <message>
- <source>Puts a maximized window back to normal</source>
- <translation>將最大化視窗放回原大小</translation>
+ <source>iTouch</source>
+ <translation>iTouch</translation>
 </message>
 <message>
- <source>Moves the window out of the way</source>
- <translation>把視窗移開</translation>
+ <source>Logoff</source>
+ <translation>登出</translation>
 </message>
 <message>
- <source>Restore down</source>
- <translation>向下恢復</translation>
+ <source>Market</source>
+ <translation>市集</translation>
 </message>
-</context>
-<context>
- <name>Phonon::</name>
 <message>
- <source>Games</source>
- <translation>遊戲</translation>
+ <source>Meeting</source>
+ <translation>通訊</translation>
+ </message>
+ <message>
+ <source>Keyboard Menu</source>
+ <translation>鍵盤目錄</translation>
+ </message>
+ <message>
+ <source>Menu PB</source>
+ <translation>選單 PB</translation>
+ </message>
+ <message>
+ <source>My Sites</source>
+ <translation>我的網站</translation>
+ </message>
+ <message>
+ <source>News</source>
+ <translation>新聞</translation>
+ </message>
+ <message>
+ <source>Home Office</source>
+ <translation>家庭辦公</translation>
+ </message>
+ <message>
+ <source>Option</source>
+ <translation>選項</translation>
+ </message>
+ <message>
+ <source>Paste</source>
+ <translation>貼上</translation>
+ </message>
+ <message>
+ <source>Phone</source>
+ <translation>手機</translation>
+ </message>
+ <message>
+ <source>Reply</source>
+ <translation>回覆</translation>
+ </message>
+ <message>
+ <source>Reload</source>
+ <translation>重新載入</translation>
+ </message>
+ <message>
+ <source>Rotate Windows</source>
+ <translation>旋轉視窗</translation>
+ </message>
+ <message>
+ <source>Rotation PB</source>
+ <translation>旋轉 PB</translation>
+ </message>
+ <message>
+ <source>Rotation KB</source>
+ <translation>旋轉 KB</translation>
+ </message>
+ <message>
+ <source>Save</source>
+ <translation>儲存</translation>
+ </message>
+ <message>
+ <source>Send</source>
+ <translation>傳送</translation>
+ </message>
+ <message>
+ <source>Spellchecker</source>
+ <translation>拼寫檢查</translation>
+ </message>
+ <message>
+ <source>Split Screen</source>
+ <translation>切割螢幕</translation>
+ </message>
+ <message>
+ <source>Support</source>
+ <translation>支援</translation>
+ </message>
+ <message>
+ <source>Task Panel</source>
+ <translation>工作面板</translation>
+ </message>
+ <message>
+ <source>Terminal</source>
+ <translation>終端器</translation>
+ </message>
+ <message>
+ <source>Tools</source>
+ <translation>工具</translation>
+ </message>
+ <message>
+ <source>Travel</source>
+ <translation>旅行</translation>
+ </message>
+ <message>
+ <source>Video</source>
+ <translation>影片</translation>
+ </message>
+ <message>
+ <source>Word Processor</source>
+ <translation>文字處理器</translation>
+ </message>
+ <message>
+ <source>XFer</source>
+ <translation>XFer</translation>
+ </message>
+ <message>
+ <source>Zoom In</source>
+ <translation>放大</translation>
+ </message>
+ <message>
+ <source>Zoom Out</source>
+ <translation>縮小</translation>
+ </message>
+ <message>
+ <source>Away</source>
+ <translation>拉遠</translation>
+ </message>
+ <message>
+ <source>Messenger</source>
+ <translation>通訊軟體</translation>
+ </message>
+ <message>
+ <source>WebCam</source>
+ <translation>網路攝影機</translation>
+ </message>
+ <message>
+ <source>Mail Forward</source>
+ <translation>信件轉發</translation>
+ </message>
+ <message>
+ <source>Pictures</source>
+ <translation>圖片</translation>
 </message>
 <message>
 <source>Music</source>
 <translation>音樂</translation>
 </message>
 <message>
- <source>Video</source>
- <translation>影像</translation>
+ <source>Battery</source>
+ <translation>電池</translation>
 </message>
 <message>
- <source>Communication</source>
- <translation>通訊</translation>
+ <source>Bluetooth</source>
+ <translation>藍牙</translation>
 </message>
 <message>
- <source>Accessibility</source>
- <translation>輔助裝置</translation>
+ <source>Wireless</source>
+ <translation>無線網路</translation>
 </message>
 <message>
- <source>Notifications</source>
- <translation>通知</translation>
+ <source>Ultra Wide Band</source>
+ <translation>超寬頻帶</translation>
 </message>
-</context>
-<context>
- <name>VolumeSlider</name>
 <message>
- <source>Muted</source>
- <translation>靜音</translation>
+ <source>Media Fast Forward</source>
+ <translation>快轉媒體</translation>
 </message>
 <message>
- <source>Volume: %1%</source>
- <translation>音量：%1%</translation>
+ <source>Audio Repeat</source>
+ <translation>重復播放音訊</translation>
 </message>
-</context>
-<context>
- <name>Q3LocalFs</name>
 <message>
- <source>Could not open
-%1</source>
- <translation>無法開啟
-%1</translation>
+ <source>Audio Random Play</source>
+ <translation>隨機播放音訊</translation>
 </message>
 <message>
- <source>Could not remove file or directory
-%1</source>
- <translation>無法移除目錄
-%1</translation>
+ <source>Subtitle</source>
+ <translation>字幕</translation>
 </message>
 <message>
- <source>Could not create directory
-%1</source>
- <translation>無法建立目錄
-%1</translation>
+ <source>Audio Cycle Track</source>
+ <translation>音訊循環音軌</translation>
 </message>
 <message>
- <source>Could not read directory
-%1</source>
- <translation>無法讀取目錄
-%1</translation>
+ <source>Time</source>
+ <translation>時間</translation>
 </message>
 <message>
- <source>Could not rename
-%1
-to
-%2</source>
- <translation>無法將
-%1
-重新命名為
-%2</translation>
+ <source>Hibernate</source>
+ <translation>休眠</translation>
 </message>
 <message>
- <source>Could not write
-%1</source>
- <translation>無法寫入
-%1</translation>
+ <source>View</source>
+ <translation>檢視</translation>
 </message>
-</context>
-<context>
- <name>QDial</name>
 <message>
- <source>QDial</source>
- <translation>QDial</translation>
+ <source>Top Menu</source>
+ <translation>頂層選單</translation>
 </message>
 <message>
- <source>SliderHandle</source>
- <translation>SliderHandle</translation>
+ <source>Power Down</source>
+ <translation>斷電</translation>
 </message>
 <message>
- <source>SpeedoMeter</source>
- <translation>SpeedoMeter</translation>
+ <source>Suspend</source>
+ <translation>暫停</translation>
 </message>
-</context>
-<context>
- <name>QSocks5SocketEngine</name>
 <message>
- <source>Network operation timed out</source>
- <translation>網路操作逾時</translation>
+ <source>Microphone Mute</source>
+ <translation>靜音麥克風</translation>
 </message>
 <message>
- <source>Connection to proxy closed prematurely</source>
- <translation>代理伺服器連線已不正常關閉</translation>
+ <source>Red</source>
+ <translation>紅色</translation>
 </message>
 <message>
- <source>Proxy authentication failed: %1</source>
- <translation>代理伺服器認證失敗：%1</translation>
+ <source>Green</source>
+ <translation>綠色</translation>
 </message>
 <message>
- <source>Proxy authentication failed</source>
- <translation>代理伺服器認證失敗</translation>
+ <source>Yellow</source>
+ <translation>黃色</translation>
 </message>
 <message>
- <source>General SOCKSv5 server failure</source>
- <translation>一般的 SOCKSv5 伺服器錯誤</translation>
+ <source>Blue</source>
+ <translation>藍色</translation>
 </message>
 <message>
- <source>Unknown SOCKSv5 proxy error code 0x%1</source>
- <translation>未知的 SOCKSv5 代理伺服器錯誤代碼 0x%1</translation>
+ <source>Channel Up</source>
+ <translation>上一頻道</translation>
 </message>
 <message>
- <source>Connection not allowed by SOCKSv5 server</source>
- <translation>連線未被 SOCKSv5 伺服器允許</translation>
+ <source>Channel Down</source>
+ <translation>下一頻道</translation>
 </message>
 <message>
- <source>SOCKSv5 command not supported</source>
- <translation>SOCKSv5 指令未被支援</translation>
+ <source>Guide</source>
+ <translation>指引</translation>
 </message>
 <message>
- <source>Connection to proxy timed out</source>
- <translation>代理伺服器連線逾時</translation>
+ <source>Info</source>
+ <translation>資訊</translation>
 </message>
 <message>
- <source>Proxy host not found</source>
- <translation>找不到代理伺服器</translation>
+ <source>Settings</source>
+ <translation>設定</translation>
 </message>
 <message>
- <source>TTL expired</source>
- <translation>TTL 逾時</translation>
+ <source>Microphone Volume Up</source>
+ <translation>增加麥克風音量</translation>
 </message>
 <message>
- <source>Address type not supported</source>
- <translation>位址型態未被支援</translation>
+ <source>Microphone Volume Down</source>
+ <translation>降低麥克風音量</translation>
 </message>
 <message>
- <source>Connection to proxy refused</source>
- <translation>代理伺服器連線被拒</translation>
+ <source>New</source>
+ <translation>建立</translation>
 </message>
 <message>
- <source>SOCKS version 5 protocol error</source>
- <translation>SOCKS 5 的協定錯誤</translation>
+ <source>Open</source>
+ <translation>開啟</translation>
 </message>
-</context>
-<context>
- <name>QWhatsThisAction</name>
 <message>
- <source>What&apos;s This?</source>
- <translation>這是&apos;什麼?</translation>
+ <source>Find</source>
+ <translation>尋找</translation>
 </message>
-</context>
-<context>
- <name>Q3UrlOperator</name>
 <message>
- <source>The protocol `%1&apos; does not support getting files</source>
- <translation>協定 %1&apos; 未支援取得檔案</translation>
+ <source>Undo</source>
+ <translation>復原</translation>
 </message>
 <message>
- <source>The protocol `%1&apos; does not support renaming files or directories</source>
- <translation>協定 %1&apos; 未支援重新命名檔案或目錄</translation>
+ <source>Redo</source>
+ <translation>重做</translation>
 </message>
 <message>
- <source>The protocol `%1&apos; does not support listing directories</source>
- <translation>協定 %1&apos; 未支援列出目錄</translation>
+ <source>Print Screen</source>
+ <translation>擷取螢幕 PrtSc</translation>
 </message>
 <message>
- <source>(unknown)</source>
- <translation>（未知）</translation>
+ <source>Page Up</source>
+ <translation>往上一頁</translation>
 </message>
 <message>
- <source>The protocol `%1&apos; does not support removing files or directories</source>
- <translation>協定 %1&apos; 未支援移除檔案或目錄</translation>
+ <source>Page Down</source>
+ <translation>往下一頁</translation>
 </message>
 <message>
- <source>The protocol `%1&apos; does not support putting files</source>
- <translation>協定 %1&apos; 未支援寫入檔案</translation>
+ <source>Caps Lock</source>
+ <translation>大寫鎖定</translation>
 </message>
 <message>
- <source>The protocol `%1&apos; is not supported</source>
- <translation>協定 %1 未支援</translation>
+ <source>Num Lock</source>
+ <translation>數字鎖定</translation>
 </message>
 <message>
- <source>The protocol `%1&apos; does not support copying or moving files or directories</source>
- <translation>協定 %1 未支援複製或移動檔案或目錄</translation>
+ <source>Number Lock</source>
+ <translation>數字鎖定</translation>
 </message>
 <message>
- <source>The protocol `%1&apos; does not support creating new directories</source>
- <translation>協定 %1 未支援建立新目錄</translation>
+ <source>Scroll Lock</source>
+ <translation>捲動鎖定</translation>
 </message>
-</context>
-<context>
- <name>QFtp</name>
 <message>
- <source>Listing directory failed:
-%1</source>
- <translation>列出目錄時失敗：
-%1</translation>
+ <source>Insert</source>
+ <translation>插入</translation>
 </message>
 <message>
- <source>Creating directory failed:
-%1</source>
- <translation>建立目錄時失敗：
-%1</translation>
+ <source>Delete</source>
+ <translation>刪除</translation>
 </message>
 <message>
- <source>Not connected</source>
- <translation>未連線</translation>
+ <source>Escape</source>
+ <translation>Esc 鍵</translation>
 </message>
 <message>
- <source>Connection refused for data connection</source>
- <translation>資料連線被拒</translation>
+ <source>System Request</source>
+ <translation>系統要求 SysRq</translation>
 </message>
 <message>
- <source>Login failed:
-%1</source>
- <translation>登入失敗：
-%1</translation>
+ <source>Select</source>
+ <translation>選擇</translation>
 </message>
 <message>
- <source>Downloading file failed:
-%1</source>
- <translation>下載檔案時失敗：
-%1</translation>
+ <source>Yes</source>
+ <translation>是</translation>
 </message>
 <message>
- <source>Connected to host</source>
- <translation>已連線到主機</translation>
+ <source>No</source>
+ <translation>否</translation>
 </message>
 <message>
- <source>Connection timed out to host %1</source>
- <translation>連線到主機 %1 逾時</translation>
+ <source>Context1</source>
+ <translation>內文 1</translation>
 </message>
 <message>
- <source>Connected to host %1</source>
- <translation>已連接到主機 %1</translation>
+ <source>Context2</source>
+ <translation>內文 2</translation>
 </message>
 <message>
- <source>Connecting to host failed:
-%1</source>
- <translation>連線到主機失敗：
-%1</translation>
+ <source>Context3</source>
+ <translation>內文 3</translation>
 </message>
 <message>
- <source>Host %1 not found</source>
- <translation>找不到主機 %1</translation>
+ <source>Context4</source>
+ <translation>內文 4</translation>
 </message>
 <message>
- <source>Uploading file failed:
-%1</source>
- <translation>上傳檔案時失敗：
-%1</translation>
+ <source>Call</source>
+ <extracomment>Button to start a call (note: a separate button is used to end the call)</extracomment>
+ <translation>撥號</translation>
 </message>
 <message>
- <source>Changing directory failed:
-%1</source>
- <translation>變更目錄時失敗：
-%1</translation>
+ <source>Hangup</source>
+ <extracomment>Button to end a call (note: a separate button is used to start the call)</extracomment>
+ <translation>掛斷</translation>
 </message>
 <message>
- <source>Host found</source>
- <translation>找到主機</translation>
+ <source>Toggle Call/Hangup</source>
+ <extracomment>Button that will hang up if we&apos;re in call, or make a call if we&apos;re not.</extracomment>
+ <translation>切換撥號/掛斷狀態</translation>
 </message>
 <message>
- <source>Removing directory failed:
-%1</source>
- <translation>移除目錄時失敗：
-%1</translation>
+ <source>Flip</source>
+ <translation>反轉</translation>
 </message>
 <message>
- <source>Connection refused to host %1</source>
- <translation>連線到主機 %1 被拒</translation>
+ <source>Voice Dial</source>
+ <extracomment>Button to trigger voice dialing</extracomment>
+ <translation>語音撥號</translation>
 </message>
 <message>
- <source>Connection to %1 closed</source>
- <translation>到 %1 的連線已關閉</translation>
+ <source>Last Number Redial</source>
+ <extracomment>Button to redial the last number called</extracomment>
+ <translation>重撥上次撥打號碼</translation>
 </message>
 <message>
- <source>Removing file failed:
-%1</source>
- <translation>移除檔案時失敗：
-%1</translation>
+ <source>Camera Shutter</source>
+ <extracomment>Button to trigger the camera shutter (take a picture)</extracomment>
+ <translation>相機快門</translation>
 </message>
 <message>
- <source>Host %1 found</source>
- <translation>找到主機 %1</translation>
+ <source>Camera Focus</source>
+ <extracomment>Button to focus the camera</extracomment>
+ <translation>相機對焦</translation>
 </message>
 <message>
- <source>Unknown error</source>
- <translation>未知的錯誤</translation>
+ <source>Kanji</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Connection closed</source>
- <translation>連線已關閉</translation>
+ <source>Muhenkan</source>
+ <translation type="unfinished"></translation>
 </message>
-</context>
-<context>
- <name>QDB2Driver</name>
 <message>
- <source>Unable to commit transaction</source>
- <translation>無法提交事務</translation>
+ <source>Henkan</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Unable to set autocommit</source>
- <translation>無法設定自動提交</translation>
+ <source>Romaji</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Unable to connect</source>
- <translation>無法連接</translation>
+ <source>Hiragana</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Unable to rollback transaction</source>
- <translation>無法反轉事務</translation>
+ <source>Katakana</source>
+ <translation type="unfinished"></translation>
 </message>
-</context>
-<context>
- <name>QIBaseDriver</name>
 <message>
- <source>Unable to commit transaction</source>
- <translation>無法提交事務</translation>
+ <source>Hiragana Katakana</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Could not start transaction</source>
- <translation>無法開始事務</translation>
+ <source>Zenkaku</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Error opening database</source>
- <translation>開啟資料庫發生錯誤</translation>
+ <source>Hankaku</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Unable to rollback transaction</source>
- <translation>無法反轉事務</translation>
+ <source>Zenkaku Hankaku</source>
+ <translation type="unfinished"></translation>
 </message>
-</context>
-<context>
- <name>QIBaseResult</name>
 <message>
- <source>Unable to commit transaction</source>
- <translation>無法提交事務</translation>
+ <source>Touroku</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Unable to open BLOB</source>
- <translation>無法開啟 BLOB</translation>
+ <source>Massyo</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Could not describe statement</source>
- <translation>無法描述敘述</translation>
+ <source>Kana Lock</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Could not describe input statement</source>
- <translation>無法描述輸入敘述</translation>
+ <source>Kana Shift</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Could not allocate statement</source>
- <translation>無法配置敘述</translation>
+ <source>Eisu Shift</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Unable to write BLOB</source>
- <translation>無法寫入 BLOB</translation>
+ <source>Eisu toggle</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Could not start transaction</source>
- <translation>無法開始事務</translation>
+ <source>Code input</source>
+ <translation>輸入代碼</translation>
 </message>
 <message>
- <source>Unable to close statement</source>
- <translation>無法關閉敘述</translation>
+ <source>Multiple Candidate</source>
+ <translation>多個候選</translation>
 </message>
 <message>
- <source>Could not get query info</source>
- <translation>無法取得查詢資訊</translation>
+ <source>Previous Candidate</source>
+ <translation>上個候選</translation>
 </message>
 <message>
- <source>Could not find array</source>
- <translation>找不到陣列</translation>
+ <source>Hangul</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Could not get array data</source>
- <translation>無法取得陣列資料</translation>
+ <source>Hangul Start</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Unable to execute query</source>
- <translation>無法執行查詢</translation>
+ <source>Hangul End</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Could not prepare statement</source>
- <translation>無法準備敘述</translation>
+ <source>Hangul Hanja</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Could not fetch next item</source>
- <translation>無法抓取下一個項目</translation>
+ <source>Hangul Jamo</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Could not get statement info</source>
- <translation>無法取得敘述資訊</translation>
+ <source>Hangul Romaja</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Unable to create BLOB</source>
- <translation>無法建立 BLOB</translation>
+ <source>Hangul Jeonja</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Unable to read BLOB</source>
- <translation>無法讀取 BLOB</translation>
+ <source>Hangul Banja</source>
+ <translation type="unfinished"></translation>
 </message>
-</context>
-<context>
- <name>QMYSQLDriver</name>
 <message>
- <source>Unable to commit transaction</source>
- <translation>無法提交事務</translation>
+ <source>Hangul PreHanja</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Unable to open database &apos;</source>
- <translation>無法開啟資料庫&apos;</translation>
+ <source>Hangul PostHanja</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Unable to connect</source>
- <translation>無法連線</translation>
+ <source>Hangul Special</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Unable to rollback transaction</source>
- <translation>無法反轉事務</translation>
+ <source>Cancel</source>
+ <translation>取消</translation>
 </message>
 <message>
- <source>Unable to begin transaction</source>
- <translation>無法開始事務</translation>
+ <source>Printer</source>
+ <translation>印表機</translation>
 </message>
-</context>
-<context>
- <name>QOCIDriver</name>
 <message>
- <source>Unable to commit transaction</source>
- <translation>無法提交事務</translation>
+ <source>Execute</source>
+ <translation>執行</translation>
 </message>
 <message>
- <source>Unable to initialize</source>
- <translation>無法初始化</translation>
+ <source>Play</source>
+ <translation>播放</translation>
 </message>
 <message>
- <source>Unable to logon</source>
- <translation>無法登入</translation>
+ <source>Zoom</source>
+ <translation>縮放</translation>
 </message>
 <message>
- <source>Unable to rollback transaction</source>
- <translation>無法反轉事務</translation>
+ <source>Exit</source>
+ <translation>離開</translation>
 </message>
 <message>
- <source>Unable to begin transaction</source>
- <translation>無法開始事務</translation>
+ <source>Touchpad Toggle</source>
+ <translation>切換觸控板</translation>
 </message>
-</context>
-<context>
- <name>QODBCDriver</name>
 <message>
- <source>Unable to commit transaction</source>
- <translation>無法提交事務</translation>
+ <source>Touchpad On</source>
+ <translation>打開觸控板</translation>
 </message>
 <message>
- <source>Unable to enable autocommit</source>
- <translation>無法開啟自動提交功能</translation>
+ <source>Touchpad Off</source>
+ <translation>關閉觸控板</translation>
 </message>
 <message>
- <source>Unable to connect - Driver doesn&apos;t support all needed functionality</source>
- <translation>無法連接─驅動程式無法&apos;支援所有需要的功能</translation>
+ <source>Ctrl</source>
+ <translation>Ctrl</translation>
 </message>
 <message>
- <source>Unable to disable autocommit</source>
- <translation>無法關閉自動提交功能</translation>
+ <source>Shift</source>
+ <translation>Shift</translation>
 </message>
 <message>
- <source>Unable to connect</source>
- <translation>無法連接</translation>
+ <source>Alt</source>
+ <translation>Alt</translation>
 </message>
 <message>
- <source>Unable to rollback transaction</source>
- <translation>無法反轉事務</translation>
+ <source>Meta</source>
+ <translation>Meta</translation>
+ </message>
+ <message>
+ <source>Num</source>
+ <translation>數字鍵</translation>
+ </message>
+ <message>
+ <source>+</source>
+ <translation>+</translation>
+ </message>
+ <message>
+ <source>F%1</source>
+ <translation>F%1</translation>
 </message>
 </context>
 <context>
- <name>QSQLite2Driver</name>
+ <name>QSocks5SocketEngine</name>
 <message>
- <source>Unable to commit transaction</source>
- <translation>無法提交事務</translation>
+ <source>Connection to proxy refused</source>
+ <translation>代理伺服器連線被拒</translation>
 </message>
 <message>
- <source>Error to open database</source>
- <translation>開啟資料庫時發生錯誤</translation>
+ <source>Connection to proxy closed prematurely</source>
+ <translation>代理伺服器連線不正常關閉</translation>
 </message>
 <message>
- <source>Unable to rollback Transaction</source>
- <translation>無法反轉事務</translation>
+ <source>Proxy host not found</source>
+ <translation>找不到代理伺服器</translation>
 </message>
 <message>
- <source>Unable to begin transaction</source>
- <translation>無法開始事務</translation>
+ <source>Connection to proxy timed out</source>
+ <translation>代理伺服器連線逾時</translation>
 </message>
-</context>
-<context>
- <name>QSQLiteDriver</name>
 <message>
- <source>Unable to commit transaction</source>
- <translation>無法提交事務</translation>
+ <source>Proxy authentication failed</source>
+ <translation>代理伺服器驗證失敗</translation>
 </message>
 <message>
- <source>Error closing database</source>
- <translation>關閉資料庫發生錯誤</translation>
+ <source>Proxy authentication failed: %1</source>
+ <translation>代理伺服器驗證失敗：%1</translation>
 </message>
 <message>
- <source>Error opening database</source>
- <translation>開啟資料庫發生錯誤</translation>
+ <source>SOCKS version 5 protocol error</source>
+ <translation>SOCKS 第五版協定錯誤</translation>
 </message>
 <message>
- <source>Unable to rollback transaction</source>
- <translation>無法反轉事務</translation>
+ <source>General SOCKSv5 server failure</source>
+ <translation>一般的 SOCKSv5 伺服器錯誤</translation>
 </message>
 <message>
- <source>Unable to begin transaction</source>
- <translation>無法開始事務</translation>
+ <source>Connection not allowed by SOCKSv5 server</source>
+ <translation>SOCKSv5 伺服器不允許連線</translation>
+ </message>
+ <message>
+ <source>TTL expired</source>
+ <translation>TTL 逾時</translation>
+ </message>
+ <message>
+ <source>SOCKSv5 command not supported</source>
+ <translation>不支援 SOCKSv5 指令</translation>
+ </message>
+ <message>
+ <source>Address type not supported</source>
+ <translation>不支援位址型態</translation>
+ </message>
+ <message>
+ <source>Unknown SOCKSv5 proxy error code 0x%1</source>
+ <translation>未知的 SOCKSv5 代理伺服器錯誤代碼 0x%1</translation>
+ </message>
+ <message>
+ <source>Network operation timed out</source>
+ <translation>網路操作逾時</translation>
 </message>
 </context>
 <context>
- <name>QAbstractSocket</name>
+ <name>QSpiAccessibleBridge</name>
 <message>
- <source>Host not found</source>
- <translation>找不到主機</translation>
+ <source>invalid role</source>
+ <extracomment>Role of an accessible object - the object is in an invalid state or could not be constructed</extracomment>
+ <translation>角色無效</translation>
 </message>
 <message>
- <source>Connection refused</source>
- <translation>連線被拒</translation>
+ <source>title bar</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>標題欄</translation>
 </message>
 <message>
- <source>Connection timed out</source>
- <translation>連線逾時</translation>
+ <source>menu bar</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>目錄欄</translation>
 </message>
 <message>
- <source>Socket is not connected</source>
- <translation>Socket 未連線</translation>
+ <source>scroll bar</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>捲軸</translation>
 </message>
 <message>
- <source>Socket operation timed out</source>
- <translation>Socket 操作逾時</translation>
+ <source>grip</source>
+ <extracomment>Role of an accessible object - the grip is usually used for resizing another object</extracomment>
+ <translation>底框</translation>
 </message>
 <message>
- <source>Network unreachable</source>
- <translation>無法使用網路</translation>
+ <source>sound</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>音效</translation>
 </message>
 <message>
- <source>Operation on socket is not supported</source>
- <translation>Socket 的操作未被支援</translation>
+ <source>cursor</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>游標</translation>
 </message>
-</context>
-<context>
- <name>QHostInfoAgent</name>
 <message>
- <source>Host not found</source>
- <translation>找不到主機</translation>
+ <source>text caret</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>文字插入點</translation>
 </message>
 <message>
- <source>Unknown address type</source>
- <translation>未知的位址型態</translation>
+ <source>alert message</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>提示訊息</translation>
 </message>
 <message>
- <source>Unknown error</source>
- <translation>未知的錯誤</translation>
+ <source>frame</source>
+ <extracomment>Role of an accessible object: a window with frame and title
+----------
+Role of an accessible object</extracomment>
+ <translation>外框</translation>
 </message>
-</context>
-<context>
- <name>Phonon::Gstreamer::MediaObject</name>
 <message>
- <source>Could not open media source.</source>
- <translation>無法開啟媒體來源。</translation>
+ <source>filler</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>過濾器</translation>
 </message>
 <message>
- <source>Could not decode media source.</source>
- <translation>無法解碼媒體來源。</translation>
+ <source>popup menu</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>彈出式選單</translation>
 </message>
 <message>
- <source>Invalid source type.</source>
- <translation>不合法的來源型態。</translation>
+ <source>menu item</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>選單項目</translation>
 </message>
 <message>
- <source>Cannot start playback. 
-
-Check your Gstreamer installation and make sure you 
-have libgstreamer-plugins-base installed.</source>
- <translation>無法開始播放。
-
-請檢查您的 Gstreamer 安裝，並確定您有安裝
-libgstreamer-plugins-base 套件。</translation>
+ <source>tool tip</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>工具提示</translation>
 </message>
 <message>
- <source>Could not open audio device. The device is already in use.</source>
- <translation>無法開啟音效裝置。裝置已在使用中。</translation>
+ <source>application</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>應用程式</translation>
 </message>
 <message>
- <source>A required codec is missing. You need to install the following codec(s) to play this content: %0</source>
- <translation>找不到需要的編解碼器。您需要安裝以下的套件來播放此內容：%0</translation>
+ <source>document</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>文件</translation>
 </message>
 <message>
- <source>Could not locate media source.</source>
- <translation>無法定位媒體來源。</translation>
+ <source>panel</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>面板</translation>
 </message>
-</context>
-<context>
- <name>QLibrary</name>
 <message>
- <source>Could not unmap &apos;%1&apos;: %2</source>
- <translation>無法 unmap &apos;%1&apos;：%2</translation>
+ <source>chart</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>圖表</translation>
 </message>
 <message>
- <source>Cannot unload library %1: %2</source>
- <translation>無法卸載函式庫 %1：%2</translation>
+ <source>dialog</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>對話框</translation>
 </message>
 <message>
- <source>Cannot load library %1: %2</source>
- <translation>無法載入函式庫 %1：%2</translation>
+ <source>separator</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>分隔符號</translation>
 </message>
 <message>
- <source>The plugin &apos;%1&apos; uses incompatible Qt library. (%2.%3.%4) [%5]</source>
- <translation>外掛程式 &apos;%1&apos; 使用不相容的 Qt 函式庫（%2.%3.%4）【%5】</translation>
+ <source>tool bar</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>工具列</translation>
 </message>
 <message>
- <source>Cannot resolve symbol &quot;%1&quot; in %2: %3</source>
- <translation>無法反解 %2 內的符號 &quot;%1&quot;：%3</translation>
+ <source>status bar</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>狀態列</translation>
 </message>
 <message>
- <source>Plugin verification data mismatch in &apos;%1&apos;</source>
- <translation>在 &apos;%1&apos; 中的外掛程式確認資料不符合</translation>
+ <source>table</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>表格</translation>
 </message>
 <message>
- <source>The plugin &apos;%1&apos; uses incompatible Qt library. (Cannot mix debug and release libraries.)</source>
- <translation>外掛程式 &apos;%1&apos; 使用不相容的 Qt 函式庫。（不能將除錯與釋出版的函式庫混在一起。）</translation>
+ <source>column header</source>
+ <extracomment>Role of an accessible object - part of a table</extracomment>
+ <translation>直欄標頭</translation>
 </message>
 <message>
- <source>The file &apos;%1&apos; is not a valid Qt plugin.</source>
- <translation>檔案 &apos;%1&apos; 不是合法的 Qt 外掛程式。</translation>
+ <source>row header</source>
+ <extracomment>Role of an accessible object - part of a table</extracomment>
+ <translation>橫列標頭</translation>
 </message>
 <message>
- <source>The shared library was not found.</source>
- <translation>找不到分享函式庫。</translation>
+ <source>column</source>
+ <extracomment>Role of an accessible object - part of a table</extracomment>
+ <translation>直欄</translation>
 </message>
 <message>
- <source>Unknown error</source>
- <translation>未知的錯誤</translation>
+ <source>row</source>
+ <extracomment>Role of an accessible object - part of a table</extracomment>
+ <translation>橫列</translation>
 </message>
 <message>
- <source>The plugin &apos;%1&apos; uses incompatible Qt library. Expected build key &quot;%2&quot;, got &quot;%3&quot;</source>
- <translation>外掛程式 &apos;%1&apos; 使用不相容的 Qt 函式庫。預期建構鑰 &quot;%2&quot;，卻得到 &quot;%3&quot;</translation>
+ <source>cell</source>
+ <extracomment>Role of an accessible object - part of a table</extracomment>
+ <translation>儲存格</translation>
 </message>
 <message>
- <source>Could not mmap &apos;%1&apos;: %2</source>
- <translation>無法 mmap &apos;%1&apos;：%2</translation>
+ <source>link</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>連結</translation>
 </message>
-</context>
-<context>
- <name>QHttp</name>
 <message>
- <source>Connection refused (or timed out)</source>
- <translation>連線被拒（或連線逾時）</translation>
+ <source>help balloon</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>求助氣球</translation>
 </message>
 <message>
- <source>Data corrupted</source>
- <translation>資料已損毀</translation>
+ <source>assistant</source>
+ <extracomment>Role of an accessible object - a helper dialog</extracomment>
+ <translation>助手</translation>
 </message>
 <message>
- <source>Connected to host</source>
- <translation>已連線到主機</translation>
+ <source>list</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>列表</translation>
 </message>
 <message>
- <source>Connected to host %1</source>
- <translation>已連接到主機 %1</translation>
+ <source>list item</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>列表項目</translation>
 </message>
 <message>
- <source>Host %1 not found</source>
- <translation>找不到主機 %1</translation>
+ <source>tree</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>樹</translation>
 </message>
 <message>
- <source>Host requires authentication</source>
- <translation>主機需要認證</translation>
+ <source>tree item</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>樹內項目</translation>
 </message>
 <message>
- <source>Error writing response to device</source>
- <translation>寫入回應到裝置時發生錯誤</translation>
+ <source>page tab</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>頁面分頁</translation>
 </message>
 <message>
- <source>HTTPS connection requested but SSL support not compiled in</source>
- <translation>HTTPS 連線需要的 SSL 支援並未編譯進來</translation>
+ <source>property page</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>屬性頁面</translation>
 </message>
 <message>
- <source>Host found</source>
- <translation>找到主機</translation>
+ <source>indicator</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>指示字元</translation>
 </message>
 <message>
- <source>Connection refused</source>
- <translation>連線被拒</translation>
+ <source>graphic</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>圖形</translation>
 </message>
 <message>
- <source>Proxy authentication required</source>
- <translation>代理伺服器需要認證</translation>
+ <source>label</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>標籤</translation>
 </message>
 <message>
- <source>Unknown protocol specified</source>
- <translation>指定了未知的協定</translation>
+ <source>text</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>文字</translation>
 </message>
 <message>
- <source>HTTP request failed</source>
- <translation>HTTP 要求失敗</translation>
+ <source>push button</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>按鈕</translation>
 </message>
 <message>
- <source>Proxy requires authentication</source>
- <translation>代理伺服器需要認證</translation>
+ <source>check box</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>核取框</translation>
 </message>
 <message>
- <source>Authentication required</source>
- <translation>需要認證</translation>
+ <source>radio button</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>選項按鈕</translation>
 </message>
 <message>
- <source>SSL handshake failed</source>
- <translation>SSL 溝通失敗</translation>
+ <source>combo box</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>下拉式方塊</translation>
 </message>
 <message>
- <source>Connection to %1 closed</source>
- <translation>到 %1 的連線已關閉</translation>
+ <source>progress bar</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>進度列</translation>
 </message>
 <message>
- <source>Invalid HTTP chunked body</source>
- <translation>不合法的 HTTP 區塊主體</translation>
+ <source>dial</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Host %1 found</source>
- <translation>找到主機 %1</translation>
+ <source>hotkey field</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>快捷鍵欄位</translation>
 </message>
 <message>
- <source>Wrong content length</source>
- <translation>錯誤的內容長度</translation>
+ <source>slider</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>滑桿</translation>
 </message>
 <message>
- <source>Unknown error</source>
- <translation>未知的錯誤</translation>
+ <source>spin box</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>微調方塊</translation>
 </message>
 <message>
- <source>Invalid HTTP response header</source>
- <translation>不合法的 HTTP 回覆標頭</translation>
+ <source>canvas</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>畫布</translation>
 </message>
 <message>
- <source>Connection closed</source>
- <translation>連線已關閉</translation>
+ <source>animation</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>動畫</translation>
+ </message>
+ <message>
+ <source>equation</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>No server set to connect to</source>
- <translation>沒有設定要連線到哪個伺服器</translation>
+ <source>button with drop down</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>可下拉按鈕</translation>
+ </message>
+ <message>
+ <source>button menu</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>按鈕選單</translation>
+ </message>
+ <message>
+ <source>button with drop down grid</source>
+ <extracomment>Role of an accessible object - a button that expands a grid.</extracomment>
+ <translation>包含下拉網格的按鈕</translation>
+ </message>
+ <message>
+ <source>space</source>
+ <extracomment>Role of an accessible object - blank space between other objects.</extracomment>
+ <translation>空白</translation>
 </message>
 <message>
- <source>Server closed connection unexpectedly</source>
- <translation>伺服器無預警關閉連線</translation>
+ <source>page tab list</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>頁面分頁列表</translation>
 </message>
 <message>
- <source>Request aborted</source>
- <translation>要求中止</translation>
+ <source>clock</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>時鐘</translation>
+ </message>
+ <message>
+ <source>splitter</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>分割符號</translation>
+ </message>
+ <message>
+ <source>layered pane</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>分層窗格</translation>
+ </message>
+ <message>
+ <source>web document</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>網頁文件</translation>
+ </message>
+ <message>
+ <source>paragraph</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>段落</translation>
+ </message>
+ <message>
+ <source>section</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>區段</translation>
+ </message>
+ <message>
+ <source>color chooser</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>顏色選擇器</translation>
+ </message>
+ <message>
+ <source>footer</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>頁尾</translation>
+ </message>
+ <message>
+ <source>form</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>表單</translation>
+ </message>
+ <message>
+ <source>heading</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>頁首</translation>
+ </message>
+ <message>
+ <source>note</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>備註</translation>
+ </message>
+ <message>
+ <source>complementary content</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>terminal</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>終端器</translation>
+ </message>
+ <message>
+ <source>desktop</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>桌面</translation>
+ </message>
+ <message>
+ <source>unknown</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>未知</translation>
 </message>
 </context>
 <context>
- <name>QXml</name>
+ <name>QSslDiffieHellmanParameter</name>
 <message>
- <source>unparsed entity reference in wrong context</source>
- <translation>在錯誤的內文中有未剖析的實體參考</translation>
+ <source>No error</source>
+ <translation>沒有錯誤</translation>
 </message>
 <message>
- <source>external parsed general entity reference not allowed in DTD</source>
- <translation>在 DTD 中不允許使用外部剖析的實體參考</translation>
+ <source>Invalid input data</source>
+ <translation>無效輸入資料</translation>
 </message>
 <message>
- <source>wrong value for standalone declaration</source>
- <translation>獨立宣告時的值錯誤</translation>
+ <source>The given Diffie-Hellman parameters are deemed unsafe</source>
+ <translation>提供的 Diffie-Hellman 參數被認為是不安全的</translation>
 </message>
+</context>
+<context>
+ <name>QSslSocket</name>
 <message>
- <source>encoding declaration or standalone declaration expected while reading the XML declaration</source>
- <translation>讀取 XML 宣告時應有編碼宣告或獨立宣告</translation>
+ <source>Error when setting the OpenSSL configuration (%1)</source>
+ <translation>設定 OpenSSL 設定時發生錯誤 (%1)</translation>
 </message>
 <message>
- <source>no error occurred</source>
- <translation>沒有發生錯誤</translation>
+ <source>Expecting QByteArray for %1</source>
+ <translation>期望 %1 的 QByteArray</translation>
 </message>
 <message>
- <source>error occurred while parsing reference</source>
- <translation>剖析參考時發生錯誤</translation>
+ <source>An error occurred attempting to set %1 to %2</source>
+ <translation>嘗試將 %1 設定為 %2 時發生錯誤</translation>
 </message>
 <message>
- <source>standalone declaration expected while reading the XML declaration</source>
- <translation>讀取 XML 宣告時應有讀立宣告</translation>
+ <source>Wrong value for %1 (%2)</source>
+ <translation>%1 的值錯誤 (%2)</translation>
 </message>
 <message>
- <source>invalid name for processing instruction</source>
- <translation>處理指令時的不合法名稱</translation>
+ <source>Unrecognized command %1 = %2</source>
+ <translation>無法識別的指令 %1 = %2</translation>
 </message>
 <message>
- <source>error triggered by consumer</source>
- <translation>用戶觸發的錯誤</translation>
+ <source>SSL_CONF_finish() failed</source>
+ <translation>SSL_CONF_finish() 失敗</translation>
 </message>
 <message>
- <source>error occurred while parsing element</source>
- <translation>剖析元素時發生錯誤</translation>
+ <source>SSL_CONF_CTX_new() failed</source>
+ <translation>SSL_CONF_CTX_new() 失敗</translation>
 </message>
 <message>
- <source>unexpected character</source>
- <translation>非預期的字元</translation>
+ <source>OpenSSL version too old, need at least v1.0.2</source>
+ <translation>OpenSSL 版本過舊，需要至少 v1.0.2 版本</translation>
 </message>
 <message>
- <source>tag mismatch</source>
- <translation>標籤不對稱</translation>
+ <source>Error when setting the elliptic curves (%1)</source>
+ <translation>設定橢圓曲線時發生錯誤 (%1)</translation>
 </message>
 <message>
- <source>error occurred while parsing content</source>
- <translation>剖析內容時發生錯誤</translation>
+ <source>Error creating SSL context (%1)</source>
+ <translation>建立 SSL 內文時發生錯誤（%1）</translation>
 </message>
 <message>
- <source>error occurred while parsing comment</source>
- <translation>剖析註解時發生錯誤</translation>
+ <source>unsupported protocol</source>
+ <translation>不支援的通訊協定</translation>
 </message>
 <message>
- <source>internal general entity reference not allowed in DTD</source>
- <translation>在 DTD 中不允許內部產生的實體參考</translation>
+ <source>Error while setting the minimal protocol version</source>
+ <translation>設定最小協定版本時發生錯誤</translation>
 </message>
 <message>
- <source>recursive entities</source>
- <translation>遞迴的實體</translation>
+ <source>Error while setting the maximum protocol version</source>
+ <translation>設定最大協定版本時發生錯誤</translation>
 </message>
 <message>
- <source>more than one document type definition</source>
- <translation>定義了一個以上的文件型態</translation>
+ <source>Invalid or empty cipher list (%1)</source>
+ <translation>無效或空白的加密清單（%1）</translation>
 </message>
 <message>
- <source>version expected while reading the XML declaration</source>
- <translation>讀取 XML 宣告時應有版本號</translation>
+ <source>Cannot provide a certificate with no key, %1</source>
+ <translation>無法提供沒有金鑰的憑證，%1</translation>
 </message>
 <message>
- <source>letter is expected</source>
- <translation>預期應為字母</translation>
+ <source>Error loading local certificate, %1</source>
+ <translation>載入本機憑證時發生錯誤，%1</translation>
 </message>
 <message>
- <source>unexpected end of file</source>
- <translation>未預期遇到檔案結尾</translation>
+ <source>Error loading private key, %1</source>
+ <translation>載入私鑰時發生錯誤，%1</translation>
 </message>
 <message>
- <source>external parsed general entity reference not allowed in attribute value</source>
- <translation>在屬性值中不允許使用外部剖析的實體參考</translation>
+ <source>Private key does not certify public key, %1</source>
+ <translation>私鑰不能證明公鑰，%1</translation>
 </message>
 <message>
- <source>error in the text declaration of an external entity</source>
- <translation>在外部實體中的文字宣告有錯誤</translation>
+ <source>Diffie-Hellman parameters are not valid</source>
+ <translation>Diffie-Hellman 參數無效</translation>
 </message>
 <message>
- <source>error occurred while parsing document type definition</source>
- <translation>剖析文件型態定義時發生錯誤</translation>
+ <source>OpenSSL version with disabled elliptic curves</source>
+ <translation>停用橢圓曲線的 OpenSSL 版本</translation>
 </message>
-</context>
-<context>
- <name>QSystemSemaphore</name>
 <message>
- <source>%1: does not exist</source>
- <translation>%1：不存在</translation>
+ <source>DTLS server requires a &apos;VerifyNone&apos; mode with your version of OpenSSL</source>
+ <translation>DTLS 伺服器需要您 OpenSSL 版本的「VerifyNone」模式</translation>
 </message>
 <message>
- <source>%1: already exists</source>
- <translation>%1：已存在</translation>
+ <source>No error</source>
+ <translation>沒有錯誤</translation>
 </message>
 <message>
- <source>%1: unknown error %2</source>
- <translation>%1：未知的錯誤 %2</translation>
+ <source>The issuer certificate could not be found</source>
+ <translation>找不到發行者憑證</translation>
 </message>
 <message>
- <source>%1: permission denied</source>
- <translation>%1：存取被拒</translation>
+ <source>The certificate signature could not be decrypted</source>
+ <translation>不能解密憑證簽名</translation>
 </message>
 <message>
- <source>%1: out of resources</source>
- <translation>%1：資源不足</translation>
+ <source>The public key in the certificate could not be read</source>
+ <translation>不能讀取憑證中的公鑰</translation>
 </message>
-</context>
-<context>
- <name>QSQLiteResult</name>
 <message>
- <source>Unable to fetch row</source>
- <translation>無法抓取列</translation>
+ <source>The signature of the certificate is invalid</source>
+ <translation>憑證簽名無效</translation>
 </message>
 <message>
- <source>No query</source>
- <translation>沒有查詢</translation>
+ <source>The certificate is not yet valid</source>
+ <translation>憑證無效</translation>
 </message>
 <message>
- <source>Unable to execute statement</source>
- <translation>無法執行敘述</translation>
+ <source>The certificate has expired</source>
+ <translation>憑證過期</translation>
 </message>
 <message>
- <source>Unable to bind parameters</source>
- <translation>無法結合參數</translation>
+ <source>The certificate&apos;s notBefore field contains an invalid time</source>
+ <translation>憑證的 notBefore 欄位包含無效時間</translation>
 </message>
 <message>
- <source>Unable to reset statement</source>
- <translation>無法重置敘述</translation>
+ <source>The certificate&apos;s notAfter field contains an invalid time</source>
+ <translation>憑證的 notAfter 欄位包含無效時間</translation>
 </message>
 <message>
- <source>Parameter count mismatch</source>
- <translation>參數數量不符合</translation>
+ <source>The certificate is self-signed, and untrusted</source>
+ <translation>憑證是自己簽發且不受信任的</translation>
 </message>
-</context>
-<context>
- <name>QApplication</name>
 <message>
- <source>Activates the program&apos;s main window</source>
- <translation>啟動程式的主視窗</translation>
+ <source>The root certificate of the certificate chain is self-signed, and untrusted</source>
+ <translation>該憑證鏈的根憑證為自己簽署且不受信任的</translation>
 </message>
 <message>
- <source>QT_LAYOUT_DIRECTION</source>
- <translation>LTR</translation>
+ <source>The issuer certificate of a locally looked up certificate could not be found</source>
+ <translation>找不到本機找到憑證的發行者憑證</translation>
 </message>
 <message>
- <source>Activate</source>
- <translation>啟動</translation>
+ <source>No certificates could be verified</source>
+ <translation>沒有能驗證的憑證</translation>
 </message>
 <message>
- <source>Executable &apos;%1&apos; requires Qt %2, found Qt %3.</source>
- <translation>執行檔 &apos;%1&apos; 需要 Qt %2，但只找到 Qt %3。</translation>
+ <source>One of the CA certificates is invalid</source>
+ <translation>其中一個 CA 憑證無效</translation>
 </message>
 <message>
- <source>Incompatible Qt Library Error</source>
- <translation>Qt 函式庫不相容的錯誤</translation>
+ <source>The basicConstraints path length parameter has been exceeded</source>
+ <translation>basicConstraints 位置長度參數超出範圍</translation>
 </message>
-</context>
-<context>
- <name>QUnicodeControlCharacterMenu</name>
 <message>
- <source>RLE Start of right-to-left embedding</source>
- <translation>RLE 右到左嵌入起點</translation>
+ <source>The supplied certificate is unsuitable for this purpose</source>
+ <translation>提供的憑證不適合此目標</translation>
 </message>
 <message>
- <source>ZWSP Zero width space</source>
- <translation>ZWSP 零寬度空白</translation>
+ <source>The root CA certificate is not trusted for this purpose</source>
+ <translation>此目標不信任此根 CA 憑證</translation>
 </message>
 <message>
- <source>Insert Unicode control character</source>
- <translation>插入萬國碼控制字元</translation>
+ <source>The root CA certificate is marked to reject the specified purpose</source>
+ <translation>此根 CA 憑證被標記為拒絕指定目標</translation>
 </message>
 <message>
- <source>LRO Start of left-to-right override</source>
- <translation>LRO 左到右覆寫起點</translation>
+ <source>The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate</source>
+ <translation>目前的候選發行者憑證已被拒絕，因為其主旨名稱與目前憑證的發行者名稱不相符</translation>
 </message>
 <message>
- <source>LRE Start of left-to-right embedding</source>
- <translation>LRE 左到右嵌入起點</translation>
+ <source>The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate</source>
+ <translation>目前的候選發行者憑證已被拒絕，因為該憑證提供的發行者名稱和序號與目前憑證的權限金鑰識別符不相符</translation>
 </message>
 <message>
- <source>RLM Right-to-left mark</source>
- <translation>RLM 右到左標記</translation>
+ <source>The peer did not present any certificate</source>
+ <translation>端點沒提供任何憑證</translation>
 </message>
 <message>
- <source>PDF Pop directional formatting</source>
- <translation>PDF 彈出方向格式</translation>
+ <source>The host name did not match any of the valid hosts for this certificate</source>
+ <translation>此主機與此憑證的任一有效主機都不相符</translation>
 </message>
 <message>
- <source>ZWNJ Zero width non-joiner</source>
- <translation>ZWNJ 零寬度非連接器</translation>
+ <source>The peer certificate is blacklisted</source>
+ <translation>該端點的憑證已被加入黑名單</translation>
 </message>
 <message>
- <source>RLO Start of right-to-left override</source>
- <translation>RLO 右到左覆寫起點</translation>
+ <source>No OCSP status response found</source>
+ <translation>找不到 OCSP 狀態回應</translation>
 </message>
 <message>
- <source>ZWJ Zero width joiner</source>
- <translation>ZWJ 零寬度連接器</translation>
+ <source>The OCSP status request had invalid syntax</source>
+ <translation>OCSP 狀態請求包含無效語法</translation>
 </message>
 <message>
- <source>LRM Left-to-right mark</source>
- <translation>LRM 左到右標記</translation>
+ <source>OCSP response contains an unexpected number of SingleResponse structures</source>
+ <translation>OCSP 回應包含不應有的 SingleResponse 建構體數字</translation>
 </message>
-</context>
-<context>
- <name>QWebFrame</name>
 <message>
- <source>Request blocked</source>
- <translation>請求已被阻擋</translation>
+ <source>OCSP responder reached an inconsistent internal state</source>
+ <translation>OCSP 回應器的內部狀態不一致</translation>
 </message>
 <message>
- <source>Request cancelled</source>
- <translation>請求已取消</translation>
+ <source>OCSP responder was unable to return a status for the requested certificate</source>
+ <translation>OCSP 回應器無法回傳請求憑證的狀態</translation>
 </message>
 <message>
- <source>Cannot show URL</source>
- <translation>無法顯示網址</translation>
+ <source>The server requires the client to sign the OCSP request in order to construct a response</source>
+ <translation>伺服器需要客戶端簽名 OCSP 請求才能建構回應</translation>
 </message>
 <message>
- <source>Frame load interruped by policy change</source>
- <translation>影像載入因政策變更而中斷</translation>
+ <source>The client is not authorized to request OCSP status from this server</source>
+ <translation>未授權客戶端自此伺服器請求 OCSP 狀態</translation>
 </message>
 <message>
- <source>File does not exist</source>
- <translation>檔案不存在</translation>
+ <source>OCSP responder&apos;s identity cannot be verified</source>
+ <translation>無法驗證 OCSP 回應者的身份</translation>
 </message>
 <message>
- <source>Cannot show mimetype</source>
- <translation>無法顯示 MIME 型態</translation>
+ <source>The identity of a certificate in an OCSP response cannot be established</source>
+ <translation>無法認定 OCSP 回應中的憑證身份</translation>
 </message>
-</context>
-<context>
- <name>QRegExp</name>
 <message>
- <source>bad lookahead syntax</source>
- <translation>錯誤的 lookahead 語法</translation>
+ <source>The certificate status response has expired</source>
+ <translation>憑證的狀態回應已過期</translation>
 </message>
 <message>
- <source>no error occurred</source>
- <translation>沒有發生錯誤</translation>
+ <source>The certificate&apos;s status is unknown</source>
+ <translation>憑證狀態未知</translation>
 </message>
 <message>
- <source>missing left delim</source>
- <translation>少了左方的區隔符</translation>
+ <source>Unknown error</source>
+ <translation>未知錯誤</translation>
 </message>
 <message>
- <source>bad char class syntax</source>
- <translation>錯誤的字元類別語法</translation>
+ <source>TLS initialization failed</source>
+ <translation>TLS 初始化失敗</translation>
 </message>
 <message>
- <source>disabled feature used</source>
- <translation>使用已關閉的功能</translation>
+ <source>Attempted to use an unsupported protocol.</source>
+ <translation>嘗試使用不支援的通訊協定。</translation>
 </message>
 <message>
- <source>invalid octal value</source>
- <translation>不合法的八進位值</translation>
+ <source>The TLS/SSL connection has been closed</source>
+ <translation>TLS/SSL 連線已被關閉</translation>
 </message>
 <message>
- <source>bad repetition syntax</source>
- <translation>錯誤的重覆語法</translation>
+ <source>Error creating SSL session, %1</source>
+ <translation>建立 SSL 階段時發生錯誤，%1</translation>
 </message>
 <message>
- <source>met internal limit</source>
- <translation>遇到內部限制</translation>
+ <source>Error creating SSL session: %1</source>
+ <translation>建立 SSL 階段時發生錯誤：%1</translation>
 </message>
 <message>
- <source>unexpected end</source>
- <translation>未預期遇到結尾</translation>
+ <source>Server-side QSslSocket does not support OCSP stapling</source>
+ <translation>伺服器端的 QSslSocket 不支援 OCSP 裝訂 (stapling)</translation>
 </message>
-</context>
-<context>
- <name>QHttpSocketEngine</name>
 <message>
- <source>Proxy connection refused</source>
- <translation>代理伺服器連線被拒</translation>
+ <source>Failed to enable OCSP stapling</source>
+ <translation>無法啟用 OCSP 裝訂 (stapling)</translation>
 </message>
 <message>
- <source>Proxy denied connection</source>
- <translation>代理伺服器拒絕連線</translation>
+ <source>Client-side sockets do not send OCSP responses</source>
+ <translation>客戶端的 socket 未傳送 OCSP 回應</translation>
 </message>
 <message>
- <source>Proxy server not found</source>
- <translation>找不到代理伺服器</translation>
+ <source>Unable to init SSL Context: %1</source>
+ <translation>無法初始化 SSL 內文：%1</translation>
 </message>
 <message>
- <source>Proxy server connection timed out</source>
- <translation>代理伺服器連線逾時</translation>
+ <source>Unable to write data: %1</source>
+ <translation>無法寫入資料：%1</translation>
 </message>
 <message>
- <source>Did not receive HTTP response from proxy</source>
- <translation>未從代理伺服器接收到 HTTP 回應</translation>
+ <source>Unable to decrypt data: %1</source>
+ <translation>無法解密資料：%1</translation>
 </message>
 <message>
- <source>Proxy connection closed prematurely</source>
- <translation>代理伺服器連線已不正常關閉</translation>
+ <source>Error while reading: %1</source>
+ <translation>讀取時發生錯誤：%1</translation>
 </message>
 <message>
- <source>Error communicating with HTTP proxy</source>
- <translation>與 HTTP 代理伺服器聯繫時發生錯誤</translation>
+ <source>Error during SSL handshake: %1</source>
+ <translation>SSL 交握時發生錯誤：%1</translation>
 </message>
 <message>
- <source>Authentication required</source>
- <translation>需要認證</translation>
+ <source>Failed to decode OCSP response</source>
+ <translation>無法解碼 OCSP 回應</translation>
 </message>
 <message>
- <source>Error parsing authentication request from proxy</source>
- <translation>剖析從代理伺服器傳來的認證要求時發生錯誤</translation>
+ <source>Failed to extract basic OCSP response</source>
+ <translation>無法解開基本 OCSP 回應</translation>
 </message>
-</context>
-<context>
- <name>QOCIResult</name>
 <message>
- <source>Unable to alloc statement</source>
- <translation>無法配置敘述</translation>
+ <source>No certificate verification store, cannot verify OCSP response</source>
+ <translation>沒有儲存的憑證驗證，因此無法驗證 OCSP 回應</translation>
 </message>
 <message>
- <source>Unable to goto next</source>
- <translation>無法跳到下一個</translation>
+ <source>Failed to decode a SingleResponse from OCSP status response</source>
+ <translation>無法解碼來自 OCSP 回應請求的 SingleResponse</translation>
 </message>
 <message>
- <source>Unable to execute statement</source>
- <translation>無法執行敘述</translation>
+ <source>Failed to extract &apos;this update time&apos; from the SingleResponse</source>
+ <translation>無法從 SingleResponse 解開「此更新時間 (this update time)」</translation>
 </message>
 <message>
- <source>Unable to bind column for batch execute</source>
- <translation>無法結合欄位以做批次執行</translation>
+ <source>Insufficient memory</source>
+ <translation>記憶體不足</translation>
 </message>
 <message>
- <source>Unable to execute select statement</source>
- <translation>無法執行選取的敘述</translation>
+ <source>Internal error</source>
+ <translation>內部錯誤</translation>
 </message>
 <message>
- <source>Unable to prepare statement</source>
- <translation>無法準備敘述</translation>
+ <source>An internal handle was invalid</source>
+ <translation>內部處理函式無效</translation>
 </message>
 <message>
- <source>Unable to execute batch statement</source>
- <translation>無法執行批次敘述</translation>
+ <source>An internal token was invalid</source>
+ <translation>內部憑證無效</translation>
 </message>
 <message>
- <source>Unable to bind value</source>
- <translation>無法結合數值</translation>
+ <source>Access denied</source>
+ <translation>存取被拒</translation>
 </message>
-</context>
-<context>
- <name>QNetworkReply</name>
 <message>
- <source>Error downloading %1 - server replied: %2</source>
- <translation>下載 %1 時發生錯誤─伺服器回應：%2</translation>
+ <source>No authority could be contacted for authorization</source>
+ <translation>沒有可讓授權程序通訊的授權單位</translation>
 </message>
 <message>
- <source>Protocol &quot;%1&quot; is unknown</source>
- <translation>未知的協定 &quot;%1&quot;</translation>
+ <source>No credentials</source>
+ <translation>找不到憑據</translation>
 </message>
-</context>
-<context>
- <name>QAbstractSpinBox</name>
 <message>
- <source>Step &amp;down</source>
- <translation>單步向&amp;下</translation>
+ <source>The target is unknown or unreachable</source>
+ <translation>目標位置未知或無法連線</translation>
 </message>
 <message>
- <source>&amp;Step up</source>
- <translation>&amp;單步向上</translation>
+ <source>An unsupported function was requested</source>
+ <translation>被請求不支援的函式</translation>
 </message>
 <message>
- <source>&amp;Select All</source>
- <translation>&amp;全部選擇</translation>
+ <source>The hostname provided does not match the one received from the peer</source>
+ <translation>提供的主機名稱與對端收到的主機名稱不相符</translation>
 </message>
-</context>
-<context>
- <name>QDB2Result</name>
 <message>
- <source>Unable to bind variable</source>
- <translation>無法結合變數</translation>
+ <source>No common protocol exists between the client and the server</source>
+ <translation>客戶端與伺服器沒有共同可用的通訊協定</translation>
 </message>
 <message>
- <source>Unable to execute statement</source>
- <translation>無法執行敘述</translation>
+ <source>Unexpected or badly-formatted message received</source>
+ <translation>接收到非期望或格式無效的訊息</translation>
 </message>
 <message>
- <source>Unable to fetch next</source>
- <translation>無法抓取下一筆</translation>
+ <source>The data could not be encrypted</source>
+ <translation>資料不能被加密</translation>
 </message>
 <message>
- <source>Unable to prepare statement</source>
- <translation>無法準備敘述</translation>
+ <source>No cipher suites in common</source>
+ <translation>沒有共同的加密套件</translation>
 </message>
 <message>
- <source>Unable to fetch record %1</source>
- <translation>無法抓取紀錄 %1</translation>
+ <source>The credentials were not recognized / Invalid argument</source>
+ <translation>未辨識出憑證或是參數無效</translation>
 </message>
 <message>
- <source>Unable to fetch first</source>
- <translation>無法抓取第一筆</translation>
+ <source>The message was tampered with, damaged or out of sequence.</source>
+ <translation>訊息可能遭竄改、損壞或者超出資料序列。</translation>
 </message>
-</context>
-<context>
- <name>QODBCResult</name>
 <message>
- <source>Unable to bind variable</source>
- <translation>無法結合變數</translation>
+ <source>A message was received out of sequence.</source>
+ <translation>接收到的訊息超出資料序列。</translation>
 </message>
 <message>
- <source>Unable to execute statement</source>
- <translation>無法執行敘述</translation>
+ <source>Unknown error occurred: %1</source>
+ <translation>發生未知錯誤：%1</translation>
 </message>
 <message>
- <source>Unable to fetch next</source>
- <translation>無法抓取下一筆</translation>
+ <source>Invalid protocol chosen</source>
+ <translation>選擇了無效的通訊協定</translation>
 </message>
 <message>
- <source>Unable to fetch last</source>
- <translation>無法抓取最後一筆</translation>
+ <source>The certificate provided cannot be used for a client.</source>
+ <translation>提供的憑證不能用於客戶端。</translation>
 </message>
 <message>
- <source>Unable to prepare statement</source>
- <translation>無法準備敘述</translation>
+ <source>The certificate provided cannot be used for a server.</source>
+ <translation>提供的憑證不能用於伺服端。</translation>
 </message>
 <message>
- <source>Unable to fetch previous</source>
- <translation>無法抓取前一筆</translation>
+ <source>Server did not accept any certificate we could present.</source>
+ <translation>伺服器不接受我們所能提供的憑證。</translation>
 </message>
 <message>
- <source>Unable to fetch</source>
- <translation>無法抓取</translation>
+ <source>Algorithm mismatch</source>
+ <translation>算法不相符</translation>
 </message>
 <message>
- <source>QODBCResult::reset: Unable to set &apos;SQL_CURSOR_STATIC&apos; as statement attribute. Please check your ODBC driver configuration</source>
- <translation>QODBCResult::reset: 無法設定 &apos;SQL_CURSOR_STATIC&apos; 做為敘述屬性。請檢查您的 ODBC 驅動程式的設定</translation>
+ <source>Handshake failed: %1</source>
+ <translation>交握失敗：%1</translation>
 </message>
 <message>
- <source>Unable to fetch first</source>
- <translation>無法抓取第一筆</translation>
+ <source>Failed to query the TLS context: %1</source>
+ <translation>無法查詢 TLS 上下文：%1</translation>
 </message>
-</context>
-<context>
- <name>QPSQLDriver</name>
 <message>
- <source>Unable to subscribe</source>
- <translation>無法訂閱</translation>
+ <source>Did not get the required attributes for the connection.</source>
+ <translation>未取得此連線所需的屬性。</translation>
 </message>
 <message>
- <source>Could not begin transaction</source>
- <translation>無法開始事務</translation>
+ <source>Unwanted protocol was negotiated</source>
+ <translation>交涉了非期望的通訊協定</translation>
 </message>
 <message>
- <source>Could not rollback transaction</source>
- <translation>無法反轉事務</translation>
+ <source>Renegotiation was unsuccessful: %1</source>
+ <translation>重新交涉失敗：%1</translation>
 </message>
 <message>
- <source>Could not commit transaction</source>
- <translation>無法提交事務</translation>
+ <source>Schannel failed to encrypt data: %1</source>
+ <translation>Schannel 加密資料失敗：%1</translation>
 </message>
 <message>
- <source>Unable to connect</source>
- <translation>無法連線</translation>
+ <source>Cannot provide a certificate with no key</source>
+ <translation>無法提供沒有金鑰的憑證</translation>
 </message>
 <message>
- <source>Unable to unsubscribe</source>
- <translation>無法取消訂閱</translation>
+ <source>OCSP reponder&apos;s identity cannot be verified</source>
+ <translation>無法驗證 OCSP 回應器的身份</translation>
+ </message>
+ <message>
+ <source>The certificate provided can not be used for a %1.</source>
+ <translation>提供的憑證不能對 %1 使用。</translation>
+ </message>
+ <message>
+ <source>client</source>
+ <translation>客戶端</translation>
+ </message>
+ <message>
+ <source>server</source>
+ <translation>伺服器</translation>
 </message>
 </context>
 <context>
- <name>QInputDialog</name>
+ <name>QStandardPaths</name>
 <message>
- <source>Enter a value:</source>
- <translation>請輸入值:</translation>
+ <source>Desktop</source>
+ <translation>桌面</translation>
+ </message>
+ <message>
+ <source>Documents</source>
+ <translation>文件</translation>
+ </message>
+ <message>
+ <source>Fonts</source>
+ <translation>字型</translation>
+ </message>
+ <message>
+ <source>Applications</source>
+ <translation>應用程式</translation>
+ </message>
+ <message>
+ <source>Music</source>
+ <translation>音樂</translation>
+ </message>
+ <message>
+ <source>Movies</source>
+ <translation>影片</translation>
+ </message>
+ <message>
+ <source>Pictures</source>
+ <translation>圖片</translation>
+ </message>
+ <message>
+ <source>Temporary Directory</source>
+ <translation>暫存目錄</translation>
+ </message>
+ <message>
+ <source>Home</source>
+ <translation>家目錄</translation>
+ </message>
+ <message>
+ <source>Cache</source>
+ <translation>快取</translation>
+ </message>
+ <message>
+ <source>Shared Data</source>
+ <translation>共享資料</translation>
+ </message>
+ <message>
+ <source>Runtime</source>
+ <translation>執行庫</translation>
+ </message>
+ <message>
+ <source>Configuration</source>
+ <translation>設定</translation>
+ </message>
+ <message>
+ <source>Shared Configuration</source>
+ <translation>共享設定</translation>
+ </message>
+ <message>
+ <source>Shared Cache</source>
+ <translation>共享快取</translation>
+ </message>
+ <message>
+ <source>Download</source>
+ <translation>下載</translation>
+ </message>
+ <message>
+ <source>Application Data</source>
+ <translation>應用程式資料</translation>
+ </message>
+ <message>
+ <source>Application Configuration</source>
+ <translation>應用程式設定</translation>
 </message>
 </context>
 <context>
- <name>QCoreApplication</name>
+ <name>QStateMachine</name>
 <message>
- <source>%1: key is empty</source>
- <translation>%1：鍵值是空的</translation>
+ <source>Missing initial state in compound state &apos;%1&apos;</source>
+ <translation>複合狀態「%1」缺少初始狀態</translation>
 </message>
 <message>
- <source>%1: unable to make key</source>
- <translation>%1：無法產生鍵值</translation>
+ <source>Missing default state in history state &apos;%1&apos;</source>
+ <translation>歷史狀態「%1」缺少預設狀態</translation>
 </message>
 <message>
- <source>%1: ftok failed</source>
- <translation>%1：ftok 失敗</translation>
+ <source>No common ancestor for targets and source of transition from state &apos;%1&apos;</source>
+ <translation>來自「%1」的過渡狀態的來源和目標沒有共同上階項目</translation>
+ </message>
+ <message>
+ <source>Unknown error</source>
+ <translation>未知錯誤</translation>
 </message>
 </context>
 <context>
- <name>QIODevice</name>
+ <name>QSystemSemaphore</name>
 <message>
- <source>No such file or directory</source>
- <translation>找不到該檔案或目錄</translation>
+ <source>%1: permission denied</source>
+ <translation>%1：存取被拒</translation>
 </message>
 <message>
- <source>Permission denied</source>
- <translation>權限不足</translation>
+ <source>%1: already exists</source>
+ <translation>%1：已存在</translation>
 </message>
 <message>
- <source>No space left on device</source>
- <translation>裝置上已無空間</translation>
+ <source>%1: does not exist</source>
+ <translation>%1：不存在</translation>
 </message>
 <message>
- <source>Unknown error</source>
- <translation>未知的錯誤</translation>
+ <source>%1: out of resources</source>
+ <translation>%1：資源不足</translation>
 </message>
 <message>
- <source>Too many open files</source>
- <translation>開啟過多檔案</translation>
+ <source>%1: unknown error %2</source>
+ <translation>%1：未知的錯誤 %2</translation>
 </message>
 </context>
 <context>
- <name>QMultiInputContext</name>
+ <name>QTDSDriver</name>
 <message>
- <source>Select IM</source>
- <translation>選擇輸入法</translation>
+ <source>Unable to open connection</source>
+ <translation>無法開啟連線</translation>
+ </message>
+ <message>
+ <source>Unable to use database</source>
+ <translation>無法使用資料庫</translation>
 </message>
 </context>
 <context>
 <name>QTabBar</name>
 <message>
 <source>Scroll Left</source>
- <translation>往左捲軸</translation>
+ <translation>往左捲動</translation>
 </message>
 <message>
 <source>Scroll Right</source>
- <translation>往右捲軸</translation>
+ <translation>往右捲動</translation>
 </message>
 </context>
 <context>
- <name>QUndoModel</name>
+ <name>QTcpServer</name>
 <message>
- <source>&lt;empty&gt;</source>
- <translation>&lt;空白&gt;</translation>
+ <source>Operation on socket is not supported</source>
+ <translation>不支援 Socket 的操作</translation>
 </message>
 </context>
 <context>
- <name>QNetworkAccessCacheBackend</name>
+ <name>QTgaFile</name>
 <message>
- <source>Error opening %1</source>
- <translation>開啟 %1 發生錯誤</translation>
+ <source>Could not read image data</source>
+ <translation>無法讀取影像資料</translation>
 </message>
-</context>
-<context>
- <name>QMYSQLResult</name>
 <message>
- <source>Unable to execute statement</source>
- <translation>無法執行敘述</translation>
+ <source>Sequential device (eg socket) for image read not supported</source>
+ <translation>不支援用於影像讀取的順序裝置（例如 socket）</translation>
 </message>
 <message>
- <source>Unable to store statement results</source>
- <translation>無法儲存敘述結果</translation>
+ <source>Seek file/device for image read failed</source>
+ <translation>尋找用於讀取影像的檔案或裝置失敗</translation>
 </message>
 <message>
- <source>Unable to execute next query</source>
- <translation>無法執行下一個查詢</translation>
+ <source>Image header read failed</source>
+ <translation>影像標頭讀取失敗</translation>
 </message>
 <message>
- <source>Unable to bind outvalues</source>
- <translation>無法結合輸出值</translation>
+ <source>Image type not supported</source>
+ <translation>不支援的影像類型</translation>
 </message>
 <message>
- <source>Unable to store next result</source>
- <translation>無法儲存下一個結果</translation>
+ <source>Image depth not valid</source>
+ <translation>無效的影像深度</translation>
 </message>
 <message>
- <source>Unable to fetch data</source>
- <translation>無法抓取資料</translation>
+ <source>Image size exceeds limit</source>
+ <translation>影像大小超出限制</translation>
 </message>
 <message>
- <source>Unable to prepare statement</source>
- <translation>無法準備敘述</translation>
+ <source>Could not seek to image read footer</source>
+ <translation>無法尋至影像讀取註腳</translation>
 </message>
 <message>
- <source>Unable to store result</source>
- <translation>無法儲存結果</translation>
+ <source>Could not read footer</source>
+ <translation>無法讀取註腳</translation>
 </message>
 <message>
- <source>Unable to bind value</source>
- <translation>無法結合數值</translation>
+ <source>Image type (non-TrueVision 2.0) not supported</source>
+ <translation>不支援的影像類型（非 TrueVision 2.0）</translation>
 </message>
 <message>
- <source>Unable to execute query</source>
- <translation>無法執行查詢</translation>
- </message>
- <message>
- <source>Unable to reset statement</source>
- <translation>無法重置敘述</translation>
+ <source>Could not reset to read data</source>
+ <translation>無法重設到讀取資料</translation>
 </message>
 </context>
 <context>
- <name>QSQLite2Result</name>
+ <name>QUdpSocket</name>
 <message>
- <source>Unable to execute statement</source>
- <translation>無法執行敘述</translation>
+ <source>Unable to send a datagram</source>
+ <translation>無法傳送資料塊</translation>
 </message>
 <message>
- <source>Unable to fetch results</source>
- <translation>無法抓取結果</translation>
+ <source>No datagram available for reading</source>
+ <translation>沒有能用於讀取的資料塊</translation>
 </message>
 </context>
 <context>
- <name>Q3MainWindow</name>
+ <name>QUndoGroup</name>
+ <message>
+ <source>Undo %1</source>
+ <translation>復原 %1</translation>
+ </message>
 <message>
- <source>Line up</source>
- <translation>排列</translation>
+ <source>Undo</source>
+ <comment>Default text for undo action</comment>
+ <translation>復原</translation>
 </message>
 <message>
- <source>Customize...</source>
- <translation>自訂...</translation>
+ <source>Redo %1</source>
+ <translation>重做 %1</translation>
+ </message>
+ <message>
+ <source>Redo</source>
+ <comment>Default text for redo action</comment>
+ <translation>重做</translation>
 </message>
 </context>
 <context>
- <name>QUdpSocket</name>
+ <name>QUndoModel</name>
 <message>
- <source>This platform does not support IPv6</source>
- <translation>此平台不支援 IPv6</translation>
+ <source>&lt;empty&gt;</source>
+ <translation>＜空白＞</translation>
 </message>
 </context>
 <context>
- <name>Phonon::Gstreamer::Backend</name>
+ <name>QUndoStack</name>
 <message>
- <source>Warning: You do not seem to have the base GStreamer plugins installed.
- All audio and video support has been disabled</source>
- <translation>警告：您可能沒有安裝 GStreamer 外掛程式。 所有音效與影像支援將被關閉</translation>
+ <source>Undo %1</source>
+ <translation>復原 %1</translation>
 </message>
 <message>
- <source>Warning: You do not seem to have the package gstreamer0.10-plugins-good installed.
- Some video features have been disabled.</source>
- <translation>警告：您可能沒有安裝 gstreamer0.10-plugins-good。
- 有些影像的功能將被關閉。</translation>
+ <source>Undo</source>
+ <comment>Default text for undo action</comment>
+ <translation>復原</translation>
+ </message>
+ <message>
+ <source>Redo %1</source>
+ <translation>重做 %1</translation>
+ </message>
+ <message>
+ <source>Redo</source>
+ <comment>Default text for redo action</comment>
+ <translation>重做</translation>
 </message>
 </context>
 <context>
- <name>QLocalServer</name>
+ <name>QUnicodeControlCharacterMenu</name>
 <message>
- <source>%1: Name error</source>
- <translation>%1：名稱錯誤</translation>
+ <source>LRM Left-to-right mark</source>
+ <translation>LRM 左到右標記</translation>
 </message>
 <message>
- <source>%1: Unknown error %2</source>
- <translation>%1：未知的錯誤 %2</translation>
+ <source>RLM Right-to-left mark</source>
+ <translation>RLM 右到左標記</translation>
 </message>
 <message>
- <source>%1: Permission denied</source>
- <translation>%1：存取被拒</translation>
+ <source>ZWJ Zero width joiner</source>
+ <translation>ZWJ 零寬度連接器</translation>
 </message>
 <message>
- <source>%1: Address in use</source>
- <translation>%1：位址使用中</translation>
+ <source>ZWNJ Zero width non-joiner</source>
+ <translation>ZWNJ 零寬度非連接器</translation>
+ </message>
+ <message>
+ <source>ZWSP Zero width space</source>
+ <translation>ZWSP 零寬度空白</translation>
 </message>
-</context>
-<context>
- <name>Phonon::VolumeSlider</name>
 <message>
- <source>Volume: %1%</source>
- <translation>音量：%1%</translation>
+ <source>LRE Start of left-to-right embedding</source>
+ <translation>LRE 左到右嵌入起點</translation>
 </message>
 <message>
- <source>Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1%</source>
- <translation>使用此滑動器來調整音量。最左邊的位置為 0%，最右邊的為 %1%</translation>
+ <source>RLE Start of right-to-left embedding</source>
+ <translation>RLE 右到左嵌入起點</translation>
 </message>
-</context>
-<context>
- <name>Q3ToolBar</name>
 <message>
- <source>More...</source>
- <translation>更多...</translation>
+ <source>LRO Start of left-to-right override</source>
+ <translation>LRO 左到右覆寫起點</translation>
+ </message>
+ <message>
+ <source>RLO Start of right-to-left override</source>
+ <translation>RLO 右到左覆寫起點</translation>
+ </message>
+ <message>
+ <source>PDF Pop directional formatting</source>
+ <translation>PDF 彈出方向格式</translation>
+ </message>
+ <message>
+ <source>LRI Left-to-right isolate</source>
+ <translation>LRI 左至右分隔</translation>
 </message>
-</context>
-<context>
- <name>QMultiInputContextPlugin</name>
 <message>
- <source>Multiple input method switcher that uses the context menu of the text widgets</source>
- <translation>使用文字元件中的內文選單的多重輸入法切換器</translation>
+ <source>RLI Right-to-left isolate</source>
+ <translation>RLI 右至左分隔</translation>
 </message>
 <message>
- <source>Multiple input method switcher</source>
- <translation>多重輸入法切換器</translation>
+ <source>FSI First strong isolate</source>
+ <translatorcomment>為 Unicode 專有名詞，因找不到適合翻譯因此留空，等待有較適合用詞後再填入。</translatorcomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>PDI Pop directional isolate</source>
+ <translatorcomment>為 Unicode 專有名詞，因找不到適合翻譯因此留空，等待有較適合用詞後再填入。</translatorcomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Insert Unicode control character</source>
+ <translation>插入 Unicode 控制字元</translation>
 </message>
 </context>
 <context>
- <name>Q3ProgressDialog</name>
+ <name>QWhatsThisAction</name>
 <message>
- <source>Cancel</source>
- <translation>取消</translation>
+ <source>What&apos;s This?</source>
+ <translation>這是什麼？</translation>
 </message>
 </context>
 <context>
- <name>QProgressDialog</name>
+ <name>QWidget</name>
 <message>
- <source>Cancel</source>
- <translation>取消</translation>
+ <source>*</source>
+ <translation>*</translation>
 </message>
 </context>
 <context>
- <name>QFile</name>
+ <name>QWidgetTextControl</name>
 <message>
- <source>Cannot create %1 for output</source>
- <translation>無法建立 %1 以輸出</translation>
+ <source>&amp;Undo</source>
+ <translation>復原(&amp;U)</translation>
 </message>
 <message>
- <source>Failure to write block</source>
- <translation>寫入區塊時失敗</translation>
+ <source>&amp;Redo</source>
+ <translation>重做(&amp;R)</translation>
 </message>
 <message>
- <source>Cannot open %1 for input</source>
- <translation>無法開啟 %1 以輸入</translation>
+ <source>Cu&amp;t</source>
+ <translation>剪下(&amp;T)</translation>
 </message>
 <message>
- <source>Destination file exists</source>
- <translation>目標檔已存在</translation>
+ <source>&amp;Copy</source>
+ <translation>複製(&amp;C)</translation>
 </message>
 <message>
- <source>Cannot open for output</source>
- <translation>無法開啟進行輸出</translation>
+ <source>Copy &amp;Link Location</source>
+ <translation>複製連結位址(&amp;L)</translation>
+ </message>
+ <message>
+ <source>&amp;Paste</source>
+ <translation>貼上(&amp;P)</translation>
+ </message>
+ <message>
+ <source>Delete</source>
+ <translation>刪除</translation>
+ </message>
+ <message>
+ <source>Select All</source>
+ <translation>全部選擇</translation>
 </message>
 </context>
 <context>
- <name>QTDSDriver</name>
+ <name>QWindowsDirect2DIntegration</name>
 <message>
- <source>Unable to open connection</source>
- <translation>無法開啟連線</translation>
+ <source>Qt cannot load the direct2d platform plugin because the Direct2D version on this system is too old. The minimum system requirement for this platform plugin is Windows 7 SP1 with Platform Update.
+
+The minimum Direct2D version required is %1. The Direct2D version on this system is %2.</source>
+ <translation>Qt 無法載入 direct2d 平台外掛程式，因為系統 Direct2D 版本過舊。此平台外掛程式的最低系統需求至少要包含平台更新的 Windows 7 SP1。
+
+最低 Direct2D 版本需求為 %1，但系統上的 Direct2D 版本為 %2。</translation>
 </message>
 <message>
- <source>Unable to use database</source>
- <translation>無法使用資料庫</translation>
+ <source>Cannot load direct2d platform plugin</source>
+ <translation>無法載入 Direct2D 平台外掛程式</translation>
 </message>
 </context>
 <context>
- <name>AudioOutput</name>
+ <name>QWizard</name>
 <message>
- <source>&lt;html&gt;The audio playback device &lt;b&gt;%1&lt;/b&gt; does not work.&lt;br/&gt;Falling back to &lt;b&gt;%2&lt;/b&gt;.&lt;/html&gt;</source>
- <translation>&lt;html&gt;音效播放裝置 &lt;b&gt;%1&lt;/b&gt; 未能運作。&lt;br/&gt;改用預設裝置 &lt;b&gt;%2&lt;/b&gt;。&lt;/html&gt;</translation>
+ <source>Go Back</source>
+ <translation>往回</translation>
 </message>
 <message>
- <source>Revert back to device &apos;%1&apos;</source>
- <translation>回復到裝置 &apos;%1&apos;</translation>
+ <source>&lt; &amp;Back</source>
+ <translation>＜返回(&amp;B)</translation>
 </message>
 <message>
- <source>&lt;html&gt;Switching to the audio playback device &lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;which just became available and has higher preference.&lt;/html&gt;</source>
- <translation>&lt;html&gt;音效播放裝置 &lt;b&gt;%1&lt;/b&gt; 已可使用，因為有較高優先權，因此將切換到該裝置。&lt;/html&gt;</translation>
+ <source>Continue</source>
+ <translation>繼續</translation>
 </message>
-</context>
-<context>
- <name>QPluginLoader</name>
 <message>
- <source>The plugin was not loaded.</source>
- <translation>外掛程式未載入。</translation>
+ <source>&amp;Next</source>
+ <translation>下一個(&amp;N)</translation>
 </message>
 <message>
- <source>Unknown error</source>
- <translation>未知的錯誤</translation>
+ <source>&amp;Next &gt;</source>
+ <translation>下一個(&amp;N) ＞</translation>
 </message>
-</context>
-<context>
- <name>QSlider</name>
 <message>
- <source>Page up</source>
- <translation>頁面上方</translation>
+ <source>Commit</source>
+ <translation>提交</translation>
 </message>
 <message>
- <source>Position</source>
- <translation>位置</translation>
+ <source>Done</source>
+ <translation>完成</translation>
 </message>
 <message>
- <source>Page right</source>
- <translation>頁面右方</translation>
+ <source>&amp;Finish</source>
+ <translation>完成(&amp;F)</translation>
 </message>
 <message>
- <source>Page down</source>
- <translation>頁面下方</translation>
+ <source>Cancel</source>
+ <translation>取消</translation>
 </message>
 <message>
- <source>Page left</source>
- <translation>頁面左方</translation>
+ <source>Help</source>
+ <translation>說明</translation>
 </message>
-</context>
-<context>
- <name>CloseButton</name>
 <message>
- <source>Close Tab</source>
- <translation>關閉分頁</translation>
+ <source>&amp;Help</source>
+ <translation>說明(&amp;H)</translation>
 </message>
 </context>
 <context>
- <name>QPSQLResult</name>
+ <name>QXml</name>
 <message>
- <source>Unable to prepare statement</source>
- <translation>無法準備敘述</translation>
+ <source>no error occurred</source>
+ <translation>沒有發生錯誤</translation>
 </message>
 <message>
- <source>Unable to create query</source>
- <translation>無法建立查詢</translation>
+ <source>error triggered by consumer</source>
+ <translation>客戶觸發的錯誤</translation>
 </message>
-</context>
-<context>
- <name>QNetworkAccessFileBackend</name>
 <message>
- <source>Request for opening non-local file %1</source>
- <translation>要求開啟非本地端檔案 %1</translation>
+ <source>unexpected end of file</source>
+ <translation>遇到非預期的檔案結尾</translation>
 </message>
 <message>
- <source>Read error reading from %1: %2</source>
- <translation>從 %1 讀取錯誤：%2</translation>
+ <source>more than one document type definition</source>
+ <translation>定義了一個以上的文件型態</translation>
 </message>
 <message>
- <source>Cannot open %1: Path is a directory</source>
- <translation>無法開啟 %1：此路徑是一個目錄</translation>
+ <source>error occurred while parsing element</source>
+ <translation>解析元素時發生錯誤</translation>
 </message>
 <message>
- <source>Error opening %1: %2</source>
- <translation>開啟 %1 發生錯誤：%2</translation>
+ <source>tag mismatch</source>
+ <translation>標籤不相等</translation>
 </message>
 <message>
- <source>Write error writing to %1: %2</source>
- <translation>寫入 %1 時發生錯誤：%2</translation>
+ <source>error occurred while parsing content</source>
+ <translation>解析內容時發生錯誤</translation>
 </message>
-</context>
-<context>
- <name>QNetworkReplyImpl</name>
 <message>
- <source>Operation canceled</source>
- <translation>取消操作</translation>
+ <source>unexpected character</source>
+ <translation>非預期字元</translation>
 </message>
-</context>
-<context>
- <name>Q3NetworkProtocol</name>
 <message>
- <source>Operation stopped by the user</source>
- <translation>使用者已中止操作</translation>
+ <source>invalid name for processing instruction</source>
+ <translation>處理指令時遇到無效名稱</translation>
 </message>
-</context>
-<context>
- <name>QMdiArea</name>
 <message>
- <source>(Untitled)</source>
- <translation>（未命名）</translation>
+ <source>version expected while reading the XML declaration</source>
+ <translation>讀取 XML 宣告時應該要有版本號</translation>
 </message>
-</context>
-<context>
- <name>QHostInfo</name>
 <message>
- <source>Unknown error</source>
- <translation>未知的錯誤</translation>
+ <source>wrong value for standalone declaration</source>
+ <translation>獨立宣告時的值錯誤</translation>
+ </message>
+ <message>
+ <source>encoding declaration or standalone declaration expected while reading the XML declaration</source>
+ <translation>讀取 XML 宣告時應有編碼方式宣告或獨立宣告</translation>
+ </message>
+ <message>
+ <source>standalone declaration expected while reading the XML declaration</source>
+ <translation>讀取 XML 宣告時應有獨立宣告</translation>
+ </message>
+ <message>
+ <source>error occurred while parsing document type definition</source>
+ <translation>解析文件型態定義時發生錯誤</translation>
+ </message>
+ <message>
+ <source>letter is expected</source>
+ <translation>預期字母</translation>
+ </message>
+ <message>
+ <source>error occurred while parsing comment</source>
+ <translation>解析註解時發生錯誤</translation>
+ </message>
+ <message>
+ <source>error occurred while parsing reference</source>
+ <translation>解析參考時發生錯誤</translation>
 </message>
-</context>
-<context>
- <name>Q3Accel</name>
 <message>
- <source>%1, %2 not defined</source>
- <translation>%1，%2 未定義</translation>
+ <source>internal general entity reference not allowed in DTD</source>
+ <translation>在 DTD 中不允許內部產生的一般實體參考</translation>
+ </message>
+ <message>
+ <source>external parsed general entity reference not allowed in attribute value</source>
+ <translation>在屬性值中不允許使用外部解析的一般實體參考</translation>
 </message>
 <message>
- <source>Ambiguous %1 not handled</source>
- <translation>不明確的 %1 尚未處理</translation>
+ <source>external parsed general entity reference not allowed in DTD</source>
+ <translation>在 DTD 中不允許使用外部解析的一般實體參考</translation>
+ </message>
+ <message>
+ <source>unparsed entity reference in wrong context</source>
+ <translation>在錯誤的內文中有未解析的實體參考</translation>
+ </message>
+ <message>
+ <source>recursive entities</source>
+ <translation>遞迴實體</translation>
+ </message>
+ <message>
+ <source>error in the text declaration of an external entity</source>
+ <translation>在外部實體中的文字宣告有錯誤</translation>
 </message>
 </context>
 <context>
- <name>QTcpServer</name>
+ <name>QXmlStream</name>
 <message>
- <source>Operation on socket is not supported</source>
- <translation>Socket 的操作未被支援</translation>
+ <source>Extra content at end of document.</source>
+ <translation>文件尾端有多餘的內容。</translation>
+ </message>
+ <message>
+ <source>Invalid entity value.</source>
+ <translation>無效的實體值。</translation>
+ </message>
+ <message>
+ <source>Invalid XML character.</source>
+ <translation>無效的 XML 字元。</translation>
+ </message>
+ <message>
+ <source>Sequence &apos;]]&gt;&apos; not allowed in content.</source>
+ <translation>在內文中不允許有序列「]]&gt;」。</translation>
+ </message>
+ <message>
+ <source>Encountered incorrectly encoded content.</source>
+ <translation>遇到不正確的編碼內容。</translation>
+ </message>
+ <message>
+ <source>Namespace prefix &apos;%1&apos; not declared</source>
+ <translation>未宣告命名空間的前置字串「%1」</translation>
+ </message>
+ <message>
+ <source>Illegal namespace declaration.</source>
+ <translation>無效的命名空間宣告。</translation>
+ </message>
+ <message>
+ <source>Attribute &apos;%1&apos; redefined.</source>
+ <translation>屬性「%1」重複定義。</translation>
+ </message>
+ <message>
+ <source>Unexpected character &apos;%1&apos; in public id literal.</source>
+ <translation>在公開代碼字元中遇到非預期的字元「%1」。</translation>
+ </message>
+ <message>
+ <source>Invalid XML version string.</source>
+ <translation>無效的 XML 版本字串。</translation>
+ </message>
+ <message>
+ <source>Unsupported XML version.</source>
+ <translation>不支援的 XML 版本。</translation>
+ </message>
+ <message>
+ <source>The standalone pseudo attribute must appear after the encoding.</source>
+ <translation>獨立的虛擬屬性必須在編碼方式之後出現。</translation>
+ </message>
+ <message>
+ <source>%1 is an invalid encoding name.</source>
+ <translation>%1 為無效的編碼名稱。</translation>
+ </message>
+ <message>
+ <source>Encoding %1 is unsupported</source>
+ <translation>不支援編碼 %1</translation>
+ </message>
+ <message>
+ <source>Standalone accepts only yes or no.</source>
+ <translation>獨立實體只接受 yes 或 no。</translation>
+ </message>
+ <message>
+ <source>Invalid attribute in XML declaration.</source>
+ <translation>XML 宣告中有無效的屬性。</translation>
+ </message>
+ <message>
+ <source>Premature end of document.</source>
+ <translation>文件結尾過早結束。</translation>
+ </message>
+ <message>
+ <source>Invalid document.</source>
+ <translation>文件無效。</translation>
+ </message>
+ <message>
+ <source>&apos;%1&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&apos;&lt;first option&gt;&apos;</extracomment>
+ <translation>「%1」</translation>
+ </message>
+ <message>
+ <source>%1 or &apos;%2&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&lt;first option&gt;, &apos;&lt;second option&gt;&apos;</extracomment>
+ <translation>%1 或「%2」</translation>
+ </message>
+ <message>
+ <source>%1, &apos;%2&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&lt;options so far&gt;, &apos;&lt;next option&gt;&apos;</extracomment>
+ <translation>%1、「%2」</translation>
+ </message>
+ <message>
+ <source>%1, or &apos;%2&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&lt;options so far&gt;, or &apos;&lt;final option&gt;&apos;</extracomment>
+ <translation>%1、或「%2」</translation>
+ </message>
+ <message>
+ <source>Expected %1, but got &apos;%2&apos;.</source>
+ <translation>應為 %1 但得到「%2」。</translation>
+ </message>
+ <message>
+ <source>Unexpected &apos;%1&apos;.</source>
+ <translation>非預期的「%1」。</translation>
+ </message>
+ <message>
+ <source>Expected character data.</source>
+ <translation>預期的字元資料。</translation>
+ </message>
+ <message>
+ <source>Recursive entity detected.</source>
+ <translation>偵測到遞迴實體。</translation>
+ </message>
+ <message>
+ <source>Start tag expected.</source>
+ <translation>預期應有開始標籤。</translation>
+ </message>
+ <message>
+ <source>NDATA in parameter entity declaration.</source>
+ <translation>參數實體宣告有 NDATA。</translation>
+ </message>
+ <message>
+ <source>XML declaration not at start of document.</source>
+ <translation>XML 宣告沒有在文件開始處。</translation>
+ </message>
+ <message>
+ <source>%1 is an invalid processing instruction name.</source>
+ <translation>%1 是無效的處理指令名稱。</translation>
+ </message>
+ <message>
+ <source>Invalid processing instruction name.</source>
+ <translation>無效的處理指令名稱。</translation>
+ </message>
+ <message>
+ <source>%1 is an invalid PUBLIC identifier.</source>
+ <translation>%1 為無效的 PUBLIC 識別子。</translation>
+ </message>
+ <message>
+ <source>Invalid XML name.</source>
+ <translation>無效的 XML 名稱。</translation>
+ </message>
+ <message>
+ <source>Opening and ending tag mismatch.</source>
+ <translation>開啟與結束的標籤不對稱。</translation>
+ </message>
+ <message>
+ <source>Entity &apos;%1&apos; not declared.</source>
+ <translation>實體「%1」未宣告。</translation>
+ </message>
+ <message>
+ <source>Reference to unparsed entity &apos;%1&apos;.</source>
+ <translation>參考到未解析的實體「%1」。</translation>
+ </message>
+ <message>
+ <source>Reference to external entity &apos;%1&apos; in attribute value.</source>
+ <translation>在屬性值中參考到外部實體「%1」。</translation>
+ </message>
+ <message>
+ <source>Invalid character reference.</source>
+ <translation>無效的字元參考。</translation>
 </message>
 </context>
 </TS>

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

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

@@ -7,34 +7,35 @@
 </head>
 <body>
 <div id="inner">
- <h1>Changes in Avidemux v2.7.1 – v2.7.2 Beta</h1>
+ <h1>Changes in Avidemux v2.7.2 – v2.7.4</h1>
 <table>
- <tr><td>New Demuxer:</td><td>Native AviSynth demuxer (MSVC++ 64 bits Windows builds only)</td></tr>
- <tr><td>New Demuxer:</td><td>VapourSynth demuxer to directly load .vpy scripts (MSVC++, macOS with Homebrew, custom Linux builds)</td></tr>
- <tr><td>New Installer:</td><td>Replace NSIS installer with Qt Installer Framework for native MSVC++ 64 bits Windows builds</td></tr>
- <tr><td>New Encoder:</td><td>Add FFmpeg-based VA-API HW accelerated H.264 encoder (Intel/Linux)</td></tr>
- <tr><td>New Encoder:</td><td>Add FFmpeg-based VA-API HW accelerated HEVC encoder (Intel/Linux)</td></tr>
- <tr><td>FFmpeg:</td><td>Migrate to the 4.x branch</td></tr>
- <tr><td>Decoder:</td><td>As a result of the FFmpeg upgrade, HW accelerated HEVC decoding on macOS is now available when supported by the hardware</td></tr>
- <tr><td>Encoder:</td><td>Fix issues with image quality and skipped frames in the MJPEG encoder</td></tr>
- <tr><td>Demuxer:</td><td>Fix audio delay calculation in the Mp4 demuxer</td></tr>
- <tr><td>Demuxer:</td><td>Fix crash loading large MP4 files with LPCM audio</td></tr>
- <tr><td>Demuxer:</td><td>Fix multiple issues in the ASF demuxer, allow to cancel indexing</td></tr>
- <tr><td>Demuxer:</td><td>Allow to cancel indexing of MKV files</td></tr>
- <tr><td>Demuxer:</td><td>Re-enable multiloading for MPEG-TS streams cut in chunks of 256, 512 MiB, 1, 2 and 4 GiB in size only</td></tr>
- <tr><td>Demuxer:</td><td>Fix MPEG-TS indexer to start a H.264 or HEVC frame with the Access Unit Delimiter</td></tr>
- <tr><td>Muxer:</td><td>Add Annex B to Annex B video stream filter to deal with misplaced frame boundaries</td></tr>
- <tr><td>Muxer:</td><td>Add support for setting rotation flag to the MP4 muxer</td></tr>
- <tr><td>Filter:</td><td>Add rubber band selector to the "Blacken Borders" filter</td></tr>
- <tr><td>Filter:</td><td>Add option to deal with anamorphic display to the subtitle filter, fix issues in SRT to SSA converter</td></tr>
- <tr><td>UI:</td><td>Autosave session on video close, add session restore feature</td></tr>
- <tr><td>UI:</td><td>Add file name extension when saving audio for some audio types</td></tr>
- <tr><td>Audio:</td><td>Make maximum level in the "Normalize" filter customizable</td></tr>
- <tr><td>Audio:</td><td>Improve AAC sampling frequency detection</td></tr>
- <tr><td>Audio:</td><td>Add decoding support for multichannel Opus audio</td></tr>
- <tr><td>Miscellaneous:</td><td>Fix regression playback stuck after going to the previous picture</td></tr>
- <tr><td>Miscellaneous:</td><td>Fix regression "Fade to black" reset when starting filtered playback close to the end of video</td></tr>
- <tr><td>Miscellaneous:</td><td>Fix regression stopping playback rewinds to the start of video if seek back to the last displayed picture fails</td></tr>
+ <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>Miscellaneous:</td><td>Numerous other fixes and polish</td></tr>
 </table>
 </div>
 </body>

avidemux_2.7.4.tar.gz/avidemux/winInstaller/qtifw/packages/org.avidemux.run/data Added

avidemux_2.7.4.tar.gz/avidemux/winInstaller/qtifw/packages/org.avidemux.run/data/scripts Added

avidemux_2.7.4.tar.gz/avidemux/winInstaller/qtifw/packages/org.avidemux.run/data/scripts/auto_uninstall.js Added

avidemux_2.7.3.tar.gz/avidemux/winInstaller/qtifw/packages/org.avidemux.run/meta/installscript.js -> avidemux_2.7.4.tar.gz/avidemux/winInstaller/qtifw/packages/org.avidemux.run/meta/installscript.js Changed

@@ -52,17 +52,26 @@
         component.loaded.connect(this, Component.prototype.installerLoaded);
         ComponentSelectionPage = gui.pageById(QInstaller.ComponentSelection);
 		
-		var text=installer.value( "TargetDir");
-		if (installer.fileExists(text + "/components.xml")) 
+		var folder=installer.value( "TargetDir");
+		if (installer.fileExists(folder + "/components.xml")) 
 		{							
 			update=true;
+    	    // remove old one
+			// https://stackoverflow.com/questions/46455360/workaround-for-qt-installer-framework-not-overwriting-existing-installation
+			QMessageBox.question("question","Uninstall","I will now uninstall the previous version of avidemux VC++" ,  QMessageBox.Yes);     			
+		    if (installer.fileExists(folder + "/scripts/auto_uninstall.js")) 
+			    installer.execute(folder+"/Uninstall Avidemux VC++ 64bits.exe", "--script="+folder+"/scripts/auto_uninstall.js");			
+            else
+			    installer.execute(folder+"/Uninstall Avidemux VC++ 64bits.exe");
 		}        
 
         installer.setDefaultPageVisible(QInstaller.TargetDirectory, !update);
         installer.setDefaultPageVisible(QInstaller.ComponentSelection, !update);
         installer.setDefaultPageVisible(QInstaller.LicenseCheck, !update);
+		/*
         if (systemInfo.productType === "windows")
             installer.setDefaultPageVisible(QInstaller.StartMenuSelection, !update);
+			*/
         installer.setDefaultPageVisible(QInstaller.ReadyForInstallation, false);
     }
 }

avidemux_2.7.3.tar.gz/avidemux/winInstaller/qtifw/split.bash -> avidemux_2.7.4.tar.gz/avidemux/winInstaller/qtifw/split.bash Changed

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

avidemux_2.7.3.tar.gz/avidemux_core/ADM_core/include/ADM_win32.h -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/include/ADM_win32.h Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_core/src/ADM_debug.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_debug.cpp Changed

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

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

avidemux_2.7.3.tar.gz/avidemux_core/ADM_core/src/ADM_folder_unix.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_folder_unix.cpp Changed

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

avidemux_2.7.3.tar.gz/avidemux_core/ADM_core/src/ADM_memcpy.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_memcpy.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_core/src/ADM_memsupport.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_memsupport.cpp Changed

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

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

@@ -38,23 +38,28 @@
 {
 void gettimeofday(struct timeval *p, TIMZ *tz);
 }
-
-void gettimeofday(struct timeval *p, TIMZ *tz)
+// https://stackoverflow.com/questions/10905892/equivalent-of-gettimeday-for-windows
+void gettimeofday(struct timeval * tp, TIMZ * tzp)
 {
- unsigned long int sec;
- SYSTEMTIME tme;
-
- GetSystemTime(&tme);
-
- sec=tme.wSecond;
- sec+=60*tme.wMinute;
- sec+=60*60*tme.wHour;
-
- p->tv_sec=sec;
- p->tv_usec=tme.wMilliseconds*1000;
-
- return;
+ // Note: some broken versions only have 8 trailing zero's, the correct epoch has 9 trailing zero's
+ // This magic number is the number of 100 nanosecond intervals since January 1, 1601 (UTC)
+ // until 00:00:00 January 1, 1970 
+ static const uint64_t EPOCH = ((uint64_t)116444736000000000ULL);
+
+ SYSTEMTIME system_time;
+ FILETIME file_time;
+ uint64_t time;
+
+ GetSystemTime(&system_time);
+ SystemTimeToFileTime(&system_time, &file_time);
+ time = ((uint64_t)file_time.dwLowDateTime);
+ time += ((uint64_t)file_time.dwHighDateTime) << 32;
+
+ tp->tv_sec = (long)((time - EPOCH) / 10000000L);
+ tp->tv_usec = (long)(system_time.wMilliseconds * 1000);
+ return ;
 }
+
 #endif // HAVE_GETTIMEOFDAY
 
 int getpriority(int which, int who)

avidemux_2.7.3.tar.gz/avidemux_core/ADM_core/src/ADM_win32_mingw.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_win32_mingw.cpp Changed

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

@@ -9,7 +9,7 @@
 #include "ADM_win32.h"
 #include "ADM_misc.h"
 #include <algorithm>
-void redirectStdoutToFile(void)
+void redirectStdoutToFile(const char *logFile)
 {
 // Don't redirect stdout and stderr if SDL hasn't already hijacked it.
 // This allows us to optionally compile all EXEs as console applications
@@ -39,10 +39,21 @@
 remove(stderrPath);
 
 // Redirect output to log file in the user's profile directory
- const char* logFile = "admlog.txt";
-
+ #if 1
 std::string filePath=std::string(ADM_getLogDir())+std::string(logFile);
-
- freopen(filePath.c_str(),"w",stdout);
- 
+#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);
+ }
 }

avidemux_2.7.3.tar.gz/avidemux_core/ADM_core/src/TLK_clock.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/TLK_clock.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioAccessFileAACADTS.h -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioAccessFileAACADTS.h Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioAccessFileAACADTS.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioAccessFileAACADTS.cpp Changed

@@ -26,12 +26,13 @@
 {
 aac=new ADM_adts2aac(); 
 // ----- extract data frequency etc.. to initialize clock
+ fseek(_fd,_offset,SEEK_SET);
 #define PROBE_SIZE 8000
 uint8_t buffer[PROBE_SIZE+1];
 int n=fread(buffer,1,PROBE_SIZE,_fd);
 if(n<=0) return false;
- fseek(_fd,0,SEEK_SET);
- ADM_info("Probing AAC/ADTS with %d bytes\n",n);
+ fseek(_fd,_offset,SEEK_SET);
+ ADM_info("Probing AAC/ADTS with %d bytes at offset %d\n",n,_offset);
 if(!aac->addData(n,buffer)) return false;
 if(ADM_adts2aac::ADTS_OK!=aac->getAACFrame(NULL,NULL))
 {
@@ -59,12 +60,12 @@
 clock= new audioClock(headerInfo.frequency);
 
 // ----- build time map
- fseek(_fd,0,SEEK_SET);
- adtsIndexer dexer(_fd,headerInfo.frequency,headerInfo.channels);
+ fseek(_fd,_offset,SEEK_SET);
+ adtsIndexer dexer(_fd,_offset,headerInfo.frequency,headerInfo.channels);
 ADM_info("Indexing adts/aac file\n");
 dexer.index(seekPoints ); 
 ADM_info("found %d seekPoints\n",seekPoints.size());
- fseek(_fd,0,SEEK_SET);
+ fseek(_fd,_offset,SEEK_SET);
 payloadSize=dexer.getPayloadSize();
 // 
 // compute duration
@@ -88,13 +89,11 @@
 
 ADM_audioAccessFileAACADTS::ADM_audioAccessFileAACADTS(const char *fileName,int offset)
 {
- fileSize=ADM_fileSize(fileName)-offset;
- _fd=ADM_fopen(fileName,"rb");
- ADM_assert(_fd);
- clock=NULL;
- inited=init();;
- 
- 
+ _offset=(offset>0)? offset : 0;
+ _fd=ADM_fopen(fileName,"rb");
+ ADM_assert(_fd);
+ clock=NULL;
+ inited=init();
 }
 /**
 \fn

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioAccessFileAACADTS_indexer.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioAccessFileAACADTS_indexer.cpp Changed

@@ -13,7 +13,7 @@
 * *
 ***************************************************************************/
 
-#define AAC_SEEK_PERIOD (10000000LL) // 10 sec
+#define AAC_SEEK_PERIOD (200000LL) // 0.2 sec
 
 /**
 * \class adtsIndexer
@@ -23,9 +23,10 @@
 {
 public:
 
- adtsIndexer(FILE *fd,int fq,int chan)
+ adtsIndexer(FILE *fd,int off,int fq,int chan)
 {
 f=fd;
+ startOffset=off;
 this->fq=fq;
 this->channels=chan;
 payload=0;
@@ -42,6 +43,7 @@
 
 protected:
 FILE *f;
+ int startOffset;
 int fq;
 int channels;
 int payload;
@@ -55,9 +57,7 @@
 */
 bool adtsIndexer::index(std::vector<aacAdtsSeek>& seekPoints)
 {
-#define CHUNK_SIZE (5*1024)
- uint8_t buffer[CHUNK_SIZE];
- int fileOffset=0;;
+ uint8_t buffer[ADTS_MAX_AAC_FRAME_SIZE];
 uint64_t lastPoint=0;
 int len;
 
@@ -67,23 +67,24 @@
 int offset;
 
 start.dts=0;
- start.position=0;
+ start.position=startOffset;
 seekPoints.push_back(start); // initial start
 
 while(1)
 {
 ADM_adts2aac::ADTS_STATE s=aac.getAACFrame(&len,buffer,&offset);
+ offset+=startOffset;
 switch(s)
 {
 case ADM_adts2aac::ADTS_OK:
 {
 uint64_t currentPoint=clk.getTimeUs();
- if( (currentPoint-lastPoint)>AAC_SEEK_PERIOD) // one seek point every 10 s
+ if( (currentPoint-lastPoint)>AAC_SEEK_PERIOD) // one seek point every 200 ms
 {
 start.dts=currentPoint;
 start.position=offset;
 seekPoints.push_back(start);
- lastPoint=currentPoint; 
+ lastPoint=currentPoint;
 }
 payload+=len;
 clk.advanceBySample(1024);
@@ -100,7 +101,7 @@
 case ADM_adts2aac::ADTS_MORE_DATA_NEEDED:
 {
 
- int n=fread(buffer,1,CHUNK_SIZE,f);
+ int n=fread(buffer,1,ADTS_MAX_AAC_FRAME_SIZE,f);
 if(n<=0)
 return true;
 if(!aac.addData(n,buffer))

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

@@ -165,7 +165,6 @@
 	 }
 	 }
 
-	 uint32_t length;
 	 wRead32(t32);
 	 ADM_info(" %lu bytes data \n", totalSize);
 	 info.blockalign=1;
@@ -317,35 +316,52 @@
 */
 static bool idAAACADTS(int bufferSize,const uint8_t *data,WAVHeader &info,uint32_t &offset)
 {
+ int firstOffset,expected,sync=0;
 ADM_adts2aac aac;
+ uint8_t out[ADTS_MAX_AAC_FRAME_SIZE];
 const uint8_t *start=data;
 const uint8_t *end=data+bufferSize;
+ offset=firstOffset=expected=0;
 while(start<end)
 {
 int incoming=500;
- int outLen;
+ int off,outLen=0;
 if(start+500>end) incoming=end-start;
- ADM_adts2aac::ADTS_STATE state=aac.convert2(incoming,start,&outLen,NULL);
+ bool r=false;
+ if(incoming>0)
+ r=aac.addData(incoming,start);
+ ADM_adts2aac::ADTS_STATE state=aac.getAACFrame(&outLen,out,&off);
 start+=incoming;
 switch(state)
 {
- case ADM_adts2aac::ADTS_ERROR: 
+ case ADM_adts2aac::ADTS_ERROR:
+ return false;
+ case ADM_adts2aac::ADTS_MORE_DATA_NEEDED:
+ if(r) continue;
 return false;
- break;
- case ADM_adts2aac::ADTS_MORE_DATA_NEEDED: 
- continue;
- break;
 case ADM_adts2aac::ADTS_OK:
 // Got sync
+ if(!sync)
+ firstOffset=off;
+ else if(off>expected)
+ {
+ ADM_warning("Skipped at least %d bytes between frames, assuming a false positive.\n",off-expected);
+ return false;
+ }
+ sync++;
+ expected=off+outLen+9; // ADTS header max size
+ ADM_info("Sync %d at offset %d, frame size %d\n",sync,off,outLen);
+ if(sync<3)
+ continue;
 info.encoding=WAV_AAC;
 info.channels=aac.getChannels();
 info.blockalign=0;
 info.bitspersample=16;
 info.byterate=128000>>3;
 info.frequency=aac.getFrequency();
- ADM_info("Detected as AAC, fq=%d, channels=%d\n",info.frequency,info.channels);
+ offset=firstOffset;
+ ADM_info("Detected as AAC, fq=%d, channels=%d, offset=%d\n",info.frequency,info.channels,offset);
 return true;
- break;
 default:
 ADM_assert(0);
 break;

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioWriteAAC.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioWriteAAC.cpp Changed

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

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreAudioParser/include/ADM_aacadts.h -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudioParser/include/ADM_aacadts.h Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_aacadts.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_aacadts.cpp Changed

@@ -176,11 +176,11 @@
 int nbFrames=0;
 bool crc=false;
 int match;
- for( p=(buffer.at(tail));p<(buffer.at(head-2));p++)
+ for( p=(buffer.at(tail));p<(buffer.at(head-6));p++)
 {
- if(p[0]!=0xff || ((p[1]&0xf0)!=0xf0))
+ if(p[0]!=0xff || (p[1]&0xf0)!=0xf0 || p[1]&6)
 continue;
- 
+
 match=p-buffer.at(0); // offset of syncword
 packetLen=((p[3]&0x3)<<11)+(p[4]<<3)+(p[5]>>5);
 nbFrames=1+(p[6]&3);
@@ -198,15 +198,15 @@
 found=true;
 break;
 }
- if(match+packetLen+2>head && match+packetLen!=head)
+ if(match+packetLen+3>head && match+packetLen!=head)
 {
 aprintf("[ADTS]** not enough data **\n");
 return ADTS_MORE_DATA_NEEDED;
 }
 // do we have sync at the end ?
- if(p[packetLen]!=0xff)
+ if(p[packetLen]!=0xff || (p[packetLen+1]&0xf0)!=0xf0 || p[packetLen+1]&6)
 {
- aprintf("[ADTS] no ff marker at the end\n");
+ aprintf("[ADTS] no syncword at the end or layer!=0\n");
 continue;
 }
 aprintf("[ADTS] End marker found\n");
@@ -217,7 +217,7 @@
 if(found==false)
 {
 aprintf("[ADTS]No sync\n");
- tail=head-1;
+ tail=head-6;
 return ADTS_MORE_DATA_NEEDED;
 }
 if(!hasExtra)

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_aacinfo.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_aacinfo.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_dcainfo.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_dcainfo.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_eac3info.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_eac3info.cpp Changed

@@ -21,10 +21,14 @@
 /**
 \fn ADM_EAC3GetInfo
 */
-bool ADM_EAC3GetInfo(const uint8_t *buf, uint32_t len, uint32_t *syncoff, ADM_EAC3_INFO *info, bool plainAC3)
+bool ADM_EAC3GetInfo(const uint8_t *data, uint32_t len, uint32_t *syncoff, ADM_EAC3_INFO *info, bool plainAC3)
 {
 uint32_t of=0;
 *syncoff=0;
+ uint8_t *buf=new uint8_t[len+AV_INPUT_BUFFER_PADDING_SIZE];
+ memset(buf,0,len+AV_INPUT_BUFFER_PADDING_SIZE);
+ memcpy(buf,data,len);
+#define CLEANUP delete [] buf; buf=NULL; av_free(hdr); hdr=NULL;
 //	printf("\n Syncing on %d \n",len);
 // Search for startcode
 // 0x0b 0x77
@@ -33,20 +37,20 @@
 if(len<7)
 {
 ADM_warning("Not enough info to find a52 syncword\n");
+ delete [] buf;
+ buf=NULL;
 return false;
 }
- if( *buf!=0x0b || *(buf+1)!=0x77)
+ if(*(buf+of)!=0x0b || *(buf+of+1)!=0x77)
 {
 len--;
- buf++;
 of++;
 continue;
 }
 AC3HeaderInfo *hdr=NULL;
- if(avpriv_ac3_parse_header(&hdr,buf,len)<0)
+ if(avpriv_ac3_parse_header(&hdr,buf+of,len)<0)
 {
 len--;
- buf++;
 of++;
 ADM_info("Sync failed... continuing\n");
 continue;
@@ -54,15 +58,13 @@
 if(!plainAC3 && hdr->bitstream_id<=10) // this is not EAC3 but plain ac3
 {
 ADM_info("Bitstream ID = %d: not EAC3\n",hdr->bitstream_id);
- av_free(hdr);
- hdr=NULL;
+ CLEANUP
 return false;
 }
 if(plainAC3 && hdr->bitstream_id>10) // this is not AC3 but EAC3
 {
 ADM_info("Bitstream ID = %d: not AC3\n",hdr->bitstream_id);
- av_free(hdr);
- hdr=NULL;
+ CLEANUP
 return false;
 }
 // printf("Sync found at offset %"PRIu32"\n",of);
@@ -72,9 +74,10 @@
 info->channels=hdr->channels;
 info->frameSizeInBytes=hdr->frame_size;
 info->samples=265*6; // ??
- av_free(hdr);
- hdr=NULL;
+ CLEANUP
 return true;
 }
+ delete [] buf;
+ buf=NULL;
 return true;
 }

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

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

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

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreImage/src/ADM_image.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreImage/src/ADM_image.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageUtils.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageUtils.cpp Changed

@@ -151,10 +151,6 @@
 {
 int step=w/4;
 int left=w-4*step;
- uint8_t *xsrc=src;
- uint8_t *xdst=dst;
- uint8_t *xdst2=dst2;
-
 
 for(int y=0;y<h;y++)
 {
@@ -208,7 +204,6 @@
 {
 int mod8=w>>3;
 int leftOver=w&7;
- int x;
 for(int y=0;y<h;y++)
 {
 adm_uv_to_nv12_mmx(srcu,srcv,dst,mod8);
@@ -254,7 +249,6 @@
 {
 int mod8=w>>3;
 int leftOver=w&7;
- int x;
 for(int y=0;y<h;y++)
 {
 uint8_t *ssrc=src;
@@ -355,16 +349,13 @@
 */
 bool ADMImage::convertToNV12(uint8_t *yData, uint8_t *uvData, int strideY, int strideUV)
 {
- // Y
- int w=_width;
- int h=_height;
 int sstride=GetPitch(PLANAR_Y);
 int dstride=strideY;
 uint8_t *src=GetReadPtr(PLANAR_Y);
 uint8_t *dst=yData;
 for(int y=0;y<_height;y++)
 {
- memcpy(dst,src,w);
+ memcpy(dst,src,_width);
 src+=sstride;
 dst+=dstride;
 }
@@ -466,10 +457,10 @@
 uint8_t dst2[50],dst2b[50];
 
 for(int i=0;i<50;i++) src[i]=(i*0x55) ^( i+1);
- memset(dst,50,0);
- memset(dst2,50,0);
- memset(dstb,50,0);
- memset(dst2b,50,0);
+ memset(dst,0,50);
+ memset(dst2,0,50);
+ memset(dstb,0,50);
+ memset(dst2b,0,50);
 
 
 #define ROW_SIZE 23
@@ -495,10 +486,10 @@
 uint8_t dst2[50],dst2b[50];
 
 for(int i=0;i<50;i++) src[i]=(i*0x55) ^( i+1);
- memset(dst,50,0);
- memset(dst2,50,0);
- memset(dstb,50,0);
- memset(dst2b,50,0);
+ memset(dst,0,50);
+ memset(dst2,0,50);
+ memset(dstb,0,50);
+ memset(dst2b,0,50);
 
 
 
@@ -527,8 +518,8 @@
 uint8_t dst2[SRC_SIZE];
 
 for(int i=0;i<SRC_SIZE;i++) src[i]=i;
- memset(dst,SRC_SIZE,0);
- memset(dst2,SRC_SIZE,0);
+ memset(dst,0,SRC_SIZE);
+ memset(dst2,0,SRC_SIZE);
 
 
 yuv444_MMX(src,dst,ROW_SIZE,1,ROW_SIZE,4*ROW_SIZE);
@@ -563,8 +554,8 @@
 srcu[i]=i;
 srcv[i]=0x80^i;
 }
- memset(dst,SRC_SIZE,0);
- memset(dst2,SRC_SIZE,0);
+ memset(dst,0,SRC_SIZE);
+ memset(dst2,0,SRC_SIZE);
 
 
 uv_to_nv12_mmx(ROW_SIZE,1,ROW_SIZE>>1,ROW_SIZE>>1,srcu,srcv,ROW_SIZE,dst2);

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageUtils_asm.asm -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageUtils_asm.asm Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreImage/src/ADM_pp.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreImage/src/ADM_pp.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreJobs/src/ADM_coreJobs.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreJobs/src/ADM_coreJobs.cpp Changed

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

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreSubtitles/src/ADM_subLoader.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreSubtitles/src/ADM_subLoader.cpp Changed

@@ -79,9 +79,10 @@
 
 
 /**
- * \fn updateTiming
+ * \fn updateTiming // unused
 * \brief srt does not provide 'end display' timeing information, make a guess
 */
+#if 0
 static bool updateSrtTiming(ListOfSubtitleLines &lines)
 {
 int n=lines.size();
@@ -96,9 +97,8 @@
 if(n)
 lines[n-1].stop=lines[n-1].start+HOLD_ON_TIMER;
 return true;
- 
- 
 }
+#endif
 /**
 * \fn loadSrt
 * @param file
@@ -113,7 +113,6 @@
 ADM_warning("Cannot open subtitle %s\n,file");
 return false;
 }
- bool status=true;
 char buffer[1024];
 SRT_STATE state=STATE_LINENO;
 subtitleTextEntry entry;
@@ -142,14 +141,12 @@
 if(length<2) 
 { 
 ADM_warning("Inconsistent file\n");
- status=false;
 break;
 }
 uint64_t start,end;
 if(!splitSrtTiming(buffer,start,end))
 {
 ADM_warning("Inconsistent timing line\n");
- status=false;
 break;
 }
 entry.start=start;

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUI/include/DIA_coreToolkit.h -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUI/include/DIA_coreToolkit.h Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUI/include/DIA_coreUI_internal.h -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUI/include/DIA_coreUI_internal.h Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUI/src/DIA_coreToolkit.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUI/src/DIA_coreToolkit.cpp Changed

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

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

@@ -34,7 +34,12 @@
     uint32_t darNum;
     uint32_t darDen;
     bool     hasStructInfo;
+    bool     hasPocInfo;
     uint32_t CpbDpbToSkip;
+    uint32_t log2MaxFrameNum;
+    uint32_t log2MaxPocLsb;
+    bool     frameMbsOnlyFlag;
+    uint32_t refFrames;
 }ADM_SPSInfo;
 
 /**
@@ -64,9 +69,9 @@
 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 uint8_t extractH264FrameType(uint32_t nalSize,uint8_t *buffer,uint32_t len,uint32_t *flags,uint32_t *recovery=NULL);
+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_startCode(uint32_t nalSize,uint8_t *buffer,uint32_t len,uint32_t *flags);
+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    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

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

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_codecType.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_codecType.cpp Changed

@@ -23,11 +23,7 @@
 */
 bool  isMpeg4Compatible (uint32_t fourcc)
 {
-#define CHECK(x) if(fourCC::check(fourcc,(uint8_t *)x)) \
-						{divx4=1; }
-
-  uint8_t divx4 = 0;
-
+#define CHECK(x) if(fourCC::check(fourcc,(uint8_t *)x)) return true
   CHECK ("FMP4");
   CHECK ("fmp4");
   CHECK ("DIVX");
@@ -39,10 +35,7 @@
   CHECK ("M4S2");
   CHECK ("3IV2");
   CHECK ("SEDG");
-
-  return divx4;
-
-#undef CHECK
+  return false;
 }
 #ifdef ADM_BIG_ENDIAN
 #define SWAP32(x) x=R32(x)
@@ -55,18 +48,13 @@
 
 bool isMpeg12Compatible (uint32_t fourcc)
 {
-#define CHECK(x) if(fourCC::check(fourcc,(uint8_t *)x)) \
-						{mpeg=1; }
-
-  uint8_t mpeg = 0;
   CHECK ("MPEG");
   CHECK ("mpg1");
   CHECK ("mpg2");
   SWAP32 (fourcc);
   if (fourcc == 0x10000002 || fourcc==0x10000001) //Mplayer fourcc
-    mpeg = 1;
-  return mpeg;
-#undef CHECK
+    return true;
+  return false;
 }
 /**
     \fn isH264Compatible
@@ -74,20 +62,13 @@
 
 bool isH264Compatible (uint32_t fourcc)
 {
-#define CHECK(x) if(fourCC::check(fourcc,(uint8_t *)x)) \
-                                                {h264=1; }
-
-  uint8_t h264 = 0;
-
   CHECK ("X264");
   CHECK ("x264");
   CHECK ("h264");
   CHECK ("H264");
   CHECK ("AVC1");
   CHECK ("avc1");
-  return h264;
-
-#undef CHECK
+  return false;
 }
 
 /**
@@ -96,11 +77,6 @@
 
 bool isH265Compatible (uint32_t fourcc)
 {
-#define CHECK(x) if(fourCC::check(fourcc,(uint8_t *)x)) \
-                                                {h265=1; }
-
-  uint8_t h265 = 0;
-
   CHECK ("X265");
   CHECK ("x265");
   CHECK ("h265");
@@ -109,9 +85,7 @@
   CHECK ("hevc");
   CHECK ("HVC1");
   CHECK ("hvc1");
-  return h265;
-
-#undef CHECK
+  return false;
 }
 
 /**
@@ -120,11 +94,6 @@
 
 bool isMSMpeg4Compatible (uint32_t fourcc)
 {
-#define CHECK(x) if(fourCC::check(fourcc,(uint8_t *)x)) \
-						{divx3=1; }
-
-  uint8_t divx3 = 0;
-
   CHECK ("MP43");
   CHECK ("mp43");
   CHECK ("div3");
@@ -132,27 +101,16 @@
   CHECK ("DIV4");
   CHECK ("div4");
   CHECK ("COL1");
-
-  return divx3;
-
-#undef CHECK
+  return false;
 }
 /**
     \fn isVC1Compatible
 */
 bool isVC1Compatible    (uint32_t fourcc)
 {
-
-#define CHECK(x) if(fourCC::check(fourcc,(uint8_t *)x)) \
-						{divx3=1; }
-
-  uint8_t divx3 = 0;
-
   CHECK ("VC1 ");
   CHECK ("WVC1");
-  return divx3;
-
-#undef CHECK
+  return false;
 }
 /**
     \fn isVP6Compatible
@@ -160,42 +118,22 @@
 
 bool isVP6Compatible (uint32_t fourcc)
 {
-
-#define CHECK(x) if(fourCC::check(fourcc,(uint8_t *)x)) \
-						{divx3=1; }
-
-  uint8_t divx3 = 0;
-
   CHECK ("VP6F");
   CHECK ("VP6 ");
   CHECK ("VP61");
   CHECK ("VP62");
-
-  return divx3;
-
-#undef CHECK
+  return false;
 }
 
-
-
 /**
     \fn isVP9Compatible
 */
 
 bool isVP9Compatible (uint32_t fourcc)
 {
-
-#define CHECK(x) if(fourCC::check(fourcc,(uint8_t *)x)) \
-						{vp9=1; }
-
-  uint8_t vp9 = 0;
-
   CHECK ("VP9 ");
   CHECK ("VP90");
-
-  return vp9;
-
-#undef CHECK
+  return false;
 }
 
 /**
@@ -204,19 +142,11 @@
 
 bool isDVCompatible (uint32_t fourcc)
 {
-#define CHECK(x) if(fourCC::check(fourcc,(uint8_t *)x)) \
-						{dv=1; }
-
-  uint8_t dv = 0;
-
   CHECK ("dvsd");
   CHECK ("DVSD");
   CHECK ("dvpp");
   CHECK ("CDVC");
   CHECK ("cdvc");
-
-  return dv;
-
-#undef CHECK
+  return false;
 }
 //EOF

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

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_file.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_file.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractor.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractor.cpp Changed

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

@@ -24,7 +24,7 @@
 #include "libavcodec/avcodec.h"
 #include "libavcodec/ff_spsinfo.h"
 #include "libavutil/mem.h"
-extern int ff_h264_info(AVCodecParserContext *parser,ffSpsInfo *ndo);
+extern int ff_h264_info(AVCodecParserContext *parser, int ticksPerFrame, ffSpsInfo *ndo);
 }
 
 #include "ADM_Video.h"
@@ -32,7 +32,6 @@
 #include "fourcc.h"
 //#include "ADM_mp4.h"
 
-#define aprintf(...) {}
 #include "ADM_getbits.h"
 #include "ADM_videoInfoExtractor.h"
 #include "ADM_h264_tag.h"
@@ -48,8 +47,11 @@
 #define check(...) {}
 #endif
 
-static ADMCountdown msgRateLimiter(100);
-static ADMCountdown limiterReset(199);
+#if 0
+#define seiprintf ADM_info
+#else
+#define seiprintf(...) {}
+#endif
 
 /**
 \fn ADM_getH264SpsPpsFromExtraData
@@ -462,11 +464,9 @@
 */
 static bool getRecoveryFromSei(uint32_t nalSize, uint8_t *org,uint32_t *recoveryLength)
 {
- static int count=0;
- if(msgRateLimiter.done() && limiterReset.done())
- count=0;
- uint8_t *payloadBuffer=(uint8_t *)malloc(nalSize+16);
- int originalNalSize=nalSize+16;
+ 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;
 nalSize=ADM_unescapeH264(nalSize,org,payload);
@@ -477,67 +477,53 @@
 return false;
 }
 
-#define RATE_LIMITED_WARNING(x) if(!count)\
- { \
- ADM_warning(#x"\n"); \
- msgRateLimiter.reset(); \
- } \
- if(msgRateLimiter.done() && count) \
- { \
- ADM_warning(#x" (message repeated %d times)\n",count); \
- msgRateLimiter.reset(); \
- count=0; \
- } \
- count++; \
- limiterReset.reset();
-
 uint8_t *tail=payload+nalSize;
 *recoveryLength=16;
 while( payload<tail)
 {
- uint32_t sei_type=0,sei_size=0;
- while(payload[0]==0xff)
- {
- sei_type+=0xff;payload++;
- if(payload+2>=tail)
- {
- RATE_LIMITED_WARNING(Cannot decode SEI)
- goto abtSei;
- }
- };
- sei_type+=payload[0];payload++;
- if(payload>=tail)
- {
- RATE_LIMITED_WARNING(Cannot decode SEI)
- goto abtSei;
- }
- while(payload[0]==0xff)
- {
- sei_size+=0xff;payload++;
- if(payload+1>=tail)
- {
- RATE_LIMITED_WARNING(Cannot decode SEI (2))
- goto abtSei;
- }
- };
- sei_size+=payload[0];payload++;
- aprintf(" [SEI] Type : 0x%x size:%d\n",sei_type,sei_size);
- if(payload+sei_size>tail) break;
- switch(sei_type) // Recovery point
- {
- case 6:
- {
- getBits bits(sei_size,payload);
- payload+=sei_size;
- *recoveryLength=bits.getUEG();
- r=true;
- count=0;
- break;
- }
- default:
- payload+=sei_size;
- break;
- }
+ uint32_t sei_type=0,sei_size=0;
+ while(payload[0]==0xff)
+ {
+ sei_type+=0xff;payload++;
+ {
+ seiprintf("Not enough data.\n");
+ goto abtSei;
+ }
+ }
+ sei_type+=payload[0];payload++;
+ if(payload>=tail)
+ {
+ seiprintf("No data left after decoding SEI type.\n");
+ goto abtSei;
+ }
+ while(payload[0]==0xff)
+ {
+ sei_size+=0xff;payload++;
+ if(payload+1>=tail)
+ {
+ seiprintf("Not enough data left after decoding SEI size.\n");
+ goto abtSei;
+ }
+ }
+ sei_size+=payload[0];payload++;
+ seiprintf(" [SEI] Type : 0x%x size:%d\n",sei_type,sei_size);
+ if(payload+sei_size>tail) break;
+ switch(sei_type)
+ {
+ case 6: // Recovery point
+ {
+ getBits bits(sei_size,payload);
+ int distance=bits.getUEG();
+ seiprintf("Recovery distance: %d\n",distance);
+ *recoveryLength=distance;
+ r=true;
+ goto abtSei;
+ break;
+ }
+ default:
+ payload+=sei_size;
+ break;
+ }
 }
 abtSei:
 free(payloadBuffer);
@@ -546,19 +532,33 @@
 /**
 \fn getNalType
 \brief Return the slice type. The stream is escaped by the function. If recovery==0
- I as considered IDR else as P.
+ or frame_num==0 I is considered IDR else as P.
 */
-static bool getNalType (uint8_t * head, uint8_t * tail, uint32_t * flags,int recovery)
+static bool getNalType (uint8_t *head, uint8_t *tail, uint32_t *flags, ADM_SPSInfo *sps, int *poc_lsb, int recovery)
 {
- uint8_t *out=(uint8_t *)malloc(tail-head);
+ if(tail<=head)
+ return false;
+ uint8_t *out=(uint8_t *)malloc(tail-head+AV_INPUT_BUFFER_PADDING_SIZE);
+ memset(out,0,tail-head+AV_INPUT_BUFFER_PADDING_SIZE);
 int size=ADM_unescapeH264(tail-head,head,out);
 
 getBits bits(size,out);
 uint32_t sliceType;
- *flags = 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
+ {
+ 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);
+ }
 if (sliceType > 9)
 {
 ADM_warning ("Weird Slice %d\n", sliceType);
@@ -574,7 +574,7 @@
 case 0: *flags= AVI_P_FRAME;break;
 case 1: *flags = AVI_B_FRAME;break;
 case 2: case 4:
- if(!recovery) *flags=AVI_KEY_FRAME;
+ if(!recovery || !frame) *flags=AVI_KEY_FRAME;
 else *flags=AVI_P_FRAME;
 break;
 
@@ -591,74 +591,82 @@
 but 4 bytes NALU
 
 */
-uint8_t extractH264FrameType (uint32_t nalSize, uint8_t * buffer, uint32_t len, uint32_t * flags,uint32_t *extRecovery)
+uint8_t extractH264FrameType(uint8_t *buffer, uint32_t len, uint32_t *flags, int *pocLsb, ADM_SPSInfo *sps, uint32_t *extRecovery)
 {
- uint8_t *head = buffer, *tail = buffer + len;
- uint8_t stream;
+ uint8_t *head = buffer, *tail = buffer + len;
+ uint8_t stream;
 
- uint32_t val, hnt;
- nalSize=4;
+ 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;
- }
- uint32_t recovery=0xff;
- 
- 
- *flags=0;
- while (head + nalSize < tail)
+ {
+ uint32_t length =(head[0] << 24) + (head[1] << 16) + (head[2] << 8) + (head[3]);
+ if(length>len) nalSize=3;
+ }
+ uint32_t recovery=0xff;
+ int p=-1;
+
+ *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];
- if (length > len)// || length < 2)
- {
- ADM_warning ("Warning , incomplete nal (%u/%u),(%0x/%0x)\n", length, len, length, len);
- *flags = 0;
- return 0;
+ uint32_t length =(head[0] << 16) + (head[1] << 8) + (head[2] << 0) ;
+ if(nalSize==4)
+ length=(length<<8)+head[3];
+ if (length > len)// || length < 2)
+ {
+ ADM_warning ("Warning , incomplete nal (%u/%u),(%0x/%0x)\n", length, len, length, len);
+ *flags = 0;
+ return 0;
 }
- head += nalSize; // Skip nal lenth
- stream = *(head) & 0x1F;
-
+ head += nalSize; // Skip nal lenth
+ int ref=(*(head)>>5) & 3;
+ stream = *(head) & 0x1F;
 
- switch (stream)
+ switch (stream)
 {
 case NAL_SEI:
- {
-
- bool sei=getRecoveryFromSei(length-1, head+1,&recovery);
- if(extRecovery)
 {
- if(sei)
- *extRecovery=recovery;
- else
- recovery=*extRecovery;
+ bool sei=getRecoveryFromSei(length-1, head+1,&recovery);
+ if(extRecovery)
+ {
+ if(sei)
+ *extRecovery=recovery;
+ else
+ recovery=*extRecovery;
+ }
 }
- }
 break;
 case NAL_SPS:
 case NAL_PPS:
 case NAL_AU_DELIMITER:
 case NAL_FILLER:
- break;
+ break;
 case NAL_IDR:
- *flags = AVI_KEY_FRAME;
- return 1;
- break;
+ *flags = AVI_KEY_FRAME;
+ if(!getNalType(head+1,head+length,flags,sps,&p,recovery))
+ return 0;
+ if(sps && *flags != AVI_KEY_FRAME)
+ ADM_warning("Mismatched frame (flags: %d) in IDR NAL unit!\n",*flags);
+ *flags = AVI_KEY_FRAME; // FIXME
+ if(pocLsb)
+ *pocLsb=p;
+ return 1;
 case NAL_NON_IDR:
- getNalType(head+1,head+length,flags,recovery);
- return 1;
- break;
+ if(!getNalType(head+1,head+length,flags,sps,&p,recovery))
+ return 0;
+ if(!ref && (*flags & AVI_B_FRAME))
+ *flags |= AVI_NON_REF_FRAME;
+ if(pocLsb)
+ *pocLsb=p;
+ return 1;
 default:
- ADM_warning ("unknown nal ??0x%x\n", stream);
- break;
- }
+ ADM_warning ("unknown nal ??0x%x\n", stream);
+ break;
+ }
 head+=length;
 }
- ADM_warning ("No stream\n");
- return 0;
+ ADM_warning ("No stream\n");
+ return 0;
 }
 
 /**
@@ -667,45 +675,72 @@
 To be used only with avi / mpeg TS nal type
 (i.e. with startcode 00 00 00 01)
 */
-uint8_t extractH264FrameType_startCode(uint32_t nalSize, uint8_t * buffer,uint32_t len, uint32_t * flags)
+uint8_t extractH264FrameType_startCode(uint8_t *buffer, uint32_t len, uint32_t *flags, int *pocLsb, ADM_SPSInfo *sps, uint32_t *extRecovery)
 {
- uint8_t *head = buffer, *tail = buffer + len;
- uint8_t stream;
- uint32_t val, hnt;
-
-// FIXME : no startcode only !
-
- while (head + 4 < tail)
+ uint8_t *head = buffer, *tail = buffer + len;
+ uint8_t stream;
+ uint32_t hnt=0xffffffff;
+ uint32_t recovery=0xff;
+ int counter = 0, length = 0;
+ int p = -1;
+
+ while (head + 2 < tail)
 {
- // Search startcode
- hnt = (head[0] << 24) + (head[1] << 16) + (head[2] << 8) + (head[3]);
- head += 4;
- while ((hnt != 1) && head < tail)
+ // Search startcode
+ hnt = (hnt << 8) + head[0];
+ if((hnt & 0xffffff) != 1)
 {
-
- hnt <<= 8;
- val = *head++;
- hnt += val;
+ head++;
+ continue;
+ }
+ head++;
+ counter++;
+ if(counter > 1)
+ {
+ length = head - buffer - 3; // 3 bytes start code length no matter zero-prefixed or not
+ buffer = head;
+ }
+ if(!length)
+ continue;
+ int ref=(*head >> 5) & 3;
+ stream = *(head++) & 0x1f;
+ switch (stream)
+ {
+ case NAL_SEI:
+ {
+ bool sei=getRecoveryFromSei(length, head, &recovery);
+ if(extRecovery)
+ {
+ if(sei)
+ *extRecovery=recovery;
+ else
+ recovery=*extRecovery;
+ }
+ }
+ 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))
+ return 0;
+ if(*flags != AVI_KEY_FRAME)
+ ADM_warning("Mismatched frame (flags: %d) in IDR NAL unit!\n",*flags);
+ *flags = AVI_KEY_FRAME; // FIXME
+ if(pocLsb)
+ *pocLsb=p;
+ return 1;
+ case NAL_NON_IDR:
+ if(!getNalType(head, head+length, flags, sps, &p, recovery))
+ return 0;
+ if(!ref && (*flags & AVI_B_FRAME))
+ *flags |= AVI_NON_REF_FRAME;
+ if(pocLsb)
+ *pocLsb=p;
+ return 1;
+ default:
+ ADM_warning("Unknown NAL type ??0x%x\n", stream);
+ break;
 }
- if (head >= tail)
- break;
- stream = *(head++) & 0x1f;
- switch (stream)
- {
- case NAL_IDR:
- *flags = AVI_KEY_FRAME;
- // printf("IDR\n");
- return 1;
- break;
- case NAL_NON_IDR:
- getNalType (head,tail, flags,16); // No recovery here
- return 1;
- break;
- case NAL_SPS:case NAL_PPS: case NAL_FILLER: case NAL_AU_DELIMITER: break;
- default:
- ADM_warning ("??0x%x\n", stream);
- continue;
- }
 }
 printf ("No stream\n");
 return 0;
@@ -719,13 +754,13 @@
 bool extractSPSInfo_mp4Header (uint8_t * data, uint32_t len, ADM_SPSInfo *spsinfo)
 {
 bool r=false;
- bool closeCodec=false;
 
 // duplicate
 int myLen=len+AV_INPUT_BUFFER_PADDING_SIZE;
 uint8_t *myData=new uint8_t[myLen];
 memset(myData,0x2,myLen);
 memcpy(myData,data,len);
+ myData[len]=0; // stop ff_h264_decode_extradata() from trying to parse the remaining buffer content as PPS
 
 // 1-Create parser
 AVCodecParserContext *parser=av_parser_init(AV_CODEC_ID_H264);
@@ -753,7 +788,7 @@
 goto theEnd;
 }
 
- ADM_info("Context created\n");
+ ADM_info("Context created, ticks_per_frame = %d\n",ctx->ticks_per_frame);
 //2- Parse, let's add SPS prefix + Filler postfix to make life easier for libavcodec parser
 ctx->extradata=myData;
 ctx->extradata_size=len;
@@ -765,15 +800,16 @@
 printf("Used bytes %d/%d (+5)\n",used,len);
 if(!used)
 {
- ADM_warning("Failed to extract SPS info\n");
+ //ADM_warning("Failed to extract SPS info\n"); // it ain't necessarily so
 // goto theEnd;
 }
 }
- ADM_info("Width : %d\n",ctx->width);
- ADM_info("Height : %d\n",ctx->height);
+ // Size is not supposed to be set in AVCodecContext after parsing
+ //ADM_info("Width : %d\n",ctx->width);
+ //ADM_info("Height : %d\n",ctx->height);
 {
 ffSpsInfo nfo;
- if(!ff_h264_info(parser,&nfo))
+ if(!ff_h264_info(parser,ctx->ticks_per_frame,&nfo))
 {
 ADM_error("Cannot get sps info from lavcodec\n");
 r=false;
@@ -786,9 +822,14 @@
 CPY(height);
 CPY(fps1000);
 CPY(hasStructInfo);
+ CPY(hasPocInfo);
 CPY(CpbDpbToSkip);
+ CPY(log2MaxFrameNum);
+ CPY(log2MaxPocLsb);
+ CPY(frameMbsOnlyFlag);
 CPY(darNum);
 CPY(darDen);
+ CPY(refFrames);
 r=true;
 }
 // cleanup
@@ -845,7 +886,11 @@
 DPY(height);
 DPY(fps1000);
 DPY(hasStructInfo);
+ DPY(hasPocInfo);
 DPY(CpbDpbToSkip);
+ DPY(log2MaxFrameNum);
+ DPY(log2MaxPocLsb);
+ DPY(frameMbsOnlyFlag);
 DPY(darNum);
 DPY(darDen);
 }else

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

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUtils/src/prefs.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/prefs.cpp Changed

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

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

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

@@ -8,9 +8,11 @@
  {"features.audiobar_uses_master",offsetof(my_prefs_struct,features.audiobar_uses_master),"bool",ADM_param_bool},
  {"features.threading_lavc",offsetof(my_prefs_struct,features.threading_lavc),"uint32_t",ADM_param_uint32_t},
  {"features.cpu_caps",offsetof(my_prefs_struct,features.cpu_caps),"uint32_t",ADM_param_uint32_t},
+ {"features.cache_size",offsetof(my_prefs_struct,features.cache_size),"uint32_t",ADM_param_uint32_t},
  {"features.mpeg_no_limit",offsetof(my_prefs_struct,features.mpeg_no_limit),"bool",ADM_param_bool},
- {"features.alternate_mp3_tag",offsetof(my_prefs_struct,features.alternate_mp3_tag),"bool",ADM_param_bool},
  {"features.dxva2",offsetof(my_prefs_struct,features.dxva2),"bool",ADM_param_bool},
+ {"features.dxva2_override_blacklist_version",offsetof(my_prefs_struct,features.dxva2_override_blacklist_version),"bool",ADM_param_bool},
+ {"features.dxva2_override_blacklist_profile",offsetof(my_prefs_struct,features.dxva2_override_blacklist_profile),"bool",ADM_param_bool},
  {"features.vdpau",offsetof(my_prefs_struct,features.vdpau),"bool",ADM_param_bool},
  {"features.xvba",offsetof(my_prefs_struct,features.xvba),"bool",ADM_param_bool},
  {"features.libva",offsetof(my_prefs_struct,features.libva),"bool",ADM_param_bool},

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

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

@@ -19,9 +19,11 @@
 { FEATURES_AUDIOBAR_USES_MASTER,"features.audiobar_uses_master"       ,ADM_param_bool    	,"0",	0,	1},
 { FEATURES_THREADING_LAVC,"features.threading_lavc"                   ,ADM_param_uint32_t	,"0",	0,	32},
 { FEATURES_CPU_CAPS,"features.cpu_caps"                               ,ADM_param_uint32_t	,"4294967295",	0,	4294967295},
+{ FEATURES_CACHE_SIZE,"features.cache_size"                           ,ADM_param_uint32_t	,"16",	8,	16},
 { FEATURES_MPEG_NO_LIMIT,"features.mpeg_no_limit"                     ,ADM_param_bool    	,"0",	0,	1},
-{ FEATURES_ALTERNATE_MP3_TAG,"features.alternate_mp3_tag"             ,ADM_param_bool    	,"1",	0,	1},
 { FEATURES_DXVA2,"features.dxva2"                                     ,ADM_param_bool    	,"0",	0,	1},
+{ FEATURES_DXVA2_OVERRIDE_BLACKLIST_VERSION,"features.dxva2_override_blacklist_version",ADM_param_bool    	,"0",	0,	1},
+{ FEATURES_DXVA2_OVERRIDE_BLACKLIST_PROFILE,"features.dxva2_override_blacklist_profile",ADM_param_bool    	,"0",	0,	1},
 { FEATURES_VDPAU,"features.vdpau"                                     ,ADM_param_bool    	,"0",	0,	1},
 { FEATURES_XVBA,"features.xvba"                                       ,ADM_param_bool    	,"0",	0,	1},
 { FEATURES_LIBVA,"features.libva"                                     ,ADM_param_bool    	,"0",	0,	1},

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

@@ -455,7 +455,6 @@
 {
     Display *dis=(Display *)x->display;
     ADM_coreLibVA::display=vaGetDisplay(dis);
-    int maj=0,min=0,patch=0;
     ADM_info("[LIBVA] Initializing LibVA library ...\n");
 
 
@@ -914,7 +913,6 @@
 bool        admLibVA::putX11Surface(ADM_vaSurface *img,int widget,int displayWidth,int displayHeight)
 {
     int xError;
-    VASurfaceStatus status;
     CHECK_WORKING(false);
     CHECK_ERROR(vaPutSurface ( ADM_coreLibVA::display, img->surface,(Drawable)widget,0,0,img->w, img->h,0,0,displayWidth,displayHeight,
                               NULL,0 // clip & and num clip
@@ -934,7 +932,6 @@
 {
 
     int xError;
-    VASurfaceStatus status;
     CHECK_WORKING(false);
     CHECK_ERROR(vaPutImage(ADM_coreLibVA::display,
                            dst->surface,
@@ -958,7 +955,6 @@
 {
 
     int xError;
-    VASurfaceStatus status;
     CHECK_WORKING(false);
     CHECK_ERROR(vaGetImage(ADM_coreLibVA::display,
                            dst->surface,
@@ -983,7 +979,6 @@
 bool   admLibVA::uploadToImage( ADMImage *src,VAImage *dest)
 {
     int xError;
-    VASurfaceStatus status;
     CHECK_WORKING(false);
     uint8_t *ptr=NULL;
     CHECK_ERROR(vaMapBuffer(ADM_coreLibVA::display, dest->buf, (void**)&ptr))
@@ -1021,7 +1016,6 @@
 bool   admLibVA::downloadFromImage( ADMImage *src,VAImage *dest,ADMColorScalerSimple *color)
 {
     int xError;
-    VASurfaceStatus status;
     CHECK_WORKING(false);
     uint8_t *ptr=NULL;
     CHECK_ERROR(vaMapBuffer(ADM_coreLibVA::display, dest->buf, (void**)&ptr))
@@ -1124,7 +1118,6 @@
 {
     int xError;
     bool r=false;
-    VASurfaceStatus status;
     CHECK_WORKING(false);
     uint8_t *ptr=NULL;

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

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_codec.h -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_codec.h Changed

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

@@ -59,6 +59,7 @@
            bool         hurryUp;
            bool         _drain;
            bool         _done;
+           bool         _keepFeeding;
            bool         _endOfStream;
            bool         _setBpp;
            bool         _setFcc;
@@ -115,7 +116,8 @@
       //  virtual uint32_t getSpecificMpeg4Info (void);
         virtual uint8_t getPARWidth (void);
         virtual uint8_t getPARHeight (void);
-        virtual bool decodeErrorHandler(int code, bool headerOnly=false);
+        virtual bool decodeErrorHandler(int code);
+        virtual bool keepFeeding(void) { return _keepFeeding; }
         virtual bool endOfStreamReached(void) { return _endOfStream; }
         virtual void setEndOfStream(bool reached) { _endOfStream=reached; }
         virtual bool getDrainingState(void) { return _drain; }
@@ -148,7 +150,7 @@
 FF_SIMPLE_DECLARE(decoderFF_ffhuff,)
 FF_SIMPLE_DECLARE(decoderFFficv, bool uncompress(ADMCompressedImage *in, ADMImage *out);)
 FF_SIMPLE_DECLARE(decoderFFPng,)
-FF_SIMPLE_DECLARE(decoderFFMpeg4, bool uncompress (ADMCompressedImage * in, ADMImage * out);
+FF_SIMPLE_DECLARE(decoderFFMpeg4, bool uncompress(ADMCompressedImage *in, ADMImage *out);
                                 // mpeg4 can have B-frame
                                 virtual bool bFramePossible (void)   {  return 1;   })
 FF_SIMPLE_DECLARE(decoderFFMpeg12,

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

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

@@ -26,22 +26,18 @@
 #define LAV_VERBOSITY_LEVEL AV_LOG_INFO
 #endif
 
-extern "C"
-{
- static void ADM_releaseBuffer(struct AVCodecContext *avctx, AVFrame *pic);
- static int ADM_getBuffer(AVCodecContext *avctx, AVFrame *pic);
-}
-
 #define aprintf(...) {}
 
 
 //****************************
 extern uint8_t DIA_lavDecoder (bool *swapUv);
+#if 0
 extern "C"
 {
 int av_is_voppacked (AVCodecContext * avctx, int *vop_packed, int *gmc,
 		 int *qpel);
 };
+#endif
 /**
 \fn clonePic
 \brief Convert AvFrame to ADMImage
@@ -170,6 +166,7 @@
 hurryUp=false;
 _drain=false;
 _done=false;
+ _keepFeeding=false;
 _endOfStream=false;
 _setBpp=false;
 _setFcc=false;
@@ -328,7 +325,7 @@
 \fn decodeErrorHandler
 \brief Evaluate return value of avcodec_receive_frame
 */
-bool decoderFF::decodeErrorHandler(int code, bool headerOnly)
+bool decoderFF::decodeErrorHandler(int code)
 {
 if(code<0)
 {
@@ -336,25 +333,30 @@
 {
 case AVERROR_EOF:
 ADM_warning("[lavc] End of video stream reached\n");
- setEndOfStream(true);
+ _keepFeeding=false;
+ _endOfStream=true;
 flush();
 return false;
 case AVERROR(EAGAIN):
+#ifdef ADM_DEBUG
 ADM_info("[lavc] The decoder expects more input before output can be produced\n");
+#endif
+ _keepFeeding=true;
 return false;
 case AVERROR(EINVAL):
 ADM_error("[lavc] Codec not opened\n");
 return false;
 default:
- if(!headerOnly)
- {
- char er[2048]={0};
- av_make_error_string(er, sizeof(er)-1, code);
- ADM_warning("Error %d in lavcodec (%s)\n",code,er);
- return false;
- }
+ {
+ char er[2048]={0};
+ av_make_error_string(er, sizeof(er)-1, code);
+ ADM_warning("Error %d in lavcodec (%s)\n",code,er);
+ return false;
+ }
 }
 }
+ _keepFeeding=false;
+ _endOfStream=false;
 return true;
 }
 
@@ -364,7 +366,6 @@
 */
 bool decoderFF::uncompress (ADMCompressedImage * in, ADMImage * out)
 {
- uint8_t *oBuff[3];
 int ret = 0;
 out->_noPicture = 0;
 if(hwDecoder)
@@ -372,30 +373,16 @@
 
 //printf("Frame size : %d\n",in->dataLength);
 
- if (in->dataLength == 0 && !_allowNull)	// Null frame, silently skipped
+ if (in->dataLength == 0 && !_allowNull) // Null frame, silently skipped
 {
-
- printf ("[Codec] null frame\n");
- // search the last image
- if (_context->coded_frame &&
- _context->coded_frame->data &&
- _context->coded_frame->data[0]
- )
- {
- printf("[Codec] Cloning older pic\n");
- clonePic (_context->coded_frame, out);
- out->Pts=ADM_COMPRESSED_NO_PTS;
- }
- else
- {
- out->_noPicture = 1;
- out->Pts=ADM_COMPRESSED_NO_PTS;
- printf("[Codec] No Picture\n");
- }
- return 1;
+ printf ("[Codec] null frame\n");
+ out->_noPicture = 1;
+ out->Pts=ADM_COMPRESSED_NO_PTS;
+ printf("[Codec] No Picture\n");
+ return 1;
 }
- // Put a safe value....
- out->Pts=in->demuxerPts;
+ // Put a safe value....
+ out->Pts=in->demuxerPts;
 _context->reordered_opaque=in->demuxerPts;
 //_frame.opaque=(void *)out->Pts;
 //printf("Incoming Pts :%"PRId64"\n",out->Pts);
@@ -422,74 +409,53 @@
 
 ret = avcodec_receive_frame(_context, _frame);
 
- if(!ret)
- _endOfStream=false;
- if(!decodeErrorHandler(ret,hurryUp))
- return false;
+ out->_qStride = 0; // Default = no quant
 
- if(!bFramePossible())
- {
- // No delay, the value is sure, no need to hide it in opaque
- _frame->reordered_opaque=(int64_t)in->demuxerPts;
- }
- out->_qStride = 0;		//Default = no quant
-#if 0
- if (0 > ret && !hurryUp)
+ if (ret && !hurryUp)
 {
- printf ("\n[lavc] error in lavcodec decoder!\n");
- printf ("[lavc] Err: %d, size :%d\n", ret, in->dataLength);
- return 0;
+ // Some encoder code a vop header with the
+ // vop flag set to 0
+ // it is meant to mean frame skipped but very dubious
+#define MPEG4_EMPTY_FRAME_THRESHOLD 19 // MAX_NVOP_SIZE
+#define FRAPS_EMPTY_FRAME_THRESHOLD 8 // assumption
+ if ((in->dataLength <= MPEG4_EMPTY_FRAME_THRESHOLD && codecId == AV_CODEC_ID_MPEG4) ||
+ (in->dataLength <= FRAPS_EMPTY_FRAME_THRESHOLD && codecId == AV_CODEC_ID_MPEG4))
+ {
+ printf ("[lavc] Probably placeholder frame (data length: %u)\n",in->dataLength);
+ out->_Qp = 2;
+ out->Pts=ADM_NO_PTS; // not sure
+ out->_noPicture = 1;
+ return true;
+ }
+ // allow null means we allow null frame in and so potentially
+ // have no frame out for a time
+ // in that case silently fill with black and returns it as KF
+ if (_allowNull)
+ {
+ out->flags = AVI_KEY_FRAME;
+	 if (!_refCopy)
+ out->blacken();
+	 else
+	 out->_noPicture = 1;
+ printf ("\n[lavc] ignoring that we got no picture\n");
+	 return 1;
+ }
 }
-#endif
- if (ret && !hurryUp)
+ if (hurryUp)
 {
- // Some encoder code a vop header with the
- // vop flag set to 0
- // it is meant to mean frame skipped but very dubious
- if (in->dataLength <= 8)
- if(codecId == AV_CODEC_ID_MPEG4||codecId==AV_CODEC_ID_FRAPS)
-	{
-	 printf ("[lavc] Probably pseudo black frame...\n");
-	 out->_Qp = 2;
-	 out->flags = 0;	// assume P ?
- if(_context->coded_frame)
- clonePic (_context->coded_frame, out);
- else
- out->_noPicture = 1;
- out->Pts=ADM_NO_PTS; // not sure
-	 return 1;
-	}
- // allow null means we allow null frame in and so potentially
- // have no frame out for a time
- // in that case silently fill with black and returns it as KF
- if (_allowNull)
-	{
-	 out->flags = AVI_KEY_FRAME;
-	 if (!_refCopy)
-	 {
- out->blacken();
-	 }
-	 else
-	 {
-	 out->_noPicture = 1;
-	 }
-	 printf ("\n[lavc] ignoring that we got no picture\n");
-	 return 1;
-
-	}
-#if 0
- printf ("[lavc] Err: %d, size: %d\n", ret, in->dataLength);
- printf ("\n[lavc] error in FFMP43/mpeg4!: got picture\n");
-#endif
- //GUI_Alert("Please retry with misc->Turbo off");
- //return 1;
- return 0;
+ out->flags = frameType ();
+ return 1;
 }
- if (hurryUp)
+
+ if(!decodeErrorHandler(ret))
+ return false;
+
+ if(!bFramePossible())
 {
- out->flags = frameType ();
- return 1;
+ // No delay, the value is sure, no need to hide it in opaque
+ _frame->reordered_opaque=(int64_t)in->demuxerPts;
 }
+
 // We have an image....
 switch (_context->pix_fmt)
 {
@@ -608,16 +574,12 @@
 WRAP_Open (AV_CODEC_ID_MPEG4);
 
 }
-bool decoderFFMpeg4::uncompress (ADMCompressedImage * in, ADMImage * out)
+bool decoderFFMpeg4::uncompress(ADMCompressedImage *in, ADMImage *out)
 {
 // For pseudo startcode
- if(!_drain && in->dataLength)
- {
- in->data[in->dataLength]=0;
- in->data[in->dataLength+1]=0;
- }
+ if(!_drain && in->dataLength && in->dataLength < ADM_COMPRESSED_MAX_DATA_LENGTH - 2)
+ memset(in->data+in->dataLength,0,2);
 return decoderFF::uncompress(in,out);
-
 }
 //************************************
 decoderFFDV::decoderFFDV (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp):
@@ -676,7 +638,10 @@
 decoderMultiThread ();
 ADM_info ("[lavc] Initializing H264 decoder with %d extradata\n", (int)extraDataLen);
 WRAP_Open(AV_CODEC_ID_H264);
- 
+#ifdef ADM_DEBUG
+ //_context->debug |= FF_DEBUG_MMCO;
+ //_context->debug |= FF_DEBUG_PICT_INFO;
+#endif
 }
 //*********************
 extern "C" {int av_getAVCStreamInfo(AVCodecContext *avctx, uint32_t *nalSize, uint32_t *isAvc);}

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

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

@@ -422,32 +422,42 @@
 */
 bool ADM_coreVideoEncoderFFmpeg::loadStatFile(const char *file)
 {
-  printf("[FFmpeg] Loading stat file :%s\n",file);
-  FILE *_statfile = ADM_fopen (file, "rb");
-  int statSize;
+    ADM_info("Loading stat file %s\n",file);
+    FILE *_statfile = ADM_fopen (file, "rb");
 
-  if (!_statfile)
+    if (!_statfile)
     {
-      printf ("[ffmpeg] internal file does not exists ?\n");
-      return false;
+        ADM_error ("Cannot open stat file. Does it exist?\n");
+        return false;
     }
 
-  fseek (_statfile, 0, SEEK_END);
-  statSize = ftello (_statfile);
-  fseek (_statfile, 0, SEEK_SET);
-  _context->stats_in = (char *) av_malloc(statSize+1);
-  _context->stats_in[statSize] = 0;
-  fread (_context->stats_in, statSize, 1, _statfile);
-  fclose(_statfile);
-
+    fseek (_statfile, 0, SEEK_END);
+    uint64_t statSize = ftello (_statfile);
+    if (statSize >= INT_MAX - 32) // enforce the av_malloc limit
+    {
+        ADM_error ("Stat file too large.\n");
+        fclose(_statfile);
+        return false;
+    }
+    fseek (_statfile, 0, SEEK_SET);
+    _context->stats_in = (char *) av_malloc(statSize+1);
+    _context->stats_in[statSize] = 0;
+    if (!fread (_context->stats_in, statSize, 1, _statfile))
+    {
+        ADM_error ("Cannot read stat file.\n");
+        fclose(_statfile);
+        return false;
+    }
+    fclose(_statfile);
 
     int i;
     char *p=_context->stats_in;
-   for(i=-1; p; i++){
-            p= strchr(p+1, ';');
-        }
-  printf("[FFmpeg] stat file loaded ok, %d frames found\n",i);
-  return true;
+    for(i=-1; p; i++)
+    {
+        p= strchr(p+1, ';');
+    }
+    ADM_info ("Stat file loaded ok, %d frames found.\n",i);
+    return true;
 }
 /**
         \fn postEncode

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

avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/attic Added

avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/attic/libavcodec_h263dec.c.patch Changed

avidemux_2.7.3.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_ff_spsinfo.h.patch -> avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_ff_spsinfo.h.patch Changed

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

@@ -1,13 +1,13 @@
---- libavcodec/h264_parser.c.org	2017-03-10 18:39:39.106069071 +0100
-+++ libavcodec/h264_parser.c	2017-03-10 18:38:20.586520540 +0100
-@@ -64,6 +64,102 @@
+--- 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 @@
 int last_frame_num, last_picture_structure;
 } H264ParseContext;
 
 +#include "ff_spsinfo.h" // MEANX
 +#include <assert.h>
 + // MEANX
-+int ff_h264_info(AVCodecParserContext *parser,ffSpsInfo *info);
++int ff_h264_info(AVCodecParserContext *parser, int ticksPerFrame, ffSpsInfo *info);
 +/**
 + \fn AVCodecParserContext
 + * \brief find a valid sps,take the 1st one that look sok
@@ -42,7 +42,7 @@
 + * @param info
 + * @return 
 + */
-+int ff_h264_info(AVCodecParserContext *parser,ffSpsInfo *info)
++int ff_h264_info(AVCodecParserContext *parser, int ticksPerFrame, ffSpsInfo *info)
 +{
 + H264ParseContext *ctx = parser->priv_data; 
 + int f; 
@@ -60,7 +60,10 @@
 + {
 + float scale=sps->time_scale ;
 + float ticks=sps->num_units_in_tick;
-+ info->fps1000 = (uint32_t) ((scale/ticks) * 1000.);
++ float fps = scale/ticks;
++ if(ticksPerFrame>1)
++ fps /= ticksPerFrame;
++ info->fps1000 = (uint32_t)(fps * 1000.);
 +#undef printf
 + printf("Scale : %d, tick=%d, fps=%d\n",(int)scale,(int)ticks,(int)info->fps1000);
 + }else
@@ -71,7 +74,9 @@
 + // D.2.2 SEI Timing present if CpbDbpDelayPresentFlag=1 or pictStructPresent=1
 + // CpbDbpDelayPresentFlag =1 if nal_hdr or vcl_hrd or ???
 + f=sps->nal_hrd_parameters_present_flag | sps->vcl_hrd_parameters_present_flag;
-+ info->hasStructInfo=f | sps->pic_struct_present_flag;;
++ info->hasStructInfo=f | sps->pic_struct_present_flag;
++ // Check whether POC is explicitely set in slice header
++ info->hasPocInfo=!sps->poc_type;
 + // While decoding SEI, if CpbDpbDelaysPresentFlags is there we skip cpb_removal_delay + dpb_output_delay
 +
 + info->CpbDpbToSkip=0;
@@ -79,6 +84,10 @@
 + {
 + info->CpbDpbToSkip=sps->cpb_removal_delay_length+sps->dpb_output_delay_length;
 + }
++ info->log2MaxFrameNum=sps->log2_max_frame_num;
++ info->log2MaxPocLsb=sps->log2_max_poc_lsb;
++ // Needed to determine the offset of poc_lsb
++ info->frameMbsOnlyFlag=sps->frame_mbs_only_flag;
 +//#warning fixme sar vs dar
 + info->darNum=sps->sar.num;
 + info->darDen=sps->sar.den;
@@ -96,6 +105,7 @@
 + info->height-=sps->crop_bottom*mul;
 +
 + }
++ info->refFrames=sps->ref_frame_count;
 + return 1;
 +}
 +// /MEANX

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

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

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

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

@@ -24,7 +24,6 @@
 #include "fourcc.h"
 #include "ADM_audioXiphUtils.h"
 
-#define SCRATCH_PAD_SIZE (100*1000*2)
 #define ADMWA_BUF (4*1024*16) // 64 kB internal
 /**
 * \class ADM_AudiocoderLavcodec
@@ -40,10 +39,10 @@
 ADM_outputFlavor outputFlavor;
 AVCodecContext *_context;
 AVFrame *_frame;
+ uint8_t *_paddedExtraData;
 uint8_t _buffer[ ADMWA_BUF];
 uint32_t _tail,_head;
 uint32_t _blockalign;
- uint8_t scratchPad[SCRATCH_PAD_SIZE];
 uint32_t channels;
 bool decodeToS16(float **outptr,uint32_t *nbOut);
 bool decodeToFloat(float **outptr,uint32_t *nbOut);
@@ -109,6 +108,7 @@
 ADM_info(" [ADM_AD_LAV] Using decoder for type 0x%x\n",info->encoding);
 ADM_info(" [ADM_AD_LAV] #of channels %d\n",info->channels);
 _tail=_head=0;
+ _paddedExtraData=NULL;
 channels=info->channels;
 _blockalign=0;
 _frame=av_frame_alloc();
@@ -185,20 +185,24 @@
 _context->bit_rate = info->byterate*8;
 _context->sample_fmt=AV_SAMPLE_FMT_FLT;
 _context->request_sample_fmt=AV_SAMPLE_FMT_FLT;
- 
+
 if(fourcc==WAV_OGG_VORBIS)
 {
 // Need to translate from adm to xiph
 int xiphLen=(int)l+(l/255)+4+5;
- uint8_t *xiph=new uint8_t[xiphLen];
+ uint8_t *xiph=new uint8_t[xiphLen+AV_INPUT_BUFFER_PADDING_SIZE];
+ memset(xiph,0,xiphLen+AV_INPUT_BUFFER_PADDING_SIZE);
 xiphLen=ADMXiph::admExtraData2xiph(l,d,xiph);
- _context->extradata=xiph;
- _context->extradata_size=xiphLen;
- }else
+ _paddedExtraData=xiph;
+ l=xiphLen;
+ }else if(l)
 {
- _context->extradata=(uint8_t *)d;
- _context->extradata_size=(int)l; 
+ _paddedExtraData=new uint8_t[l+AV_INPUT_BUFFER_PADDING_SIZE];
+ memset(_paddedExtraData,0,l+AV_INPUT_BUFFER_PADDING_SIZE);
+ memcpy(_paddedExtraData,d,l);
 }
+ _context->extradata=_paddedExtraData;
+ _context->extradata_size=l;
 
 if (!_blockalign) 
 {
@@ -277,11 +281,16 @@
 \fn dtor
 */
 ADM_AudiocoderLavcodec::~ADM_AudiocoderLavcodec()
- {
- avcodec_close(_context);
- av_free(_context);
- _context=NULL;
- av_frame_free(&_frame);
+{
+ avcodec_close(_context);
+ av_free(_context);
+ _context=NULL;
+ av_frame_free(&_frame);
+ if(_paddedExtraData)
+ {
+ delete [] _paddedExtraData;
+ _paddedExtraData=NULL;
+ }
 }
 /**
 \fn decodeToS16
@@ -442,7 +451,8 @@
 AVPacket pkt;
 av_init_packet(&pkt);
 int nbChunk,res=0;
- while(_tail-_head>=_blockalign)
+ bool eof=false;
+ while(_tail-_head>=_blockalign && !eof)
 {
 nbChunk=(_tail-_head)/_blockalign;
 pkt.size=nbChunk*_blockalign;
@@ -458,14 +468,15 @@
 if(res==AVERROR(EAGAIN)) break; // we need to send more input
 if(res==AVERROR_EOF)
 {
- return 1;
+ eof=true;
+ break;
 }
 if(res<0)
 {
 char er[2048]={0};
 av_make_error_string(er, sizeof(er)-1, res);
 ADM_warning("[ADM_ad_lav] decoding error: %s\n",er);
- return 1;
+ break;
 }
 
 bool invalid=false;

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

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

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

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

@@ -75,6 +75,7 @@
 uint32_t extraDataSize;
 uint8_t *extraData;
 WAVHeader _rdWav;
+ uint64_t totalDataSize;
 int64_t delay; // in movie scale units
 int64_t startOffset; // media time in track scale units
 std::vector <mp4Fragment> fragments;
@@ -122,6 +123,7 @@
 #define _3GP_MAX_TRACKS 8
 #define VDEO _tracks[0]
 #define ADIO _tracks[nbAudioTrack+1]._rdWav
+#define AUDIO_BYTERATE_UNSET 0xFFFFFFFF
 /**
 * 
 */
@@ -193,7 +195,7 @@
 int lookupIndex(int desc) ;
 bool parseTrun(int trackNo,adm_atom &son,const mp4TrafInfo &info);
 uint8_t decodeVideoAtom(void *ztom);
- uint8_t parseMdia(void *ztom,uint32_t *trackType);
+ uint8_t parseMdia(void *ztom,uint32_t *trackType,uint32_t *trackId);
 uint8_t parseEdts(void *ztom,uint32_t trackType);
 uint8_t parseStbl(void *ztom,uint32_t trackType,uint32_t trackScale);
 uint8_t decodeEsds(void *ztom,uint32_t trackType);

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

@@ -208,6 +208,7 @@
     uint32_t container;
     uint32_t w,h;
     uint32_t trackType=TRACK_OTHER;
+    uint32_t trackId=0;
     _currentDelay=0;
     _currentStartOffset=0;
 
@@ -235,7 +236,8 @@
                 else
                     tom->skipBytes(8);
 
-                aprintf("Track Id: %" PRIu32"\n", son.read32());
+                trackId = son.read32();
+                aprintf("[parseTrack] Track Id: %" PRIu32"\n", trackId);
                 son.skipBytes(4);
 
                 uint64_t duration = (version == 1) ? son.read64() : son.read32();
@@ -253,7 +255,7 @@
             }
             case ADM_MP4_MDIA:
             {
-                if(!parseMdia(&son,&trackType))
+                if(!parseMdia(&son,&trackType,&trackId))
                     return false;
                 break;
             }
@@ -274,7 +276,7 @@
       \fn parseMdia
       \brief Parse mdia header
 */
-uint8_t MP4Header::parseMdia(void *ztom,uint32_t *trackType)
+uint8_t MP4Header::parseMdia(void *ztom,uint32_t *trackType,uint32_t *trackId)
 {
     adm_atom *tom=(adm_atom *)ztom;
     ADMAtoms id;
@@ -347,10 +349,14 @@
                         _movieDuration=trackDuration;
                         _videoScale=trackScale;
                         _tracks[0].scale=_videoScale;
+                        _tracks[0].id=*trackId;
                         break;
                     case MKFCCR('s','o','u','n'): // 'soun'
                         _tracks[1+nbAudioTrack].delay=_currentDelay;
                         _tracks[1+nbAudioTrack].startOffset=_currentStartOffset;
+                        _tracks[1+nbAudioTrack].id=*trackId;
+                        if(!*trackId)
+                            ADM_warning("Invalid track ID for audio track %d\n",1+nbAudioTrack);
                         *trackType=TRACK_AUDIO;
                         ADM_info("hdlr audio found \n ");
                         break;
@@ -851,7 +857,8 @@
                                     while(!son.isDone())
                                     {
                                         adm_atom avcc(&son);
-                                        printf("Reading hev1, got %s\n",fourCC::tostringBE(avcc.getFCC()));
+                                        const char *hevc = (entryName == MKFCCR('h','e','v','1'))? "hev1" : "hvc1";
+                                        printf("Reading %s, got %s\n",hevc,fourCC::tostringBE(avcc.getFCC()));
                                         if( avcc.getFCC()== MKFCCR('h','v','c','C'))
                                         {
                                             VDEO.extraDataSize=avcc.getRemainingSize();
@@ -938,7 +945,7 @@
                             // Put some defaults
                             ADIO.encoding=1234;
                             ADIO.frequency=44100;
-                            ADIO.byterate=128000>>3;
+                            ADIO.byterate=AUDIO_BYTERATE_UNSET;
                             ADIO.channels=2;
                             ADIO.bitspersample=16;
 
@@ -1029,7 +1036,10 @@
                                 case MKFCCR('a','c','-','3'):
                                 case MKFCCR('s','a','c','3'):
                                     audioCodec(AC3);
-                                    ADIO.byterate=128000>>3;
+
+                                    break;
+                                case MKFCCR('e','c','-','3'):
+                                    audioCodec(EAC3);
 
                                     break;
                                 case MKFCCR('l','p','c','m'):
@@ -1068,7 +1078,6 @@
                                     break;
                                 case MKFCCR('.','m','p','3'): //.mp3
                                     audioCodec(MP3);
-                                    ADIO.byterate=128000>>3;
 
                                     break;
                                 case MKFCCR('r','a','w',' '):
@@ -1280,18 +1289,29 @@
               info.SzIndentical=info.SzIndentical*ADIO.channels;
             }
 #endif
+            if(nbAudioTrack>=_3GP_MAX_TRACKS-1)
+            {
+                ADM_warning("Maximum number of tracks reached, cannot add audio track.\n");
+                r=1;
+                break;
+            }
             r=indexify(&(_tracks[1+nbAudioTrack]),trackScale,&info,1,&nbo);
             ADM_info("Indexed audio, nb blocks:%u\n",nbo);
+            nbAudioTrack++;
+            _tracks[nbAudioTrack].scale=trackScale;
             if(r)
             {
-                nbo=_tracks[1+nbAudioTrack].nbIndex;
-                if(nbo)
-                    _tracks[1+nbAudioTrack].nbIndex=nbo;
-                else
-                    _tracks[1+nbAudioTrack].nbIndex=info.nbSz;
-                ADM_info("Indexed audio, nb blocks:%u (final)\n",_tracks[1+nbAudioTrack].nbIndex);
-                _tracks[1+nbAudioTrack].scale=trackScale;
-                nbAudioTrack++;
+                nbo=_tracks[nbAudioTrack].nbIndex;
+                if(!nbo)
+                    _tracks[nbAudioTrack].nbIndex=info.nbSz;
+                ADM_info("Indexed audio, nb blocks:%u (final)\n",_tracks[nbAudioTrack].nbIndex);
+            }else
+            {
+                if(_tracks[nbAudioTrack].index)
+                {
+                    delete [] _tracks[nbAudioTrack].index;
+                    _tracks[nbAudioTrack].index=NULL;
+                }
             }
 
             break;

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

@@ -85,7 +85,7 @@
 { 
 ADMAtoms id;
 uint32_t container;
- aprintf("[TRAF]\n");
+ aprintf("[TRAF] Starting at 0x%" PRIx64"\n",moofStart);
 uint32_t trafFlags=0;
 mp4TrafInfo info;
 int trackIndex=-1;
@@ -128,11 +128,12 @@
 info.baseOffset=moofStart;
 aprintf("base is moof at %llx\n",(long long int)info.baseOffset);
 }
- trackIndex=lookupIndex((!info.trackID)? 0 : info.trackID-1);
+ trackIndex=lookupIndex(info.trackID);
 if(-1==trackIndex)
 {
- ADM_warning("Cannot find track for %d\n",info.sampleDesc);
+ ADM_warning("Cannot find track with id %d\n",info.trackID);
 }
+ break;
 }
 case ADM_MP4_TFDT:
 {
@@ -148,8 +149,6 @@
 break;
 default:break;
 }
- 
- aprintf("[MOOF]Found atom %s \n",fourCC::tostringBE(son.getFCC()));
 son.skipAtom();
 } 
 tom.skipAtom();
@@ -171,14 +170,14 @@
 std::vector <mp4Fragment> &fragList=_tracks[trackNo].fragments;
 if(flags & 0x1)
 {
- firstOffset+=tom.read32()&0xffff; // Signed!
+ firstOffset+=tom.read32(); // Signed!
 }
 if(flags & 0x4) 
 firstSampleFlags=tom.read32(); // Signed!
 else 
 firstSampleFlags=info.defaultFlags;
 
- aprintf("[TRUN] count=%d, offset=0x%x,synth=0x%x, flags=%x\n",count,firstOffset,(long long int)firstOffset+info.baseOffset,firstSampleFlags);
+ aprintf("[TRUN] count=%d, offset=0x%" PRIx64", base=0x%" PRIx64", flags=%x\n",count,firstOffset,info.baseOffset,firstSampleFlags);
 for(int i=0;i<count;i++)
 {
 mp4Fragment frag;
@@ -213,16 +212,16 @@
 trk->index=new MP4Index[trk->nbIndex];
 uint64_t sum=0;
 int intra=0;
- for(int i=0;i<trk->nbIndex;i++)
+ 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;
+
 double dts=sum;
 double ctts=fragList[i].composition;
- dts=sum;
- 
+
 dts=dts/_videoScale;
 dts*=1000000.;
 ctts=ctts/_videoScale;
@@ -237,7 +236,8 @@
 else
 dex->intra=0; 
 sum+=fragList[i].duration;
- aprintf("[FRAG] offset=0x%llx size=%d dts=%s pts=%s\n",dex->offset,(int)dex->size,ADM_us2plain(dex->dts),ADM_us2plain(dex->pts));
+ 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));
 }
 printf("Found %d intra\n",intra);
 MP4Index *ff=trk->index;
@@ -258,20 +258,31 @@
 trk->nbIndex=fragList.size();
 trk->index=new MP4Index[trk->nbIndex];
 uint64_t sum=0;
- for(int i=0;i<trk->nbIndex;i++)
+ 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;
 
 double dts=sum;
- dts=sum;
+ dts/=trk->scale;
+ dts*=1000000.;
 dex->dts=dts;
- dex->pts=dex->dts+fragList[i].composition*10;
+ dex->pts=dex->dts;
+ if(fragList[i].composition)
+ {
+ dts=fragList[i].composition;
+ dts/=trk->scale;
+ dts*=1000000.;
+ dex->pts+=dts;
+ }
 dex->intra=0; 
 sum+=fragList[i].duration;
- aprintf("[FRAG] offset=0x%llx size=%d dts=%s pts=%s\n",dex->offset,(int)dex->size,ADM_us2plain(dex->dts),ADM_us2plain(dex->pts));
- } 
+ aprintf("[FRAG] Audio entry %d 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));
+ }
+ fragList.clear();
 return true;
 }
 // EOF

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

@@ -122,14 +122,14 @@
 bool	MP4Header::processAudio( MP4Track *track, uint32_t trackScale, 
 MPsampleinfo *info,uint32_t *nbOut)
 {
- uint64_t audioClock=0;
- 
- uint32_t totalBytes=info->SzIndentical*info->nbSz;
+ uint64_t totalBytes=info->SzIndentical*info->nbSz;
 uint32_t totalSamples=0;
 double skewFactor=1;
- ADM_info("All the same size: %u (total size %u bytes)\n",info->SzIndentical,totalBytes);
+ ADM_info("All the same size: %u (total size %" PRIu64" bytes)\n",info->SzIndentical,totalBytes);
 ADM_info("Byte per frame =%d\n",(int)info->bytePerFrame);
 ADM_info("SttsC[0] = %d, sttsN[0]=%d\n",info->SttsC[0],info->SttsN[0]);
+
+ track->totalDataSize=totalBytes;
 
 if(info->nbStts!=1) 
 {
@@ -204,7 +204,8 @@
 if(info->nbCo)
 track->index[0].pts=0;
 ADM_info("Found %u bytes, spread over %d blocks\n",totalBytes,info->nbCo);
- //
+ track->totalDataSize=totalBytes;
+
 // split large chunk into smaller ones if needed
 splitAudio(track,info, trackScale);
 
@@ -291,12 +292,14 @@
 aprintf("\t size for all %u frames : %u\n",info->nbSz,info->SzIndentical);
 for(i=0;i<info->nbSz;i++)
 track->index[i].size=info->SzIndentical;
+ track->totalDataSize+=info->nbSz*info->SzIndentical;
 }else // Different size
 {
 for(i=0;i<info->nbSz;i++)
 {
 track->index[i].size=info->Sz[i];
 aprintf("\t size : %d : %u\n",i,info->Sz[i]);
+ track->totalDataSize+=info->Sz[i];
 }
 }
 	// if no sample to chunk we map directly

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

@@ -44,34 +44,48 @@
 */
 ADM_mp4AudioAccess::ADM_mp4AudioAccess(const char *name,MP4Track *track)
 {
-	_nb_chunks=track->nbIndex;
-	_fd=ADM_fopen(name,"rb");
+ _nb_chunks=track->nbIndex;
+ _fd=ADM_fopen(name,"rb");
 ADM_assert(_fd);
-	_current_index=0;
-	_index=track->index;
-	_msg_counter = 0;
-	_msg_ratelimit = new ADMCountdown(200);
-	_msg_ratelimit->reset();
+ _current_index=0;
+ _index=track->index;
+ _msg_counter = 0;
+ _msg_ratelimit = new ADMCountdown(200);
+ _msg_ratelimit->reset();
 
-	extraDataLen=track->extraDataSize;
-	extraData=track->extraData;
+ extraDataLen=track->extraDataSize;
+ extraData=track->extraData;
 
-	// Check if MP3 track is actually MP2
-	if (track->_rdWav.encoding == WAV_MP3 && _nb_chunks && _index[0].size >= 4)
-	{
-		uint8_t sample[4];
-
-		fseeko(_fd, _index[0].offset, SEEK_SET);
-		if(fread(&sample, 1, 4, _fd) < 4) return;
+ // Check if MP3 track is actually MP2
+ if(track->_rdWav.encoding == WAV_MP3 && _nb_chunks && _index[0].size >= 4)
+ {
+ uint8_t sample[4];
 
-		uint32_t fcc = sample[0] << 24 | sample[1] << 16 | sample[2] << 8 | sample[3];
-		int layer = 4 - ((fcc >> 17) & 0x3);
+ fseeko(_fd, _index[0].offset, SEEK_SET);
+ if(fread(&sample, 1, 4, _fd) < 4) return;
 
-		if (layer == 2)
-			track->_rdWav.encoding = WAV_MP2;
-	}
+ uint32_t fcc = sample[0] << 24 | sample[1] << 16 | sample[2] << 8 | sample[3];
+ int layer = 4 - ((fcc >> 17) & 0x3);
 
+ if (layer == 2)
+ track->_rdWav.encoding = WAV_MP2;
+ }
 
+ if(track->_rdWav.byterate == AUDIO_BYTERATE_UNSET)
+ {
+ track->_rdWav.byterate = 128000 >> 3; // dummy value
+ 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
+ {
+ double d = duration;
+ d /= 1000;
+ 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;
+ }
+ }
 }
 /**
 \fn ADM_mp4AudioAccess

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

@@ -43,7 +43,8 @@
     if(r==ADM_IGN)
     {
         ADM_warning("Indexing cancelled by the user, deleting the index file. Bye.\n");
-        remove(idxName);
+        if(!ADM_eraseFile(idxName))
+            ADM_warning("Could not delete %s\n",idxName);
         free(idxName);
         return r;
     }
@@ -59,6 +60,7 @@
     char *type;
     uint64_t startDts;
     uint32_t version=0;
+    bool reindex=false;
     indexFile index;
     r=0;
 
@@ -77,7 +79,8 @@
     version=index.getAsUint32("Version");
     if(version!=ADM_INDEX_FILE_VERSION)
     {
-        GUI_Error_HIG(QT_TRANSLATE_NOOP("psdemuxer","Error"), QT_TRANSLATE_NOOP("psdemuxer","This file's index has been created with an older version of avidemux.\nPlease delete the idx2 file and reopen."));
+        if(GUI_Question(QT_TRANSLATE_NOOP("psdemuxer","This file's index has been created with an older version of avidemux.\nThe file must be re-indexed. Proceed?")))
+            reindex=true;
         goto abt;
     }
     type=index.getAsString("Type");
@@ -162,11 +165,22 @@
     }
 abt:
     index.close();
-    free(idxName);
-    if(r)
-        ADM_info("Loaded %s successfully\n",name);
-    else
-        ADM_warning("Loading %s failed\n",name);
+    if(reindex)
+    {
+        uint8_t success=ADM_eraseFile(idxName);
+        free(idxName);
+        if(success)
+            r=open(name);
+        else
+            ADM_error("Can't delete old index file.\n");
+    }else
+    {
+        free(idxName);
+        if(r)
+            ADM_info("Loaded %s successfully\n",name);
+        else
+            ADM_warning("Loading %s failed\n",name);
+    }
     return r;
 }

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

@@ -25,9 +25,7 @@
 #define MY_CLASS tsHeader
 #include "ADM_coreDemuxerMpegTemplate.cpp.h"
 
-
-
-uint32_t ADM_UsecFromFps1000(uint32_t fps1000);
+extern uint8_t tsIndexer(const char *file);
 
 /**
       \fn open
@@ -37,14 +35,35 @@
 uint8_t tsHeader::open(const char *name)
 {
     char *idxName=(char *)malloc(strlen(name)+6);
-    bool r=false;
+    uint8_t r=1;
+
+    sprintf(idxName,"%s.idx2",name);
+    if(!ADM_fileExist(idxName))
+        r=tsIndexer(name);
+    if(r==ADM_IGN)
+    {
+        ADM_warning("Indexing cancelled by the user, deleting the index file. Bye.\n");
+        if(!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;
-    uint32_t append;
     char *type;
     uint64_t startDts;
     uint32_t version=0;
+    bool reindex=false;
+    uint32_t append;
+    r=0;
 
-    sprintf(idxName,"%s.idx2",name);
     indexFile index;
     if(!index.open(idxName))
     {
@@ -67,7 +86,8 @@
     version=index.getAsUint32("Version");
     if(version!=ADM_INDEX_FILE_VERSION)
     {
-        GUI_Error_HIG(QT_TRANSLATE_NOOP("tsdemuxer","Error"),QT_TRANSLATE_NOOP("tsdemuxer","This file's index has been created with an older version of avidemux.\nPlease delete the idx2 file and reopen."));
+        if(GUI_Question(QT_TRANSLATE_NOOP("tsdemuxer","This file's index has been created with an older version of avidemux.\nThe file must be re-indexed. Proceed?")))
+            reindex=true;
         goto abt;
     }
     append=index.getAsUint32("Append");
@@ -127,9 +147,18 @@
         }
     }
 abt:
-    free(idxName);
     index.close();
-    printf("[tsDemuxer] Loaded %d\n",r);
+    if(reindex)
+    {
+        uint8_t success=ADM_eraseFile(idxName);
+        free(idxName);
+        if(success)
+            r=open(name);
+        else
+            ADM_error("Can't delete old index file.\n");
+    }else
+        free(idxName);
+    printf("[tsDemuxer] open() returned %d\n",r);
     return r;
 }

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

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

@@ -144,7 +144,7 @@
 public:
                 TsIndexerBase(listOfTsAudioTracks *tr);
         virtual ~TsIndexerBase();
-virtual bool    run(const char *file,ADM_TS_TRACK *videoTrac)=0;                
+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);
@@ -190,7 +190,7 @@
                 {
                   
                 } 
-        bool    run(const char *file,ADM_TS_TRACK *videoTrac);
+        uint8_t run(const char *file,ADM_TS_TRACK *videoTrac);
         bool    updatePicStructure(TSVideo &video,const uint32_t t)
                         {
                                             switch(t)
@@ -223,7 +223,7 @@
                         {
                           
                         }
-        bool            run(const char *file,ADM_TS_TRACK *videoTrac);
+        uint8_t         run(const char *file,ADM_TS_TRACK *videoTrac);
                         TsIndexerVC1(listOfTsAudioTracks *tr) : TsIndexerBase(tr)
                         {
 
@@ -243,7 +243,7 @@
                 {
                   
                 }
-        bool    run(const char *file,ADM_TS_TRACK *videoTrac);
+        uint8_t run(const char *file,ADM_TS_TRACK *videoTrac);
                 TsIndexerMpeg2(listOfTsAudioTracks *tr) : TsIndexerBase(tr)
                 {
 
@@ -271,7 +271,7 @@
                 {
                   
                 }
-        bool    run(const char *file,ADM_TS_TRACK *videoTrac);
+        uint8_t run(const char *file,ADM_TS_TRACK *videoTrac);
                 TsIndexerH265(listOfTsAudioTracks *tr) : TsIndexerBase(tr)
                 {

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

@@ -85,53 +85,48 @@
 TS_PESpacket SEI_nal(0);
 while(keepRunning)
 {
- int startCode=pkt->findStartCode();
+ int startCode=pkt->findStartCode();
 
- if(!pkt->stillOk())
- {
- keepRunning=false;
- continue;
- }
- if(startCode&0x80) continue; // Marker missing
- startCode&=0x1f;
- if(startCode!=NAL_SPS) 
- continue;
+ if(!pkt->stillOk())
+ {
+ keepRunning=false;
+ continue;
+ }
+ if(startCode&0x80) continue; // Marker missing
+ startCode&=0x1f;
+ if(startCode!=NAL_SPS)
+ continue;
 
 // Got SPS!
-
- uint32_t xA,xR;
 // Get info
 pkt->getInfo(&tmpInfo);
 // Read just enough...
+ SEI_nal.empty();
+ uint32_t code=0xffff+0xffff0000;
+ while(((code&0xffffff)!=1) && pkt->stillOk())
+ {
+ uint8_t r=pkt->readi8();
+ code=(code<<8)+r;
+ 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))
 {
- SEI_nal.empty();
- uint32_t code=0xffff+0xffff0000;
- while(((code&0xffffff)!=1) && pkt->stillOk())
- {
- uint8_t r=pkt->readi8();
- code=(code<<8)+r;
- SEI_nal.pushByte(r);
- }
- if(!pkt->stillOk()) break;;
- pkt->seek(tmpInfo.startAt,tmpInfo.offset-5);
- if (extractSPSInfo(SEI_nal.payload, SEI_nal.payloadSize-4,&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;
 video.w=spsInfo.width;
 video.h=spsInfo.height;
 video.fps=spsInfo.fps1000;
- xA=spsInfo.darNum;
- xR=spsInfo.darDen;
 writeVideo(&video,ADM_TS_H264);
 writeAudio();
 qfprintf(index,"[Data]");
 // Rewind
 
 break;
- };
- }
+ }
+ pkt->seek(tmpInfo.startAt,tmpInfo.offset);
 }
 return seq_found;
 }
@@ -139,7 +134,7 @@
 \fn run
 \brief Index H264 stream
 */
-bool TsIndexerH264::run(const char *file, ADM_TS_TRACK *videoTrac)
+uint8_t TsIndexerH264::run(const char *file, ADM_TS_TRACK *videoTrac)
 {
 bool seq_found=false;
 bool firstSps=true;
@@ -147,7 +142,7 @@
 TSVideo video;
 indexerData data;
 
- bool result=false;
+ uint8_t result=0;
 bool bAppend=false;
 
 beginConsuming=0;
@@ -170,8 +165,8 @@
 
 if(!index)
 {
- printf("[PsIndex] Cannot create %s\n",indexName.c_str());
- return false;
+ ADM_error("[TsIndexerH264] Cannot create %s\n",indexName.c_str());
+ return 0;
 }
 
 uint64_t lastAudOffset=0;
@@ -292,7 +287,10 @@
 
 decodingImage=false;
 if(!addUnit(data,unitTypeSei,thisUnit,startCodeLength))
- keepRunning=false;
+ {
+ result=ADM_IGN;
+ goto the_end;
+ }
 fourBytes=true;
 goto resume;
 }
@@ -329,7 +327,10 @@
 }
 }
 if(!addUnit(data,unitTypeSps,thisUnit,startCodeLength))
- keepRunning=false;
+ {
+ result=ADM_IGN;
+ goto the_end;
+ }
 }
 break;
 
@@ -385,7 +386,10 @@
 audCount=0;
 
 if(!addUnit(data,unitTypePic,thisUnit,startCodeLength))
- keepRunning=false;
+ {
+ result=ADM_IGN;
+ goto the_end;
+ }
 // reset to default
 thisUnit.imageStructure=pictureFrame;
 thisUnit.recoveryCount=0xff;
@@ -396,7 +400,7 @@
 break;
 }
 } // End while
- result=true;
+ result=1;
 the_end:
 printf("\n");
 qfprintf(index,"\n[End]\n");

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

@@ -106,8 +106,7 @@
 */
 static bool findGivenStartCode(tsPacketLinearTracker *pkt,int match, const char *name)
 {
- bool keepRunning=true; 
- while(keepRunning)
+ while(true)
 {
 int startCode=pkt->findStartCode();
 if(!pkt->stillOk())
@@ -157,7 +156,6 @@
 */
 bool TsIndexerH265::findH265VPS(tsPacketLinearTracker *pkt,TSVideo &video)
 { 
- bool keepRunning=true;
 dmxPacketInfo packetInfo;
 uint8_t headerBuffer[512+5]={0,0,0,1,(NAL_H265_VPS<<1)}; // we are forcing some bits to be zero...
 // This is a bit naive...
@@ -282,7 +280,7 @@
 \fn run
 \brief Index H265 stream
 */
-bool TsIndexerH265::run(const char *file,ADM_TS_TRACK *videoTrac)
+uint8_t TsIndexerH265::run(const char *file,ADM_TS_TRACK *videoTrac)
 {
 TSVideo video;
 indexerData data;
@@ -310,7 +308,7 @@
 return false;
 }
 
- bool result=false;
+ uint8_t result=0;
 bool bAppend=false;
 bool seq_found=false;
 bool firstSps=true;
@@ -336,7 +334,6 @@
 fullSize=pkt->getSize();
 gui=createProcessing(QT_TRANSLATE_NOOP("tsdemuxer","Indexing"),pkt->getSize());
 int lastRefIdc=0;
- bool keepRunning=true;
 //******************
 // 1 search SPS
 //******************
@@ -355,7 +352,7 @@
 // 2 Index
 //******************
 bool fourBytes;
- while(keepRunning)
+ while(true)
 {
 fourBytes=false;
 int startCode=pkt->findStartCode2(fourBytes);
@@ -424,7 +421,10 @@
 thisUnit.imageType=picType;
 thisUnit.unitType=unitTypePic;
 if(!addUnit(data,unitTypePic,thisUnit,startCodeLength))
- keepRunning=false;
+ {
+ result=ADM_IGN;
+ goto the_end;
+ }
 // reset to default
 thisUnit.imageStructure=pictureFrame;
 thisUnit.recoveryCount=0xff;
@@ -455,14 +455,17 @@
 thisUnit.consumedSoFar=lastAudOffset;
 }
 if(!addUnit(data,unitTypeSps,thisUnit,startCodeLength))
- keepRunning=false;
+ {
+ result=ADM_IGN;
+ goto the_end;
+ }
 break;
 }
 default:
 break;
 }
 } // End while
- result=true;
+ result=1;
 the_end:
 printf("\n");
 qfprintf(index,"\n[End]\n");

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

@@ -37,7 +37,7 @@
 /**
     \fn runMpeg2
 */  
-bool TsIndexerMpeg2::run(const char *file,ADM_TS_TRACK *videoTrac)
+uint8_t TsIndexerMpeg2::run(const char *file,ADM_TS_TRACK *videoTrac)
 {
 uint32_t temporal_ref,val;
 uint8_t buffer[50*1024];
@@ -50,6 +50,7 @@
 indexerData  data;    
 dmxPacketInfo tmpInfo;
 
+uint8_t result=1;
 bool bAppend=false;
 
     listOfUnits.clear();
@@ -70,8 +71,8 @@
 
     if(!index)
     {
-        printf("[PsIndex] Cannot create %s\n",indexName.c_str());
-        return false;
+        printf("[TsIndexerMpeg2] Cannot create %s\n",indexName.c_str());
+        return 0;
     }
     
     pkt=new tsPacketLinearTracker(videoTrac->trackPid, audioTracks);
@@ -93,13 +94,12 @@
     fullSize=pkt->getSize();
     int startCode;
     decodingImage=false;
-    bool keepRunning=true;
 #define likely(x) x
 #define unlikely(x) x
     int lastStartCode=0xb3;
 
 #define REMEMBER() { lastStartCode=startCode;}   
-      while(keepRunning)
+      while(true)
       {
         startCode=pkt->findStartCode();
         if(!pkt->stillOk()) break;
@@ -115,7 +115,10 @@
                                 pkt->getInfo(&thisUnit.packetInfo);
                                 thisUnit.consumedSoFar=pkt->getConsumed();
                                 if(!addUnit(data,unitTypeSps,thisUnit,4))
-                                    keepRunning=false;
+                                {
+                                    result=ADM_IGN;
+                                    goto the_end;
+                                }
                                 pkt->forward(8);  // Ignore
                                 continue;
                           }
@@ -139,7 +142,10 @@
                           pkt->getInfo(&thisUnit.packetInfo);
                           thisUnit.consumedSoFar=pkt->getConsumed();
                           if(!addUnit(data,unitTypeSps,thisUnit,4+4+4))
-                              keepRunning=false;
+                          {
+                              result=ADM_IGN;
+                              goto the_end;
+                          }
                           continue;
                           break;
 //#warning FIXME, update pic field info.... It triggers a end-of-pic message as it is
@@ -192,7 +198,10 @@
                           pkt->getInfo(&thisUnit.packetInfo);
                           thisUnit.consumedSoFar=pkt->getConsumed();
                           if(!addUnit(data,unitTypeSps,thisUnit,4))
-                              keepRunning=false;
+                          {
+                              result=ADM_IGN;
+                              goto the_end;
+                          }
                           break;                                            
                   case 0x00 : // picture
                         {
@@ -219,7 +228,10 @@
                           thisUnit.consumedSoFar=pkt->getConsumed();
                           thisUnit.imageType=type;
                           if(!addUnit(data,unitTypePic,thisUnit,4+2))
-                              keepRunning=false;
+                          {
+                              result=ADM_IGN;
+                              goto the_end;
+                          }
                           pkt->invalidatePtsDts();
                           data.nbPics++;
                         }
@@ -228,7 +240,7 @@
                     break;
                   }
       }
-    
+the_end:
         printf("\n");
         qfprintf(index,"\n[End]\n");
         qfprintf(index,"\n# Found %" PRIu32" images \n",data.nbPics); // Size
@@ -239,7 +251,7 @@
         audioTracks=NULL;
         delete pkt;
         pkt=NULL;
-        return 1; 
+        return result;
 }
 
 /********************************************************************************************/

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

@@ -23,7 +23,7 @@
     \fn runVC1
     \brief Index VC1 stream
 */  
-bool TsIndexerVC1::run(const char *file,ADM_TS_TRACK *videoTrac)
+uint8_t TsIndexerVC1::run(const char *file,ADM_TS_TRACK *videoTrac)
 {
 uint32_t temporal_ref,val;
 uint8_t buffer[50*1024];
@@ -64,6 +64,7 @@
     data.pkt=pkt;
     fullSize=pkt->getSize();
     gui= createProcessing(QT_TRANSLATE_NOOP("tsdemuxer","Indexing"),pkt->getSize());
+    uint8_t result=1;
     int startCode;
     decodingImage=false;
 #define likely(x) x
@@ -81,7 +82,11 @@
                           {
                               pkt->getInfo(&thisUnit.packetInfo);
                               thisUnit.consumedSoFar=pkt->getConsumed();
-                              addUnit(data,unitTypeSps,thisUnit,4);
+                              if(!addUnit(data,unitTypeSps,thisUnit,4))
+                              {
+                                  result=ADM_IGN;
+                                  goto the_end;
+                              }
                               decodingImage=false;
                               break;
                           }
@@ -113,7 +118,11 @@
                           
                           pkt->getInfo(&thisUnit.packetInfo);
                           thisUnit.consumedSoFar=pkt->getConsumed();
-                          addUnit(data,unitTypeSps,thisUnit,seqSize+4);
+                          if(!addUnit(data,unitTypeSps,thisUnit,seqSize+4))
+                          {
+                              result=ADM_IGN;
+                              goto the_end;
+                          }
                           decodingImage=false;
                           
                           continue;
@@ -136,7 +145,11 @@
                           if(!decodeVC1Pic(bits,fType,sType)) continue;
                           thisUnit.imageType=fType;
                           updatePicStructure(video,sType);
-                          addUnit(data,unitTypePic,thisUnit,4);
+                          if(!addUnit(data,unitTypePic,thisUnit,4))
+                          {
+                              result=ADM_IGN;
+                              goto the_end;
+                          }
                           decodingImage=true;
                           data.nbPics++;
                         }
@@ -145,7 +158,7 @@
                     break;
                   }
       }
-    
+the_end:
         printf("\n");
 //        Mark(&data,&info,2);
         qfprintf(index,"\n[End]\n");
@@ -157,7 +170,7 @@
         audioTracks=NULL;
         delete pkt;
         pkt=NULL;
-        return 1; 
+        return result;
 }
 /**
     \fn decodeVc1Seq

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPlugin.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPlugin.cpp Changed

@@ -27,74 +27,21 @@
 
 static bool detectTs(const char *file);
 static bool checkMarker(uint8_t *buffer, uint32_t bufferSize,uint32_t block);
-uint8_t   tsIndexer(const char *file);
+
 /**
     \fn Probe
 */
 
 extern "C"  uint32_t ADM_PLUGIN_EXPORT        probe(uint32_t magic, const char *fileName)
 {
-char *index=(char *)malloc(strlen(fileName)+6);
-int count=0;
     printf("[TS Demuxer] Probing...\n");
     if( !detectTs(fileName))
     {
         printf(" [TS Demuxer] Not a ts file\n");
-        free(index);
         return false;
     }
-    sprintf(index,"%s.idx2",fileName);
-again:    
-    if(ADM_fileExist(index)) 
-    {
-        printf(" [TS Demuxer] There is an index for that file \n");
-        FILE *f=ADM_fopen(index,"rt");
-        char signature[10];
-        fread(signature,4,1,f);
-        signature[4]=0;
-        fclose(f);
-        if(!strcmp(signature,"PSD1"))
-        {
-                // Check if it is a valid index for us...
-                 indexFile indexFile;
-                 char *type;
-                 if(!indexFile.open(index))
-                 {
-                    printf("[tsDemux] Cannot open index file %s\n",index);
-                    indexFile.close();
-                    free(index);
-                    return false;
-                  }
-                 if(!indexFile.readSection("System"))
-                {
-                    printf("[tsDemux] Cannot read system section\n");
-                    indexFile.close();
-                    free(index);
-                    return false;
-                }
-                type=indexFile.getAsString("Type");
-                if(!type || type[0]!='T')
-                    {
-                        printf("[TsDemux] Incorrect or not found type\n");
-                        indexFile.close();
-                        free(index);
-                        return false;
-                    }
-                return 50;
-        }
-        printf("[TSDemuxer] Not a valid index\n");
-        return false;
-
-     }
-    if(count) return false;
-    printf("[TSDemuxer] Analyzing file..\n");
-    count++;
     
-  
-    if(true==tsIndexer(fileName)) goto again;
-    free(index);
-    printf("[TSDemuxer] Failed..\n");
-   return 0;
+    return 50;
 }
 #define PROBE_SIZE (1024*1024)
 /**

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

@@ -181,6 +181,17 @@
 
                 }
                 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);
+                    }
+                }
                 ListOfFrames.push_back(frame);
                 count++;
                 if(!next) 
@@ -203,7 +214,7 @@
 {
     printf("[TsDemuxerer] Reading Video\n");
     if(!index->readSection("Video")) return false;
-    uint32_t w,h,fps,ar;
+    uint32_t w,h,fps;
     
     w=index->getAsUint32("Width");
     h=index->getAsUint32("height");

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

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

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

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

@@ -32,7 +32,7 @@
 mp4_muxer muxerConfig=
 {
 MP4_MUXER_MP4,
- true,
+ MP4_MUXER_OPT_FASTSTART,
 false,
 WIDE,
 MP4_MUXER_ROTATE_0
@@ -98,6 +98,8 @@
 c = video_st->codec;
 AVCodecParameters *par;
 par = video_st->codecpar;
+ if(isH265Compatible(s->getFCC()))
+ par->codec_tag = MKTAG('h', 'v', 'c', '1');
 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);
@@ -139,7 +141,11 @@
 printf("[MP4] Failed to init audio\n");
 return false;
 }
-
+ // Mark all audio tracks as enabled, VLC is picky about that.
+ for(int i=0;i<nbAudioTrack;i++)
+ {
+ audio_st[i]->disposition |= AV_DISPOSITION_DEFAULT;
+ }
 // /audio
 int er = avio_open(&(oc->pb), file, AVIO_FLAG_WRITE);
 
@@ -158,9 +164,19 @@
 snprintf(buf, sizeof(buf), "%d", AV_TIME_BASE / 10);
 av_dict_set(&dict, "preload", buf, 0);
 av_dict_set(&dict, "max_delay", "200000", 0);
-#ifndef _WIN32 // does not work on windows as the file must be opened twice at the same time 
- av_dict_set(&dict, "movflags","faststart",0);
-#endif
+
+ switch(muxerConfig.optimize)
+ {
+ case(MP4_MUXER_OPT_FASTSTART):
+ av_dict_set(&dict, "movflags", "faststart", 0);
+ break;
+ case(MP4_MUXER_OPT_FRAGMENT):
+ av_dict_set(&dict, "movflags", "frag_keyframe+empty_moov", 0);
+ av_dict_set(&dict, "min_frag_duration", "2000000", 0); // 2 seconds, an arbitrary value
+ break;
+ default: break;
+ }
+
 const char *angle=NULL;
 switch(muxerConfig.rotation)
 {

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

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

@@ -18,17 +18,22 @@
 #include "muxerMP4.h"
 #define ADM_MINIMAL_UI_INTERFACE
 #include "DIA_factory.h"
-#include "fourcc.h"
+
 bool mp4Configure(void)
 {
         uint32_t fmt=(uint32_t)muxerConfig.muxerType;
         uint32_t dar=(uint32_t)muxerConfig.aspectRatio;
         uint32_t rot=(uint32_t)muxerConfig.rotation;
-        bool alt=muxerConfig.useAlternateMp3Tag;
+        uint32_t opt=(uint32_t)muxerConfig.optimize;
         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,"");
-        diaElemToggle alternate(&alt,QT_TRANSLATE_NOOP("mp4muxer","Use alternate MP3 tag"));
+        diaMenuEntry streamOpt[]={
+            {MP4_MUXER_OPT_NONE,QT_TRANSLATE_NOOP("mp4muxer","No optimization")},
+            {MP4_MUXER_OPT_FASTSTART,QT_TRANSLATE_NOOP("mp4muxer","Move index to the beginning of the file")},
+            {MP4_MUXER_OPT_FRAGMENT,QT_TRANSLATE_NOOP("mp4muxer","Use fragmentation")}
+        };
+        diaElemMenu  menuOptimize(&opt,QT_TRANSLATE_NOOP("mp4muxer","Optimize for Streaming"),3,streamOpt,"");
         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,"");
@@ -39,12 +44,12 @@
             {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};
 
-        diaElem *tabs[]={&menuFormat,&alternate,&forceAR,&menuAspect,&menuRotation};
         if( diaFactoryRun(QT_TRANSLATE_NOOP("mp4muxer","MP4 Muxer"),5,tabs))
         {
             muxerConfig.muxerType=(MP4_MUXER_TYPE)fmt;
-            muxerConfig.useAlternateMp3Tag=alt;
+            muxerConfig.optimize=(MP4_MUXER_OPTIMIZE)opt;
             muxerConfig.forceAspectRatio=force;
             muxerConfig.aspectRatio=(MP4_MUXER_DAR)dar;
             muxerConfig.rotation=(MP4_MUXER_ROTATION)rot;

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

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

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

@@ -187,28 +187,34 @@
 }
 
 upload();
- ADM_pluginInstallSystem( std::string("x264"),std::string(".json"),pluginVersion);
+ ADM_pluginInstallSystem( std::string("x264"),std::string("json"),pluginVersion);
 updatePresetList();
- int n=ui.configurationComboBox->count();
- ui.configurationComboBox->setCurrentIndex(n-1);
+ adjustSize();
 }
 /**
 \fn updatePresetList
 */
-bool x264Dialog::updatePresetList(void)
+bool x264Dialog::updatePresetList(const char *match)
 {
 QComboBox *combo=ui.configurationComboBox;
 std::string rootPath;
 vector <std::string > list;
 ADM_pluginGetPath("x264",pluginVersion,rootPath);
- ADM_listFile(rootPath,".json",list);
+ ADM_listFile(rootPath,"json",list);
 int l=list.size();
+ int idx=l;
+ std::string current;
+ if(match)
+ current=std::string(match);
 combo->clear();
 for( int i=0;i<l;i++)
 {
+ if(match && list[i]==current)
+ idx=i;
 combo->addItem(list[i].c_str());
 }
 combo->addItem(QString(QT_TRANSLATE_NOOP("x264","Custom")));
+ combo->setCurrentIndex(idx);
 return true;
 }
 
@@ -797,9 +803,9 @@
 \fn getProfileName 
 \brief Popup a dialog that asks the user the preset name
 */
-static char *getProfileName(void)
+static char *getProfileName(QDialog *parent)
 {
- QDialog dialog;
+ QDialog dialog(parent);
 dialog.setWindowTitle(QString::fromUtf8(QT_TRANSLATE_NOOP("x264","Save Profile")));
 QDialogButtonBox *buttonBox = new QDialogButtonBox(); 
 QVBoxLayout *vboxLayout = new QVBoxLayout();
@@ -811,22 +817,22 @@
 QLineEdit *text=new QLineEdit;
 // text->setAcceptRichText(false);
 
- text->setText(QT_TRANSLATE_NOOP("x264","my profile"));
+ text->setText("my profile");
 text->selectAll();
 
 vboxLayout->addWidget(text);
 vboxLayout->addWidget(buttonBox);
-
+// dialog.setModal(true);
+// dialog.setWindowModality(Qt::ApplicationModal);
 dialog.setLayout(vboxLayout);
 
 if(dialog.exec()!=QDialog::Accepted)
 {
- ADM_info("Canceled");
+ ADM_info("Cancelled");
 return NULL;
 }
- QString fileName=text->text();
- const char *out=fileName.toUtf8().constData();
- return ADM_strdup(out);
+ std::string st = std::string(text->text().toUtf8().constData());
+ return ADM_strdup(st.c_str());
 }
 /**
 \fn saveAsButton_pressed
@@ -835,13 +841,14 @@
 void x264Dialog::saveAsButton_pressed(void)
 {
 // 1-ask name
- char *out=getProfileName();
+ char *out=getProfileName(this);
 if(!out) return;
 ADM_info("Using %s\n",out);
 download();
 std::string rootPath;
 ADM_pluginGetPath("x264",pluginVersion,rootPath);
- std::string fullpath=rootPath+std::string(ADM_SEPARATOR)+out+std::string(".json");
+ std::string name=std::string(out);
+ std::string fullpath=rootPath+std::string(ADM_SEPARATOR)+name+std::string(".json");
 
 if(ADM_fileExist(fullpath.c_str()))
 {
@@ -857,7 +864,7 @@
 GUI_Error_HIG(QT_TRANSLATE_NOOP("x264","Error"),QT_TRANSLATE_NOOP("x264","Cannot save preset"));
 ADM_error("Cannot write to %s\n",out);
 }
- updatePresetList();
+ updatePresetList(name.c_str());
 }
 /**
 
@@ -874,15 +881,15 @@
 QString preset=ui.configurationComboBox->itemText(n);
 QString msg=QString(QT_TRANSLATE_NOOP("x264","Do you really want to delete the "))+preset+
 QString(QT_TRANSLATE_NOOP("x264"," profile ?.\nIf it is a system profile it will be recreated next time."));
- if(true==GUI_Confirmation_HIG(QT_TRANSLATE_NOOP("x264","Delete preset"),QT_TRANSLATE_NOOP("x264","Delete"),msg.toUtf8().constData()))
+ if(true==GUI_Confirmation_HIG(QT_TRANSLATE_NOOP("x264","Delete"),QT_TRANSLATE_NOOP("x264","Delete preset"),msg.toUtf8().constData()))
 {
 std::string rootPath;
 ADM_pluginGetPath("x264",pluginVersion,rootPath);
 QString text=QString("/")+ui.configurationComboBox->itemText(n);
 text=QString(rootPath.c_str())+text+QString(".json");
- unlink(text.toUtf8().constData());
+ if(!ADM_eraseFile(text.toUtf8().constData()))
+ ADM_warning("Could not delete %s\n",text.toUtf8().constData());
 }
 updatePresetList();
 }
 
-

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.h Changed

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

@@ -193,28 +193,34 @@
 }
 
 upload();
- ADM_pluginInstallSystem( std::string("x265"),std::string(".json"),pluginVersion);
+ ADM_pluginInstallSystem( std::string("x265"),std::string("json"),pluginVersion);
 updatePresetList();
- int n=ui.configurationComboBox->count();
- ui.configurationComboBox->setCurrentIndex(n-1);
+ adjustSize();
 }
 /**
 \fn updatePresetList
 */
-bool x265Dialog::updatePresetList(void)
+bool x265Dialog::updatePresetList(const char *match)
 {
 QComboBox *combo=ui.configurationComboBox;
 std::string rootPath;
 vector <std::string > list;
 ADM_pluginGetPath("x265",pluginVersion,rootPath);
- ADM_listFile(rootPath,".json",list);
+ ADM_listFile(rootPath,"json",list);
 int l=list.size();
+ int idx=l;
+ std::string current;
+ if(match)
+ current=std::string(match);
 combo->clear();
 for( int i=0;i<l;i++)
 {
+ if(match && list[i]==current)
+ idx=i;
 combo->addItem(list[i].c_str());
 }
 combo->addItem(QString(QT_TRANSLATE_NOOP("x265","Custom")));
+ combo->setCurrentIndex(idx);
 return true;
 }
 
@@ -761,9 +767,9 @@
 \fn getProfileName 
 \brief Popup a dialog that asks the user the preset name
 */
-static char *getProfileName(void)
+static char *getProfileName(QDialog *parent)
 {
- QDialog dialog;
+ QDialog dialog(parent);
 dialog.setWindowTitle(QString::fromUtf8(QT_TRANSLATE_NOOP("x265","Save Profile")));
 QDialogButtonBox *buttonBox = new QDialogButtonBox(); 
 QVBoxLayout *vboxLayout = new QVBoxLayout();
@@ -780,17 +786,17 @@
 
 vboxLayout->addWidget(text);
 vboxLayout->addWidget(buttonBox);
-
 dialog.setLayout(vboxLayout);
+// dialog.setModal(true);
+// dialog.setWindowModality(Qt::ApplicationModal);
 
 if(dialog.exec()!=QDialog::Accepted)
 {
- ADM_info("Canceled");
+ ADM_info("Cancelled");
 return NULL;
 }
- QString fileName=text->text();
- const char *out=fileName.toUtf8().constData();
- return ADM_strdup(out);
+ std::string st = std::string( text->text().toUtf8().constData());
+ return ADM_strdup(st.c_str());
 }
 /**
 \fn saveAsButton_pressed
@@ -799,13 +805,14 @@
 void x265Dialog::saveAsButton_pressed(void)
 {
 // 1-ask name
- char *out=getProfileName();
+ char *out=getProfileName(this);
 if(!out) return;
 ADM_info("Using %s\n",out);
 download();
 std::string rootPath;
 ADM_pluginGetPath("x265",pluginVersion,rootPath);
- std::string fullpath=rootPath+std::string(ADM_SEPARATOR)+out+std::string(".json");
+ std::string name=std::string(out);
+ std::string fullpath=rootPath+std::string(ADM_SEPARATOR)+name+std::string(".json");
 
 if(ADM_fileExist(fullpath.c_str()))
 {
@@ -821,7 +828,7 @@
 GUI_Error_HIG(QT_TRANSLATE_NOOP("x265","Error"),QT_TRANSLATE_NOOP("x265","Cannot save preset"));
 ADM_error("Cannot write to %s\n",out);
 }
- updatePresetList();
+ updatePresetList(name.c_str());
 }
 /**
 
@@ -838,15 +845,15 @@
 QString preset=ui.configurationComboBox->itemText(n);
 QString msg=QString(QT_TRANSLATE_NOOP("x265","Do you really want to delete the "))+preset+
 QString(QT_TRANSLATE_NOOP("x265"," profile ?.\nIf it is a system profile it will be recreated next time."));
- if(true==GUI_Confirmation_HIG(QT_TRANSLATE_NOOP("x265","Delete preset"),QT_TRANSLATE_NOOP("x265","Delete"),msg.toUtf8().constData()))
+ if(true==GUI_Confirmation_HIG(QT_TRANSLATE_NOOP("x265","Delete"),QT_TRANSLATE_NOOP("x265","Delete preset"),msg.toUtf8().constData()))
 {
 std::string rootPath;
 ADM_pluginGetPath("x265",pluginVersion,rootPath);
 QString text=QString("/")+ui.configurationComboBox->itemText(n);
 text=QString(rootPath.c_str())+text+QString(".json");
- unlink(text.toUtf8().constData());
+ if(!ADM_eraseFile(text.toUtf8().constData()))
+ ADM_warning("Could not delete %s\n",text.toUtf8().constData());
 }
 updatePresetList();
 }
 
-

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.h Changed

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

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/DIA_flyBlackenBorders.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/DIA_flyBlackenBorders.cpp Changed

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

@@ -38,7 +38,7 @@
     myBlacken->addControl(ui.toolboxLayout);
     myBlacken->upload();
     myBlacken->sliderChanged();
-
+    myBlacken->rubber->nestedIgnore=1;
 
     connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
     connect( ui.pushButtonReset,SIGNAL(clicked(bool)),this,SLOT(reset(bool)));
@@ -49,9 +49,6 @@
     SPINNER(Bottom);
 
     setModal(true);
-    show();
-    myBlacken->adjustCanvasPosition();
-    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
   }
   void Ui_blackenWindow::sliderUpdate(int foo)
   {
@@ -121,6 +118,15 @@
     
 }
 
+void Ui_blackenWindow::showEvent(QShowEvent *event)
+{
+    myBlacken->rubber->rubberband->show(); // must be called first
+    QDialog::showEvent(event);
+    myBlacken->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing both ways after the dialog has settled
+    myBlacken->rubber->nestedIgnore=0;
+}
+
 //************************
 uint8_t flyBlacken::upload(bool redraw, bool toRubber)
 {

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

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

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/colorYUV/avsColor.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/colorYUV/avsColor.cpp Changed

@@ -59,7 +59,7 @@
 	int i,j,wby4;
 	int modulo;
 
-#ifdef _DEBUG
+#ifdef cyuv_DEBUG
 	COUNT y0,u0,v0;
 	COUNT y,u,v;
 	COUNT r,g,b;
@@ -239,7 +239,7 @@
 	  MakeGammaLUT();
   }
 
-#ifdef _DEBUG
+#ifdef cyuv_DEBUG
 	total = wby4 * h;
 	totalby2 = total / 2;
 
@@ -275,7 +275,7 @@
 		  {
 			  pixel.data = *srcp;
 
-#ifdef _DEBUG
+#ifdef cyuv_DEBUG
 			pixel0.data = pixel.data;
 			CheckYUV(NULL, &pixel, &y0, &u0, &v0, 0);
 			
@@ -291,7 +291,7 @@
 			  pixel.yuv.v  = LUT_V[pixel.yuv.v ];
 			  *srcp++ = pixel.data;
 
-#ifdef _DEBUG
+#ifdef cyuv_DEBUG
 			CheckYUV(&pixel0, &pixel, &y, &u, &v, 1);
 
 			YUV2RGB(pixel.yuv.y0, pixel.yuv.u, pixel.yuv.v, &r.d, &g.d, &b.d, matrix);
@@ -332,7 +332,7 @@
     }
   }
 
-#ifdef _DEBUG
+#ifdef cyuv_DEBUG
 /*
 	y.ave  = ( y.ave+total)/total/2; u.ave  = ( u.ave+totalby2)/total;   v.ave  = ( v.ave+totalby2)/total;
 	y0.ave = (y0.ave+total)/total/2; u0.ave = (u0.ave+totalby2)/total;   v0.ave = (v0.ave+totalby2)/total;
@@ -521,7 +521,7 @@
 		LUT_V[i] = (unsigned char)val;
     }
 
-#ifdef _DEBUG
+#ifdef cyuv_DEBUG
 	DumpLUT();
 #endif

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.h Changed

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

@@ -35,7 +35,6 @@
                 : ADM_flyDialogRgb(parent,width, height,in,canvas, slider,RESIZE_LAST)
 {
     rubber=new ADM_rubberControl(this,canvas);
-    rubber->resize(width,height);
     _ox=0;
     _oy=0;
     _ow=width;
@@ -344,7 +343,6 @@
     canvas=new ADM_QCanvas(ui.graphicsView,width,height);
 
     myCrop=new flyCrop( this,width, height,in,canvas,ui.horizontalSlider);
-    myCrop->rubber->nestedIgnore++; // don't modify crop parameters simply by opening the dialog
     myCrop->left=param->left;
     myCrop->right=param->right;
     myCrop->top=param->top;
@@ -354,9 +352,9 @@
     myCrop->addControl(ui.toolboxLayout);
     myCrop->upload(false,true);
     myCrop->sliderChanged();
+    myCrop->rubber->nestedIgnore=1;
 
     ui.checkBoxRubber->setChecked(myCrop->rubber_is_hidden);
-    myCrop->rubber->setVisible(!(myCrop->rubber_is_hidden));
 
     connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
     connect( ui.checkBoxRubber,SIGNAL(stateChanged(int)),this,SLOT(toggleRubber(int)));
@@ -369,10 +367,6 @@
       SPINNER(Bottom);
 
     setModal(true);
-    show();
-    myCrop->adjustCanvasPosition();
-    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing both ways after the dialog has settled
-    myCrop->rubber->nestedIgnore--;
 }
 /**
  * 
@@ -481,5 +475,19 @@
     myCrop->blockChanges(false);
 }
 
+/**
+ * \fn showEvent
+ * \brief set canvas size and position
+ */
+void Ui_cropWindow::showEvent(QShowEvent *event)
+{
+    myCrop->rubber->rubberband->show(); // must be called first
+    myCrop->rubber->setVisible(!(myCrop->rubber_is_hidden));
+    QDialog::showEvent(event);
+    myCrop->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing both ways after the dialog has settled
+    myCrop->rubber->nestedIgnore=0;
+}
+
 //EOF

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/Q_crop.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/Q_crop.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp Changed

@@ -198,6 +198,8 @@
         aprintf("Uploading\n");
         myCrop->upload();
         myCrop->sliderChanged();
+        myCrop->rubber->nestedIgnore=1;
+
         connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
 #define SPINNER(x) connect( ui.x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); 
         SPINNER(spinX);
@@ -216,9 +218,6 @@
         ui.labelHelp->setPixmap(QPixmap(":/images/grips.png"));
 
         setModal(true);
-        show();
-        myCrop->adjustCanvasPosition();
-        canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
   }
 
 /**
@@ -239,6 +238,18 @@
 }
 
 /**
+    \fn showEvent
+*/
+void Ui_mpdelogoWindow::showEvent(QShowEvent *event)
+{
+    myCrop->rubber->rubberband->show(); // must be called first
+    QDialog::showEvent(event);
+    myCrop->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing both ways after the dialog has settled
+    myCrop->rubber->nestedIgnore=0;
+}
+
+/**
     \fn sliderUpdate
 */

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/Q_mpdelogo.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/Q_mpdelogo.h Changed

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

@@ -1,5 +1,29 @@
 /*
-	Yadif C-plugin for Avisynth 2.5 - Yet Another DeInterlacing Filter
+ * 
+ * Ported from yadif c plugin, then ported from ffmpeg vf_yadif
+ * 
+ * 
+ * Copyright (C) 2006-2011 Michael Niedermayer <michaelni@gmx.at>
+ * 2010 James Darnley <james.darnley@gmail.com>
+
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 
+ * 
+ 	Yadif C-plugin for Avisynth 2.5 - Yet Another DeInterlacing Filter
 	Copyright (C)2007 Alexander G. Balakhnin aka Fizick http://avisynth.org.ru
 Port of YADIF filter from MPlayer
 	Copyright (C) 2006 Michael Niedermayer <michaelni@gmx.at>
@@ -21,10 +45,6 @@
 	Assembler optimized for GNU C compiler
 
 */
-/*
- Ported to avidemux by mean
- Same license as original (?GPL)
-*/
 
 #include "ADM_default.h"
 #include "ADM_coreVideoFilter.h"
@@ -32,27 +52,49 @@
 #include "DIA_factory.h"
 #include "yadif.h"
 #include "yadif_desc.cpp"
-
-#if defined( ADM_CPU_X86) && !defined(_MSC_VER)
+#include "libavutil/common.h"
+#if defined( ADM_CPU_X86) 
 #define CAN_DO_INLINE_X86_ASM
 #endif
 
 
 //************************************************
-#define MIN(a,b) ((a) > (b) ? (b) : (a))
-#define MAX(a,b) ((a) < (b) ? (b) : (a))
-#define ABS(a) ((a) > 0 ? (a) : (-(a)))
 
-#define MIN3(a,b,c) MIN(MIN(a,b),c)
-#define MAX3(a,b,c) MAX(MAX(a,b),c)
+
+static void filter_line_c( uint8_t *dst1, const uint8_t *prev1, const uint8_t *cur1, const uint8_t *next1, int w, int prefs, int mrefs, int parity, int mode);
+static void filter_edges_c(uint8_t *dst1, const uint8_t *prev1, const uint8_t *cur1, const uint8_t *next1, int w, int prefs, int mrefs, int parity, int mode);
+static void filter_end_c(void) {};
 
 //===========================================================================//
 #ifdef CAN_DO_INLINE_X86_ASM
 extern "C"
 {
-void filter_line_mmx2(int mode, uint8_t *dst, const uint8_t *prev, const uint8_t *cur, const uint8_t *next, int w, int refs, int parity);
+ void filter_end_sse(void); // emms , not needed for sse2
+ void adm_yadif_filter_line_sse2( uint8_t *dst1, const uint8_t *prev1, const uint8_t *cur1, const uint8_t *next1, int w, int prefs, int mrefs, int parity, int mode);
+ void adm_yadif_filter_line_ssse3( uint8_t *dst1, const uint8_t *prev1, const uint8_t *cur1, const uint8_t *next1, int w, int prefs, int mrefs, int parity, int mode);
 }
 #endif
+
+
+enum YADIFMode {
+ YADIF_MODE_SEND_FRAME = 0, ///< send 1 frame for each frame
+ YADIF_MODE_SEND_FIELD = 1, ///< send 1 frame for each field
+ YADIF_MODE_SEND_FRAME_NOSPATIAL = 2, ///< send 1 frame for each frame but skips spatial interlacing check
+ YADIF_MODE_SEND_FIELD_NOSPATIAL = 3, ///< send 1 frame for each field but skips spatial interlacing check
+};
+
+enum YADIFParity {
+ YADIF_PARITY_TFF = 0, ///< top field first
+ YADIF_PARITY_BFF = 1, ///< bottom field first
+ YADIF_PARITY_AUTO = -1, ///< auto detection
+};
+
+enum YADIFDeint {
+ YADIF_DEINT_ALL = 0, ///< deinterlace all frames
+ YADIF_DEINT_INTERLACED = 1, ///< only deinterlace frames marked as interlaced
+};
+
+
 //
 /**
 \class yadifFilter
@@ -72,6 +114,13 @@
 virtual bool getCoupledConf(CONFcouple **couples) ; /// Return the current filter configuration
 		virtual void setCoupledConf(CONFcouple *couples);
 virtual bool configure(void) ; /// Start graphical user interface
+ 
+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);
+ void (*filter_edges)(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);
+ void (*filter_end)(void); 
+ 
+ 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);
 };
 
 // Add the hook to make it valid plugin
@@ -98,11 +147,27 @@
 if(!setup || !ADM_paramLoad(setup,yadif_param,&configuration))
 {
 // Default value
- configuration.mode=0;
- configuration.order=1;
+ configuration.mode=YADIF_MODE_SEND_FRAME;
+ configuration.deint=YADIF_DEINT_ALL; 
+ configuration.parity=YADIF_PARITY_AUTO;
 }
- 
 updateInfo();
+
+ filter_line=filter_line_c;
+ filter_edges=filter_edges_c;
+ filter_end=filter_end_c;
+
+#ifdef CAN_DO_INLINE_X86_ASM 
+ if (CpuCaps::hasSSE3()) 
+ {
+ filter_line=adm_yadif_filter_line_ssse3;
+ }else 
+ if (CpuCaps::hasSSE2()) 
+ {
+ filter_line=adm_yadif_filter_line_sse2;
+ }
+#endif
+ 
 myName="yadif";
 }
 /**
@@ -112,8 +177,6 @@
 {
 delete original;
 original=NULL;
- 
- 
 }
 /**
 \fn updateInfo
@@ -121,7 +184,7 @@
 
 void yadifFilter::updateInfo(void)
 {
- memcpy(&info,previousFilter->getInfo(),sizeof(info)); 
+ memcpy(&info,previousFilter->getInfo(),sizeof(info)); 
 if(configuration.mode &1 ) // Bob
 {
 info.frameIncrement/=2;
@@ -133,28 +196,37 @@
 bool yadifFilter::configure( void) 
 {
 
- diaMenuEntry tMode[]={
- {0, QT_TRANSLATE_NOOP("yadif","Temporal & spatial check"),NULL},
- {1, QT_TRANSLATE_NOOP("yadif","Bob, temporal & spatial check"),NULL},
- {2, QT_TRANSLATE_NOOP("yadif","Skip spatial temporal check"),NULL},
- {3, QT_TRANSLATE_NOOP("yadif","Bob, skip spatial temporal check"),NULL}
+ diaMenuEntry tMode[]={
+ {0, QT_TRANSLATE_NOOP("yadif","Frame : Temporal & spatial check"),NULL},
+ {1, QT_TRANSLATE_NOOP("yadif","Field : Temporal & spatial check"),NULL},
+ {2, QT_TRANSLATE_NOOP("yadif","Frame : Skip spatial temporal check"),NULL},
+ {3, QT_TRANSLATE_NOOP("yadif","Field : Skip spatial temporal check"),NULL}
 };
- diaMenuEntry tOrder[]={
- {0, QT_TRANSLATE_NOOP("yadif","Bottom field first"),NULL},
- {1, QT_TRANSLATE_NOOP("yadif","Top field first"),NULL}
+ diaMenuEntry tOrder[]={
+ //{0, QT_TRANSLATE_NOOP("yadif","Auto"),NULL},
+ {1, QT_TRANSLATE_NOOP("yadif","Top field first"),NULL},
+ {2, QT_TRANSLATE_NOOP("yadif","Bottom field first"),NULL} 
 };
- 
- diaElemMenu mMode(&(configuration.mode), QT_TRANSLATE_NOOP("yadif","_Mode:"), 4,tMode);
- diaElemMenu morder(&(configuration.order), QT_TRANSLATE_NOOP("yadif","_Order:"), 2,tOrder);
+
+ diaMenuEntry tDeint[]={
+ {0, QT_TRANSLATE_NOOP("yadif","Deint all"),NULL},
+ {1, QT_TRANSLATE_NOOP("yadif","Deint interlaced"),NULL}
+ };
+
 
- diaElem *elems[]={&mMode,&morder};
+ uint32_t parity=configuration.parity+1;
+ diaElemMenu mMode(&(configuration.mode), QT_TRANSLATE_NOOP("yadif","_Mode:"), 4,tMode);
+ diaElemMenu mDeint(&(configuration.deint), QT_TRANSLATE_NOOP("yadif","_Deint:"), 2,tDeint); 
+ diaElemMenu mOrder(&(parity), QT_TRANSLATE_NOOP("yadif","_Order:"), 2,tOrder);
+ diaElem *elems[]={&mMode,&mOrder}; //,&mDeint};
 
- if(diaFactoryRun(QT_TRANSLATE_NOOP("yadif","yadif"),sizeof(elems)/sizeof(diaElem *),elems))
- {
+ if(diaFactoryRun(QT_TRANSLATE_NOOP("yadif","yadif"),sizeof(elems)/sizeof(diaElem *),elems))
+ {
+ configuration.parity=(int)parity-1;
 updateInfo();
 return 1;
- }
- return 0;
+ }
+ return 0;
 }
 /**
 \fn getCoupledConf
@@ -178,236 +250,10 @@
 {
 static char conf[80];
 conf[0]=0;
- snprintf(conf,80,"yadif : mode=%d, order=%d\n",
- (int)configuration.mode, (int)configuration.order);
+ snprintf(conf,80,"yadif : mode=%d, order=%d, deint=%d\n",
+ (int)configuration.mode, (int)configuration.parity,(int)configuration.deint);
 return conf;
 }
 
-/**
- \fn getConfiguration
- \brief Return current setting as a string
-*/
-bool yadifFilter::getNextFrame(uint32_t *fn,ADMImage *image)
-{
-
- int mode;
- int parity;
- int tff;
- int iplane;
- int cpu;
- int n;
- ADMImage *src, *dst, * prev, *next;
- 
- 
- mode = configuration.mode;
-
- if (mode & 1) 
- {
- n = (nextFrame>>1); // bob
- }
- else
- n = nextFrame;
-
- src = vidCache->getImage(n);
- *fn=nextFrame;
- if(!src) return false;
- 
- 
- // If possible get previous image...
- if (n>0)
- prev = vidCache->getImage( n-1); // get previous frame
- else
- prev= src; // get very first frame
-
- ADM_assert(prev);
- next=vidCache->getImage(n+1);
- if(!next) next=src;
- ADM_assert(next);
- 
- dst = image;
- dst->copyInfo(src);
-
- if(!prev || !src || !next)
- {
- printf("Failed to read frame for frame %u\n",nextFrame);
- vidCache->unlockAll();
- return 0;
- }
- 
- // Construct a frame based on the information of the current frame
- // contained in the "vi" struct.
-#if 0 //MEANX
- if (configuration.order == -1)
-//		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.order;	
- 
- parity = (mode & 1) ? (nextFrame & 1) ^ (1^tff) : (tff ^ 1); // 0 or 1
-
- //MEANX cpu = avs_get_cpu_flags(p->env);
-
- for (iplane = 0; iplane<3; iplane++)
- {
- ADM_PLANE plane = (iplane==0) ? PLANAR_Y : (iplane==1) ? PLANAR_U : PLANAR_V;
-
- const unsigned char* srcp = src->GetWritePtr(plane);
- // Request a Read pointer from the current source frame
-
- const unsigned char* prevp0 = prev->GetWritePtr( plane);
- unsigned char* prevp = (unsigned char*) prevp0; // with same pitch
- // Request a Read pointer from the prev source frame.
-
- const unsigned char* nextp0 = next->GetWritePtr( plane);
- unsigned char* nextp = (unsigned char*) nextp0; // with same pitch
- // Request a Read pointer from the next source frame.
-
- unsigned char* dstp = dst->GetWritePtr( plane);
- // Request a Write pointer from the newly created destination image.
- // You can request a writepointer to images that have just been
-
- const int dst_pitch = dst->GetPitch( plane);
- // Requests pitch (length of a line) of the destination image.
- // For more information on pitch see: http://www.avisynth.org/index.php?page=WorkingWithImages
- // (short version - pitch is always equal to or greater than width to allow for seriously fast assembly code)
-
- const int width =dst->GetPitch( plane);
- // Requests rowsize (number of used bytes in a line.
- // See the link above for more information.
-
- const int height = dst->GetHeight( plane);
- // Requests the height of the destination image.
-
- const int src_pitch = src->GetPitch(plane);
- const int prev_pitch = prev->GetPitch(plane);
- const int next_pitch = next->GetPitch(plane);
-
- // in v.0.1-0.3 all source pitches are assumed equal (for simplicity)
- // consider other (rare) case
- if (prev_pitch != src_pitch)
- {
- prevp = (unsigned char *)ADM_alloc(height*src_pitch);
- int h;
- for (h=0; h<0; h++)
- memcpy(prevp+h*src_pitch, prevp0+h*prev_pitch, width);
- }
- 
- if (next_pitch != src_pitch)
- {
- nextp = (unsigned char *)ADM_alloc(height*src_pitch);
- int h;
- for (h=0; h<0; h++)
- memcpy(nextp+h*src_pitch, nextp0+h*next_pitch, width);
- }
- 
- filter_plane(mode, dstp, dst_pitch, prevp, srcp, nextp, src_pitch, width, height, parity, tff, 0);
- if (prev_pitch != src_pitch)
- ADM_dealloc(prevp);
- if (next_pitch != src_pitch)
- ADM_dealloc(nextp);
- }
- vidCache->unlockAll();
- 
- if (mode & 1) 
- {
- if(nextFrame&1)
- image->Pts+= info.frameIncrement;
- }
- //printf("out PTs=%"PRIu64", nextFrame=%d,inc=%d\n",image->Pts,(int)nextFrame,(int)info.frameIncrement);
- nextFrame++;
- 
- return 1;
-}
-//****************
-
-static void filter_line_c(int mode, uint8_t *dst, const uint8_t *prev, const uint8_t *cur, const uint8_t *next, int w, int refs, int parity){
- int x;
- const uint8_t *prev2= parity ? prev : cur ;
- const uint8_t *next2= parity ? cur : next;
- for(x=0; x<w; x++){
- int c= cur[-refs];
- int d= (prev2[0] + next2[0])>>1;
- int e= cur[+refs];
- int temporal_diff0= ABS(prev2[0] - next2[0]);
- int temporal_diff1=( ABS(prev[-refs] - c) + ABS(prev[+refs] - e) )>>1;
- int temporal_diff2=( ABS(next[-refs] - c) + ABS(next[+refs] - e) )>>1;
- int diff= MAX3(temporal_diff0>>1, temporal_diff1, temporal_diff2);
- int spatial_pred= (c+e)>>1;
- int spatial_score= ABS(cur[-refs-1] - cur[+refs-1]) + ABS(c-e)
- + ABS(cur[-refs+1] - cur[+refs+1]) - 1;
-
-#define CHECK(j)\
- { int score= ABS(cur[-refs-1+ j] - cur[+refs-1- j])\
- + ABS(cur[-refs + j] - cur[+refs - j])\
- + ABS(cur[-refs+1+ j] - cur[+refs+1- j]);\
- if(score < spatial_score){\
- spatial_score= score;\
- spatial_pred= (cur[-refs + j] + cur[+refs - j])>>1;\
-
- CHECK(-1) CHECK(-2) }} }}
- CHECK( 1) CHECK( 2) }} }}
-
- if(mode<2){
- int b= (prev2[-2*refs] + next2[-2*refs])>>1;
- int f= (prev2[+2*refs] + next2[+2*refs])>>1;
-#if 0
- int a= cur[-3*refs];
- int g= cur[+3*refs];
- int max= MAX3(d-e, d-c, MIN3(MAX(b-c,f-e),MAX(b-c,b-a),MAX(f-g,f-e)) );
- int min= MIN3(d-e, d-c, MAX3(MIN(b-c,f-e),MIN(b-c,b-a),MIN(f-g,f-e)) );
-#else
- int max= MAX3(d-e, d-c, MIN(b-c, f-e));
- int min= MIN3(d-e, d-c, MAX(b-c, f-e));
-#endif
-
- diff= MAX3(diff, min, -max);
- }
-
- if(spatial_pred > d + diff)
- spatial_pred = d + diff;
- else if(spatial_pred < d - diff)
- spatial_pred = d - diff;
-
- dst[0] = spatial_pred;
-
- dst++;
- cur++;
- prev++;
- next++;
- prev2++;
- next2++;
- }
-}
-
-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)
-{
-void (*filter_line)(int mode, uint8_t *dst, const uint8_t *prev, const uint8_t *cur, const uint8_t *next, int w, int refs, int parity);
-	int y;
-	filter_line = filter_line_c;
-#ifdef CAN_DO_INLINE_X86_ASM
-	if (CpuCaps::hasMMXEXT()) 
-		filter_line = filter_line_mmx2;
-#endif
-
- memcpy(dst, cur0, w);
- memcpy(dst + dst_stride, cur0 + refs, w);
- for(y=2; y<h-1; 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;
- filter_line(mode, dst2, prev, cur, next, w, refs, (parity ^ tff));
- }else{
- memcpy(dst + y*dst_stride, cur0 + y*refs, w);
- }
- }
- memcpy(dst + (h-1)*dst_stride, cur0 + (h-1)*refs, w);
-
-#ifdef CAN_DO_INLINE_X86_ASM
-	if (CpuCaps::hasMMXEXT()) 
-		asm volatile("emms");
-#endif
-}
 
+#include "ADM_vidYadif_body.cpp"

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif_body.cpp Added

@@ -0,0 +1,297 @@
+/*
+ * Copyright (C) 2006-2011 Michael Niedermayer <michaelni@gmx.at>
+ * 2010 James Darnley <james.darnley@gmail.com>
+
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+#define MAX_ALIGN 8
+
+/**
+ \fn getConfiguration
+ \brief Return current setting as a string
+*/
+bool yadifFilter::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+
+ int mode;
+ int parity;
+ int tff;
+ int iplane;
+ int cpu;
+ int n;
+ ADMImage *src, *dst, * prev, *next;
+ 
+ 
+ mode = configuration.mode;
+
+ if (mode & 1) 
+ {
+ n = (nextFrame>>1); // bob
+ }
+ else
+ n = nextFrame;
+
+ src = vidCache->getImage(n);
+ *fn=nextFrame;
+ if(!src) return false;
+ 
+ 
+ // If possible get previous image...
+ if (n>0)
+ prev = vidCache->getImage( n-1); // get previous frame
+ else
+ prev= src; // get very first frame
+
+ ADM_assert(prev);
+ next=vidCache->getImage(n+1);
+ if(!next) next=src;
+ ADM_assert(next);
+ 
+ dst = image;
+ dst->copyInfo(src);
+
+ if(!prev || !src || !next)
+ {
+ printf("Failed to read frame for frame %u\n",nextFrame);
+ vidCache->unlockAll();
+ return 0;
+ }
+ 
+ // Construct a frame based on the information of the current frame
+ // contained in the "vi" struct.
+#if 0 //MEANX
+ if (configuration.order == -1)
+//		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;	
+ 
+ parity = (mode & 1) ? (nextFrame & 1) ^ (1^tff) : (tff ^ 1); // 0 or 1
+
+ //MEANX cpu = avs_get_cpu_flags(p->env);
+
+ for (iplane = 0; iplane<3; iplane++)
+ {
+ ADM_PLANE plane = (iplane==0) ? PLANAR_Y : (iplane==1) ? PLANAR_U : PLANAR_V;
+
+ const unsigned char* srcp = src->GetWritePtr(plane);
+ // Request a Read pointer from the current source frame
+
+ const unsigned char* prevp0 = prev->GetWritePtr( plane);
+ unsigned char* prevp = (unsigned char*) prevp0; // with same pitch
+ // Request a Read pointer from the prev source frame.
+
+ const unsigned char* nextp0 = next->GetWritePtr( plane);
+ unsigned char* nextp = (unsigned char*) nextp0; // with same pitch
+ // Request a Read pointer from the next source frame.
+
+ unsigned char* dstp = dst->GetWritePtr( plane);
+ // Request a Write pointer from the newly created destination image.
+ // You can request a writepointer to images that have just been
+
+ const int dst_pitch = dst->GetPitch( plane);
+ // Requests pitch (length of a line) of the destination image.
+ // For more information on pitch see: http://www.avisynth.org/index.php?page=WorkingWithImages
+ // (short version - pitch is always equal to or greater than width to allow for seriously fast assembly code)
+
+ const int width =dst->GetPitch( plane);
+ // Requests rowsize (number of used bytes in a line.
+ // See the link above for more information.
+
+ const int height = dst->GetHeight( plane);
+ // Requests the height of the destination image.
+
+ const int src_pitch = src->GetPitch(plane);
+ const int prev_pitch = prev->GetPitch(plane);
+ const int next_pitch = next->GetPitch(plane);
+
+ // in v.0.1-0.3 all source pitches are assumed equal (for simplicity)
+ // consider other (rare) case
+ if (prev_pitch != src_pitch)
+ {
+ prevp = (unsigned char *)ADM_alloc(height*src_pitch);
+ int h;
+ for (h=0; h<0; h++)
+ memcpy(prevp+h*src_pitch, prevp0+h*prev_pitch, width);
+ }
+ 
+ if (next_pitch != src_pitch)
+ {
+ nextp = (unsigned char *)ADM_alloc(height*src_pitch);
+ int h;
+ for (h=0; h<0; h++)
+ memcpy(nextp+h*src_pitch, nextp0+h*next_pitch, width);
+ }
+ 
+ filter_plane(mode, dstp, dst_pitch, prevp, srcp, nextp, src_pitch, width, height, parity, tff, 0);
+ if (prev_pitch != src_pitch)
+ ADM_dealloc(prevp);
+ if (next_pitch != src_pitch)
+ ADM_dealloc(nextp);
+ }
+ vidCache->unlockAll();
+ 
+ if (mode & 1) 
+ {
+ if(nextFrame&1)
+ image->Pts+= info.frameIncrement;
+ }
+ //printf("out PTs=%"PRIu64", nextFrame=%d,inc=%d\n",image->Pts,(int)nextFrame,(int)info.frameIncrement);
+ nextFrame++;
+ filter_end();
+ return 1;
+}
+
+
+void yadifFilter::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)
+{
+ 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++){
+ 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;
+ 
+ filter_line(dst2 + pix_3, prev + pix_3, cur + pix_3, next + pix_3, 
+ w - edge,
+ y + 1 < h ? refs : -refs,
+ y ? -refs : refs,
+ parity ^ tff, mode);
+ filter_edges(dst2, prev, cur, next, 
+ w,
+ y + 1 < h ? refs : -refs,
+ y ? -refs : refs,
+ parity ^ tff, mode); 
+ 
+ }else{
+ memcpy(dst + y*dst_stride, cur0 + y*refs, w);
+ }
+ }
+ memcpy(dst + (h-1)*dst_stride, cur0 + (h-1)*refs, w);
+
+}
+
+//--- ff ---
+#define CHECK(j)\
+ { int score = FFABS(cur[mrefs - 1 + (j)] - cur[prefs - 1 - (j)])\
+ + FFABS(cur[mrefs +(j)] - cur[prefs -(j)])\
+ + FFABS(cur[mrefs + 1 + (j)] - cur[prefs + 1 - (j)]);\
+ if (score < spatial_score) {\
+ spatial_score= score;\
+ spatial_pred= (cur[mrefs +(j)] + cur[prefs -(j)])>>1;\
+
+/* The is_not_edge argument here controls when the code will enter a branch
+ * which reads up to and including x-3 and x+3. */
+
+#define FILTER(start, end, is_not_edge) \
+ for (x = start; x < end; x++) { \
+ int c = cur[mrefs]; \
+ int d = (prev2[0] + next2[0])>>1; \
+ int e = cur[prefs]; \
+ int temporal_diff0 = FFABS(prev2[0] - next2[0]); \
+ int temporal_diff1 =(FFABS(prev[mrefs] - c) + FFABS(prev[prefs] - e) )>>1; \
+ int temporal_diff2 =(FFABS(next[mrefs] - c) + FFABS(next[prefs] - e) )>>1; \
+ int diff = FFMAX3(temporal_diff0 >> 1, temporal_diff1, temporal_diff2); \
+ int spatial_pred = (c+e) >> 1; \
+ \
+ if (is_not_edge) {\
+ int spatial_score = FFABS(cur[mrefs - 1] - cur[prefs - 1]) + FFABS(c-e) \
+ + FFABS(cur[mrefs + 1] - cur[prefs + 1]) - 1; \
+ CHECK(-1) CHECK(-2) }} }} \
+ CHECK( 1) CHECK( 2) }} }} \
+ }\
+ \
+ if (!(mode&2)) { \
+ int b = (prev2[2 * mrefs] + next2[2 * mrefs])>>1; \
+ int f = (prev2[2 * prefs] + next2[2 * prefs])>>1; \
+ int max = FFMAX3(d - e, d - c, FFMIN(b - c, f - e)); \
+ int min = FFMIN3(d - e, d - c, FFMAX(b - c, f - e)); \
+ \
+ diff = FFMAX3(diff, min, -max); \
+ } \
+ \
+ if (spatial_pred > d + diff) \
+ spatial_pred = d + diff; \
+ else if (spatial_pred < d - diff) \
+ spatial_pred = d - diff; \
+ \
+ dst[0] = spatial_pred; \
+ \
+ dst++; \
+ cur++; \
+ prev++; \
+ next++; \
+ prev2++; \
+ next2++; \
+ }
+
+void filter_line_c(uint8_t *dst1,
+ const uint8_t *prev1, const uint8_t *cur1, const uint8_t *next1,
+ int w, int prefs, int mrefs, int parity, int mode)
+{
+ uint8_t *dst = (uint8_t *) dst1;
+ uint8_t *prev = (uint8_t *)prev1;
+ uint8_t *cur = (uint8_t *)cur1;
+ uint8_t *next = (uint8_t *)next1;
+ int x;
+ uint8_t *prev2 = parity ? prev : cur ;
+ uint8_t *next2 = parity ? cur : next;
+
+ /* The function is called with the pointers already pointing to data[3] and
+ * with 6 subtracted from the width. This allows the FILTER macro to be
+ * called so that it processes all the pixels normally. A constant value of
+ * true for is_not_edge lets the compiler ignore the if statement. */
+ FILTER(0, w, 1)
+}
+
+
+void filter_edges_c(uint8_t *dst1, const uint8_t *prev1, const uint8_t *cur1, const uint8_t *next1,
+ int w, int prefs, int mrefs, int parity, int mode)
+{
+ uint8_t *dst = (uint8_t *)dst1;
+ uint8_t *prev = (uint8_t *)prev1;
+ uint8_t *cur = (uint8_t *)cur1;
+ uint8_t *next = (uint8_t *)next1;
+ int x;
+ uint8_t *prev2 = parity ? prev : cur ;
+ uint8_t *next2 = parity ? cur : next;
+
+ const int edge = MAX_ALIGN - 1;
+
+ /* Only edge pixels need to be processed here. A constant value of false
+ * for is_not_edge should let the compiler ignore the whole branch. */
+ FILTER(0, 3, 0)
+
+ dst = (uint8_t*)dst1 + w - edge;
+ prev = (uint8_t*)prev1 + w - edge;
+ cur = (uint8_t*)cur1 + w - edge;
+ next = (uint8_t*)next1 + w - edge;
+ prev2 = (uint8_t*)(parity ? prev : cur);
+ next2 = (uint8_t*)(parity ? cur : next);
+
+ FILTER(w - edge, w - 3, 1)
+ FILTER(w - 3, w, 0)
+}
+

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

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/vf_yadif.asm -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/vf_yadif.asm Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/yadif.conf -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/yadif.conf Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/yadif.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/yadif.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/yadif_desc.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/yadif_desc.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/yadif_json.cpp Added

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

@@ -6,6 +6,7 @@
 default_mxerootdir="/opt/mxe"
 mxerootdir="$default_mxerootdir"
 rebuild=0
+debug=0
 do_core=1
 do_qt=1
 do_cli=1
@@ -62,7 +63,11 @@
         export TOOLCHAIN_LOCATION=${MXE_ROOT}/usr
         export SDL2DIR=${MXE_ROOT}/usr/${MXE_TARGET}
         export PARAL="-j $(nproc)"
-        export INSTALL_DIR=${MINGW}/out/avidemux
+        if [ "x$debug" != "x1" ]; then
+            export INSTALL_DIR=${MINGW}/out/avidemux
+        else
+            export INSTALL_DIR=${MINGW}/out_debug/avidemux
+        fi
     fi
     export CROSS_PREFIX=$MXE_TARGET
     export PKG_CONFIG_PATH=$MINGW/lib/pkgconfig
@@ -84,6 +89,12 @@
     export BUILDDIR=$1
     export SOURCEDIR=$2
     export EXTRA=$3
+    GENERATOR="Unix Makefiles"
+    if [ "x$debug" = "x1" ]; then
+                DEBUG="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug"
+                BUILDDIR="${BUILDDIR}_debug"
+                GENERATOR="CodeBlocks - Unix Makefiles"
+    fi
     echo "Building $BUILDDIR from $SOURCEDIR (Extra=$EXTRA)"
     if [ "x$rebuild" != "x1" ]; then
         rm -Rf ./"$BUILDDIR"
@@ -104,10 +115,11 @@
     -DCMAKE_AR:STRING=${CROSS_PREFIX}-ar \
     -DCMAKE_RC_COMPILER:STRING=${CROSS_PREFIX}-windres \
     -DAVIDEMUX_TOP_SOURCE_DIR="$TOP" \
-    -G "Unix Makefiles" \
+    ${DEBUG} \
+    -G "${GENERATOR}" \
     $EXTRA \
     $SOURCEDIR || fail cmake
-    make $PARAL VERBOSE=1 >& /tmp/log$BUILDDIR || fail make
+    make $PARAL >& /tmp/log$BUILDDIR || fail "make, result in /tmp/log$BUILDDIR "
     make install || fail make_install
     # Only install  component=dev for dev package
     if [ "x$author_setup" = "x1" ]; then
@@ -121,6 +133,7 @@
     echo "  --help                : Print usage"
     echo "  --32                  : Build a 32 bit application (default)"
     echo "  --64                  : Build a 64 bit application"
+    echo "  --debug               : Switch debugging on"
     echo "  --mxe-root=DIR        : Use MXE installed in DIR (default: ${default_mxerootdir})"
     echo "  --rebuild             : Preserve existing build directories"
     echo "  --with-core           : Build core"
@@ -177,9 +190,12 @@
         echo "No avidemux.exe (${BITS} bit) found in ${INSTALL_DIR}, aborting"
         exit 1
     fi
-    echo "Preparing release package..."
+    echo "Preparing package..."
     cd $TOP
     PACKAGE_DIR="packaged_mingw_build_${BUILDDATE}"
+    if [ "x$debug" = "x1" ]; then
+        PACKAGE_DIR="packaged_mingw_debug_build_${BUILDDATE}"
+    fi
     if [ ! -e $PACKAGE_DIR ]; then
         mkdir $PACKAGE_DIR
     fi
@@ -236,6 +252,7 @@
     libwinpthread-*.dll \
     libx264-*.dll \
     libx265.dll \
+    libzstd.dll \
     SDL2.dll \
     ssleay32.dll \
     xvidcore.dll \

avidemux_2.7.3.tar.gz/cmake/admCheckMiscLibs.cmake -> avidemux_2.7.4.tar.gz/cmake/admCheckMiscLibs.cmake Changed

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

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

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

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

avidemux_2.7.3.tar.gz/cmake/osx/fonts.conf -> avidemux_2.7.4.tar.gz/cmake/osx/fonts.conf Changed